rpms/gtk-qt-engine/F-9 gtk-qt-engine-1.1-ooo.patch, NONE, 1.1 gtk-qt-engine.spec, 1.37, 1.38 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/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28561

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/F-9/gtk-qt-engine.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gtk-qt-engine.spec	5 Apr 2008 16:30:13 -0000	1.37
+++ gtk-qt-engine.spec	23 Dec 2008 21:01:55 -0000	1.38
@@ -6,7 +6,7 @@
 Group:	 User Interface/Desktops
 Epoch:   1
 Version: 1.1 
-Release: 1%{?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
@@ -26,6 +28,9 @@
 BuildRequires: libbonoboui-devel
 BuildRequires: libpng-devel
 
+# provide name used in other distros
+Provides: gtk-qt-engine-kde4 = %{version}-%{release}
+
 
 %description
 The GTK-Qt Theme Engine is a project allowing GTK to use Qt widget styles.
@@ -37,6 +42,8 @@
 %prep
 %setup -q  -n %{name}
 
+%patch1 -p1 -b .ooo
+
 
 %build
 
@@ -51,7 +58,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # locale's
-%find_lang gtkqtengine || touch gtkqtengine.lang
+%find_lang gtkqtengine 
+# \ || touch gtkqtengine.lang
 
 # FIXME: workaround our parallel-install hack
 mv %{buildroot}%{_kde4_libdir}/kde4/devel/kde4/kcm_gtk4.so \
@@ -67,12 +75,19 @@
 %doc AUTHORS ChangeLog COPYING
 %{_datadir}/themes/Qt4/
 %{_datadir}/applications/kde4/kcmgtk4.desktop
+# FIXME: put into themed dir, like hicolor/48x48
 %{_datadir}/icons/kcmgtk.png
 %{_libdir}/gtk-2.0/*/engines/*
 %{_kde4_libdir}/kde4/kcm_gtk4.so
 
 
 %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
+
 * Fri Apr 04 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.1-1
 - gtk-qt-engine-1.1 for kde4 support (#441038)
 


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


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