packages (DEVEL): mysql-workbench/mysql-workbench.spec, mysql-workbench/mys...

arvenil arvenil at pld-linux.org
Sat Jun 26 16:39:52 CEST 2010


Author: arvenil                      Date: Sat Jun 26 14:39:52 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- added patch which replaces gnome_url_show() by xdg-open
- R: xdg-utils
- release 0.2

---- Files affected:
packages/mysql-workbench:
   mysql-workbench.spec (1.12.2.10 -> 1.12.2.11) , mysql-workbench-replace_gnome_url_show_by_xdg-open.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mysql-workbench/mysql-workbench.spec
diff -u packages/mysql-workbench/mysql-workbench.spec:1.12.2.10 packages/mysql-workbench/mysql-workbench.spec:1.12.2.11
--- packages/mysql-workbench/mysql-workbench.spec:1.12.2.10	Tue Jun 22 02:27:43 2010
+++ packages/mysql-workbench/mysql-workbench.spec	Sat Jun 26 16:39:47 2010
@@ -3,13 +3,14 @@
 Summary(pl.UTF-8):	Narzędzie do modelowania baz danych dla MySQL-a
 Name:		mysql-workbench
 Version:	5.2.24
-Release:	0.1
+Release:	0.2
 License:	GPL v2
 Group:		Applications/Databases
 Source0:	ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/%{name}-ce-%{version}.tar.gz
 # Source0-md5:	4815cefb03205c99e4c5d66b8b3b1ed4
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-python_libs.patch
+Patch2:		%{name}-replace_gnome_url_show_by_xdg-open.patch
 URL:		http://wb.mysql.com/
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
@@ -33,6 +34,7 @@
 Requires:	python-paramiko
 Requires:	python-pexpect
 Requires:	python-sqlite
+Requires:	xdg-utils
 Suggests:	gnome-keyring
 Suggests:	sudo
 Obsoletes:	mysql-administrator
@@ -57,6 +59,7 @@
 rm -rf ext/boost
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__glib_gettextize}
@@ -103,6 +106,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12.2.11  2010/06/26 14:39:47  arvenil
+- added patch which replaces gnome_url_show() by xdg-open
+- R: xdg-utils
+- release 0.2
+
 Revision 1.12.2.10  2010/06/22 00:27:43  arvenil
 - up to 5.2.24
 - droped patch for external_ctemplate; it's detected automatically now

================================================================
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.1.2.1
--- /dev/null	Sat Jun 26 16:39:52 2010
+++ packages/mysql-workbench/mysql-workbench-replace_gnome_url_show_by_xdg-open.patch	Sat Jun 26 16:39:47 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[] = {"xdg-open", 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.spec?r1=1.12.2.10&r2=1.12.2.11&f=u



More information about the pld-cvs-commit mailing list