rpms/gtk-qt-engine/F-8 gtk-qt-engine-0.8-env.patch, NONE, 1.1 gtk-qt-engine-0.8-ooo.patch, 1.2, 1.3 gtk-qt-engine.spec, 1.33, 1.34

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/gtk-qt-engine/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2989

Modified Files:
	gtk-qt-engine-0.8-ooo.patch gtk-qt-engine.spec 
Added Files:
	gtk-qt-engine-0.8-env.patch 
Log Message:
* Tue Dec 23 2008 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-6
- SAL_GTK_USE_PIXMAPPAINT=1 (#450414, #475007)
- uninstalling gtk-qt-engine leaves gtk apps in ugly state (#473471)


gtk-qt-engine-0.8-env.patch:

--- NEW FILE gtk-qt-engine-0.8-env.patch ---
diff -up gtk-qt-engine/kcm_gtk/kcmgtk.cpp.env gtk-qt-engine/kcm_gtk/kcmgtk.cpp
--- gtk-qt-engine/kcm_gtk/kcmgtk.cpp.env	2007-08-28 15:30:37.000000000 -0500
+++ gtk-qt-engine/kcm_gtk/kcmgtk.cpp	2008-12-23 15:32:21.000000000 -0600
@@ -393,8 +393,12 @@ void KcmGtk::save()
 	if (!found)
 	{
 		stream << "#!/bin/bash\n\n";
+		stream << "if [ -e \"$(kde-config --expandvars --install module)/kcm_kcmgtk.so\" ]; then\n";
 		stream << "# Make sure our customised gtkrc file is loaded.\n";
 		stream << "export GTK2_RC_FILES=$HOME/" + GTK_RC_FILE + "\n";
+		stream << "# hack around ooo wierdness.\n";
+		stream << "export SAL_GTK_USE_PIXMAPPAINT=1\n";
+		stream << "fi\n";
 	}
 	file.close();
 	

gtk-qt-engine-0.8-ooo.patch:

Index: gtk-qt-engine-0.8-ooo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/F-8/gtk-qt-engine-0.8-ooo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-qt-engine-0.8-ooo.patch	23 Dec 2008 21:08:21 -0000	1.2
+++ gtk-qt-engine-0.8-ooo.patch	23 Dec 2008 21:36:07 -0000	1.3
@@ -20,15 +20,3 @@
  
  	eclipseFix = cmdLine.contains("eclipse");
  	
-diff -up gtk-qt-engine/kcm_gtk/kcmgtk.cpp.ooo gtk-qt-engine/kcm_gtk/kcmgtk.cpp
---- gtk-qt-engine/kcm_gtk/kcmgtk.cpp.ooo	2008-12-23 15:07:09.000000000 -0600
-+++ gtk-qt-engine/kcm_gtk/kcmgtk.cpp	2008-12-23 15:07:12.000000000 -0600
-@@ -395,6 +395,8 @@ void KcmGtk::save()
- 		stream << "#!/bin/bash\n\n";
- 		stream << "# Make sure our customised gtkrc file is loaded.\n";
- 		stream << "export GTK2_RC_FILES=$HOME/" + GTK_RC_FILE + "\n";
-+		stream << "# hack around ooo wierdness.\n";
-+		stream << "export SAL_GTK_USE_PIXMAPPAINT=1\n";
- 	}
- 	file.close();
- 	


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/F-8/gtk-qt-engine.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gtk-qt-engine.spec	23 Dec 2008 21:08:21 -0000	1.33
+++ gtk-qt-engine.spec	23 Dec 2008 21:36:07 -0000	1.34
@@ -1,12 +1,19 @@
 
 #define svn 20070811svn
 
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%endif
+
 Summary: A project allowing GTK to use Qt widget styles
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Epoch:   1
 Version: 0.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2+
 URL: 	 http://gtk-qt.ecs.soton.ac.uk/
@@ -23,15 +30,13 @@
 Patch1: gtk-qt-engine-0.8-nspluginviewer.patch 
 # http://gtk-qt.ecs.soton.ac.uk/trac/ticket/24
 Patch2: gtk-qt-engine-0.8-ooo.patch
+# rh bugs #450414 , #473471
+Patch3: gtk-qt-engine-0.8-env.patch
 
 BuildRequires: cmake
 BuildRequires: gettext
 BuildRequires: gtk2-devel
-%if 0%{?fedora} > 6
-BuildRequires: kdelibs3-devel
-%else
-BuildRequires: kdelibs-devel
-%endif
+BuildRequires: %{kdelibs3}-devel
 BuildRequires: libbonoboui-devel
 BuildRequires: libpng-devel
 
@@ -48,6 +53,7 @@
 
 %patch1 -p1 -b .nspluginviewer
 %patch2 -p1 -b .ooo
+%patch3 -p1 -b .env
 
 
 %build
@@ -85,8 +91,9 @@
 
 
 %changelog
-* Tue Dec 23 2008 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-5
+* Tue Dec 23 2008 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-6
 - SAL_GTK_USE_PIXMAPPAINT=1 (#450414, #475007)
+- uninstalling gtk-qt-engine leaves gtk apps in ugly state (#473471)
 
 * Fri Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-4
 - fix ooffice detection (#232159,gtk-qt#24)