Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting2.git;a=commitdiff;h=114f8861248f7e38c16da149dc878bb21b1bf9c2

commit 114f8861248f7e38c16da149dc878bb21b1bf9c2
Author: Baste <[email protected]>
Date:   Mon Jun 25 16:43:25 2012 +0200

unique1-1.1.6-4-x86_64
* Rebuild with gtk+2

diff --git a/source/xlib/unique1/FrugalBuild b/source/xlib/unique1/FrugalBuild
index 187e615..3077e47 100644
--- a/source/xlib/unique1/FrugalBuild
+++ b/source/xlib/unique1/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=unique1
pkgver=1.1.6
-pkgrel=3
+pkgrel=4
pkgdesc="a library for writing single instance of gtk+2 application"
depends=('libxml2>=2.7.8' 'gtk+2' 'glibc' 'libxau>=1.0.4' 'libxdmcp' 
'freetype2' 'dbus-glib' 'libxdamage>=1.1.1-3' 'libxext>=1.0.5-3')
_F_gnome_name=libunique
@@ -13,7 +13,11 @@ url="http://live.gnome.org/LibUnique";
options=('scriptlet')
groups=('xlib')
archs=('i686' 'x86_64' 'arm')
-sha1sums=('d44ad06503efaaa0c660c5f8a817e90fbe254d1f')
+source=($source unique-gdbus.patch fix-disable-deprecated.patch)
+sha1sums=('d44ad06503efaaa0c660c5f8a817e90fbe254d1f' \
+          '95689829db288f82275f04bb25de09ef4bdba259' \
+          '02cfffc7c83af003a96b5f025962eaffa2de9f7b')
+
_F_cd_path=$_F_gnome_name-$pkgver
Fconfopts="$Fconfopts --enable-bacon --disable-introspection --disable-gtk-doc"

diff --git a/source/xlib/unique1/fix-disable-deprecated.patch 
b/source/xlib/unique1/fix-disable-deprecated.patch
new file mode 100644
index 0000000..34fde9d
--- /dev/null
+++ b/source/xlib/unique1/fix-disable-deprecated.patch
@@ -0,0 +1,31 @@
+diff -urNp libunique-1.1.6.old/unique/Makefile.am 
libunique-1.1.6/unique/Makefile.am
+--- libunique-1.1.6.old/unique/Makefile.am     2011-07-06 10:54:38.403127656 
+0100
++++ libunique-1.1.6/unique/Makefile.am 2011-07-06 10:55:00.354127659 +0100
+@@ -19,11 +19,8 @@ INCLUDES = -I$(top_srcdir)
+ AM_CPPFLAGS = \
+       -DG_DISABLE_SINGLE_INCLUDES     \
+       -DGTK_DISABLE_SINGLE_INCLUDES   \
+-      -DG_DISABLE_DEPRECATED          \
+-      -DGTK_DISABLE_DEPRECATED        \
+       -DG_LOG_DOMAIN=\"Unique\"       \
+       -DPREFIX=\""$(prefix)"\"        \
+-      $(DISABLE_DEPRECATED_FLAGS)     \
+       $(UNIQUE_DEBUG_CFLAGS)          \
+       $(NULL)
+
+diff -urNp libunique-1.1.6.old/unique/Makefile.in 
libunique-1.1.6/unique/Makefile.in
+--- libunique-1.1.6.old/unique/Makefile.in     2011-07-06 11:01:36.306127549 
+0100
++++ libunique-1.1.6/unique/Makefile.in 2011-07-06 11:01:58.311127546 +0100
+@@ -394,11 +394,8 @@ INCLUDES = -I$(top_srcdir)
+ AM_CPPFLAGS = \
+       -DG_DISABLE_SINGLE_INCLUDES     \
+       -DGTK_DISABLE_SINGLE_INCLUDES   \
+-      -DG_DISABLE_DEPRECATED          \
+-      -DGTK_DISABLE_DEPRECATED        \
+       -DG_LOG_DOMAIN=\"Unique\"       \
+       -DPREFIX=\""$(prefix)"\"        \
+-      $(DISABLE_DEPRECATED_FLAGS)     \
+       $(UNIQUE_DEBUG_CFLAGS)          \
+       $(NULL)
+
+
diff --git a/source/xlib/unique1/unique-gdbus.patch 
b/source/xlib/unique1/unique-gdbus.patch
new file mode 100644
index 0000000..d89aef6
--- /dev/null
+++ b/source/xlib/unique1/unique-gdbus.patch
@@ -0,0 +1,30 @@
+diff -urNp libunique-1.1.6.old/unique/dbus/uniquebackend-dbus.c 
libunique-1.1.6/unique/dbus/uniquebackend-dbus.c
+--- libunique-1.1.6.old/unique/dbus/uniquebackend-dbus.c       2011-07-06 
10:30:49.712128019 +0100
++++ libunique-1.1.6/unique/dbus/uniquebackend-dbus.c   2011-07-06 
10:32:11.026127998 +0100
+@@ -84,7 +84,6 @@ unique_backend_dbus_register_proxy (Uniq
+ static gboolean
+ unique_backend_dbus_request_name (UniqueBackend *backend)
+ {
+-  UniqueBackendDBus *backend_dbus;
+   const gchar *name;
+   DBusGConnection *connection;
+   DBusGProxy *proxy;
+@@ -97,8 +96,6 @@ unique_backend_dbus_request_name (Unique
+   if (!connection)
+     return FALSE;
+
+-  backend_dbus = UNIQUE_BACKEND_DBUS (backend);
+-
+   retval = TRUE;
+   name = unique_backend_get_name (backend);
+   g_assert (name != NULL);
+@@ -207,7 +204,7 @@ unique_backend_dbus_send_message (Unique
+                                         cmd, data, time_,
+                                         &resp,
+                                         &error);
+-  if (error)
++  if (!res && error)
+     {
+       g_warning ("Error while sending message: %s", error->message);
+       g_error_free (error);
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to