Author: arvenil Date: Sat Jun 5 09:28:25 2010 GMT Module: packages Tag: DEVEL ---- Log message: - rename -build.patch -> -external_ctemplate.patch - added -as_needed.patch - added -python_libs.patch
---- Files affected: packages/mysql-workbench: mysql-workbench.spec (1.12.2.3 -> 1.12.2.4) , mysql-workbench-as_needed.patch (NONE -> 1.1.2.1) (NEW), mysql-workbench-external_ctemplate.patch (NONE -> 1.1.2.1) (NEW), mysql-workbench-python_libs.patch (NONE -> 1.1.2.1) (NEW), mysql-workbench-build.patch (1.1.2.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/mysql-workbench/mysql-workbench.spec diff -u packages/mysql-workbench/mysql-workbench.spec:1.12.2.3 packages/mysql-workbench/mysql-workbench.spec:1.12.2.4 --- packages/mysql-workbench/mysql-workbench.spec:1.12.2.3 Thu Jun 3 12:36:46 2010 +++ packages/mysql-workbench/mysql-workbench.spec Sat Jun 5 11:28:19 2010 @@ -1,12 +1,6 @@ # $Revision$, $Date$ # TODO: -# - something wrong after start: -# ** Message: WARNING: Could not open module /usr/lib64/mysql-workbench/modules/wb.mysql.import.grt.so (/usr/lib64/mysql-workbench/modules/wb.mysql.import.grt.so: undefined symbol: _ZN19Mysql_sql_parser_feC1Ev) -# ** Message: WARNING: Could not load wb.mysql.import.grt.so: Cannot open /usr/lib64/mysql-workbench/modules/wb.mysql.import.grt.so -# - runs but not tested at all # - what with mysql-workbench from mysql-gui-tools.spec? -# - doesn't build, -Wl,--as-needed problem, -# with %%define filterout_ld -Wl,--as-needed builds fine Summary: Extensible modeling tool for MySQL Summary(pl.UTF-8): Narzędzie do modelowania baz danych dla MySQL-a @@ -18,7 +12,9 @@ Source0: ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/%{name}-oss-%{version}.tar.gz # Source0-md5: 2856c040ba859336a9c892ea147b4261 Patch0: %{name}-desktop.patch -Patch1: %{name}-build.patch +Patch1: %{name}-external_ctemplate.patch +Patch2: %{name}-as_needed.patch +Patch3: %{name}-python_libs.patch URL: http://wb.mysql.com/ BuildRequires: OpenGL-devel BuildRequires: autoconf @@ -43,9 +39,6 @@ Requires: python-pexpect BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -# FIXME: fix linking of m/usr/lib{,64}/mysql-workbench/plugins/*.so* modules and then drop this -%define filterout_ld -Wl,--as-needed - %description MySQL Workbench is a database modeling tool for MySQL. You can use it to design and create new database schemas, document existing databases @@ -64,6 +57,8 @@ rm -rf ext/ctemplate %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %{__glib_gettextize} @@ -111,6 +106,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12.2.4 2010/06/05 09:28:19 arvenil +- rename -build.patch -> -external_ctemplate.patch +- added -as_needed.patch +- added -python_libs.patch + Revision 1.12.2.3 2010/06/03 10:36:46 glen - deps for fixed undos macro ================================================================ Index: packages/mysql-workbench/mysql-workbench-as_needed.patch diff -u /dev/null packages/mysql-workbench/mysql-workbench-as_needed.patch:1.1.2.1 --- /dev/null Sat Jun 5 11:28:25 2010 +++ packages/mysql-workbench/mysql-workbench-as_needed.patch Sat Jun 5 11:28:19 2010 @@ -0,0 +1,22 @@ +Patch from Gentoo +http://git.overlays.gentoo.org/gitweb/?p=user/wish.git;a=blob;f=dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch;h=a53b49d37f0c3f61683a8ece2e6e2fb712f8756b;hb=6c2a287fc8cd60b3806ec3d5b058a513c4b417b5 +--- mysql-workbench-oss-5.2.22/modules/wb.validation/Makefile.am 2010-04-02 03:26:24.000000000 +0200 ++++ mysql-workbench-oss-5.2.22/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_liba...@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\ +--- mysql-workbench-oss-5.2.22/modules/wb.mysql.validation/Makefile.am 2010-04-02 03:26:24.000000000 +0200 ++++ mysql-workbench-oss-5.2.22/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_liba...@grt_libs@ @GLIB_LIBS@ @SIGC_LIBS@ + #wb_mysql_import_grt_la_LIBADD=$(top_srcdir) + + wb_mysql_validation_grt_la_SOURCES=src/register_plugin.cpp\ ================================================================ Index: packages/mysql-workbench/mysql-workbench-external_ctemplate.patch diff -u /dev/null packages/mysql-workbench/mysql-workbench-external_ctemplate.patch:1.1.2.1 --- /dev/null Sat Jun 5 11:28:25 2010 +++ packages/mysql-workbench/mysql-workbench-external_ctemplate.patch Sat Jun 5 11:28:19 2010 @@ -0,0 +1,18 @@ +--- mysql-workbench-oss-5.2.21/ext/Makefile.am 2010-05-11 13:50:49.000000000 +0000 ++++ mysql-workbench-oss-5.2.21/ext/Makefile.am 2010-05-16 22:47:10.000000000 +0000 +@@ -1 +1 @@ +-SUBDIRS=ctemplate scintilla/gtk cppconn ++SUBDIRS=scintilla/gtk cppconn +--- mysql-workbench-oss-5.2.21/configure.in 2010-05-11 13:51:04.000000000 +0000 ++++ mysql-workbench-oss-5.2.21/configure.in 2010-05-16 23:05:44.000000000 +0000 +@@ -524,10 +524,3 @@ + + + AC_OUTPUT() +- +-( +- cd ./ext/ctemplate/ctemplate-src && +- autoreconf -i -s; +- ./configure --prefix=$prefix --libdir=$libdir/mysql-workbench --disable-dependency-tracking --disable-dynamic +-) +- ================================================================ Index: packages/mysql-workbench/mysql-workbench-python_libs.patch diff -u /dev/null packages/mysql-workbench/mysql-workbench-python_libs.patch:1.1.2.1 --- /dev/null Sat Jun 5 11:28:25 2010 +++ packages/mysql-workbench/mysql-workbench-python_libs.patch Sat Jun 5 11:28:19 2010 @@ -0,0 +1,22 @@ +Patch from Gentoo +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. +http://git.overlays.gentoo.org/gitweb/?p=user/wish.git;a=blob;f=dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch;h=8fb6b71e91b0c5e14bb542e05f2bab1da4dbc60d;hb=6c2a287fc8cd60b3806ec3d5b058a513c4b417b5 +--- mysql-workbench-oss-5.2.22/configure.in 2010-04-02 03:26:27.000000000 +0200 ++++ mysql-workbench-oss-5.2.22/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" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-workbench/mysql-workbench.spec?r1=1.12.2.3&r2=1.12.2.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
