From 16a95017bc20bd5e96250be803c87fd6d615245b Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sun, 17 May 2009 15:32:11 +0000 Subject: Revision bump. Fix various issues. Per bug #257542. (Portage version: 2.2_rc33/cvs/Linux i686) --- x11-themes/gtk-engines-qt/ChangeLog | 10 ++++- .../files/1.1-firefoxOpenFileDialogFix.patch | 32 +++++++++++++++ .../gtk-engines-qt/files/1.1-fixsegfault.patch | 11 +++++ .../gtk-engines-qt/files/1.1-scrollbar.patch | 12 ++++++ .../gtk-engines-qt/gtk-engines-qt-1.1-r1.ebuild | 41 ------------------- .../gtk-engines-qt/gtk-engines-qt-1.1-r2.ebuild | 47 ++++++++++++++++++++++ 6 files changed, 111 insertions(+), 42 deletions(-) create mode 100644 x11-themes/gtk-engines-qt/files/1.1-firefoxOpenFileDialogFix.patch create mode 100644 x11-themes/gtk-engines-qt/files/1.1-fixsegfault.patch create mode 100644 x11-themes/gtk-engines-qt/files/1.1-scrollbar.patch delete mode 100644 x11-themes/gtk-engines-qt/gtk-engines-qt-1.1-r1.ebuild create mode 100644 x11-themes/gtk-engines-qt/gtk-engines-qt-1.1-r2.ebuild diff --git a/x11-themes/gtk-engines-qt/ChangeLog b/x11-themes/gtk-engines-qt/ChangeLog index 4e645217ef0d..36e8378d0a0c 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.47 2009/05/17 15:21:01 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.48 2009/05/17 15:32:11 scarabeus Exp $ + +*gtk-engines-qt-1.1-r2 (17 May 2009) + + 17 May 2009; Tomas Chvatal + +files/1.1-firefoxOpenFileDialogFix.patch, +gtk-engines-qt-1.1-r2.ebuild, + +files/1.1-fixsegfault.patch, +files/1.1-scrollbar.patch, + -gtk-engines-qt-1.1-r1.ebuild: + Revision bump. Fix various issues. Per bug #257542. *gtk-engines-qt-0.8-r4 (17 May 2009) diff --git a/x11-themes/gtk-engines-qt/files/1.1-firefoxOpenFileDialogFix.patch b/x11-themes/gtk-engines-qt/files/1.1-firefoxOpenFileDialogFix.patch new file mode 100644 index 000000000000..5129f6853636 --- /dev/null +++ b/x11-themes/gtk-engines-qt/files/1.1-firefoxOpenFileDialogFix.patch @@ -0,0 +1,32 @@ +Index: /gtk-qt/trunk/gtk-qt-engine/ChangeLog +=================================================================== +--- /gtk-qt/trunk/gtk-qt-engine/ChangeLog (revision 136) ++++ /gtk-qt/trunk/gtk-qt-engine/ChangeLog (revision 140) +@@ -11,4 +11,5 @@ + * Fix a divide by 0 exception in styles where there are no scrollbar buttons + (cloudcity) ++ * Fix a crash in Firefox's open file dialog + + i18n: +Index: /gtk-qt/trunk/gtk-qt-engine/src/engine.cpp +=================================================================== +--- /gtk-qt/trunk/gtk-qt-engine/src/engine.cpp (revision 136) ++++ /gtk-qt/trunk/gtk-qt-engine/src/engine.cpp (revision 140) +@@ -642,4 +642,6 @@ + // Figure out where the slider is. Hope this rect is the same size as oldSize + QRect sliderRect = m_qtStyle->subControlRect(QStyle::CC_ScrollBar, &option, QStyle::SC_ScrollBarSlider, m_dummyScrollBar); ++ if (sliderRect.width() < 0 || sliderRect.height() < 0) // Firefox again :( ++ return; + + // Get rid of the buttons so we're left with just the scrollbar slider of the size we were asked to draw +Index: /gtk-qt/trunk/gtk-qt-engine/src/rcproperties.cpp +=================================================================== +--- /gtk-qt/trunk/gtk-qt-engine/src/rcproperties.cpp (revision 139) ++++ /gtk-qt/trunk/gtk-qt-engine/src/rcproperties.cpp (revision 140) +@@ -175,5 +175,5 @@ + int availableSize = 200 - qtStyle->subControlRect(QStyle::CC_ScrollBar, &option, QStyle::SC_ScrollBarGroove, scrollBar).width(); + s_scrollBarButtonCount = s_scrollBarHasForward1 + s_scrollBarHasBack1 + s_scrollBarHasForward2 + s_scrollBarHasBack2; // Evil +- if (s_scrollBarButtonSize != 0) ++ if (s_scrollBarButtonCount != 0) + s_scrollBarButtonSize = availableSize / s_scrollBarButtonCount; + } diff --git a/x11-themes/gtk-engines-qt/files/1.1-fixsegfault.patch b/x11-themes/gtk-engines-qt/files/1.1-fixsegfault.patch new file mode 100644 index 000000000000..d05027be4285 --- /dev/null +++ b/x11-themes/gtk-engines-qt/files/1.1-fixsegfault.patch @@ -0,0 +1,11 @@ +Index: /gtk-qt/trunk/gtk-qt-engine/src/engine.cpp +=================================================================== +--- /gtk-qt/trunk/gtk-qt-engine/src/engine.cpp (revision 140) ++++ /gtk-qt/trunk/gtk-qt-engine/src/engine.cpp (revision 142) +@@ -379,5 +379,5 @@ + } + +- m_qtStyle->drawPrimitive(element, &option, &p); ++ m_qtStyle->drawPrimitive(element, &option, &p, m_dummyWidget); + + GTK_QT_FINISH diff --git a/x11-themes/gtk-engines-qt/files/1.1-scrollbar.patch b/x11-themes/gtk-engines-qt/files/1.1-scrollbar.patch new file mode 100644 index 000000000000..6112a1d1e48a --- /dev/null +++ b/x11-themes/gtk-engines-qt/files/1.1-scrollbar.patch @@ -0,0 +1,12 @@ +Index: /gtk-qt/trunk/gtk-qt-engine/src/rcproperties.cpp +=================================================================== +--- /gtk-qt/trunk/gtk-qt-engine/src/rcproperties.cpp (revision 119) ++++ /gtk-qt/trunk/gtk-qt-engine/src/rcproperties.cpp (revision 131) +@@ -132,5 +132,6 @@ + int availableSize = 200 - qtStyle->subControlRect(QStyle::CC_ScrollBar, &option, QStyle::SC_ScrollBarGroove, scrollBar).width(); + s_scrollBarButtonCount = s_scrollBarHasForward1 + s_scrollBarHasBack1 + s_scrollBarHasForward2 + s_scrollBarHasBack2; // Evil +- s_scrollBarButtonSize = availableSize / s_scrollBarButtonCount; ++ if (s_scrollBarButtonSize != 0) ++ s_scrollBarButtonSize = availableSize / s_scrollBarButtonCount; + } + diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-1.1-r1.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-1.1-r1.ebuild deleted file mode 100644 index fe2ef2988853..000000000000 --- a/x11-themes/gtk-engines-qt/gtk-engines-qt-1.1-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2009 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-1.1-r1.ebuild,v 1.1 2009/02/03 13:49:50 scarabeus Exp $ - -EAPI="2" - -KDE_LINGUAS="bg cs de es fr it nn ru sv tr" -inherit kde4-base - -MY_PN="gtk-qt-engine" -DESCRIPTION="GTK+2 Qt4 Theme Engine" -HOMEPAGE="http://gtk-qt.ecs.soton.ac.uk" -SRC_URI="http://gtk-qt.ecs.soton.ac.uk/files/${PV}/${MY_PN}-${PV}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -SLOT="1" -IUSE="gnome" - -RDEPEND="!x11-themes/gtk-engines-qt:4.1 - x11-libs/gtk+:2 - gnome? ( gnome-base/libbonoboui )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_PN} - -CMAKE_IN_SOURCE_BUILD="1" - -src_prepare() { - epatch "${FILESDIR}/${PV}-stdlib.patch" - sed -i \ - -e "s:\${XDG_APPS_INSTALL_DIR}:${KDEDIR}/share/kde4/services/:g" \ - kcm_gtk/CMakeLists.txt || die "replacing correct folder failed" - - kde4-base_src_prepare -} - -src_configure() { - # BONOBOUI is automagic - cmake-utils_src_configure -} diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-1.1-r2.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-1.1-r2.ebuild new file mode 100644 index 000000000000..226548a552bd --- /dev/null +++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-1.1-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2009 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-1.1-r2.ebuild,v 1.1 2009/05/17 15:32:11 scarabeus Exp $ + +EAPI="2" + +KDE_LINGUAS="bg cs de es fr it nn ru sv tr" +inherit kde4-base + +MY_PN="gtk-qt-engine" +DESCRIPTION="GTK+2 Qt4 Theme Engine" +HOMEPAGE="http://gtk-qt.ecs.soton.ac.uk" +SRC_URI="http://gtk-qt.ecs.soton.ac.uk/files/${PV}/${MY_PN}-${PV}.tar.bz2" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +SLOT="1" +IUSE="gnome" + +RDEPEND="!x11-themes/gtk-engines-qt:4.1 + x11-libs/gtk+:2 + gnome? ( gnome-base/libbonoboui )" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${MY_PN} + +PATCHES=( + "${FILESDIR}/${PV}-stdlib.patch" + "${FILESDIR}/${PV}-fixsegfault.patch" + "${FILESDIR}/${PV}-scrollbar.patch" + "${FILESDIR}/${PV}-firefoxOpenFileDialogFix.patch" +) + +CMAKE_IN_SOURCE_BUILD="1" + +src_prepare() { + sed -i \ + -e "s:\${XDG_APPS_INSTALL_DIR}:${KDEDIR}/share/kde4/services/:g" \ + kcm_gtk/CMakeLists.txt || die "replacing correct folder failed" + + kde4-base_src_prepare +} + +src_configure() { + # BONOBOUI is automagic + cmake-utils_src_configure +} -- cgit v1.2.3-65-gdbad