rpms/gtk-qt-engine/F-7 gtk-qt-engine-0.8-nspluginviewer.patch, NONE, 1.1 gtk-qt-engine.spec, 1.29, 1.30
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Jan 14 13:30:20 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/gtk-qt-engine/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22046
Modified Files:
gtk-qt-engine.spec
Added Files:
gtk-qt-engine-0.8-nspluginviewer.patch
Log Message:
* Mon Jan 14 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1:0.8-2
- nslpluginviewer patch (kde#132138c#48)
gtk-qt-engine-0.8-nspluginviewer.patch:
--- NEW FILE gtk-qt-engine-0.8-nspluginviewer.patch ---
diff -up gtk-qt-engine/src/qt_qt_wrapper.cpp.nspluginviewer gtk-qt-engine/src/qt_qt_wrapper.cpp
--- gtk-qt-engine/src/qt_qt_wrapper.cpp.nspluginviewer 2007-08-28 15:30:38.000000000 -0500
+++ gtk-qt-engine/src/qt_qt_wrapper.cpp 2008-01-14 06:47:07.000000000 -0600
@@ -334,7 +334,7 @@ void createQApp()
printf("createQApp()\n");
char* sessionEnv = getenv("SESSION_MANAGER");
- if (QString(sessionEnv).endsWith(QString::number(getpid())) || cmdLine.contains("gnome-wm") || cmdLine.contains("metacity") || cmdLine.contains("xfwm4") || (getenv("GTK_QT_ENGINE_DISABLE") != NULL) ||
+ if (QString(sessionEnv).endsWith(QString::number(getpid())) || cmdLine.contains("gnome-wm") || cmdLine.contains("metacity") || cmdLine.contains("nspluginviewer") || cmdLine.contains("xfwm4") || (getenv("GTK_QT_ENGINE_DISABLE") != NULL) ||
((qApp) && (qApp->type() == QApplication::Tty)))
{
printf("Not initializing the Gtk-Qt theme engine\n");
Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/F-7/gtk-qt-engine.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gtk-qt-engine.spec 12 Dec 2007 16:49:59 -0000 1.29
+++ gtk-qt-engine.spec 14 Jan 2008 13:29:44 -0000 1.30
@@ -1,12 +1,12 @@
#define svn 20070811svn
-Summary: A project allowing GTK to use Qt widget styles.
+Summary: A project allowing GTK to use Qt widget styles
Name: gtk-qt-engine
Group: User Interface/Desktops
Epoch: 1
Version: 0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: http://gtk-qt.ecs.soton.ac.uk/
@@ -19,10 +19,17 @@
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# see http://bugs.kde.org/132138c#48
+Patch1: gtk-qt-engine-0.8-nspluginviewer.patch
+
BuildRequires: cmake
BuildRequires: gettext
BuildRequires: gtk2-devel
+%if 0%{?fedora} > 6
BuildRequires: kdelibs3-devel
+%else
+BuildRequires: kdelibs-devel
+%endif
BuildRequires: libbonoboui-devel
BuildRequires: libpng-devel
@@ -37,6 +44,8 @@
%prep
%setup -q -n %{name}
+%patch1 -p1 -b .nspluginviewer
+
%build
@@ -64,7 +73,7 @@
%files -f gtkqtengine.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc AUTHORS ChangeLog README
%{_datadir}/themes/Qt/
%{_datadir}/applications/*.desktop
@@ -73,6 +82,9 @@
%changelog
+* Mon Jan 14 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1:0.8-2
+- nslpluginviewer patch (kde#132138c#48)
+
* Sun Dec 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:0.8-1
- gtk-qt-engine-0.8
More information about the fedora-extras-commits
mailing list