[packages/im-chooser] - new format patch added (even larger)

[qboosh]

commit 9e519db3ed163687c64d1794fff39a04a13ce937
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 26 17:41:22 2013 +0200

    - new format patch added (even larger)

 im-chooser-format.patch | 82 +++++++++++++++++++++++++++++++++++++++++++++++++
 im-chooser.spec         |  7 +++--
 2 files changed, 87 insertions(+), 2 deletions(-)
---
diff --git a/im-chooser.spec b/im-chooser.spec
index e7dd205..91035d5 100644
--- a/im-chooser.spec
+++ b/im-chooser.spec
@@ -13,6 +13,7 @@ Group:		Applications
 Source0:	http://fedorahosted.org/releases/i/m/im-chooser/%{name}-%{version}.tar.bz2
 # Source0-md5:	fbf6598df98c9992e91aa62b7d33bc1b
 Patch0:		%{name}-imchooserui.patch
+Patch1:		%{name}-format.patch
 URL:		http://fedorahosted.org/im-chooser/
 BuildRequires:	glib2-devel >= 1:2.16.0
 BuildRequires:	imsettings-devel >= 1.3.0
@@ -60,10 +61,12 @@ Ten pakiet zawiera aplikację przeznaczoną dla Xfce 4.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
-	--disable-silent-rules
+	--disable-silent-rules \
+	--disable-static
 
 %{__make}
 
@@ -73,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libimchooseui.{so,la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libimchooseui.{so,la}
 
 %find_lang %{name}
 
diff --git a/im-chooser-format.patch b/im-chooser-format.patch
new file mode 100644
index 0000000..87619f9
--- /dev/null
+++ b/im-chooser-format.patch
@@ -0,0 +1,82 @@
+--- im-chooser-1.6.4/libimchooseui/eggsmclient-dbus-gnome.c.orig	2012-11-23 07:17:43.000000000 +0100
++++ im-chooser-1.6.4/libimchooseui/eggsmclient-dbus-gnome.c	2013-07-26 17:24:57.550140470 +0200
+@@ -77,7 +77,7 @@ sm_client_gdbus_get_interface_info(void)
+ 										 &err);
+ 
+ 		if (err) {
+-			g_warning(err->message);
++			g_warning("%s", err->message);
+ 			return NULL;
+ 		}
+ 		info = g_dbus_interface_info_ref(introspection_data->interfaces[0]);
+@@ -120,7 +120,7 @@ sm_client_dbus_gnome_end_session(EggSMCl
+ 	if (value)
+ 		g_variant_unref(value);
+ 	if (err) {
+-		g_warning(err->message);
++		g_warning("%s", err->message);
+ 		g_error_free(err);
+ 
+ 		return FALSE;
+@@ -160,7 +160,7 @@ egg_sm_client_dbus_gnome_new(void)
+ 					      NULL,
+ 					      &err);
+ 	if (err) {
+-		g_warning(err->message);
++		g_warning("%s", err->message);
+ 		g_error_free(err);
+ 		return NULL;
+ 	}
+--- im-chooser-1.6.4/libimchooseui/eggsmclient-dbus-kde.c.orig	2012-11-23 07:17:52.000000000 +0100
++++ im-chooser-1.6.4/libimchooseui/eggsmclient-dbus-kde.c	2013-07-26 17:25:23.571293078 +0200
+@@ -77,7 +77,7 @@ sm_client_kdbus_get_interface_info(void)
+ 										 &err);
+ 
+ 		if (err) {
+-			g_warning(err->message);
++			g_warning("%s", err->message);
+ 			return NULL;
+ 		}
+ 		info = g_dbus_interface_info_ref(introspection_data->interfaces[0]);
+@@ -112,7 +112,7 @@ sm_client_dbus_kde_end_session(EggSMClie
+ 	if (value)
+ 		g_variant_unref(value);
+ 	if (err) {
+-		g_warning(err->message);
++		g_warning("%s", err->message);
+ 		g_error_free(err);
+ 
+ 		return FALSE;
+@@ -152,7 +152,7 @@ egg_sm_client_dbus_kde_new(void)
+ 					      NULL,
+ 					      &err);
+ 	if (err) {
+-		g_warning(err->message);
++		g_warning("%s", err->message);
+ 		g_error_free(err);
+ 		return NULL;
+ 	}
+--- im-chooser-1.6.4/src/app/main.c.orig	2013-04-12 09:55:59.000000000 +0200
++++ im-chooser-1.6.4/src/app/main.c	2013-07-26 17:30:37.898551681 +0200
+@@ -92,7 +92,7 @@ _show_error_cb(IMChooseUI  *ui,
+ 						 GTK_DIALOG_MODAL,
+ 						 GTK_MESSAGE_ERROR,
+ 						 GTK_BUTTONS_OK,
+-						 s);
++						 "%s", s);
+ 	logfile = g_build_filename(g_get_user_cache_dir(), "imsettings", "log", NULL);
+ 	m = g_strdup_printf(_("Please check <a href=\"file://%s\">%s</a> for more details"),
+ 			    logfile, logfile);
+--- im-chooser-1.6.4/src/xfce/main.c.orig	2012-11-23 07:23:19.000000000 +0100
++++ im-chooser-1.6.4/src/xfce/main.c	2013-07-26 17:32:39.190592588 +0200
+@@ -94,8 +94,8 @@ _show_error_cb(IMChooseUI  *ui,
+ 						 GTK_DIALOG_MODAL,
+ 						 GTK_MESSAGE_ERROR,
+ 						 GTK_BUTTONS_OK,
+-						 s);
+-	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG (dlg), details);
++						 "%s", s);
++	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG (dlg), "%s", details);
+ 
+ 	/* for GNOME HIG compliance */
+ 	gtk_rc_parse_string("style \"imchoose-ui-message-dialog\" {\n"	\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/im-chooser.git/commitdiff/9e519db3ed163687c64d1794fff39a04a13ce937