rpms/gtk-qt-engine/devel gtk-qt-engine-1.1-ooo.patch, NONE, 1.1 gtk-qt-engine.spec, 1.38, 1.39 gtk-qt-engine-0.8-nspluginviewer.patch, 1.1, NONE gtk-qt-engine-0.8-ooo.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	gtk-qt-engine.spec 
Added Files:
	gtk-qt-engine-1.1-ooo.patch 
Removed Files:
	gtk-qt-engine-0.8-nspluginviewer.patch 
	gtk-qt-engine-0.8-ooo.patch 
Log Message:
* Tue Dec 23 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.1-3
- SAL_GTK_USE_PIXMAPPAINT=1 (#450414, #475007)


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

--- NEW FILE gtk-qt-engine-1.1-ooo.patch ---
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-03-10 20:30:19.000000000 -0500
+++ gtk-qt-engine/kcm_gtk/kcmgtk.cpp	2008-12-23 14:03:03.000000000 -0600
@@ -129,6 +129,11 @@ void KcmGtk::save()
 	stream << "#!/bin/bash\n\n";
 	stream << "# Make sure our customised gtkrc file is loaded.\n";
 	stream << "export GTK2_RC_FILES=" + k_gtkRcFileName + "\n";
+	// make this unconditional?  sure, for now -- Rex
+       // if ( m_gtkRc->themeName() == k_qtThemeName ) {
+		stream << "# hack around ooo wierdness.\n";
+		stream << "export SAL_GTK_USE_PIXMAPPAINT=1\n";
+	//} 
 	file.close();
 	
 	// Make it executable


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gtk-qt-engine.spec	22 May 2008 15:31:57 -0000	1.38
+++ gtk-qt-engine.spec	23 Dec 2008 20:07:15 -0000	1.39
@@ -6,7 +6,7 @@
 Group:	 User Interface/Desktops
 Epoch:   1
 Version: 1.1 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 URL: 	 http://gtk-qt.ecs.soton.ac.uk/
@@ -19,6 +19,8 @@
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+Patch1: gtk-qt-engine-1.1-ooo.patch
+
 BuildRequires: cmake
 BuildRequires: gettext
 BuildRequires: gtk2-devel
@@ -40,6 +42,8 @@
 %prep
 %setup -q  -n %{name}
 
+%patch1 -p1 -b .ooo
+
 
 %build
 
@@ -78,6 +82,9 @@
 
 
 %changelog
+* Tue Dec 23 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.1-3
+- SAL_GTK_USE_PIXMAPPAINT=1 (#450414, #475007)
+
 * Thu May 22 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.1-2
 - Provides: gtk-qt-engine-kde4
 


--- gtk-qt-engine-0.8-nspluginviewer.patch DELETED ---


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