[gentoo-commits] gentoo-x86 commit in x11-libs/gtk+: ChangeLog gtk+-2.12.0-r2.ebuild

[Mart Raudsepp (leio)]

leio        07/09/25 23:00:35

  Modified:             ChangeLog
  Added:                gtk+-2.12.0-r2.ebuild
  Log:
  Fix a crash in file chooser search functionality and freezes in OpenOffice when ran outside Gnome; upstream bug #480123 and our bug #193513 respectively
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.339                x11-libs/gtk+/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.339&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.339&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.338&r2=1.339

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- ChangeLog	25 Sep 2007 08:15:50 -0000	1.338
+++ ChangeLog	25 Sep 2007 23:00:34 -0000	1.339
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.338 2007/09/25 08:15:50 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.339 2007/09/25 23:00:34 leio Exp $
+
+*gtk+-2.12.0-r2 (25 Sep 2007)
+
+  25 Sep 2007; Mart Raudsepp <leio@g.o>
+  +files/gtk+-2.12.0-openoffice-freeze-workaround.patch,
+  +files/gtk+-2.12.0-searchenginesimple-crash-fix.patch,
+  +gtk+-2.12.0-r2.ebuild:
+  Fix a crash in file chooser search functionality and freezes in OpenOffice
+  when ran outside Gnome; upstream bug #480123 and our bug #193513
+  respectively
 
   25 Sep 2007; Mart Raudsepp <leio@g.o> gtk+-2.12.0-r1.ebuild:
   QA: Some quoting and other fixes, thanks to Donnie Berkholz



1.1                  x11-libs/gtk+/gtk+-2.12.0-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/gtk+-2.12.0-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/gtk+-2.12.0-r2.ebuild?rev=1.1&content-type=text/plain

Index: gtk+-2.12.0-r2.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.12.0-r2.ebuild,v 1.1 2007/09/25 23:00:34 leio Exp $

inherit gnome.org flag-o-matic eutils autotools virtualx

DESCRIPTION="Gimp ToolKit +"
HOMEPAGE="http://www.gtk.org/"

LICENSE="LGPL-2"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="cups debug doc jpeg tiff xinerama"

RDEPEND="x11-libs/libXrender
	x11-libs/libX11
	x11-libs/libXi
	x11-libs/libXt
	x11-libs/libXext
	x11-libs/libXrandr
	x11-libs/libXcursor
	x11-libs/libXfixes
	x11-libs/libXcomposite
	x11-libs/libXdamage
	xinerama? ( x11-libs/libXinerama )
	>=dev-libs/glib-2.13.5
	>=x11-libs/pango-1.17.3
	>=dev-libs/atk-1.10.1
	>=x11-libs/cairo-1.2.0
	media-libs/fontconfig
	x11-misc/shared-mime-info
	>=media-libs/libpng-1.2.1
	cups? ( net-print/cups )
	jpeg? ( >=media-libs/jpeg-6b-r2 )
	tiff? ( >=media-libs/tiff-3.5.7 )"
DEPEND="${RDEPEND}
	sys-devel/autoconf
	>=dev-util/pkgconfig-0.9
	=sys-devel/automake-1.7*
	x11-proto/xextproto
	x11-proto/xproto
	x11-proto/inputproto
	x11-proto/damageproto
	xinerama? ( x11-proto/xineramaproto )
	doc? (
			>=dev-util/gtk-doc-1.6
			~app-text/docbook-xml-dtd-4.1.2
		 )"

pkg_setup() {
	if ! built_with_use x11-libs/cairo X; then
		eerror "Please re-emerge x11-libs/cairo with the X USE flag set"
		die "cairo needs the X flag set"
	fi
}

set_gtk2_confdir() {
	# An arch specific config directory is used on multilib systems
	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
}

src_unpack() {
	unpack ${A}
	cd "${S}"

	# use an arch-specific config directory so that 32bit and 64bit versions
	# dont clash on multilib systems
	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"

	# http://bugzilla.gnome.org/show_bug.cgi?id=476342
	epatch "${FILESDIR}/${P}-icon-cache-speedup.patch"

	# http://bugzilla.gnome.org/show_bug.cgi?id=478173
	epatch "${FILESDIR}/${PN}-2.12.0-libtracker_so.patch"

	# Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11
	epatch "${FILESDIR}/${P}-flash-workaround.patch"

	# Gtk tooltips + swt crash at a later point, upstream has committed this by now - http://bugzilla.gnome.org/show_bug.cgi?id=460194
	# Seems to also fix a weird behaviour where GtkTreeView rows got a tooltip that shouldn't be there
	epatch "${FILESDIR}/${P}-swt-tooltips-fix.patch"

	# OpenOffice.org might hang at startup (on non-gnome env) without this workaround, bug #193513
	epatch "${FILESDIR}/${P}-openoffice-freeze-workaround.patch"

	# Fix for crashes with simple search engine (the one used when neither beagle nor tracker are available) when cancelling dialog
	# before the search is finished - http://bugzilla.gnome.org/show_bug.cgi?id=480123
	epatch "${FILESDIR}/${P}-searchenginesimple-crash-fix.patch"

	# -O3 and company cause random crashes in applications. Bug #133469
	replace-flags -O3 -O2
	strip-flags

	use ppc64 && append-flags -mminimal-toc

	# remember, eautoreconf applies elibtoolize.
	# if you remove this, you should manually run elibtoolize
	export WANT_AUTOMAKE=1.7
	cp aclocal.m4 old_macros.m4
	AT_M4DIR="." eautoreconf

	epunt_cxx
}

src_compile() {
	# png always on to display icons (foser)
	local myconf="$(use_enable doc gtk-doc) \
		$(use_with jpeg libjpeg) \
		$(use_with tiff libtiff) \
		$(use_enable xinerama) \
		--with-libpng \
		--with-gdktarget=x11 \
		--with-xinput"

	# Passing --disable-debug is not recommended for production use
	use debug && myconf="${myconf} --enable-debug=yes"

	econf ${myconf} || die "configure failed"

	emake || die "compile failed"
}

src_test() {
	Xmake check || die
}

src_install() {
	einstall || die "Installation failed"

	set_gtk2_confdir
	dodir ${GTK2_CONFDIR}
	keepdir ${GTK2_CONFDIR}

	# see bug #133241
	echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc"

	# Enable xft in environment as suggested by <utx@g.o>
	dodir /etc/env.d
	echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2"

	dodoc AUTHORS ChangeLog* HACKING NEWS* README*

	# This has to be removed, because it's multilib specific; generated in
	# postinst
	rm "${D}/etc/gtk-2.0/gtk.immodules"
}

pkg_postinst() {
	set_gtk2_confdir

	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
		gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
		gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
	else
		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
		ewarn "to complete the installation of GTK+, please create the"
		ewarn "directory and then manually run:"
		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
	fi

	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
		elog "to do that you can use qfile from portage-utils:"
		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
	fi
}



-- 
gentoo-commits@g.o mailing list