[packages/gtk2-change-theme] - added fixes from fedora

[baggins]

commit 24a6d7a737e90450ba95376c4ac3a60a162de946
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Jan 28 20:58:15 2014 +0100

    - added fixes from fedora

 gtk-chtheme-build-fix.patch | 23 +++++++++++++++++++++++
 gtk-chtheme-new-api.patch   | 12 ++++++++++++
 gtk-chtheme-nostrip.patch   | 10 ++++++++++
 gtk2-change-theme.spec      |  6 ++++++
 4 files changed, 51 insertions(+)
---
diff --git a/gtk2-change-theme.spec b/gtk2-change-theme.spec
index 8647303..32b7833 100644
--- a/gtk2-change-theme.spec
+++ b/gtk2-change-theme.spec
@@ -11,6 +11,9 @@ Source0:	http://plasmasturm.org/programs/gtk-chtheme/%{_rnam}-%{version}.tar.bz2
 # Source0-md5:	f688053bf26dd6c4f1cd0bf2ee33de2a
 Source1:	gtk-chtheme.desktop
 Source2:	gtk-chtheme.xpm
+Patch0:		gtk-chtheme-build-fix.patch
+Patch1:		gtk-chtheme-new-api.patch
+Patch2:		gtk-chtheme-nostrip.patch
 URL:		http://plasmasturm.org/programs/gtk-chtheme/
 BuildRequires:	gtk+2-devel >= 2.0.0
 BuildRequires:	pkgconfig
@@ -30,6 +33,9 @@ Gtk+2.
 
 %prep
 %setup -q -n %{_rnam}-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p0
 
 %build
 %{__make} \
diff --git a/gtk-chtheme-build-fix.patch b/gtk-chtheme-build-fix.patch
new file mode 100644
index 0000000..b623f64
--- /dev/null
+++ b/gtk-chtheme-build-fix.patch
@@ -0,0 +1,23 @@
+diff -up gtk-chtheme-0.3.1/about_dialog.c.fix gtk-chtheme-0.3.1/about_dialog.c
+--- gtk-chtheme-0.3.1/about_dialog.c.fix	2012-03-22 14:24:17.502746629 -0400
++++ gtk-chtheme-0.3.1/about_dialog.c	2012-03-22 14:24:20.537719693 -0400
+@@ -39,7 +39,6 @@ void show_about_dialog(void) {
+ 	GtkWidget* about_dlg = gtk_dialog_new();
+ 	gtk_window_set_title(GTK_WINDOW(about_dlg), "About");
+ 	gtk_window_set_resizable(GTK_WINDOW(about_dlg), FALSE);
+-	gtk_dialog_set_has_separator(GTK_DIALOG(about_dlg), FALSE);
+ 	gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(about_dlg)->vbox), 20);
+ 	
+ 	GtkWidget* about = GTK_WIDGET(gtk_label_new_from_pango_markup((ABOUT), GTK_JUSTIFY_CENTER));
+diff -up gtk-chtheme-0.3.1/theme_sel.c.fix gtk-chtheme-0.3.1/theme_sel.c
+--- gtk-chtheme-0.3.1/theme_sel.c.fix	2012-03-22 14:20:43.743651593 -0400
++++ gtk-chtheme-0.3.1/theme_sel.c	2012-03-22 14:23:34.217131165 -0400
+@@ -110,7 +110,7 @@ GtkWidget *create_theme_sel(void)
+ 		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ 	gtk_container_add(GTK_CONTAINER(sw), theme_list);
+ 
+-	gtk_timeout_add(0, (GtkFunction)theme_list_focus, theme_list);
++	g_timeout_add(0, (GSourceFunc)theme_list_focus, theme_list);
+ 
+ 	return sw;
+ }
diff --git a/gtk-chtheme-new-api.patch b/gtk-chtheme-new-api.patch
new file mode 100644
index 0000000..e3a2404
--- /dev/null
+++ b/gtk-chtheme-new-api.patch
@@ -0,0 +1,12 @@
+--- gtk-chtheme-0.3.1/util.c~	2004-02-08 14:42:33.000000000 +0100
++++ gtk-chtheme-0.3.1/util.c	2010-07-14 10:40:18.000000000 +0200
+@@ -19,7 +19,8 @@
+ 
+ GtkWidget* unfocussable(GtkWidget *w)
+ {
+-	GTK_WIDGET_UNSET_FLAGS(w, GTK_CAN_FOCUS);
++        /* GTK_WIDGET_UNSET_FLAGS(w, GTK_CAN_FOCUS); */
++        gtk_widget_set_can_focus(w, FALSE);
+ 	return w;
+ }
+ 
diff --git a/gtk-chtheme-nostrip.patch b/gtk-chtheme-nostrip.patch
new file mode 100644
index 0000000..d700abb
--- /dev/null
+++ b/gtk-chtheme-nostrip.patch
@@ -0,0 +1,10 @@
+--- Makefile.orig	2010-05-04 17:22:25.127295630 -0300
++++ Makefile	2010-05-04 17:22:44.000000000 -0300
+@@ -38,7 +38,6 @@
+ 	-rm -f $(EXENAME).spec $(EXENAME).1 Makefile.bak
+ 
+ install: all
+-	strip      $(EXENAME)
+ 	install -d              $(DESTDIR)/$(BINDIR)
+ 	install -c $(EXENAME)   $(DESTDIR)/$(BINDIR)
+ 	install -d              $(DESTDIR)/$(MANDIR)/man1
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtk2-change-theme.git/commitdiff/24a6d7a737e90450ba95376c4ac3a60a162de946