Package: gtk2-engines-gtk-qt
Version: 0.60-1.3
Followup-For: Bug #266521

Sorry, it seems it's to early for me.

Correct patch attached.

Jan

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)

Versions of packages gtk2-engines-gtk-qt depends on:
ii  kdelibs4c2a               4:3.5.0-3      core libraries for all KDE applica
ii  libc6                     2.3.5-11       GNU C Library: Shared libraries an
ii  libglib2.0-0              2.8.5-1        The GLib library of C routines
ii  libgtk2.0-0               2.8.9-2        The GTK+ graphical user interface 
ii  libpango1.0-0             1.10.2-1       Layout and rendering of internatio
ii  libqt3-mt                 3:3.3.5-3      Qt GUI Library (Threaded runtime v
ii  libstdc++6                4.0.2-6        The GNU Standard C++ Library v3
ii  libx11-6                  6.9.0.dfsg.1-3 X Window System protocol client li

gtk2-engines-gtk-qt recommends no packages.

-- no debconf information
diff -Nur /tmp/gtk-qt-engine-0.60/debian/changelog 
gtk-qt-engine-0.60/debian/changelog
--- /tmp/gtk-qt-engine-0.60/debian/changelog    2006-01-11 07:50:12.880493368 
+0100
+++ gtk-qt-engine-0.60/debian/changelog 2006-01-11 08:20:47.002664416 +0100
@@ -1,3 +1,15 @@
+gtk-qt-engine (0.60-1.3) unstable; urgency=low
+
+  * Fixed missing commas when generating the .qt_gtk_engine_rc file 
+
+ -- devilkin <[EMAIL PROTECTED]>  Wed, 11 Jan 2006 08:20:18 +0100
+
+gtk-qt-engine (0.60-1.2) unstable; urgency=low
+
+  * Rebuild with black-menu fix (as posted on debian-kde ML by Matt Sicker
+
+ -- devilkin <[EMAIL PROTECTED]>  Mon, 19 Dec 2005 07:56:52 +0100
+
 gtk-qt-engine (0.60-1.1) unstable; urgency=low
 
   * NMU at maintainer's request.
diff -Nur /tmp/gtk-qt-engine-0.60/patch gtk-qt-engine-0.60/patch
--- /tmp/gtk-qt-engine-0.60/patch       1970-01-01 01:00:00.000000000 +0100
+++ gtk-qt-engine-0.60/patch    2005-12-19 07:56:01.338728000 +0100
@@ -0,0 +1,12 @@
+diff -urN gtk-qt-engine-0.6.orig/src/qt_theme_draw.c
+gtk-qt-engine-0.6/src/qt_theme_draw.c
+--- gtk-qt-engine-0.6.orig/src/qt_theme_draw.c 2004-12-21 21:28:34 +0600
++++ gtk-qt-engine-0.6/src/qt_theme_draw.c 2005-09-30 08:20:50 +0700
+@@ -1777,6 +1777,7 @@
+{
+pixmap = pix_test;
+parent_relative = FALSE;
++ gdk_drawable_set_colormap(pixmap, style->colormap);
+}
+
+gdk_window_set_back_pixmap (window, pixmap, parent_relative);
diff -Nur /tmp/gtk-qt-engine-0.60/src/qt_qt_wrapper.cpp 
gtk-qt-engine-0.60/src/qt_qt_wrapper.cpp
--- /tmp/gtk-qt-engine-0.60/src/qt_qt_wrapper.cpp       2006-01-11 
08:28:49.612296600 +0100
+++ gtk-qt-engine-0.60/src/qt_qt_wrapper.cpp    2006-01-11 08:24:18.804465648 
+0100
@@ -1505,9 +1505,7 @@
        
        if (sizes & 2)
        {
-               ret += "\t{ \"22x22/" + path +"\", *, *, \"gtk-large-toolbar\" 
}";
-               if (sizes != 2) ret += ",\n";
-               else ret += "\n";
+               ret += "\t{ \"22x22/" + path +"\", *, *, \"gtk-large-toolbar\" 
},\n";
        }
 
        if (sizes & 4)
diff -Nur /tmp/gtk-qt-engine-0.60/src/qt_theme_draw.c 
gtk-qt-engine-0.60/src/qt_theme_draw.c
--- /tmp/gtk-qt-engine-0.60/src/qt_theme_draw.c 2004-12-21 16:28:34.000000000 
+0100
+++ gtk-qt-engine-0.60/src/qt_theme_draw.c      2005-12-19 07:56:48.049647000 
+0100
@@ -1777,6 +1777,7 @@
         {
           pixmap = pix_test;
           parent_relative = FALSE;
+          gdk_drawable_set_colormap(pixmap, style->colormap);
         }
       
       gdk_window_set_back_pixmap (window, pixmap, parent_relative);

Reply via email to