diff options
| -rw-r--r-- | libraries/libunique/libunique-1.1.6-compiler-warnings.patch | 50 | ||||
| -rw-r--r-- | libraries/libunique/libunique.SlackBuild | 5 |
2 files changed, 1 insertions, 54 deletions
diff --git a/libraries/libunique/libunique-1.1.6-compiler-warnings.patch b/libraries/libunique/libunique-1.1.6-compiler-warnings.patch deleted file mode 100644 index f47e66267d..0000000000 --- a/libraries/libunique/libunique-1.1.6-compiler-warnings.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 9df132a70d54b768a8e1d0335d24b85ac9b3fb76 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi <ebassi@linux.intel.com> -Date: Sun, 27 Mar 2011 08:42:22 +0000 -Subject: Remove compiler warnings - -(cherry picked from commit f791ed16b19dddc7fbaf90d8f797520e67883021) - -Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com> ---- -diff --git a/unique/dbus/uniquebackend-dbus.c b/unique/dbus/uniquebackend-dbus.c -index 3ae1bed..69faa00 100644 ---- a/unique/dbus/uniquebackend-dbus.c -+++ b/unique/dbus/uniquebackend-dbus.c -@@ -84,7 +84,6 @@ unique_backend_dbus_register_proxy (UniqueBackendDBus *backend_dbus) - 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 (UniqueBackend *backend) - if (!connection) - return FALSE; - -- backend_dbus = UNIQUE_BACKEND_DBUS (backend); -- - retval = TRUE; - name = unique_backend_get_name (backend); - g_assert (name != NULL); -@@ -207,10 +204,14 @@ unique_backend_dbus_send_message (UniqueBackend *backend, - cmd, data, time_, - &resp, - &error); -- if (error) -+ if (!res) - { -- g_warning ("Error while sending message: %s", error->message); -- g_error_free (error); -+ if (error) -+ { -+ g_warning ("Error while sending message: %s", error->message); -+ g_error_free (error); -+ } -+ - g_free (cmd); - - return UNIQUE_RESPONSE_INVALID; --- -cgit v0.9 diff --git a/libraries/libunique/libunique.SlackBuild b/libraries/libunique/libunique.SlackBuild index f1ef5c55ae..2a815437f2 100644 --- a/libraries/libunique/libunique.SlackBuild +++ b/libraries/libunique/libunique.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=libunique VERSION=${VERSION:-1.1.6} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -51,9 +51,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# remove compiler warnings to make gcc-4.7 happy -patch -p1 < $CWD/libunique-1.1.6-compiler-warnings.patch - # Remove G_CONST_RETURN usage, now that its gone in glib # https://bugzilla.gnome.org/show_bug.cgi?id=652545 patch -p1 < $CWD/libunique-1.1.6-G_CONST_RETURN.patch |