Add patch to fix menus with gtk-2.8, thanks to Lorenzo Villani <arbitermc@gmail.com> in bug 108863

(Portage version: 2.0.53_rc6)

5 files changed, 26 insertions, 5 deletions

diff --git a/x11-themes/gtk-engines-qt/ChangeLog b/x11-themes/gtk-engines-qt/ChangeLog
index 0c5ed77523f8..9063a6f15390 100644
--- a/x11-themes/gtk-engines-qt/ChangeLog
+++ b/x11-themes/gtk-engines-qt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/gtk-engines-qt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.2 2005/08/02 14:49:25 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.3 2005/10/23 09:18:44 genstef Exp $
+
+*gtk-engines-qt-0.6-r2 (23 Oct 2005)
+
+  23 Oct 2005; Stefan Schweizer <genstef@gentoo.org>
+  +files/gtk-2.8-fix.patch, -gtk-engines-qt-0.6-r1.ebuild,
+  +gtk-engines-qt-0.6-r2.ebuild:
+  Add patch to fix menus with gtk-2.8, thanks to Lorenzo Villani
+  <arbitermc@gmail.com> in bug 108863
 
   02 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
   gtk-engines-qt-0.6-r1.ebuild:
diff --git a/x11-themes/gtk-engines-qt/Manifest b/x11-themes/gtk-engines-qt/Manifest
index 7a7d877cd48d..c68845f5e22b 100644
--- a/x11-themes/gtk-engines-qt/Manifest
+++ b/x11-themes/gtk-engines-qt/Manifest
@@ -1,5 +1,6 @@
-MD5 7b1835a7be79a61b7b9491c6eaf4e537 gtk-engines-qt-0.6-r1.ebuild 1012
 MD5 e48634f130449753ee88d56de4454769 ChangeLog 1738
-MD5 1cdea9d92f759ed6423e4ace9446da66 metadata.xml 266
-MD5 5581455144e4c925a184778c26ba5b78 files/digest-gtk-engines-qt-0.6-r1 70
+MD5 5581455144e4c925a184778c26ba5b78 files/digest-gtk-engines-qt-0.6-r2 70
+MD5 8b8d9d95fe481699fe79e5d1617468ec files/gtk-2.8-fix.patch 374
 MD5 8f580df2eb803899e2f8a45a5d133d08 files/gtk-qt-engine-0.6-kcm-fixinstallationdir.patch 657
+MD5 e9c1fe82b853e43f97ad76c58e131651 gtk-engines-qt-0.6-r2.ebuild 1050
+MD5 1cdea9d92f759ed6423e4ace9446da66 metadata.xml 266
diff --git a/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.6-r1 b/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.6-r2
index 11074064dfba..11074064dfba 100644
--- a/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.6-r1
+++ b/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.6-r2
diff --git a/x11-themes/gtk-engines-qt/files/gtk-2.8-fix.patch b/x11-themes/gtk-engines-qt/files/gtk-2.8-fix.patch
new file mode 100644
index 000000000000..b8d58a4f9c4a
--- /dev/null
+++ b/x11-themes/gtk-engines-qt/files/gtk-2.8-fix.patch
@@ -0,0 +1,11 @@
+--- src/qt_theme_draw.c.orig 2004-12-21 16:28:34.000000000 +0100
++++ src/qt_theme_draw.c      2005-10-11 18:06:11.000000000 +0200
+@@ -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 --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.6-r1.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.6-r2.ebuild
index 4d39454591da..955890047bf8 100644
--- a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.6-r1.ebuild
+++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.6-r1.ebuild,v 1.1 2005/08/02 14:44:35 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.6-r2.ebuild,v 1.1 2005/10/23 09:18:44 genstef Exp $
 
 inherit eutils kde-functions
 
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${MY_P}-kcm-fixinstallationdir.patch
+	epatch ${FILESDIR}/gtk-2.8-fix.patch
 }
 
 src_compile() {