diff options
Diffstat (limited to 'databases/mysql-workbench52/files')
7 files changed, 0 insertions, 144 deletions
diff --git a/databases/mysql-workbench52/files/patch-backend__wbprivate__Makefile.am b/databases/mysql-workbench52/files/patch-backend__wbprivate__Makefile.am deleted file mode 100644 index e5cf8d8b61e5..000000000000 --- a/databases/mysql-workbench52/files/patch-backend__wbprivate__Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ ---- backend/wbprivate/Makefile.am.orig -+++ backend/wbprivate/Makefile.am -@@ -14,7 +14,7 @@ - -I$(top_srcdir)/ext/scintilla/include\ - -I$(top_srcdir)/ext/vsqlite++/include\ - -I$(top_srcdir)/ext/vsqlite\ -- -I$(top_srcdir)/ext/tinyxml -+ @TINYXML_CFLAGS@ - - libwbprivate_a_SOURCES=\ - model/canvas_floater.cpp\ -@@ -78,11 +78,7 @@ - $(top_srcdir)/frontend/common/grt_python_debugger.cpp\ - $(top_srcdir)/frontend/common/plugin_manager_window.cpp\ - $(top_srcdir)/frontend/common/plugin_install_window.cpp\ -- $(top_srcdir)/frontend/common/select_option_dialog.cpp\ -- $(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\ -- $(top_srcdir)/ext/tinyxml/tinyxml.cpp\ -- $(top_srcdir)/ext/tinyxml/tinystr.cpp\ -- $(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp -+ $(top_srcdir)/frontend/common/select_option_dialog.cpp - - #BUILT_SOURCES=stdafx.h.gch - #stdafx.h.gch: workbench/stdafx.h diff --git a/databases/mysql-workbench52/files/patch-configure.in b/databases/mysql-workbench52/files/patch-configure.in deleted file mode 100644 index c67ebaa0a1e3..000000000000 --- a/databases/mysql-workbench52/files/patch-configure.in +++ /dev/null @@ -1,52 +0,0 @@ ---- configure.in.orig -+++ configure.in -@@ -66,9 +66,9 @@ - std_edition=$enableval, std_edition=no) - - if test x$std_edition = xyes; then -- echo -en "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#define EDITION_SE\n#define COMMERCIAL_CODE\n#endif\n" > wb_config.h -+ echo -e "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#define EDITION_SE\n#define COMMERCIAL_CODE\n#endif\n" > wb_config.h - else -- echo -en "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#undef COMMERCIAL_CODE\n#define EDITION_OSS\n#endif\n" > wb_config.h -+ echo -e "#ifndef __WB_CONFIG_H__\n#define __WB_CONFIG_H__\n#undef COMMERCIAL_CODE\n#define EDITION_OSS\n#endif\n" > wb_config.h - fi - - AC_CHECK_HEADERS([sys/select.h]) -@@ -99,6 +99,10 @@ - AM_GLIB_GNU_GETTEXT - fi - -+PKG_CHECK_MODULES(TINYXML, [tinyxml]) -+AC_SUBST(TINYXML_CFLAGS) -+AC_SUBST(TINYXML_LIBS) -+ - have_zip="no" - if test x"$ac_libzip_libs" = x"no"; then - PKG_CHECK_MODULES(ZIP, [libzip]) -@@ -205,7 +209,7 @@ - ac_mysql_config_path="$withval", ac_mysql_config_path="mysql_config") - - AC_MSG_CHECKING([for mysql headers and libraries]) --MYSQL_INCLUDE=`$ac_mysql_config_path --cflags` -+MYSQL_INCLUDE=`$ac_mysql_config_path --include` - MYSQL_LIBS=`$ac_mysql_config_path --libs_r` - - if test -z "$MYSQL_INCLUDE"; then -@@ -248,7 +252,7 @@ - cfg=sysconfig.get_config_vars() - lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY']) - if os.path.exists(lib): -- print \"-L\" + cfg['LIBDIR'] + \" -l\" + cfg['LDLIBRARY'].lstrip(\"lib\").rstrip(\".so\")")] -+ print \"-L\" + cfg['LIBDIR'] + \" -l\" + cfg['LDLIBRARY'].lstrip(\"lib\").rstrip(\".so\").rstrip(\".a\")")] - PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig - print sysconfig.get_python_inc()")] - PYTHON_CFLAGS="-I$PYTHON_CFLAGS" -@@ -461,7 +465,7 @@ - elif test "$(uname -s)" = "SunOS"; then - DLMAKE="gcc -shared -mimpure-text" - else -- DLMAKE="gcc -shared" -+ DLMAKE="\$(CC) -shared" - fi - AC_SUBST(DLEXT) - AC_SUBST(DLMAKE) diff --git a/databases/mysql-workbench52/files/patch-frontend__linux__workbench__Makefile.am b/databases/mysql-workbench52/files/patch-frontend__linux__workbench__Makefile.am deleted file mode 100644 index a52ba75a5a39..000000000000 --- a/databases/mysql-workbench52/files/patch-frontend__linux__workbench__Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- frontend/linux/workbench/Makefile.am.orig -+++ frontend/linux/workbench/Makefile.am -@@ -60,6 +60,7 @@ - $(top_srcdir)/library/canvas/src/libmdcanvas.la\ - $(top_srcdir)/library/mysql-parser/libmysqlparser.la\ - @CTEMPLATE_LIBS@\ -+ @TINYXML_LIBS@\ - @GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ @SQLITE3_LIBS@\ - -lX11 - diff --git a/databases/mysql-workbench52/files/patch-frontend__linux__workbench__mysql-workbench.in b/databases/mysql-workbench52/files/patch-frontend__linux__workbench__mysql-workbench.in deleted file mode 100644 index 3c8b1dc878cf..000000000000 --- a/databases/mysql-workbench52/files/patch-frontend__linux__workbench__mysql-workbench.in +++ /dev/null @@ -1,17 +0,0 @@ ---- frontend/linux/workbench/mysql-workbench.in.orig -+++ frontend/linux/workbench/mysql-workbench.in -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - # Uncomment the following line if you're having trouble with gnome-keyring lockups. - # This will cause passwords to be stored only temporarily for the session. -@@ -58,8 +58,4 @@ - - export MWB_BASE_DIR="$basedirname" - --if type -p catchsegv > /dev/null; then --catchsegv $basedirname/$libexecdir/mysql-workbench-bin "$@" --else - $basedirname/$libexecdir/mysql-workbench-bin "$@" --fi diff --git a/databases/mysql-workbench52/files/patch-library__canvas__src__mdc_draw_util.cpp b/databases/mysql-workbench52/files/patch-library__canvas__src__mdc_draw_util.cpp deleted file mode 100644 index e52b487b15f5..000000000000 --- a/databases/mysql-workbench52/files/patch-library__canvas__src__mdc_draw_util.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- ./library/canvas/src/mdc_draw_util.cpp.orig 2014-08-26 12:45:54.802730992 -0400 -+++ ./library/canvas/src/mdc_draw_util.cpp 2014-08-26 12:46:32.638126992 -0400 -@@ -24,6 +24,7 @@ - #endif - - #include "mdc_draw_util.h" -+#include <cstdlib> - - using namespace base; - diff --git a/databases/mysql-workbench52/files/patch-library__forms__Makefile.am b/databases/mysql-workbench52/files/patch-library__forms__Makefile.am deleted file mode 100644 index ce4d2c2d7b4d..000000000000 --- a/databases/mysql-workbench52/files/patch-library__forms__Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- library/forms/Makefile.am.orig -+++ library/forms/Makefile.am -@@ -91,7 +91,7 @@ - -I$(top_srcdir)/ext/vsqlite\ - -I$(top_srcdir)/library/\ - -I$(top_srcdir)/ext\ ---I$(top_srcdir)/ext/tinyxml\ -+@TINYXML_CFLAGS@\ - -I$(top_srcdir)/ext/scintilla/include - - diff --git a/databases/mysql-workbench52/files/patch-modules__wb.mysql.import__Makefile.am b/databases/mysql-workbench52/files/patch-modules__wb.mysql.import__Makefile.am deleted file mode 100644 index 5e80ba4c9ada..000000000000 --- a/databases/mysql-workbench52/files/patch-modules__wb.mysql.import__Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ ---- modules/wb.mysql.import/Makefile.am.orig -+++ modules/wb.mysql.import/Makefile.am -@@ -17,7 +17,7 @@ - -I$(top_srcdir)/library/sql-parser/source/linux\ - -I$(top_srcdir)/ext/vsqlite\ - -I$(top_srcdir)/ext/vsqlite++/include\ -- -I$(top_srcdir)/ext/tinyxml\ -+ @TINYXML_CFLAGS@\ - @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ - - -@@ -27,7 +27,4 @@ - wb_mysql_import_grt_la_SOURCES=\ - src/wb_mysql_import.cpp\ - src/wb_mysql_import_dbd4.cpp\ -- $(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\ -- $(top_srcdir)/ext/tinyxml/tinyxml.cpp\ -- $(top_srcdir)/ext/tinyxml/tinystr.cpp\ -- $(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp -+ $(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp |