Browse Source

unique 1.1.6-4

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10830 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim 7 years ago
parent
commit
2547e00532

+ 29 - 0
u/unique/fix-unused-but-set-variable.patch

@@ -0,0 +1,29 @@
+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);

+ 15 - 0
u/unique/libunique-1.1.6-format-security.patch

@@ -0,0 +1,15 @@
+--- libunique-1.1.6/tests/test-unique.c.orig	2014-05-07 11:05:02.743420865 +0100
++++ libunique-1.1.6/tests/test-unique.c	2014-05-07 11:24:20.163336706 +0100
+@@ -82,10 +82,10 @@
+                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    GTK_MESSAGE_INFO,
+                                    GTK_BUTTONS_CLOSE,
+-                                   title);
++                                   "%s", title);
+   if (message)
+     gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+-                                              message);
++                                              "%s", message);
+ 
+   gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE);
+ 

+ 12 - 2
u/unique/unique-vl.spec

@@ -1,15 +1,17 @@
 Name:           unique
 Version:        1.1.6
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
 Summary:        Single instance support for applications
 Summary(ja):    アプリケーションのシングルインスタンス支援
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gnome.org/~ebassi/source/
-Source0:        http://www.gnome.org/~ebassi/source/libunique-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/libunique/1.1/libunique-%{version}.tar.bz2
 
 Patch0:			libunique-1.1.6-remove-disable-deprecated.patch
+Patch1:			fix-unused-but-set-variable.patch
+Patch2:			libunique-1.1.6-format-security.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -45,6 +47,8 @@ Headers and libraries for Unique.
 %prep
 %setup -q -n libunique-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure \
@@ -79,6 +83,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 
 %changelog
+* Fri Nov 25 2016 IWAI, Masaharu <iwaim.sub@gmail.com> 1.1.6-4
+- add some patches from Rawhide 1.1.6-15.fc24
+ - fix-unused-but-set-variable.patch (Patch1)
+ - libunique-1.1.6-format-security.patch (for test; Patch2)
+- update Source0 URI
+
 * Sat Jan 04 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.1.6-3
 - rebuild with VineSeed environment
 - add Patch0 (libunique-1.1.6-remove-disable-deprecated.patch)