summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2013-01-02 19:08:30 +0000
committerHans de Graaff <graaff@gentoo.org>2013-01-02 19:08:30 +0000
commit0b44b55542b259f718ff6b561fd7a0fdbd73c648 (patch)
treeedfa14a7a7c7b4feaed9becab9f01a3190a5fa48 /dev-db/mysql-workbench
parentVersion bump, bug 449636. (diff)
downloadgentoo-2-0b44b55542b259f718ff6b561fd7a0fdbd73c648.tar.gz
gentoo-2-0b44b55542b259f718ff6b561fd7a0fdbd73c648.tar.bz2
gentoo-2-0b44b55542b259f718ff6b561fd7a0fdbd73c648.zip
Remove unused patches.
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Diffstat (limited to 'dev-db/mysql-workbench')
-rw-r--r--dev-db/mysql-workbench/ChangeLog8
-rw-r--r--dev-db/mysql-workbench/files/mysql-workbench-5.2.31-python-libs.patch21
-rw-r--r--dev-db/mysql-workbench/files/mysql-workbench-5.2.34-gcc46.patch13
-rw-r--r--dev-db/mysql-workbench/files/mysql-workbench-5.2.39-glib-2.32.patch103
4 files changed, 7 insertions, 138 deletions
diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index 0475bd95e53e..372d01fd2e28 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-db/mysql-workbench
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.73 2013/01/02 19:07:39 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.74 2013/01/02 19:08:30 graaff Exp $
+
+ 02 Jan 2013; Hans de Graaff <graaff@gentoo.org>
+ -files/mysql-workbench-5.2.31-python-libs.patch,
+ -files/mysql-workbench-5.2.34-gcc46.patch,
+ -files/mysql-workbench-5.2.39-glib-2.32.patch:
+ Remove unused patches.
*mysql-workbench-5.2.45 (02 Jan 2013)
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.31-python-libs.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.31-python-libs.patch
deleted file mode 100644
index 5e78761cd8a5..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.31-python-libs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Use a simpler check for Python's libs that returns 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-12-08 03:20:38.000000000 +0100
-+++ configure.in 2010-12-15 19:10:11.716940123 +0100
-@@ -280,12 +280,7 @@
- AC_CHECK_PROG(PYTHON27, python2.7, [yes])
- # Python headers
- AC_MSG_CHECKING(for Python libraries)
--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.34-gcc46.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.34-gcc46.patch
deleted file mode 100644
index 00c262a1c236..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.34-gcc46.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Patch by Remi Collet for Fedora in http://bugs.mysql.com/bug.php?id=60603
-
-diff -up mysql-workbench-gpl-5.2.34-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 mysql-workbench-gpl-5.2.34-src/modules/db.mysql/src/db_mysql_catalog_report.h
---- mysql-workbench-gpl-5.2.34-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 2011-05-28 08:12:31.887897052 +0200
-+++ mysql-workbench-gpl-5.2.34-src/modules/db.mysql/src/db_mysql_catalog_report.h 2011-05-28 08:13:10.397054637 +0200
-@@ -10,6 +10,7 @@
- #include "config.h"
- #endif
-
-+#include <cstddef>
- #include "ctemplate/template.h"
-
- #include "grt/common.h"
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.39-glib-2.32.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.39-glib-2.32.patch
deleted file mode 100644
index a07f16f30684..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.39-glib-2.32.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Allow compilation with glib 2.32.
-
-Patch by goeland86@gmail.com in bug 412157
-
---- library/canvas/src/mdc_canvas_view.h 2012-02-21 17:53:45.000000000 +0100
-+++ library/canvas/src/mdc_canvas_view_new.h 2012-04-15 21:34:19.000000000 +0200
-@@ -28,7 +28,7 @@
- #include "mdc_selection.h"
-
- #ifndef _WIN32
--#include <glib/gthread.h>
-+#include <glib.h>
- #endif
-
- BEGIN_MDC_DECLS
---- library/canvas/src/stdafx.h 2012-02-21 17:53:46.000000000 +0100
-+++ library/canvas/src/stdafx.new.h 2012-04-15 22:18:14.000000000 +0200
-@@ -52,7 +52,7 @@
- #include <gl/gl.h>
- #include <gl/glu.h>
-
--#include <glib/gthread.h>
-+#include <glib.h>
-
- #endif // _WIN32
-
---- library/canvas/src/mdc_canvas_view_printing.cpp 2012-04-15 22:17:38.000000000 +0200
-+++ library/canvas/src/mdc_canvas_view_printing.new.cpp 2012-04-15 22:14:49.000000000 +0200
-@@ -21,7 +21,7 @@
-
- #include "mdc_canvas_view.h"
- #include "mdc_canvas_view_printing.h"
--#include <glib/gmessages.h>
-+#include <glib.h>
-
- #ifdef _WIN32
- #include <cairo/cairo-win32.h>
-
---- library/grt/src/grtpp_util.new.cpp 2012-04-15 22:57:55.000000000 +0200
-+++ library/grt/src/grtpp_util.cpp 2012-02-21 17:53:44.000000000 +0100
-@@ -25,7 +25,7 @@
- #include "grtpp_util.h"
- #include "base/string_utilities.h"
-
--#include <glib/gbase64.h>
-+#include <glib.h>
- #include <functional>
-
- using namespace grt;
-
---- backend/wbprivate/sqlide/wb_live_schema_tree.h 2012-02-21 17:53:39.000000000 +0100
-+++ backend/wbprivate/sqlide/wb_live_schema_tree.new.h 2012-04-15 23:41:01.000000000 +0200
-@@ -24,7 +24,7 @@
- #include "grtpp.h"
- #include "workbench/wb_backend_public_interface.h"
- #include "base/string_utilities.h"
--#include <glib/gpattern.h>
-+#include <glib.h>
-
- namespace wb
- {
-
---- modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp 2012-02-21 17:53:37.000000000 +0100
-+++ modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.new.cpp 2012-04-16 00:33:55.000000000 +0200
-@@ -20,7 +20,7 @@
-
- #include "stdafx.h"
-
--#include <glib/gunicode.h>
-+#include <glib.h>
- #include "grt/common.h"
- #include "grt/grt_manager.h"
- #include "grtdb/charset_utils.h"
-@@ -651,4 +651,4 @@
- return versioning_comment_subst_token;
- else
- return token;
--}
-\ No newline at end of file
-+}
-
---- modules/db.mysql.sqlparser/src/stdafx.h 2012-02-21 17:53:46.000000000 +0100
-+++ modules/db.mysql.sqlparser/src/stdafx.new.h 2012-04-16 00:35:10.000000000 +0200
-@@ -32,7 +32,7 @@
- #include <algorithm>
- #include <sstream>
- #include <fstream>
--#include <glib/gunicode.h>
-+#include <glib.h>
- #include <map>
- #include "direct.h"
-
---- plugins/db.mysql/backend/db_plugin_be.cpp 2012-02-21 17:53:41.000000000 +0100
-+++ plugins/db.mysql/backend/db_plugin_be.new.cpp 2012-04-16 01:39:48.000000000 +0200
-@@ -31,7 +31,7 @@
- #include "grts/structs.db.h"
- #include "base/string_utilities.h"
-
--#include <glib/gunicode.h>
-+#include <glib.h>
-
- void Db_plugin::grtm(bec::GRTManager *grtm)
- {