Author: arvenil Date: Fri Jul 2 08:02:21 2010 GMT Module: packages Tag: HEAD ---- Log message: - merge changes from DEVEL
---- Files affected: packages/mysql-workbench: mysql-workbench-python_libs.patch (1.1 -> 1.2) , mysql-workbench-replace_gnome_url_show_by_xdg-open.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/mysql-workbench/mysql-workbench-python_libs.patch diff -u /dev/null packages/mysql-workbench/mysql-workbench-python_libs.patch:1.2 --- /dev/null Fri Jul 2 10:02:21 2010 +++ packages/mysql-workbench/mysql-workbench-python_libs.patch Fri Jul 2 10:02:14 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" ================================================================ Index: packages/mysql-workbench/mysql-workbench-replace_gnome_url_show_by_xdg-open.patch diff -u /dev/null packages/mysql-workbench/mysql-workbench-replace_gnome_url_show_by_xdg-open.patch:1.2 --- /dev/null Fri Jul 2 10:02:21 2010 +++ packages/mysql-workbench/mysql-workbench-replace_gnome_url_show_by_xdg-open.patch Fri Jul 2 10:02:14 2010 @@ -0,0 +1,22 @@ +--- mysql-workbench-ce-5.2.24/frontend/linux/linux_utilities/gtk_helpers.cpp 2010-06-19 02:40:15.000000000 +0000 ++++ mysql-workbench-ce-5.2.24/frontend/linux/linux_utilities/gtk_helpers.cpp 2010-06-26 14:07:16.000000000 +0000 +@@ -44,11 +44,14 @@ + //------------------------------------------------------------------------------ + void open_url(const std::string &url) + { +-#ifdef HAVE_LIBGNOME +- gnome_url_show(url.c_str(), NULL); +-#else +- g_message("Open URL %s (no url handler)", url.c_str()); +-#endif ++ if (g_find_program_in_path ("xdg-open")) { ++ char *argv[] = {(char*)"xdg-open", (char*)url.c_str(), NULL, NULL}; ++ if (!g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL)) { ++ g_warning("Open URL %s with xdg-open failed", url.c_str()); ++ } ++ } else { ++ g_warning("Open URL %s (no url handler)", url.c_str()); ++ } + } + + //------------------------------------------------------------------------------ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-workbench/mysql-workbench-python_libs.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-workbench/mysql-workbench-replace_gnome_url_show_by_xdg-open.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
