rpms/inkscape/F-12 inkscape-20091101svn-icon.patch, NONE, 1.1 inkscape.spec, 1.87, 1.88

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9857

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-20091101svn-icon.patch 
Log Message:
Hot-fix for icon

inkscape-20091101svn-icon.patch:
 main.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE inkscape-20091101svn-icon.patch ---
From: Lubomir Rintel <lkundrak at v3.sk>

Hot fix for #532325 [1]
Not upstreamable since it defeats the icon's theming.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=532325

Index: src/main.cpp
===================================================================
--- src/main.cpp	(revision 22548)
+++ src/main.cpp	(working copy)
@@ -924,8 +924,7 @@
     gdk_event_handler_set((GdkEventFunc)snooper, NULL, NULL);
     Inkscape::Debug::log_display_config();
 
-    // Set default window icon. Obeys the theme.
-    gtk_window_set_default_icon_name("inkscape");
+    gtk_window_set_default_icon_from_file("/usr/share/pixmaps/inkscape.png", NULL);
     // Do things that were previously in inkscape_gtk_stock_init().
     sp_icon_get_phys_size(GTK_ICON_SIZE_MENU);
     Inkscape::UI::Widget::Panel::prep();


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-12/inkscape.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- inkscape.spec	1 Nov 2009 15:16:39 -0000	1.87
+++ inkscape.spec	1 Nov 2009 22:03:12 -0000	1.88
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.47
-Release:        0.16.pre4.20091101svn%{?dist}
+Release:        0.17.pre4.20091101svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -14,6 +14,7 @@ Source0:        %{name}.tar.gz
 Patch0:         inkscape-20090410svn-uniconv.patch
 Patch4:         inkscape-20090410svn-formats.patch
 Patch5:         inkscape-20090925svn-el5.patch
+Patch6:         inkscape-20091101svn-icon.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -131,6 +132,7 @@ graphics in W3C standard Scalable Vector
 %patch0 -p1 -b .uniconv
 %patch4 -p1 -b .formats
 %patch5 -p1 -b .el5
+%patch6 -p0 -b .japierdole
 
 # https://bugs.launchpad.net/inkscape/+bug/314381
 # A couple of files have executable bits set,
@@ -220,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.17.pre4.20091101svn
+- Icon for main window (#532325)
+
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.16.pre4.20091101svn
 - Move to a later snapshot
 - python-lxml and numpy seem to be rather popular, add them as hard deps