From 5b7a6e169279f85c5a44306d765bfd412d7e879b Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Sun, 23 Oct 2005 09:18:44 +0000 Subject: Add patch to fix menus with gtk-2.8, thanks to Lorenzo Villani in bug 108863 (Portage version: 2.0.53_rc6) --- x11-themes/gtk-engines-qt/ChangeLog | 10 ++++- x11-themes/gtk-engines-qt/Manifest | 7 ++-- .../files/digest-gtk-engines-qt-0.6-r1 | 1 - .../files/digest-gtk-engines-qt-0.6-r2 | 1 + x11-themes/gtk-engines-qt/files/gtk-2.8-fix.patch | 11 ++++++ .../gtk-engines-qt/gtk-engines-qt-0.6-r1.ebuild | 44 --------------------- .../gtk-engines-qt/gtk-engines-qt-0.6-r2.ebuild | 45 ++++++++++++++++++++++ 7 files changed, 70 insertions(+), 49 deletions(-) delete mode 100644 x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.6-r1 create mode 100644 x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.6-r2 create mode 100644 x11-themes/gtk-engines-qt/files/gtk-2.8-fix.patch delete mode 100644 x11-themes/gtk-engines-qt/gtk-engines-qt-0.6-r1.ebuild create mode 100644 x11-themes/gtk-engines-qt/gtk-engines-qt-0.6-r2.ebuild (limited to 'x11-themes') 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 + +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 + in bug 108863 02 Aug 2005; Leonardo Boshell 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-r1 deleted file mode 100644 index 11074064dfba..000000000000 --- a/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.6-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 9c02c95a6e8d304b1f2801429759e1c0 gtk-qt-engine-0.6.tar.bz2 435510 diff --git a/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.6-r2 b/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.6-r2 new file mode 100644 index 000000000000..11074064dfba --- /dev/null +++ b/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.6-r2 @@ -0,0 +1 @@ +MD5 9c02c95a6e8d304b1f2801429759e1c0 gtk-qt-engine-0.6.tar.bz2 435510 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-r1.ebuild deleted file mode 100644 index 4d39454591da..000000000000 --- a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.6-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# 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 $ - -inherit eutils kde-functions - -MY_P="gtk-qt-engine-${PV}" -DESCRIPTION="GTK+2 Qt Theme Engine" -HOMEPAGE="http://www.freedesktop.org/Software/gtk-qt" -SRC_URI="http://www.freedesktop.org/~davidsansome/${MY_P}.tar.bz2" -LICENSE="GPL-2" - -IUSE="arts debug" -KEYWORDS="~x86 ~ppc ~amd64" - -DEPEND="${DEPEND} - >=x11-libs/gtk+-2.2 - arts? ( kde-base/arts )" - -need-kde 3 -# Set slot after the need-kde. Fixes bug #78455. -SLOT="2" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${MY_P}-kcm-fixinstallationdir.patch -} - -src_compile() { - make -f ${S}/admin/Makefile.common - - local myconf="$(use_with arts) $(use_enable debug)" - econf ${myconf} || die - emake || die -} - -src_install() { - make DESTDIR="${D}" install || die "Installation failed" - - dodoc AUTHORS -} diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.6-r2.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.6-r2.ebuild new file mode 100644 index 000000000000..955890047bf8 --- /dev/null +++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.6-r2.ebuild @@ -0,0 +1,45 @@ +# 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-r2.ebuild,v 1.1 2005/10/23 09:18:44 genstef Exp $ + +inherit eutils kde-functions + +MY_P="gtk-qt-engine-${PV}" +DESCRIPTION="GTK+2 Qt Theme Engine" +HOMEPAGE="http://www.freedesktop.org/Software/gtk-qt" +SRC_URI="http://www.freedesktop.org/~davidsansome/${MY_P}.tar.bz2" +LICENSE="GPL-2" + +IUSE="arts debug" +KEYWORDS="~x86 ~ppc ~amd64" + +DEPEND="${DEPEND} + >=x11-libs/gtk+-2.2 + arts? ( kde-base/arts )" + +need-kde 3 +# Set slot after the need-kde. Fixes bug #78455. +SLOT="2" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${MY_P}-kcm-fixinstallationdir.patch + epatch ${FILESDIR}/gtk-2.8-fix.patch +} + +src_compile() { + make -f ${S}/admin/Makefile.common + + local myconf="$(use_with arts) $(use_enable debug)" + econf ${myconf} || die + emake || die +} + +src_install() { + make DESTDIR="${D}" install || die "Installation failed" + + dodoc AUTHORS +} -- cgit v1.2.3-65-gdbad