rpms/gtk-qt-engine/devel gtk-qt-engine-1.1-env.patch, NONE, 1.1 gtk-qt-engine.spec, 1.39, 1.40 gtk-qt-engine-1.1-ooo.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Tue Dec 23 21:24:25 UTC 2008
- Previous message (by thread): rpms/python-twisted-lore/devel .cvsignore, 1.3, 1.4 python-twisted-lore.spec, 1.6, 1.7 sources, 1.3, 1.4
- Next message (by thread): rpms/gtk-qt-engine/F-10 gtk-qt-engine-1.1-env.patch, NONE, 1.1 gtk-qt-engine.spec, 1.39, 1.40 gtk-qt-engine-1.1-ooo.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/gtk-qt-engine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1166
Modified Files:
gtk-qt-engine.spec
Added Files:
gtk-qt-engine-1.1-env.patch
Removed Files:
gtk-qt-engine-1.1-ooo.patch
Log Message:
- uninstalling gtk-qt-engine leaves gtk apps in ugly state (#473471)
gtk-qt-engine-1.1-env.patch:
--- NEW FILE gtk-qt-engine-1.1-env.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 15:21:23.000000000 -0600
@@ -127,8 +127,12 @@ void KcmGtk::save()
file.open(QIODevice::WriteOnly);
QTextStream stream(&file);
stream << "#!/bin/bash\n\n";
+ stream << "if [ -e \"$(kde4-config --install module)/kcm_gtk4.so\" ]; then\n";
stream << "# Make sure our customised gtkrc file is loaded.\n";
stream << "export GTK2_RC_FILES=" + k_gtkRcFileName + "\n";
+ stream << "# hack around ooo wierdness.\n";
+ stream << "export SAL_GTK_USE_PIXMAPPAINT=1\n";
+ stream << "fi\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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gtk-qt-engine.spec 23 Dec 2008 20:07:15 -0000 1.39
+++ gtk-qt-engine.spec 23 Dec 2008 21:23:55 -0000 1.40
@@ -6,7 +6,7 @@
Group: User Interface/Desktops
Epoch: 1
Version: 1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
URL: http://gtk-qt.ecs.soton.ac.uk/
@@ -19,7 +19,7 @@
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: gtk-qt-engine-1.1-ooo.patch
+Patch1: gtk-qt-engine-1.1-env.patch
BuildRequires: cmake
BuildRequires: gettext
@@ -82,8 +82,9 @@
%changelog
-* Tue Dec 23 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.1-3
+* Tue Dec 23 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.1-4
- SAL_GTK_USE_PIXMAPPAINT=1 (#450414, #475007)
+- uninstalling gtk-qt-engine leaves gtk apps in ugly state (#473471)
* Thu May 22 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.1-2
- Provides: gtk-qt-engine-kde4
--- gtk-qt-engine-1.1-ooo.patch DELETED ---
- Previous message (by thread): rpms/python-twisted-lore/devel .cvsignore, 1.3, 1.4 python-twisted-lore.spec, 1.6, 1.7 sources, 1.3, 1.4
- Next message (by thread): rpms/gtk-qt-engine/F-10 gtk-qt-engine-1.1-env.patch, NONE, 1.1 gtk-qt-engine.spec, 1.39, 1.40 gtk-qt-engine-1.1-ooo.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list