[Frugalware-darcs] frugalware-current: gtk-qt-engine-0.7-3-i686

[crazy]

Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070224013433-f6986-5abf07ba7e85e35580ff22751e2449348e493d93.gz;

[gtk-qt-engine-0.7-3-i686
crazy <crazy at frugalware.org>**20070224013433
 * bump to SVN
 * tarball is on FTP now 
] {
addfile ./source/kde/gtk-qt-engine/mozilla-scrollbars.patch
hunk ./source/kde/gtk-qt-engine/FrugalBuild 7
-pkgrel=2
+pkgrel=3
hunk ./source/kde/gtk-qt-engine/FrugalBuild 9
-depends=('gtk+2' 'kdebase>=3.5.2')
-makedepends=('libbonoboui')
-groups=('kde')
+depends=('gtk+2' 'kdebase>=3.5.6')
+makedepends=('cmake' 'kdesdk' 'libbonoboui')
+groups=('kde-extra')
+options=('scriptlet')
hunk ./source/kde/gtk-qt-engine/FrugalBuild 14
-Finclude kde
hunk ./source/kde/gtk-qt-engine/FrugalBuild 16
-source=($url/files/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha1sums=('7e0df095171112e79b3bc8bee13287bb0e1cea2a')
+source=(http://ftp.frugalware.org/pub/other/sources/kde/gtk-qt-engine/$pkgname-$pkgver.tar.bz2 mozilla-scrollbars.patch)
+sha1sums=('a397243a9fd2ddcca2a0b74edae8520fa357c9e7'\
+          '100b306486c8f69923c0142896f22824c2957cbf')
hunk ./source/kde/gtk-qt-engine/FrugalBuild 22
-	Fcd $pkgname
-	Fbuild
-	echo "OnlyShowIn=KDE;" >> $Fdestdir/usr/share/applnk/Settings/LookNFeel/kcmgtk.desktop
-	Frm usr/lib/menu usr/share/applications
+	Fcd
+	Fpatchall
+	cmake . -DCMAKE_INSTALL_PREFIX=/usr || Fdie
+	make || Fdie
+	## BLAH what kind build system is this ?
+	make install DESTDIR=$Fdestdir || Fdie
hunk ./source/kde/gtk-qt-engine/mozilla-scrollbars.patch 1
+Index: src/qt_qt_wrapper.cpp
+===================================================================
+--- src/qt_qt_wrapper.cpp	(revision 25)
++++ src/qt_qt_wrapper.cpp	(working copy)
+@@ -18,6 +18,7 @@
+ #include <gdk/gdkx.h>
+ 
+ #include <fcntl.h>
++#include <dlfcn.h>
+ 
+ #ifdef USE_SOLARIS
+ #include <procfs.h>
+@@ -136,7 +137,29 @@
+ 	return 0;
+ }
+ 
++typedef void (*kstyle_fn)( void* );
+ 
++static kstyle_fn get_set_scrollbar_fn()
++{
++	void* handle = dlopen( "libkdefx.so.4", RTLD_LAZY );
++	if( handle == NULL )
++		return NULL;
++	kstyle_fn ret = (kstyle_fn) dlsym( handle, "kde_kstyle_set_scrollbar_type_windows" );
++	dlclose( handle );
++        return ret;
++}
++
++static void initStyle( QStyle* style )
++{
++	if( !style->inherits("KStyle" ) || !mozillaFix )
++		return;
++        if( QCString(style->name()).lower() == "thinkeramik" )
++            return; // this one has its own kdefx :-/
++	static kstyle_fn set_scrollbar = get_set_scrollbar_fn();
++	if( set_scrollbar != NULL )
++		set_scrollbar( style );
++}
++
+ void createQApp()
+ {
+ 	int argc = 1;
+@@ -254,7 +277,7 @@
+ 	}
+ #endif // USE_SOLARIS
+ 
+-	if (cmdLine.contains("mozilla") || cmdLine.contains("firefox"))
++	if (cmdLine.contains("seamonkey") || cmdLine.contains("firefox") || cmdLine.contains("thunderbird"))
+ 		mozillaFix = true;
+ 	
+ 	openOfficeFix = (cmdLine.endsWith("soffice.bin"))
+@@ -366,6 +389,8 @@
+ 	backgroundTile = meepWidget->paletteBackgroundPixmap();
+ 	if (backgroundTile != NULL)
+ 		backgroundTileGdk = gdk_pixmap_foreign_new(backgroundTile->handle());
++
++	initStyle( &qApp->style());
+ }
+ 
+ void destroyQApp()
+@@ -408,6 +433,7 @@
+ 		
+ 		// Tell the QApplication about this new style
+ 		qApp->setStyle(style);
++		initStyle(style);
+ 		
+ 		// Now we need to update GTK's properties
+ 		setRcProperties(gtkRcStyle, 1); // Rewrite our cache file
}