rev 14619 - in kde-extras/gtk-qt-engine/trunk/debian: . patches

[Didier Raboud]

Author: odyx-guest
Date: 2009-05-14 13:51:31 +0000 (Thu, 14 May 2009)
New Revision: 14619

Added:
   kde-extras/gtk-qt-engine/trunk/debian/patches/04_no_kde4_in_configfile.diff
Modified:
   kde-extras/gtk-qt-engine/trunk/debian/changelog
   kde-extras/gtk-qt-engine/trunk/debian/patches/series
Log:
gtk-qt-engine: Add patch 04_no_kde4_in_configfile to Closes: 527340


Modified: kde-extras/gtk-qt-engine/trunk/debian/changelog
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/changelog	2009-05-14 13:32:50 UTC (rev 14618)
+++ kde-extras/gtk-qt-engine/trunk/debian/changelog	2009-05-14 13:51:31 UTC (rev 14619)
@@ -9,6 +9,7 @@
   * Refactorize debian/rules
     - Remove the custom debian/cdbs directory
     - Add get-orig-source target
+  * Add 04_no_kde4_in_configfile.diff (Closes: 527340)
 
  -- Didier Raboud <didier at raboud.com>  Thu, 14 May 2009 13:35:53 +0200
 

Added: kde-extras/gtk-qt-engine/trunk/debian/patches/04_no_kde4_in_configfile.diff
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/04_no_kde4_in_configfile.diff	                        (rev 0)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/04_no_kde4_in_configfile.diff	2009-05-14 13:51:31 UTC (rev 14619)
@@ -0,0 +1,22 @@
+Index: gtk-qt-engine-1.1+svn5.orig/kcm_gtk/kcmgtk.cpp
+===================================================================
+--- gtk-qt-engine-1.1+svn5.orig.orig/kcm_gtk/kcmgtk.cpp	2009-05-14 15:47:12.000000000 +0200
++++ gtk-qt-engine-1.1+svn5.orig/kcm_gtk/kcmgtk.cpp	2009-05-14 15:47:39.000000000 +0200
+@@ -37,7 +37,7 @@
+ #include <sys/stat.h>
+ 
+ 
+-const QString KcmGtk::k_gtkRcFileName(QDir::homePath() + "/.gtkrc-2.0-kde4");
++const QString KcmGtk::k_gtkRcFileName(QDir::homePath() + "/.gtkrc-2.0");
+ const QString KcmGtk::k_envFileName(KGlobal::dirs()->localkdedir() + "/env/gtk-qt-engine.rc.sh");
+ const QString KcmGtk::k_qtThemeName("Qt4");
+ 
+@@ -112,7 +112,7 @@
+ 
+ void KcmGtk::save()
+ {
+-	// Write ~/.gtkrc-2.0-kde4
++	// Write ~/.gtkrc-2.0
+ 	m_gtkRc->save();
+ 	
+ 	// Write ~/.kde/env/gtk-qt-engine.rc.sh

Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/series
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/series	2009-05-14 13:32:50 UTC (rev 14618)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/series	2009-05-14 13:51:31 UTC (rev 14619)
@@ -1,4 +1,5 @@
 01_fix_out_of_source_build.diff
 02_change_desktop_file_installation.diff
 03_disable_engine_with_nspluginviewer.diff
+04_no_kde4_in_configfile.diff