[paketler-commits] r7925 - in stable/pardus-1/desktop/kde/gtk-qt-engine: . files

[paketler-uludag at uludag.org.tr]

Author: caglar
Date: Tue Jun  6 20:04:27 2006
New Revision: 7925

Added:
   stable/pardus-1/desktop/kde/gtk-qt-engine/files/no_g_return_if_fail.patch
Modified:
   stable/pardus-1/desktop/kde/gtk-qt-engine/files/fix-slider.patch
   stable/pardus-1/desktop/kde/gtk-qt-engine/files/mozilla-scrollbars.patch
   stable/pardus-1/desktop/kde/gtk-qt-engine/pspec.xml
Log:
sync

Modified: stable/pardus-1/desktop/kde/gtk-qt-engine/files/fix-slider.patch
=================================================================
--- stable/pardus-1/desktop/kde/gtk-qt-engine/files/fix-slider.patch	(original)
+++ stable/pardus-1/desktop/kde/gtk-qt-engine/files/fix-slider.patch	Tue Jun  6 20:04:27 2006
@@ -1,6 +1,6 @@
---- src/qt_qt_wrapper.cpp.sav	2006-02-10 11:38:27.000000000 +0100
-+++ src/qt_qt_wrapper.cpp	2006-02-10 11:38:57.000000000 +0100
-@@ -1356,26 +1356,12 @@ void drawSlider(GdkWindow * window, GtkS
+--- src/qt_qt_wrapper.cpp.sav	2006-02-03 14:50:05.000000000 +0100
++++ src/qt_qt_wrapper.cpp	2006-03-14 21:49:33.000000000 +0100
+@@ -1265,26 +1265,12 @@ void drawSlider(GdkWindow * window, GtkS
  	if (!gtkQtEnable)
  		return;
  
@@ -28,3 +28,17 @@
  	meepSlider->setMinValue(0);
  	meepSlider->setMaxValue(100);
  	
+--- src/qt_theme_draw.c.sav	2006-02-03 04:13:09.000000000 +0100
++++ src/qt_theme_draw.c	2006-03-14 21:50:17.000000000 +0100
+@@ -1204,9 +1204,9 @@ draw_slider(GtkStyle * style,
+ 	{
+ 		GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(widget));
+ 		if (orientation == GTK_ORIENTATION_VERTICAL)
+-			drawScrollBarSlider(window, style, state_type, orientation, adj, x-1, y, width+2, height);
++			drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height);
+ 		else
+-			drawScrollBarSlider(window, style, state_type, orientation, adj, x, y-1, width, height+2);
++			drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height);
+ 		return;
+ 	}
+ }

Modified: stable/pardus-1/desktop/kde/gtk-qt-engine/files/mozilla-scrollbars.patch
=================================================================
--- stable/pardus-1/desktop/kde/gtk-qt-engine/files/mozilla-scrollbars.patch	(original)
+++ stable/pardus-1/desktop/kde/gtk-qt-engine/files/mozilla-scrollbars.patch	Tue Jun  6 20:04:27 2006
@@ -1,5 +1,5 @@
---- src/qt_qt_wrapper.cpp.sav	2006-02-09 17:50:47.000000000 +0100
-+++ src/qt_qt_wrapper.cpp	2006-02-09 18:09:42.000000000 +0100
+--- src/qt_qt_wrapper.cpp.sav	2006-05-05 18:14:07.000000000 +0200
++++ src/qt_qt_wrapper.cpp	2006-05-05 18:26:56.000000000 +0200
 @@ -40,6 +40,7 @@
  #include <fcntl.h>
  #include <stdlib.h>
@@ -8,7 +8,7 @@
  
  #ifdef USE_SOLARIS
  #include <procfs.h>
-@@ -144,6 +145,26 @@ static int dummy_xio_errhandler( Display
+@@ -144,6 +145,28 @@ static int dummy_xio_errhandler( Display
  	return 0;
  }
  
@@ -28,6 +28,8 @@
 +{
 +	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 );
@@ -35,7 +37,7 @@
  
  void createQApp()
  {
-@@ -262,7 +283,7 @@ void createQApp()
+@@ -262,7 +285,7 @@ void createQApp()
  	}
  #endif // USE_SOLARIS
  
@@ -44,7 +46,7 @@
  		mozillaFix = true;
  		
  	gtkQtDebug = (getenv("GTK_QT_ENGINE_DEBUG") != NULL) ? 1 : 0;
-@@ -353,6 +374,8 @@ void createQApp()
+@@ -353,6 +376,8 @@ void createQApp()
  	backgroundTile = meepWidget->paletteBackgroundPixmap();
  	if (backgroundTile != NULL)
  		backgroundTileGdk = gdk_pixmap_foreign_new(backgroundTile->handle());
@@ -53,7 +55,7 @@
  }
  
  void destroyQApp()
-@@ -395,6 +418,7 @@ GdkFilterReturn gdkEventFilter(GdkXEvent
+@@ -395,6 +420,7 @@ GdkFilterReturn gdkEventFilter(GdkXEvent
  		
  		// Tell the QApplication about this new style
  		qApp->setStyle(style);

Modified: stable/pardus-1/desktop/kde/gtk-qt-engine/pspec.xml
=================================================================
--- stable/pardus-1/desktop/kde/gtk-qt-engine/pspec.xml	(original)
+++ stable/pardus-1/desktop/kde/gtk-qt-engine/pspec.xml	Tue Jun  6 20:04:27 2006
@@ -22,6 +22,7 @@
             <Patch>mozilla-scrollbars.patch</Patch>
             <Patch>dont-touch-bashrc.diff</Patch>
             <Patch level="1">gtk-qt-engine-small-pixmaps.patch</Patch>
+            <Patch level="1">no_g_return_if_fail.patch</Patch>
             <Patch level="1">tr_translation.patch</Patch>
         </Patches>
         <BuildDependencies>
@@ -49,6 +50,13 @@
     </Package>
 
     <History>
+        <Update release="9">
+            <Date>2006-06-06</Date>
+            <Version>20060209</Version>
+            <Comment>Do not use g_return_if_fail or binary only softwares (like vmware) cant use gtk-qt-engine</Comment>
+            <Name>S.Çağlar Onur</Name>
+            <Email>caglar at pardus.org.tr</Email>
+        </Update>
         <Update release="8">
             <Date>2006-03-15</Date>
             <Version>20060209</Version>