SOURCES: gtk2-theme-engine-qt-dt.patch (NEW), gtk2-theme-engine-qt...

psz psz at pld-linux.org
Thu Apr 6 22:35:59 CEST 2006


Author: psz                          Date: Thu Apr  6 20:35:59 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- -kcm-fixinstallationdir.patch from Gentoo
- -dt.patch from Fedora
- -notebook.patch from Freedesktop
- build process fixed
- rel 1

---- Files affected:
SOURCES:
   gtk2-theme-engine-qt-dt.patch (NONE -> 1.1)  (NEW), gtk2-theme-engine-qt-kcm-fixinstallationdir.patch (NONE -> 1.1)  (NEW), gtk2-theme-engine-qt-notebook.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/gtk2-theme-engine-qt-dt.patch
diff -u /dev/null SOURCES/gtk2-theme-engine-qt-dt.patch:1.1
--- /dev/null	Thu Apr  6 22:35:59 2006
+++ SOURCES/gtk2-theme-engine-qt-dt.patch	Thu Apr  6 22:35:54 2006
@@ -0,0 +1,8 @@
+--- gtk-qt-engine-0.6/kcm_gtk/kcmgtk.desktop.dt	2004-08-22 03:40:29.000000000 -0500
++++ gtk-qt-engine-0.6/kcm_gtk/kcmgtk.desktop	2006-01-23 09:28:15.000000000 -0600
+@@ -12,3 +12,5 @@
+ X-KDE-Library=kcmgtk
+ X-KDE-ModuleType=Library
+ Type=Application
++
++NotShowIn=KDE

================================================================
Index: SOURCES/gtk2-theme-engine-qt-kcm-fixinstallationdir.patch
diff -u /dev/null SOURCES/gtk2-theme-engine-qt-kcm-fixinstallationdir.patch:1.1
--- /dev/null	Thu Apr  6 22:35:59 2006
+++ SOURCES/gtk2-theme-engine-qt-kcm-fixinstallationdir.patch	Thu Apr  6 22:35:54 2006
@@ -0,0 +1,21 @@
+--- kcm_gtk/Makefile.am.orig	2005-01-14 10:52:16.000000000 +0000
++++ kcm_gtk/Makefile.am	2005-01-15 10:44:20.006738856 +0000
+@@ -2,8 +2,7 @@
+ METASOURCES = AUTO
+ 
+ # Install this plugin in the KDE modules directory
+-kcmgtkmoduledir = $(KDE_PREFIX)/lib/kde3/
+-kcmgtkmodule_LTLIBRARIES = kcm_kcmgtk.la
++kde_module_LTLIBRARIES = kcm_kcmgtk.la
+ 
+ kcm_kcmgtk_la_SOURCES = kcmgtkwidget.ui kcmgtk.cpp
+ kcm_kcmgtk_la_LIBADD = $(LIB_KDEUI)
+@@ -11,7 +10,7 @@
+ 
+ 
+ kcmgtk_DATA = kcmgtk.desktop
+-kcmgtkdir = $(KDE_PREFIX)/share/applnk/Settings/LookNFeel
++kcmgtkdir = $(kde_appsdir)/Settings/LookNFeel
+ 
+ kcmgtkdebian_DATA = kcmgtk.menu
+ kcmgtkdebiandir = /usr/lib/menu

================================================================
Index: SOURCES/gtk2-theme-engine-qt-notebook.patch
diff -u /dev/null SOURCES/gtk2-theme-engine-qt-notebook.patch:1.1
--- /dev/null	Thu Apr  6 22:35:59 2006
+++ SOURCES/gtk2-theme-engine-qt-notebook.patch	Thu Apr  6 22:35:54 2006
@@ -0,0 +1,12 @@
+--- gtk-qt-engine-0.6/src/qt_qt_wrapper.cpp.3919	2004-12-19 09:31:48.000000000 -0600
++++ gtk-qt-engine-0.6/src/qt_qt_wrapper.cpp	2005-10-27 09:48:07.000000000 -0500
+@@ -1363,7 +1363,8 @@
+ 	int sdiff = 10000, pos = -1, diff = 1;
+ 	for ( int i = 0; i < g_list_length(notebook->children); i++ )
+ 	{
+-		diff = gtk_notebook_get_tab_label(notebook,gtk_notebook_get_nth_page(notebook,i))->allocation.x - x;
++		GtkWidget *tab_label=gtk_notebook_get_tab_label(notebook,gtk_notebook_get_nth_page(notebook,i));
++		if (tab_label) diff = tab_label->allocation.x - x;
+ 		if ((diff > 0) && (diff < sdiff))
+ 		{
+ 			sdiff = diff; pos = i;
================================================================


More information about the pld-cvs-commit mailing list