+++ /dev/null
-# ChangeLog for dev-db/mysql-gui-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/ChangeLog,v 1.31 2009/12/26 12:50:08 graaff Exp $
-
- 26 Dec 2009; Hans de Graaff <graaff@gentoo.org>
- mysql-gui-tools-5.0_p12-r3.ebuild:
- Explicitly depend on libgnome now, fixes #296254.
-
-*mysql-gui-tools-5.0_p12-r3 (07 Dec 2009)
-
- 07 Dec 2009; Hans de Graaff <graaff@gentoo.org>
- +mysql-gui-tools-5.0_p12-r3.ebuild,
- +files/mysql-gui-tools-5.0_p12-gnome-2.28.patch:
- Fix compilation with gnome 2.28 installed, due to other modules dropping
- the libgnome dependency: #293063.
-
- 20 Nov 2009; Mark Loeser <halcy0n@gentoo.org>
- mysql-gui-tools-5.0_p12-r2.ebuild:
- Move EAPI definition up above the inherit
-
- 26 Oct 2008; Sven Wegener <swegener@gentoo.org>
- +files/mysql-gui-tools-5.0_p12-deprecated-gtk+-api.patch,
- mysql-gui-tools-5.0_p12-r2.ebuild:
- Add patch to fix use of deprecated gtk+ API, fixes bug #240548.
-
- 17 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
- -files/mysql-gui-tools-5.0_p12-workbench-lua.patch,
- mysql-gui-tools-5.0_p12-r2.ebuild:
- remove workbench references since lua-5.0 is gone.
-
- 05 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
- Add USE flag description to metadata wrt GLEP 56.
-
- 09 Jun 2008; Sven Wegener <swegener@gentoo.org>
- +files/mysql-gui-tools-5.0_p12-gcc-4.3.patch,
- mysql-gui-tools-5.0_p12-r2.ebuild:
- Add compability with gcc-4.3.
-
- 11 Apr 2008; Sven Wegener <swegener@gentoo.org>
- +files/mysql-gui-tools-5.0_p12-libsigc++-2.2.patch,
- mysql-gui-tools-5.0_p12-r2.ebuild:
- Include a compability patch for libsigc++-2.2, bug #206318.
-
- 24 Feb 2008; Sven Wegener <swegener@gentoo.org>
- mysql-gui-tools-5.0_p12-r2.ebuild:
- Add missing libgnomeprint dependency.
-
-*mysql-gui-tools-5.0_p12-r2 (28 Nov 2007)
-
- 28 Nov 2007; Sven Wegener <swegener@gentoo.org>
- +files/mysql-gui-tools-5.0_p12-query-browser-sps.patch,
- -mysql-gui-tools-5.0_p12-r1.ebuild, +mysql-gui-tools-5.0_p12-r2.ebuild:
- Revision bump to fix a hang in mysql-query-browser, bug #170943.
-
- 10 Nov 2007; Sven Wegener <swegener@gentoo.org>
- mysql-gui-tools-5.0_p12-r1.ebuild:
- Include some EAPI1 features, SLOT depends and IUSE defaults.
-
-*mysql-gui-tools-5.0_p12-r1 (24 Oct 2007)
-
- 24 Oct 2007; Sven Wegener <swegener@gentoo.org>
- +files/mysql-gui-tools-5.0_p12-workbench-lua.patch,
- -mysql-gui-tools-5.0_p12.ebuild, +mysql-gui-tools-5.0_p12-r1.ebuild:
- Revision bump to fix bug #190355.
-
- 21 Oct 2007; Sven Wegener <swegener@gentoo.org>
- mysql-gui-tools-5.0_p12.ebuild:
- Adjust gtkhtml dependency.
-
- 28 Sep 2007; Sven Wegener <swegener@gentoo.org>
- mysql-gui-tools-5.0_p12.ebuild:
- Make the gtkmm and glibmm a || dependency. Also bump the gtkhtml dependency.
-
- 28 Sep 2007; Sven Wegener <swegener@gentoo.org>
- mysql-gui-tools-5.0_p12.ebuild:
- Adjust glibmm and gtkmm dependencies.
-
- 17 Jun 2007; Sven Wegener <swegener@gentoo.org>
- -mysql-gui-tools-5.0_p11.ebuild:
- Cleanup.
-
- 12 Jun 2007; Sven Wegener <swegener@gentoo.org>
- mysql-gui-tools-5.0_p11.ebuild, mysql-gui-tools-5.0_p12.ebuild:
- Make the gtkhtml dependency conditional on the query-browser USE flag.
- Thanks to Pietro Franchi in bug #181285.
-
-*mysql-gui-tools-5.0_p12 (15 May 2007)
-
- 15 May 2007; Sven Wegener <swegener@gentoo.org>
- +mysql-gui-tools-5.0_p12.ebuild:
- Version bump.
-
- 03 May 2007; Sven Wegener <swegener@gentoo.org>
- -files/mysql-gui-tools-5.0_p6-i18n-fix.patch,
- -files/mysql-gui-tools-5.0_p6-lua-modules.patch,
- -mysql-gui-tools-5.0_p6.ebuild, -mysql-gui-tools-5.0_p8.ebuild,
- -mysql-gui-tools-5.0_p9.ebuild, -mysql-gui-tools-5.0_p10.ebuild,
- -mysql-gui-tools-5.0_p10-r1.ebuild:
- Cleanup.
-
- 14 Apr 2007; Sven Wegener <swegener@gentoo.org>
- mysql-gui-tools-5.0_p11.ebuild:
- Fix sed and move it to src_unpack.
-
-*mysql-gui-tools-5.0_p11 (03 Apr 2007)
-
- 03 Apr 2007; Sven Wegener <swegener@gentoo.org>
- +mysql-gui-tools-5.0_p11.ebuild:
- Version bump.
-
-*mysql-gui-tools-5.0_p10-r1 (10 Mar 2007)
-
- 10 Mar 2007; Sven Wegener <swegener@gentoo.org>
- +mysql-gui-tools-5.0_p10-r1.ebuild:
- Revision bump. Fix nls support, bug #167867. Enable MySQL Workbench, bug
- #159957. Add local USE flags for all components.
-
-*mysql-gui-tools-5.0_p10 (02 Mar 2007)
-
- 02 Mar 2007; Sven Wegener <swegener@gentoo.org>
- +mysql-gui-tools-5.0_p10.ebuild:
- Version bump.
-
-*mysql-gui-tools-5.0_p9 (22 Jan 2007)
-
- 22 Jan 2007; Sven Wegener <swegener@gentoo.org>
- +mysql-gui-tools-5.0_p9.ebuild:
- Version bump.
-
-*mysql-gui-tools-5.0_p8 (16 Dec 2006)
-
- 16 Dec 2006; Sven Wegener <swegener@gentoo.org>
- +files/mysql-gui-tools-5.0_p8-i18n-fix.patch,
- +files/mysql-gui-tools-5.0_p8-lua-modules.patch,
- +mysql-gui-tools-5.0_p8.ebuild:
- Version bump.
-
- 13 Dec 2006; Sven Wegener <swegener@gentoo.org>
- +files/mysql-gui-tools-5.0_p6-i18n-fix.patch,
- mysql-gui-tools-5.0_p6.ebuild:
- Fix i18n issue.
-
- 09 Dec 2006; Sven Wegener <swegener@gentoo.org>
- -files/mysql-gui-tools-5.0_p4-lua-modules.patch,
- -files/mysql-gui-tools-5.0_p5-lua-modules.patch,
- -mysql-gui-tools-5.0_p4.ebuild, -mysql-gui-tools-5.0_p5.ebuild:
- Cleanup.
-
-*mysql-gui-tools-5.0_p6 (27 Nov 2006)
-
- 27 Nov 2006; Sven Wegener <swegener@gentoo.org>
- +files/mysql-gui-tools-5.0_p6-lua-modules.patch,
- +mysql-gui-tools-5.0_p6.ebuild:
- Version bump.
-
- 23 Nov 2006; Francesco Riosa <vivo@gentoo.org>
- mysql-gui-tools-5.0_p4.ebuild, mysql-gui-tools-5.0_p5.ebuild:
- dev-db/mysql => virtual/mysql
-
-*mysql-gui-tools-5.0_p5 (05 Nov 2006)
-
- 05 Nov 2006; Sven Wegener <swegener@gentoo.org>
- +files/mysql-gui-tools-5.0_p5-lua-modules.patch,
- +mysql-gui-tools-5.0_p5.ebuild:
- Version bump.
-
-*mysql-gui-tools-5.0_p4 (22 Oct 2006)
-
- 22 Oct 2006; Sven Wegener <swegener@gentoo.org>
- +files/mysql-gui-tools-5.0_p4-lua-modules.patch, +metadata.xml,
- +mysql-gui-tools-5.0_p4.ebuild:
- Initial commit, ebuild written by me.
-
+++ /dev/null
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX mysql-gui-tools-5.0_p12-deprecated-gtk+-api.patch 4974 RMD160 de60ab5dcc6479b82dc07337d4a67fd2a7b7d10b SHA1 b59073272865b111f30b58fac0b5f0b061d80e86 SHA256 88f61ff309afc0b210cab1f5bdef1d512c4cb6616550a028ae9f1d41f7da961a
-AUX mysql-gui-tools-5.0_p12-gcc-4.3.patch 1189 RMD160 939152bbcbd99372351023fdf61441326235a763 SHA1 21b827334555ffd30f5d1991d9be381fa800b4d8 SHA256 507d029d23c7d180418831e6f61a9ec53b8461891a0493689909c61fc60e6939
-AUX mysql-gui-tools-5.0_p12-gnome-2.28.patch 338 RMD160 6ad2342cf6ca773105ac8f2a59043dfb2aae50db SHA1 99ee8ca9235b0de300679a6ca215072630471dde SHA256 f7b45a35d8b98aba1e28e69fc3d9b0523bc07c170c4327fc3ee04f127991ff7c
-AUX mysql-gui-tools-5.0_p12-libsigc++-2.2.patch 8320 RMD160 b6f1a5f946fa371f9ce484af6ca839dedd46bec7 SHA1 7b2146726ec939ccda449a3ddbc127eab823b5ec SHA256 9844dcb8b7b9c1ea2d092c6afa4cb2a46b994b6ae8c3654932b4e24cf8d24048
-AUX mysql-gui-tools-5.0_p12-query-browser-sps.patch 313 RMD160 c2b2727f8cab0946659b1cc39ae1d2983a50e4f0 SHA1 ce78c02e84e029199b7d8ea73a8b53f67d32b38b SHA256 a68fce4a3d4f51f9ad9d3c743fa9bb7be59356eaf2f21a7cc6f1735fd5528c8b
-AUX mysql-gui-tools-5.0_p8-i18n-fix.patch 354 RMD160 660c2f3715e655c5473738c8c69be69c5e3d2a81 SHA1 eb700f0d691fa7d6a69db3f51059844b9855215f SHA256 9abc2cb8370b4f550718c6500be717951c527e6dca9f9530be534a5f8db09447
-AUX mysql-gui-tools-5.0_p8-lua-modules.patch 672 RMD160 6a5aed0f34bb2d4bada62851dfb18ba329693e47 SHA1 d6b13610e25bbe3e22af040fc3c46d25564f0693 SHA256 2e3e271de504562db3f3d3ef33297ce454a6e1a223f98e4c4480cb2361dcbf28
-DIST mysql-gui-tools-5.0r12.tar.gz 25357550 RMD160 ea94545c0e351e86112b13a43479aba361bc2cef SHA1 3fdd3a80c634f0aa9fa8f3bc505add18f360dc6c SHA256 4ede2e8073ab3ffa9371c3ad258eec433e8bdea876aa3db6b85e26072eb2cf7e
-EBUILD mysql-gui-tools-5.0_p12-r2.ebuild 2772 RMD160 7a5c8f0468852f57da38a90504473cac23694c18 SHA1 b3ae73e7fa34c04d97e64f36e4c7349167732c8a SHA256 435bc880dcfa20574b7d4d2b2780e938436831cfd0bf4b026e48e674a0ea3fd3
-EBUILD mysql-gui-tools-5.0_p12-r3.ebuild 2922 RMD160 1ff3d5556c70b227b2ca70855fb254c7997dc40d SHA1 ab917953d0939f361d58863faca7133fd9085e50 SHA256 24daf0f92fe9d1d2a2f527b3d7d954cb7f60f0aaa7a1613b5c169edfa502bd2a
-MISC ChangeLog 5897 RMD160 d234f4575d14fca8598e7bc214cde1e7b726b7ef SHA1 3a3b92362f8b73df17b3296dcfd6fc573f81585a SHA256 b09ce86aec50e2a4456a76ca9a4834ef5d37d53b39192e88e6e313d367a60c7d
-MISC metadata.xml 433 RMD160 00b52a4a1d7d67beb63b23e2cf7541b3849594de SHA1 9fe6c230cad179e8e8109719cb332d64a58f50c6 SHA256 29a10e9d7bd0d3dcc7b8ddc354c532efc9158a7e39940f253ba8f7dd0a71c804
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks2Bo0ACgkQeM7EJeUH71M7CgCfRsCo6e/QhppG09RwLw+hZIcB
-vGAAnjeqdlC1q53D0bM92eRXieDEr5Sm
-=Tdhb
------END PGP SIGNATURE-----
+++ /dev/null
-Index: mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguage.h
-===================================================================
---- mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguage.h (revision 488)
-+++ mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguage.h (working copy)
-@@ -30,10 +30,10 @@
- G_BEGIN_DECLS\r
- \r
- #define GTK_TYPE_SOURCE_LANGUAGE (gtk_source_language_get_type ())\r
--#define GTK_SOURCE_LANGUAGE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguage))\r
--#define GTK_SOURCE_LANGUAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))\r
--#define GTK_IS_SOURCE_LANGUAGE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGE))\r
--#define GTK_IS_SOURCE_LANGUAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGE))\r
-+#define GTK_SOURCE_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguage))\r
-+#define GTK_SOURCE_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))\r
-+#define GTK_IS_SOURCE_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGE))\r
-+#define GTK_IS_SOURCE_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGE))\r
- #define GTK_SOURCE_LANGUAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))\r
- \r
- \r
-Index: mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguagesmanager.h
-===================================================================
---- mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguagesmanager.h (revision 488)
-+++ mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourcelanguagesmanager.h (working copy)
-@@ -27,10 +27,10 @@
- G_BEGIN_DECLS\r
- \r
- #define GTK_TYPE_SOURCE_LANGUAGES_MANAGER (gtk_source_languages_manager_get_type ())\r
--#define GTK_SOURCE_LANGUAGES_MANAGER(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManager))\r
--#define GTK_SOURCE_LANGUAGES_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManagerClass))\r
--#define GTK_IS_SOURCE_LANGUAGES_MANAGER(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))\r
--#define GTK_IS_SOURCE_LANGUAGES_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))\r
-+#define GTK_SOURCE_LANGUAGES_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManager))\r
-+#define GTK_SOURCE_LANGUAGES_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManagerClass))\r
-+#define GTK_IS_SOURCE_LANGUAGES_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))\r
-+#define GTK_IS_SOURCE_LANGUAGES_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))\r
- \r
- \r
- typedef struct _GtkSourceLanguagesManager GtkSourceLanguagesManager;\r
-Index: mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourceundomanager.h
-===================================================================
---- mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourceundomanager.h (revision 488)
-+++ mysql-query-browser/source/linux/gtksourceview/gtksourceview/gtksourceundomanager.h (working copy)
-@@ -29,11 +29,11 @@
- #include <gtk/gtktextbuffer.h>\r
- \r
- #define GTK_SOURCE_TYPE_UNDO_MANAGER (gtk_source_undo_manager_get_type ())\r
--#define GTK_SOURCE_UNDO_MANAGER(obj) (GTK_CHECK_CAST ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManager))\r
--#define GTK_SOURCE_UNDO_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))\r
--#define GTK_SOURCE_IS_UNDO_MANAGER(obj) (GTK_CHECK_TYPE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER))\r
--#define GTK_SOURCE_IS_UNDO_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER))\r
--#define GTK_SOURCE_UNDO_MANAGER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))\r
-+#define GTK_SOURCE_UNDO_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManager))\r
-+#define GTK_SOURCE_UNDO_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))\r
-+#define GTK_SOURCE_IS_UNDO_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER))\r
-+#define GTK_SOURCE_IS_UNDO_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER))\r
-+#define GTK_SOURCE_UNDO_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))\r
- \r
- \r
- typedef struct _GtkSourceUndoManager GtkSourceUndoManager;\r
+++ /dev/null
-Index: mysql-gui-common/source/linux/MGFileBrowserList.cc
-===================================================================
---- mysql-gui-common/source/linux/MGFileBrowserList.cc (revision 2059)
-+++ mysql-gui-common/source/linux/MGFileBrowserList.cc (working copy)
-@@ -20,6 +20,7 @@
- #include <unistd.h>\r
- #include <sys/stat.h>\r
- #include <errno.h>\r
-+#include <string.h>\r
- #include <stdio.h> /* rename() in FreeBSD */\r
- \r
- \r
-Index: mysql-gui-common/source/linux/MGHMeterGraphPlotter.cc
-===================================================================
---- mysql-gui-common/source/linux/MGHMeterGraphPlotter.cc (revision 2059)
-+++ mysql-gui-common/source/linux/MGHMeterGraphPlotter.cc (working copy)
-@@ -16,6 +16,7 @@
- \r
- \r
- #include "MGHMeterGraphPlotter.h"\r
-+#include <string.h>\r
- \r
- \r
- \r
-Index: mysql-query-browser/source/linux/MGCodeEditor.cc
-===================================================================
---- mysql-query-browser/source/linux/MGCodeEditor.cc (revision 476)
-+++ mysql-query-browser/source/linux/MGCodeEditor.cc (working copy)
-@@ -16,6 +16,7 @@
- \r
- #include "MGCodeEditor.h"\r
- \r
-+#include <string.h>\r
- #include <gtksourceview/gtksourcelanguagesmanager.h>\r
- \r
- \r
+++ /dev/null
---- mysql-query-browser/configure.in.~1~ 2009-12-07 20:30:05.870570830 +0100
-+++ mysql-query-browser/configure.in 2009-12-07 20:54:57.009820684 +0100
-@@ -72,6 +72,7 @@
-
- PKG_CHECK_MODULES(GNOME, [libglade-2.0
- gthread-2.0
-+ libgnome-2.0
- libxml-2.0 >= 2.6.2
- $gtkhtml
- gtkmm-2.4])
+++ /dev/null
---- old/mysql-administrator/source/linux/MABackupPanel.cc
-+++ new/mysql-administrator/source/linux/MABackupPanel.cc
-@@ -1282,7 +1282,7 @@
-
- if (_inst->check_connection())
- {
-- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
-+ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
- (sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata),
- 50);
- dlg->show();
---- old/mysql-administrator/source/linux/MACatalogsPanel.cc
-+++ new/mysql-administrator/source/linux/MACatalogsPanel.cc
-@@ -1488,7 +1488,7 @@
- \r
- _maint_dlg_xml->get_button("next_button")->set_sensitive(false);\r
- _maint_dlg_xml->get_note("note")->set_current_page(4);\r
-- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);\r
-+ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);\r
- \r
- status= (MYX_TABLE_COMMAND_STATUSES*)\r
- _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_optimize_table,\r
-@@ -1528,7 +1528,7 @@
- \r
- _maint_dlg_xml->get_button("next_button")->set_sensitive(false);\r
- _maint_dlg_xml->get_note("note")->set_current_page(4); \r
-- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);\r
-+ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);\r
- \r
- status= (MYX_TABLE_COMMAND_STATUSES*)\r
- _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_check_table,\r
-@@ -1568,7 +1568,7 @@
- \r
- _maint_dlg_xml->get_button("next_button")->set_sensitive(false);\r
- _maint_dlg_xml->get_note("note")->set_current_page(4);\r
-- SigC::Connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);\r
-+ sigc::connection conn = Glib::signal_timeout().connect(sigc::mem_fun(*this, &MACatalogsPanel::maint_pulse_progressbar), 200);\r
- \r
- status= (MYX_TABLE_COMMAND_STATUSES*)\r
- _data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table,\r
---- old/mysql-administrator/source/linux/MAdministrator.h
-+++ new/mysql-administrator/source/linux/MAdministrator.h
-@@ -66,7 +66,7 @@
- \r
- sigc::signal0<void> _signal_prefs_changed;\r
- \r
-- SigC::Connection _pulse_conn;\r
-+ sigc::connection _pulse_conn;\r
- bool pulse_progress();\r
- \r
- void setup_sidebar();\r
---- old/mysql-administrator/source/linux/MARestorePanel.cc
-+++ new/mysql-administrator/source/linux/MARestorePanel.cc
-@@ -728,7 +728,7 @@
- op_aborted= false;
-
- {
-- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
-+ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
- (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
- 50);
-
-@@ -854,7 +854,7 @@
- //{
- MYX_BACKUP_ERROR err;
-
-- SigC::Connection con= Glib::signal_timeout().connect(sigc::bind<void*>
-+ sigc::connection con= Glib::signal_timeout().connect(sigc::bind<void*>
- (sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
- 50);
-
---- old/mysql-administrator/source/linux/MAServerConnectionsPanel.h
-+++ new/mysql-administrator/source/linux/MAServerConnectionsPanel.h
-@@ -87,7 +87,7 @@
- \r
- Glib::RefPtr<Gdk::Pixbuf> _thread_icon;\r
- \r
-- SigC::Connection _timer;\r
-+ sigc::connection _timer;\r
- \r
- int _current_page;\r
- \r
-Only in new/mysql-gui-common/library/sql-parser/source: sed885efK
---- old/mysql-gui-common/source/linux/MGConnectDialog.cc
-+++ new/mysql-gui-common/source/linux/MGConnectDialog.cc
-@@ -659,9 +659,9 @@
- // select back the original item\r
- ((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item);\r
- \r
-- SigC::Connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,\r
-+ sigc::connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,\r
- &MGConnectDialog::preferences_closed));\r
-- SigC::Connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,\r
-+ sigc::connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,\r
- &MGConnectDialog::preferences_changed));\r
- MGPreferencesEditor::instance()->show(true);\r
- MGPreferencesEditor::instance()->set_modal(true);\r
-@@ -676,7 +676,7 @@
- {\r
- Gtk::Button *btn;\r
- pid_t ping_pid= 0;\r
-- SigC::Connection input_handler;\r
-+ sigc::connection input_handler;\r
- int rc;\r
- bool pinging= false;\r
- int myerror= 0;\r
---- old/mysql-gui-common/source/linux/MGTreeTooltip.h
-+++ new/mysql-gui-common/source/linux/MGTreeTooltip.h
-@@ -39,7 +39,7 @@
- \r
- WillShowSignal _show_signal;\r
- \r
-- SigC::Connection _timeout;\r
-+ sigc::connection _timeout;\r
- \r
- void expose_event(GdkEventExpose *event);\r
- void leave_event(GdkEventCrossing *event);\r
---- old/mysql-migration-tool/source/linux/GRTEnvironment.cc
-+++ new/mysql-migration-tool/source/linux/GRTEnvironment.cc
-@@ -76,7 +76,7 @@
- }\r
- \r
- \r
--void GRTEnvironment::set_shell_output_handler(const SigC::Slot1<void,const Glib::ustring&> &slot)\r
-+void GRTEnvironment::set_shell_output_handler(const sigc::slot1<void,const Glib::ustring&> &slot)\r
- {\r
- _shellOutputHandler= slot;\r
- \r
---- old/mysql-migration-tool/source/linux/GRTEnvironment.h
-+++ new/mysql-migration-tool/source/linux/GRTEnvironment.h
-@@ -28,7 +28,7 @@
- int _msgOffset;\r
- std::vector<Glib::ustring> _sourceObjectNames;\r
- \r
-- SigC::Slot1<void,const Glib::ustring&> _shellOutputHandler;\r
-+ sigc::slot1<void,const Glib::ustring&> _shellOutputHandler;\r
- \r
- static void process_shell_output(const char *text, void *udata);\r
- \r
-@@ -42,7 +42,7 @@
- int init_jni(const std::string &classpath);\r
- int execute_shell_command(const Glib::ustring &command);\r
- \r
-- void set_shell_output_handler(const SigC::Slot1<void,const Glib::ustring&> &slot);\r
-+ void set_shell_output_handler(const sigc::slot1<void,const Glib::ustring&> &slot);\r
- \r
- MYX_GRT_OBJ *get_object(const Glib::ustring &name);\r
- bool object_implements_interface(MYX_GRT_OBJ *obj, const Glib::ustring &name);\r
---- old/mysql-migration-tool/source/linux/ObjectShell.cc
-+++ new/mysql-migration-tool/source/linux/ObjectShell.cc
-@@ -45,7 +45,7 @@
- \r
- tree->set_model(_otree);\r
- \r
-- tree->get_selection()->signal_changed().connect(SigC::slot(*this,&ObjectShell::object_selected));\r
-+ tree->get_selection()->signal_changed().connect(sigc::slot(*this,&ObjectShell::object_selected));\r
- \r
- \r
- tree= _xml->get_tree("inspector_tree");\r
-@@ -57,9 +57,9 @@
- \r
- tree->set_model(_ilist);\r
- \r
-- _xml->get_text("shell_text")->signal_key_press_event().connect(SigC::slot(*this,&ObjectShell::shell_key_press), false);\r
-+ _xml->get_text("shell_text")->signal_key_press_event().connect(sigc::slot(*this,&ObjectShell::shell_key_press), false);\r
- \r
-- env->set_shell_output_handler(SigC::slot(*this,&ObjectShell::print_shell));\r
-+ env->set_shell_output_handler(sigc::slot(*this,&ObjectShell::print_shell));\r
- \r
- put_prompt();\r
- }\r
---- old/mysql-query-browser/source/linux/MQResultTab.h
-+++ new/mysql-query-browser/source/linux/MQResultTab.h
-@@ -45,7 +45,7 @@
- \r
- Gtk::Paned *paned;\r
- \r
-- SigC::Connection scroll_con;\r
-+ sigc::connection scroll_con;\r
- };\r
- \r
- enum CompareAction {\r
-@@ -71,7 +71,7 @@
- \r
- bool _vertical;\r
- \r
-- SigC::Connection _sync_con1, _sync_con2;\r
-+ sigc::connection _sync_con1, _sync_con2;\r
- \r
- void scrolled(MQResultSetView *sender);\r
- void activated(MQResultSetView *sender);\r
+++ /dev/null
---- mysql-gui-tools/mysql-query-browser/source/linux/MQQueryDispatcher.cc
-+++ mysql-gui-tools/mysql-query-browser/source/linux/MQQueryDispatcher.cc
-@@ -558,8 +558,8 @@
- \r
- Gtk::Main::instance()->run();\r
- \r
-- while(!req->is_complete())\r
-- ;\r
-+// while(!req->is_complete())\r
-+// ;\r
- \r
- return sps;\r
- }\r
+++ /dev/null
-Index: mysql-administrator/po/de.po
-===================================================================
---- mysql-administrator/po/de.po (revision 610)
-+++ mysql-administrator/po/de.po (working copy)
-@@ -11476,7 +11476,7 @@
-
- #: po/glade_files.c:300
- msgid "_Help"
--msgstr "_Hilfe\""
-+msgstr "_Hilfe"
-
- #: po/glade_files.c:284
- msgid "_New Connection"
+++ /dev/null
-Index: mysql-gui-common/source/linux/MySQLGRT/MGRT.cc
-===================================================================
---- mysql-gui-common/source/linux/MySQLGRT/MGRT.cc (revision 1861)
-+++ mysql-gui-common/source/linux/MySQLGRT/MGRT.cc (working copy)
-@@ -284,6 +284,7 @@
- flush_messages();
- #endif
-
-+#ifdef ENABLE_LUA_MODULES
- // lua modules
- out_text("Loading Lua modules...");
- loader= myx_lua_init_loader(_grt, &error, std::string(resourcePath+"/lua").c_str());
-@@ -303,6 +304,7 @@
- else
- out_text(ufmt("Error initializing Lua module loader (%i)\n",error));
- flush_messages();
-+#endif
-
- // builtin c++
- out_text("Initializing C++ loader...");
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
- <email>swegener@gentoo.org</email>
- <description>Primary Maintainer</description>
-</maintainer>
-<use>
- <flag name='administrator'>Build and install MySQL Administrator</flag>
- <flag name='query-browser'>Build and install MySQL Query Browser</flag>
-</use>
-</pkgmetadata>
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r2.ebuild,v 1.7 2009/11/20 18:02:11 halcy0n Exp $
-
-GCONF_DEBUG="no"
-EAPI="1"
-
-inherit gnome2 eutils flag-o-matic
-
-MY_P="${P/_p/r}"
-
-DESCRIPTION="MySQL GUI Tools"
-HOMEPAGE="http://www.mysql.com/products/tools/"
-SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls +administrator +query-browser"
-
-RDEPEND=">=x11-libs/gtk+-2.6
- >=dev-libs/glib-2.6
- >=gnome-base/libglade-2.5
- >=dev-libs/libsigc++-2.0
- >=dev-libs/libpcre-4.4
- >=dev-libs/libxml2-2.6.2
- >=dev-cpp/glibmm-2.14
- dev-cpp/gtkmm:2.4
- >=virtual/mysql-5.0
- query-browser? (
- gnome-extra/gtkhtml:3.14
- gnome-base/libgnomeprint:2.2
- )"
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.15
- >=app-text/scrollkeeper-0.3.11"
-RDEPEND="${RDEPEND}
- !dev-db/mysql-administrator
- !dev-db/mysql-query-browser"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
- if ! use administrator && ! use query-browser
- then
- elog "Please activate at least one of the following USE flags:"
- elog "- administrator for MySQL Administrator"
- elog "- query-browser for MySQL Query Browser"
- die "Please activate at least one of the following USE flags: administrator, query-browser"
- fi
-
- # Needed for gcc-4.3
- append-cppflags -D_GNU_SOURCE
-}
-
-src_unpack() {
- gnome2_src_unpack
- cd "${S}"
-
- epatch \
- "${FILESDIR}"/${PN}-5.0_p8-i18n-fix.patch \
- "${FILESDIR}"/${PN}-5.0_p8-lua-modules.patch \
- "${FILESDIR}"/${P}-query-browser-sps.patch \
- "${FILESDIR}"/${P}-libsigc++-2.2.patch \
- "${FILESDIR}"/${P}-gcc-4.3.patch \
- "${FILESDIR}"/${P}-deprecated-gtk+-api.patch
-
- sed -i \
- -e "s/\\(^\\|[[:space:]]\\)-ltermcap\\($\\|[[:space:]]\\)/ /g" \
- mysql-gui-common/tools/grtsh/Makefile.{am,in}
-}
-
-src_compile() {
- # mysql has -fno-exceptions, but we need exceptions
- append-flags -fexceptions
-
- cd "${S}"/mysql-gui-common
- use nls || sed -i -e "/^SUBDIRS = / s/\\bpo\\b//" Makefile.{am,in}
- gnome2_src_compile \
- --disable-java-modules \
- --disable-workbench \
- $(use_enable nls i18n)
-
- if use administrator
- then
- cd "${S}"/mysql-administrator
- use nls || sed -i -e "/^SUBDIRS = / s/\\bpo\\b//" Makefile.{am,in}
- gnome2_src_compile $(use_enable nls i18n)
- fi
-
- if use query-browser
- then
- cd "${S}"/mysql-query-browser
- use nls || sed -i -e "/^SUBDIRS=/ s/\\bpo\\b//" Makefile.{am,in}
- gnome2_src_compile --with-gtkhtml=libgtkhtml-3.14
- fi
-}
-
-src_install() {
- cd "${S}"/mysql-gui-common
- gnome2_src_install
-
- if use administrator
- then
- cd "${S}"/mysql-administrator
- gnome2_src_install
- fi
-
- if use query-browser
- then
- cd "${S}"/mysql-query-browser
- gnome2_src_install
- fi
-}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-gui-tools/mysql-gui-tools-5.0_p12-r3.ebuild,v 1.2 2009/12/26 12:50:08 graaff Exp $
-
-GCONF_DEBUG="no"
-EAPI="1"
-
-inherit autotools gnome2 eutils flag-o-matic
-
-MY_P="${P/_p/r}"
-
-DESCRIPTION="MySQL GUI Tools"
-HOMEPAGE="http://www.mysql.com/products/tools/"
-SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls +administrator +query-browser"
-
-RDEPEND=">=x11-libs/gtk+-2.6
- >=dev-libs/glib-2.6
- >=gnome-base/libglade-2.5
- >=dev-libs/libsigc++-2.0
- >=dev-libs/libpcre-4.4
- >=dev-libs/libxml2-2.6.2
- >=dev-cpp/glibmm-2.14
- dev-cpp/gtkmm:2.4
- >=virtual/mysql-5.0
- query-browser? (
- gnome-extra/gtkhtml:3.14
- gnome-base/libgnomeprint:2.2
- gnome-base/libgnome
- )"
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.15
- >=app-text/scrollkeeper-0.3.11"
-RDEPEND="${RDEPEND}
- !dev-db/mysql-administrator
- !dev-db/mysql-query-browser"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
- if ! use administrator && ! use query-browser
- then
- elog "Please activate at least one of the following USE flags:"
- elog "- administrator for MySQL Administrator"
- elog "- query-browser for MySQL Query Browser"
- die "Please activate at least one of the following USE flags: administrator, query-browser"
- fi
-
- # Needed for gcc-4.3
- append-cppflags -D_GNU_SOURCE
-}
-
-src_unpack() {
- gnome2_src_unpack
- cd "${S}"
-
- epatch \
- "${FILESDIR}"/${PN}-5.0_p8-i18n-fix.patch \
- "${FILESDIR}"/${PN}-5.0_p8-lua-modules.patch \
- "${FILESDIR}"/${P}-query-browser-sps.patch \
- "${FILESDIR}"/${P}-libsigc++-2.2.patch \
- "${FILESDIR}"/${P}-gcc-4.3.patch \
- "${FILESDIR}"/${P}-deprecated-gtk+-api.patch \
- "${FILESDIR}"/${P}-gnome-2.28.patch
-
- sed -i \
- -e "s/\\(^\\|[[:space:]]\\)-ltermcap\\($\\|[[:space:]]\\)/ /g" \
- mysql-gui-common/tools/grtsh/Makefile.{am,in}
-
- if use query-browser
- then
- cd "${S}"/mysql-query-browser
- eautoreconf
- fi
-}
-
-src_compile() {
- # mysql has -fno-exceptions, but we need exceptions
- append-flags -fexceptions
-
- cd "${S}"/mysql-gui-common
- use nls || sed -i -e "/^SUBDIRS = / s/\\bpo\\b//" Makefile.{am,in}
- gnome2_src_compile \
- --disable-java-modules \
- --disable-workbench \
- $(use_enable nls i18n)
-
- if use administrator
- then
- cd "${S}"/mysql-administrator
- use nls || sed -i -e "/^SUBDIRS = / s/\\bpo\\b//" Makefile.{am,in}
- gnome2_src_compile $(use_enable nls i18n)
- fi
-
- if use query-browser
- then
- cd "${S}"/mysql-query-browser
- use nls || sed -i -e "/^SUBDIRS=/ s/\\bpo\\b//" Makefile.{am,in}
- gnome2_src_compile --with-gtkhtml=libgtkhtml-3.14
- fi
-}
-
-src_install() {
- cd "${S}"/mysql-gui-common
- gnome2_src_install
-
- if use administrator
- then
- cd "${S}"/mysql-administrator
- gnome2_src_install
- fi
-
- if use query-browser
- then
- cd "${S}"/mysql-query-browser
- gnome2_src_install
- fi
-}
projects / gentoo.git / commitdiff