From c704254e0c64e12e6ee95beb8c736633b4fa8aaa Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Wed, 14 Dec 2011 19:39:07 +0000 Subject: [PATCH] Drop old patches. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- dev-db/mysql-workbench/ChangeLog | 9 ++++++- dev-db/mysql-workbench/Manifest | 12 ++++------ ...l-workbench-5.2.17-as-needed-modules.patch | 20 ---------------- .../mysql-workbench-5.2.17-python-libs.patch | 21 ---------------- .../files/mysql-workbench-5.2.33-cpp.patch | 24 ------------------- .../files/mysql-workbench-5.2.33-gtkmm.patch | 15 ------------ 6 files changed, 12 insertions(+), 89 deletions(-) delete mode 100644 dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch delete mode 100644 dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch delete mode 100644 dev-db/mysql-workbench/files/mysql-workbench-5.2.33-cpp.patch delete mode 100644 dev-db/mysql-workbench/files/mysql-workbench-5.2.33-gtkmm.patch diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog index 3fe23f4b8333..bbb10ecfef3f 100644 --- a/dev-db/mysql-workbench/ChangeLog +++ b/dev-db/mysql-workbench/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/mysql-workbench # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.46 2011/12/14 19:34:14 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.47 2011/12/14 19:39:07 graaff Exp $ + + 14 Dec 2011; Hans de Graaff + -files/mysql-workbench-5.2.17-as-needed-modules.patch, + -files/mysql-workbench-5.2.17-python-libs.patch, + -files/mysql-workbench-5.2.33-cpp.patch, + -files/mysql-workbench-5.2.33-gtkmm.patch: + Drop old patches. 14 Dec 2011; Hans de Graaff mysql-workbench-5.2.36.ebuild: diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest index 860dc2cf4a5c..cd86c2df3922 100644 --- a/dev-db/mysql-workbench/Manifest +++ b/dev-db/mysql-workbench/Manifest @@ -1,11 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX mysql-workbench-5.2.17-as-needed-modules.patch 817 RMD160 07a91a62a364ead59597317738df334a8773338a SHA1 60c17b4337adef0257e3c9dc9facefcc5b6364fe SHA256 2b2503059228381ff16135bb6bf9987807661215b8b45f91acb7c6c156c5d7da -AUX mysql-workbench-5.2.17-python-libs.patch 853 RMD160 b2ca54f9342c082395c5b5cac92e6247362531b9 SHA1 405a46f1d15f8d428dc3e6f0eada4d36cc00bb93 SHA256 8625ec48e17d3871d37dce559118868edc840a235a0010b47ea4f1afb277872b AUX mysql-workbench-5.2.31-python-libs.patch 873 RMD160 f1af6477590b37ec78894dca991f8ede3fcf0bac SHA1 2bf2317c32fb365fc82e3346d3b4773426e0275d SHA256 7ddeb3cfd33c0a1460b3271f2fb3eb7b8cfa40496994b9288009bedb2cc3740a -AUX mysql-workbench-5.2.33-cpp.patch 544 RMD160 f8c824dae64e1dd205e4c34b7ece25f9132ff7e0 SHA1 3d1f47e2a11407ebc9e8d1a95418f78bc794417a SHA256 ee2a9106b7b18d64478f9bfa1143705d5d8f1b839ce88f71a3c570d54aeec853 -AUX mysql-workbench-5.2.33-gtkmm.patch 863 RMD160 d0acabbde930656f03576027153bcda7cc84ba60 SHA1 69c1bc26b5887cea4714a462c9f5c270ac9b5712 SHA256 00102fbd57977f7d064c336ee43314aa102c2586d650c3d14f709067a2594c1c AUX mysql-workbench-5.2.34-gcc46.patch 617 RMD160 8c71980999b7f5caa98c200411bfefc220fec245 SHA1 18948ed74b1e60614ed7aaa00850515919ec6637 SHA256 6d0d9302e0f3682a6b9cb91c42955eacf60389881f3b531f65526b2b099baebd DIST mysql-workbench-gpl-5.2.34-src.tar.gz 18160097 RMD160 9607f1c7082700d1df5b7b1aa42e3c903c68d049 SHA1 e4f9a9ee43783361c05a98196eaf196c42d03a03 SHA256 868dd4d92f601f3789eaa50af9920b9907c5c38711357a898b670acf9892b1ac DIST mysql-workbench-gpl-5.2.35-src.tar.gz 17874329 RMD160 6207d7350cf1ea7a426ece90dabb4b7caab072a2 SHA1 74c2dddba06e4b233f3b28acf8be45f0394310f2 SHA256 3681351af061637ce54dcc1b490325e9a4a0b42127e642e60220845fcfc2cbaa @@ -13,12 +9,12 @@ DIST mysql-workbench-gpl-5.2.36-src.tar.gz 18571353 RMD160 2afa2de53cff8fa7e23be EBUILD mysql-workbench-5.2.34.ebuild 2171 RMD160 d16791cacb8fb4d75441d7c0334b82e077bf6c40 SHA1 dadf3caae51f149c3fce3bfac69ac2261d3e9512 SHA256 8c9ee7ddaa655c52c289839a02f682648c220a37009cdfc6f6d42389d687a33f EBUILD mysql-workbench-5.2.35.ebuild 2132 RMD160 d5f010e34e41060fb6ee41934b05d701e424c2fe SHA1 58bc5dbfef7d02f6c60e0464477422299473845b SHA256 a0c8afbe2f4e67d11929042ddafb15195ab076f707201fbd069775ee0edccb69 EBUILD mysql-workbench-5.2.36.ebuild 2234 RMD160 31b098e65723dc93e63295ccfd4229d844569c57 SHA1 66ec2dbb1c44df334a70fa176b36446f129eac4e SHA256 9d64287f973e282bcdaa1b3ee382316786dfc17f039fd95364262c353a26c579 -MISC ChangeLog 8738 RMD160 8020b367d7ae94a42577af05f7f08739806765b7 SHA1 2c556a84d030d5a8ff8923027f0075977d930258 SHA256 e4c4a5f36ce90286810e07127b2cb29806d030e11e10582fff20633c91412d31 +MISC ChangeLog 9005 RMD160 ab5b3c34e9a8025041b76ee2e38b1f2da66c3c3e SHA1 e6f890f03c2dd0c64bb96c98fe1bdc2b72968b45 SHA256 5ea9262963305328371e7eda19e31013d861c7a21a22e4cfade9a6b0da89437c MISC metadata.xml 201 RMD160 bbf7920d9809941fb024d20016dbe2fb9f15ff97 SHA1 e629d21795e99a77bd0a6aded1a153fd12d5b2c5 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk7o+jsACgkQiIP6VqMIqNcYVAD+Np/L9hyxNSDZ1RapAP8E9woI -hmdRnCprbB7tGBWDnQwA/iuBOt6J6yXkTEob7swvDUEijsWsP85gB3zQZ68xYm8i -=Az2C +iF4EAREIAAYFAk7o+2AACgkQiIP6VqMIqNc7vgD+JzbfzftnsreF+l6YBK8dF0Gc +pYNxliy07Rs+DnZ7ib8A/RMX2KvHcsw1R5UU1Ak5sIVGHnN2A8Esbd9t9AQXM8zx +=SQD4 -----END PGP SIGNATURE----- diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch deleted file mode 100644 index a53b49d37f0c..000000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- modules/wb.validation/Makefile.am.~1~ 2010-04-02 03:26:24.000000000 +0200 -+++ modules/wb.validation/Makefile.am 2010-04-09 16:18:16.703343478 +0200 -@@ -19,6 +19,7 @@ - - - wb_validation_grt_la_LDFLAGS=-module -+wb_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@ - #wb_mysql_import_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la - - wb_validation_grt_la_SOURCES=src/register_plugin.cpp\ ---- modules/wb.mysql.validation/Makefile.am.~1~ 2010-04-02 03:26:24.000000000 +0200 -+++ modules/wb.mysql.validation/Makefile.am 2010-04-09 16:17:53.991717921 +0200 -@@ -21,6 +21,7 @@ - - - wb_mysql_validation_grt_la_LDFLAGS=-module -+wb_mysql_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@ - #wb_mysql_import_grt_la_LIBADD=$(top_srcdir) - - wb_mysql_validation_grt_la_SOURCES=src/register_plugin.cpp\ diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch deleted file mode 100644 index 8fb6b71e91b0..000000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch +++ /dev/null @@ -1,21 +0,0 @@ -Use a simpler check for Python's libs that return an actual linker -invocation (e.g. -lpython2.6) instead of the .so file. This fixes the -case with forced as-needed where the .so gets re-ordered to the front -during link. - ---- configure.in.~1~ 2010-04-02 03:26:27.000000000 +0200 -+++ configure.in 2010-04-09 16:06:10.271092660 +0200 -@@ -303,12 +303,7 @@ - dnl enable_python=$enableval, enable_python=no) - - AC_MSG_CHECKING(for Python) --PYTHON_LIBS=[$(python -c "from distutils import sysconfig --import os --cfg=sysconfig.get_config_vars() --lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY']) --if os.path.exists(lib): -- print lib")] -+PYTHON_LIBS=[$(python -c 'import sys; print("-lpython%s.%s" % sys.version_info[:2])')] - PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig - print sysconfig.get_python_inc()")] - PYTHON_CFLAGS="-I$PYTHON_CFLAGS" diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-cpp.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-cpp.patch deleted file mode 100644 index 879db83ed32d..000000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-cpp.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- library/base/base/xml_util_functions.h.~1~ 2011-03-11 00:03:28.000000000 +0100 -+++ library/base/base/xml_util_functions.h 2011-03-14 18:57:34.571514279 +0100 -@@ -20,10 +20,6 @@ - #ifndef _XML_UTIL_FUNCTIONS_H_ - #define _XML_UTIL_FUNCTIONS_H_ - --#ifdef __cplusplus --extern "C" { --#endif -- - #include "base/common.h" - //#include "util.h" - -@@ -31,6 +27,10 @@ - #include - //#endif - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - typedef char base_bool; - - BASELIBRARY_PUBLIC_FUNC xmlDocPtr base_xmlParseFile(const char *filename); diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-gtkmm.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-gtkmm.patch deleted file mode 100644 index c2220bd43025..000000000000 --- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.33-gtkmm.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch to fix compilation with gtkmm-2.24.0. Taken from -http://bugs.mysql.com/bug.php?id=60603 - -diff -up mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp ---- mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp.gcc46 2011-03-23 16:56:16.000000000 +0100 -+++ mysql-workbench-gpl-5.2.33-src/frontend/linux/linux_utilities/toolbar_manager.cpp 2011-03-23 17:07:36.000000000 +0100 -@@ -31,7 +31,7 @@ static Gtk::ComboBox *create_color_combo - } - - Glib::RefPtr model= Gtk::ListStore::create(*color_combo_columns); -- Gtk::ComboBox *combo= new Gtk::ComboBox(model); -+ Gtk::ComboBox *combo= new Gtk::ComboBox((Glib::RefPtr &)model); - - combo->pack_start(color_combo_columns->image); - -- 2.26.2