update code

This commit is contained in:
zhuchunyi 2019-11-06 19:55:20 +08:00
commit a467b52f38
5 changed files with 142 additions and 0 deletions

View File

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

View File

@ -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);

View File

@ -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);

BIN
libunique-1.1.6.tar.bz2 Normal file

Binary file not shown.

68
unique.spec Normal file
View File

@ -0,0 +1,68 @@
Name: unique
Version: 1.1.6
Release: 22
Summary: library for writing single instance applications
License: LGPLv2+
URL: http://www.gnome.org/~ebassi/source/
Source0: http://download.gnome.org/sources/libunique/1.1/libunique-%{version}.tar.bz2
Patch0: fix-unused-but-set-variable.patch
Patch1: fix-disable-deprecated.patch
Patch2: libunique-1.1.6-format-security.patch
BuildRequires: autoconf automake libtool
BuildRequires: dbus-glib-devel glib2-devel gtk2-devel gnome-doc-utils gtk-doc
Requires: atk gdk-pixbuf2 gtk2 pango
%description
This package contains a library for writing single instance applications.
%package devel
Summary: Development files for %{name}
Requires: %{name} = %{version}-%{release}
Requires: dbus-glib-devel gtk2-devel
%description devel
Headers and libraries for Unique.
%package_help
%prep
%autosetup -n libunique-%{?version} -p1
gtkdocize
autoreconf -fiv
%build
%configure --enable-gtk-doc --disable-static --enable-introspection=no --enable-maintainer-flags=no
%make_build
%install
%make_install
%delete_la
%pre
%preun
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog README
%license COPYING
%{_libdir}/lib*.so.*
%files devel
%{_includedir}/unique-1.0/
%{_libdir}/pkgconfig/*
%{_libdir}/lib*.so
%files help
%doc %{_datadir}/gtk-doc
%changelog
* Sat Oct 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1.6-22
- Package init