From 44e1a837db51799ef23068699f366991334a3494 Mon Sep 17 00:00:00 2001 From: Sergey Matveychuk Date: Tue, 18 Apr 2006 17:35:29 +0000 Subject: MySQL Query Browser is a database querying tool that combines the simplicity of a Web-browser-like interface with powerful features like multiple result sets on tab sheets, query history, storing query "bookmarks", editing and comparing resultsets, SQL script debugging, and more. WWW: http://www.mysql.com/products/tools/query-browser/ PR: ports/95530 Submitted by: Rainer Alves --- .../mysql-query-browser/files/patch-MCrontab.h | 13 +++++++++++++ .../mysql-query-browser/files/patch-MGPreferences.h | 11 +++++++++++ .../files/patch-MQBookmarkBrowser.cc | 12 ++++++++++++ .../mysql-query-browser/files/patch-Makefile.in | 11 +++++++++++ databases/mysql-query-browser/files/patch-regcomp.c | 21 +++++++++++++++++++++ 5 files changed, 68 insertions(+) create mode 100644 databases/mysql-query-browser/files/patch-MCrontab.h create mode 100644 databases/mysql-query-browser/files/patch-MGPreferences.h create mode 100644 databases/mysql-query-browser/files/patch-MQBookmarkBrowser.cc create mode 100644 databases/mysql-query-browser/files/patch-Makefile.in create mode 100644 databases/mysql-query-browser/files/patch-regcomp.c (limited to 'databases/mysql-query-browser/files') diff --git a/databases/mysql-query-browser/files/patch-MCrontab.h b/databases/mysql-query-browser/files/patch-MCrontab.h new file mode 100644 index 000000000000..4986a8b1372e --- /dev/null +++ b/databases/mysql-query-browser/files/patch-MCrontab.h @@ -0,0 +1,13 @@ +--- mysql-gui-common/source/linux/MCrontab.h.orig Sat Apr 8 21:17:27 2006 ++++ mysql-gui-common/source/linux/MCrontab.h Sat Apr 8 21:18:01 2006 +@@ -41,8 +41,8 @@ + public: + bool find_entry_by_comment(const std::string &comment, Entry &entry); + +- bool MCrontab::remove_entry_with_comment(const std::string &comment, +- const std::string &command=""); ++ bool remove_entry_with_comment(const std::string &comment, ++ const std::string &command=""); + + void add_entry(Entry &entry, const std::string &comment); + diff --git a/databases/mysql-query-browser/files/patch-MGPreferences.h b/databases/mysql-query-browser/files/patch-MGPreferences.h new file mode 100644 index 000000000000..fb26b42cf54d --- /dev/null +++ b/databases/mysql-query-browser/files/patch-MGPreferences.h @@ -0,0 +1,11 @@ +--- mysql-gui-common/source/linux/MGPreferences.h.orig Sat Apr 8 21:21:45 2006 ++++ mysql-gui-common/source/linux/MGPreferences.h Sat Apr 8 21:22:58 2006 +@@ -40,7 +40,7 @@ + virtual MYX_APPLICATION_OPTIONS *prepare_options()= 0; + + const char *find_value(MYX_OPTION_GROUP *group, const char *name); +- std::listMGOptions::find_values(MYX_OPTION_GROUP *group, const char *name); ++ std::list find_values(MYX_OPTION_GROUP *group, const char *name); + + void add_group(MYX_APPLICATION_OPTIONS *options, const char *name, + const std::list &values); diff --git a/databases/mysql-query-browser/files/patch-MQBookmarkBrowser.cc b/databases/mysql-query-browser/files/patch-MQBookmarkBrowser.cc new file mode 100644 index 000000000000..0eeebe9d1e32 --- /dev/null +++ b/databases/mysql-query-browser/files/patch-MQBookmarkBrowser.cc @@ -0,0 +1,12 @@ +--- mysql-query-browser/source/linux/MQBookmarkBrowser.cc.orig Sat Apr 8 21:26:35 2006 ++++ mysql-query-browser/source/linux/MQBookmarkBrowser.cc Sat Apr 8 21:27:52 2006 +@@ -257,7 +257,8 @@ + { + for (unsigned int i=0; i < _menu.items().size(); i++) + _menu.items()[i].set_sensitive(false); +- _menu.items()[3].set_sensitive(true); // New Folder ++ if( _menu.items().size() > 3 ) ++ _menu.items()[3].set_sensitive(true); // New Folder + } + } + diff --git a/databases/mysql-query-browser/files/patch-Makefile.in b/databases/mysql-query-browser/files/patch-Makefile.in new file mode 100644 index 000000000000..fd40f1eb8033 --- /dev/null +++ b/databases/mysql-query-browser/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- mysql-query-browser/source/linux/Makefile.in.orig Sat Apr 8 16:49:12 2006 ++++ mysql-query-browser/source/linux/Makefile.in Sat Apr 8 16:49:32 2006 +@@ -574,7 +574,7 @@ + # If a solution is found, this could be removed. + # + $(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a: +- (cd gtksourceview; ./configure --enable-static --disable-shared --disable-build-tests; make) ++ (cd gtksourceview; ./configure --enable-static --disable-shared --disable-build-tests; gmake) + + clean-generic: + -make -C gtksourceview distclean diff --git a/databases/mysql-query-browser/files/patch-regcomp.c b/databases/mysql-query-browser/files/patch-regcomp.c new file mode 100644 index 000000000000..6c68e2ccc7a7 --- /dev/null +++ b/databases/mysql-query-browser/files/patch-regcomp.c @@ -0,0 +1,21 @@ +--- mysql-query-browser/source/linux/gtksourceview/gtksourceview/gnu-regex/regcomp.c.orig Sun Apr 9 00:37:59 2006 ++++ mysql-query-browser/source/linux/gtksourceview/gtksourceview/gnu-regex/regcomp.c Sun Apr 9 00:39:42 2006 +@@ -451,18 +451,6 @@ + if (ret == REG_ERPAREN) + ret = REG_EPAREN; + +- /* We have already checked preg->fastmap != NULL. */ +- if (BE (ret == REG_NOERROR, 1)) +- /* Compute the fastmap now, since regexec cannot modify the pattern +- buffer. This function nevers fails in this implementation. */ +- (void) re_compile_fastmap (preg); +- else +- { +- /* Some error occurred while compiling the expression. */ +- re_free (preg->fastmap); +- preg->fastmap = NULL; +- } +- + return (int) ret; + } + #ifdef _LIBC -- cgit v1.2.3