rpms/gtk-qt-engine/FC-3 gtk-qt-engine-3919.patch, NONE, 1.1 gtk-qt-engine-3983.patch, NONE, 1.1 gtk-qt-engine-gcc29.patch, NONE, 1.1 gtk-qt-engine-x86_64.patch, 1.2, 1.3 gtk-qt-engine.spec, 1.4, 1.5

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/gtk-qt-engine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24528/FC-3

Modified Files:
	gtk-qt-engine.spec 
Added Files:
	gtk-qt-engine-3919.patch gtk-qt-engine-3983.patch 
	gtk-qt-engine-gcc29.patch gtk-qt-engine-x86_64.patch 
Log Message:
* Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-5
- revert to 0.6.
- Req: kdebase
- cleanout unused crud
- fix gtk/cairo crasher (fdo bug #3214)
- segfault in libqtengine.so drawing notebook (fdo bug #3919)


gtk-qt-engine-3919.patch:

--- NEW FILE gtk-qt-engine-3919.patch ---
--- 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;

gtk-qt-engine-3983.patch:

--- NEW FILE gtk-qt-engine-3983.patch ---
--- gtk-qt-engine/src/qt_theme_draw.c.3983	2005-01-06 14:38:14.000000000 -0600
+++ gtk-qt-engine/src/qt_theme_draw.c	2005-10-27 08:35:35.000000000 -0500
@@ -1831,6 +1831,7 @@
           parent_relative = FALSE;
         }
       
+      if (pixmap && !gdk_drawable_get_colormap (pixmap)) gdk_drawable_set_colormap (pixmap, gdk_drawable_get_colormap (window));
       gdk_window_set_back_pixmap (window, pixmap, parent_relative);
     }
   else

gtk-qt-engine-gcc29.patch:

--- NEW FILE gtk-qt-engine-gcc29.patch ---
--- gtk-qt-engine/src/qt_theme_draw.c.gcc29	2005-01-06 14:38:14.000000000 -0600
+++ gtk-qt-engine/src/qt_theme_draw.c	2005-10-03 10:25:40.000000000 -0500
@@ -665,6 +665,8 @@
 	if (GTK_IS_SCALE(widget) && DETAIL("trough"))
 	{
 		GtkAdjustment* adj;
+		int inverted;
+		GValue *val = (GValue*)g_malloc( sizeof(GValue) );
 		if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget)))
 		{
 			GdkPixbuf *gpix;
@@ -673,8 +675,6 @@
 			g_object_unref(gpix);
 		}
 		
-		int inverted;
-		GValue *val = (GValue*)g_malloc( sizeof(GValue) );
 		memset( val, 0, sizeof(GValue) );
 		g_value_init( val, G_TYPE_BOOLEAN );
 		g_object_get_property(widget, "inverted", val);

gtk-qt-engine-x86_64.patch:

Index: gtk-qt-engine-x86_64.patch
===================================================================
RCS file: gtk-qt-engine-x86_64.patch
diff -N gtk-qt-engine-x86_64.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gtk-qt-engine-x86_64.patch	27 Oct 2005 15:21:51 -0000	1.3
@@ -0,0 +1,13 @@
+--- kcm_gtk/Makefile.am
++++ kcm_gtk/Makefile.am
+@@ -1,9 +1,7 @@
+ INCLUDES    = $(all_includes)
+ 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)


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-3/gtk-qt-engine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtk-qt-engine.spec	5 Aug 2005 15:54:58 -0000	1.4
+++ gtk-qt-engine.spec	27 Oct 2005 15:21:51 -0000	1.5
@@ -1,35 +1,52 @@
-# $Id$
 
 %define real_ver 0.6
+#define cvs cvs20050930
 
 Summary: A project allowing GTK to use Qt widget styles.
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.60
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 License: GPL
-Source:	 http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2
-URL:	 http://www.freedesktop.org/Software/gtk-qt
+URL:     http://www.freedesktop.org/Software/gtk-qt
+#Source: gtk-qt-engine-%{cvs}.tar.bz2
+Source:  http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-# fix x86_64 build, requires auto-tools
+#### reported Bugs, patches
+## fix x86_64 build, requires auto-tools
+## (already fixed in upstream cvs)
 Patch0: gtk-qt-engine-x86_64.patch
-BuildRequires: autoconf, automake17
+## GTK/QT + Baghira = lots of problems
+## (gtk-qt-engine-cvs20050930 + baghira-0.71 crashes firefox/gimp)
+## http://bugs.freedesktop.org/show_bug.cgi?id=2349
+#Patch2349:
+## segfault in libqtengine.so drawing notebook
+## https://bugs.freedesktop.org/show_bug.cgi?id=3919
+Patch3919: gtk-qt-engine-3919.patch
+## GTK-Qt engine causes crashes with Cairo GTK:
+## http://bugs.freedesktop.org/show_bug.cgi?id=3983
+Patch3983: gtk-qt-engine-3983.patch
+## missing toolbar icons
+## http://bugs.freedesktop.org/show_bug.cgi?id=4904
+#Patch4904: 
+## build fails w/gcc-2.9x:
+## http://bugs.freedesktop.org/show_bug.cgi?id=4676
+Patch1: gtk-qt-engine-gcc29.patch
+
+
+BuildRequires: automake17
 
 BuildRequires: gtk2-devel >= 2.2
-# workaround for stock qt-devel's missing deps
-BuildRequires: libpng-devel
+BuildRequires: libbonoboui-devel
 
 BuildRequires: qt-devel >= 1:3.3
-%define qt_ver %(rpm -q --qf '%%{version}' qt-devel )
-Requires: qt >= 1:%{qt_ver}
 BuildRequires: kdelibs-devel >= 6:3.3
-%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel )
-Requires: kdelibs >= 6:%{kdelibs_ver}
-## For KDE Control center (??)
-## Not strictly required, leave out for now. -- Rex
-#Requires: kdebase
+BuildRequires: libpng-devel
+
+# For KDE Control center
+Requires: kdebase
 
 
 %description
@@ -40,30 +57,40 @@
 
 
 %prep
-%setup -q  -n %{name}-%{real_ver}
+%setup -q  -n %{name}%{!?cvs:-%{real_ver}}
 
-%patch0 -p0 -b .x86_64
-
-make -f admin/Makefile.common
+%{!?cvs:%patch0 -p0 -b .x86_64}
+%{?gcc296:%patch1 -p1 -b .gcc29}
+%patch3919 -p1 -b .3919
+%patch3983 -p1 -b .3983
+
+#if [ ! -f configure -o ! -z "%{?cvs}" ]; then
+make -f admin/Makefile.common cvs
+#fi
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; source /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \
   %{?debug:  --enable-debug --enable-warnings } \
-  %{!?debug: --disable-debug --disable-warnings } 
+  %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking }
+
+make %{?_smp_mflags}
 
-make %{?_smp_mflags} 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# locale's
+%find_lang gtkqtengine || touch gtkqtengine.lang
 
-## Unpackaged files
+# Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/menu
 
 
@@ -71,7 +98,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f gtkqtengine.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog README
 %{_datadir}/themes/Qt
@@ -83,6 +110,16 @@
 
 
 %changelog 
+* Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-5
+- revert to 0.6.
+- Req: kdebase
+- cleanout unused crud
+- fix gtk/cairo crasher (fdo bug #3214)
+- segfault in libqtengine.so drawing notebook (fdo bug #3919)
+
+* Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-4.cvs
+- update to cvs to see if it helps ooo (and others)
+
 * Fri Aug  5 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-3
 - drop bogus BR: libjpeg-devel libmng-devel
 - x86_64 patch (and BR: autoconf automake17)