* [gentoo-commits] gentoo-x86 commit in x11-libs/gtk+: gtk+-2.22.1-r1.ebuild ChangeLog gtk+-2.24.0.ebuild gtk+-2.22.1.ebuild gtk+-2.18.9.ebuild gtk+-2.22.0.ebuild
@ 2011-02-09 17:18 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; only message in thread
From: Gilles Dartiguelongue (eva) @ 2011-02-09 17:18 UTC (permalink / raw
To: gentoo-commits
eva 11/02/09 17:18:19
Modified: gtk+-2.22.1-r1.ebuild ChangeLog
Added: gtk+-2.24.0.ebuild
Removed: gtk+-2.22.1.ebuild gtk+-2.18.9.ebuild
gtk+-2.22.0.ebuild
Log:
Clean up unused la files. Disable recentmanager tests, bug #285687. Drop jpeg, jpeg2k and tiff use flags unneeded since the gdk-pixbuf split. Version bump to 2.24. Drop old revisions.
(Portage version: 2.2.0_alpha21/cvs/Linux x86_64, RepoMan options: --force)
Revision Changes Path
1.4 x11-libs/gtk+/gtk+-2.22.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild?r1=1.3&r2=1.4
Index: gtk+-2.22.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk+-2.22.1-r1.ebuild 12 Jan 2011 16:24:39 -0000 1.3
+++ gtk+-2.22.1-r1.ebuild 9 Feb 2011 17:18:19 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild,v 1.3 2011/01/12 16:24:39 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.22.1-r1.ebuild,v 1.4 2011/02/09 17:18:19 eva Exp $
EAPI="3"
PYTHON_DEPEND="2:2.4"
@@ -13,7 +13,7 @@
LICENSE="LGPL-2"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cups debug doc examples +introspection jpeg jpeg2k tiff test vim-syntax xinerama"
+IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama"
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
RDEPEND="!aqua? (
@@ -28,11 +28,11 @@
x11-libs/libXcomposite
x11-libs/libXdamage
>=x11-libs/cairo-1.6[X,svg]
- x11-libs/gdk-pixbuf:2[X,introspection?,jpeg?,jpeg2k?,tiff?]
+ x11-libs/gdk-pixbuf:2[X,introspection?]
)
aqua? (
>=x11-libs/cairo-1.6[aqua,svg]
- x11-libs/gdk-pixbuf:2[introspection?,jpeg?,jpeg2k?,tiff?]
+ x11-libs/gdk-pixbuf:2[introspection?]
)
xinerama? ( x11-libs/libXinerama )
>=dev-libs/glib-2.25.10
@@ -106,6 +106,16 @@
sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-i gtk/tests/testing.c || die "sed 1 failed"
+ # Cannot work because glib is too clever to find real user's home
+ # gentoo bug #285687, upstream bug #639832
+ # XXX: /!\ Pay extra attention to second sed when bumping /!\
+ sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
+ || die "failed to disable recentmanager test (1)"
+ sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
+ || die "failed to disable recentmanager test (2)"
+ sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
+ || die "failed to disable recentmanager test (3)"
+
if use x86-interix; then
# activate the itx-bind package...
append-flags "-I${EPREFIX}/usr/include/bind"
@@ -176,6 +186,9 @@
sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
done
+ # Clean up useless la files
+ find "${ED}"/usr/$(get_libdir)/gtk-2.0/ -name "*.la" -delete
+
python_convert_shebangs 2 "${ED}"usr/bin/gtk-builder-convert
}
1.485 x11-libs/gtk+/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.485&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.485&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.484&r2=1.485
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -r1.484 -r1.485
--- ChangeLog 12 Jan 2011 16:24:39 -0000 1.484
+++ ChangeLog 9 Feb 2011 17:18:19 -0000 1.485
@@ -1,6 +1,15 @@
# ChangeLog for x11-libs/gtk+
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.484 2011/01/12 16:24:39 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.485 2011/02/09 17:18:19 eva Exp $
+
+*gtk+-2.24.0 (09 Feb 2011)
+
+ 09 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org> -gtk+-2.18.9.ebuild,
+ -gtk+-2.22.0.ebuild, -gtk+-2.22.1.ebuild, gtk+-2.22.1-r1.ebuild,
+ +gtk+-2.24.0.ebuild:
+ Clean up unused la files. Disable recentmanager tests, bug #285687. Drop
+ jpeg, jpeg2k and tiff use flags unneeded since the gdk-pixbuf split. Version
+ bump to 2.24. Drop old revisions.
12 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> gtk+-2.22.1-r1.ebuild:
Always apply multilib patch, will avoid falling into bug #288549 again, and
1.1 x11-libs/gtk+/gtk+-2.24.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.24.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.24.0.ebuild?rev=1.1&content-type=text/plain
Index: gtk+-2.24.0.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.0.ebuild,v 1.1 2011/02/09 17:18:19 eva Exp $
EAPI="3"
PYTHON_DEPEND="2:2.4"
inherit eutils flag-o-matic gnome.org libtool python 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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama"
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
RDEPEND="!aqua? (
x11-libs/libXrender
x11-libs/libX11
x11-libs/libXi
x11-libs/libXt
x11-libs/libXext
>=x11-libs/libXrandr-1.3
x11-libs/libXcursor
x11-libs/libXfixes
x11-libs/libXcomposite
x11-libs/libXdamage
>=x11-libs/cairo-1.6[X,svg]
x11-libs/gdk-pixbuf:2[X,introspection?]
)
aqua? (
>=x11-libs/cairo-1.6[aqua,svg]
x11-libs/gdk-pixbuf:2[introspection?]
)
xinerama? ( x11-libs/libXinerama )
>=dev-libs/glib-2.27.3
>=x11-libs/pango-1.20[introspection?]
>=dev-libs/atk-1.29.2[introspection?]
media-libs/fontconfig
x11-misc/shared-mime-info
cups? ( net-print/cups )
introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
!<gnome-base/gail-1000"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.9
!aqua? (
x11-proto/xextproto
x11-proto/xproto
x11-proto/inputproto
x11-proto/damageproto
)
x86-interix? (
sys-libs/itx-bind
)
xinerama? ( x11-proto/xineramaproto )
>=dev-util/gtk-doc-am-1.11
doc? (
>=dev-util/gtk-doc-1.11
~app-text/docbook-xml-dtd-4.1.2 )
test? (
media-fonts/font-misc-misc
media-fonts/font-cursor-misc )"
PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
strip_builddir() {
local rule=$1
shift
local directory=$1
shift
sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
|| die "Could not strip director ${directory} from build."
}
set_gtk2_confdir() {
# An arch specific config directory is used on multilib systems
GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
}
src_prepare() {
# use an arch-specific config directory so that 32bit and 64bit versions
# dont clash on multilib systems
epatch "${FILESDIR}/${PN}-2.21.3-multilib.patch"
# Don't break inclusion of gtkclist.h, upstream bug 536767
epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
# Create symlinks to old icons until apps are ported, bug #339319
epatch "${FILESDIR}/${PN}-2.22.1-old-icons.patch"
# Stop trying to build unmaintained docs, bug #349754
strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in
# -O3 and company cause random crashes in applications. Bug #133469
replace-flags -O3 -O2
strip-flags
use ppc64 && append-flags -mminimal-toc
# Non-working test in gentoo's env
sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-i gtk/tests/testing.c || die "sed 1 failed"
# Cannot work because glib is too clever to find real user's home
# gentoo bug #285687, upstream bug #639832
# XXX: /!\ Pay extra attention to second sed when bumping /!\
sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
|| die "failed to disable recentmanager test (1)"
sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
|| die "failed to disable recentmanager test (2)"
sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
|| die "failed to disable recentmanager test (3)"
if use x86-interix; then
# activate the itx-bind package...
append-flags "-I${EPREFIX}/usr/include/bind"
append-ldflags "-L${EPREFIX}/usr/lib/bind"
fi
if ! use test; then
# don't waste time building tests
strip_builddir SRC_SUBDIRS tests Makefile.am Makefile.in
fi
if ! use examples; then
# don't waste time building demos
strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
fi
# Use elibtoolize in place of eautoreconf when it will be dropped
#elibtoolize
eautoreconf
}
src_configure() {
local myconf="$(use_enable doc gtk-doc)
$(use_enable xinerama)
$(use_enable cups cups auto)
$(use_enable introspection)
--disable-papi"
if use aqua; then
myconf="${myconf} --with-gdktarget=quartz"
else
myconf="${myconf} --with-gdktarget=x11 --with-xinput"
fi
# Passing --disable-debug is not recommended for production use
use debug && myconf="${myconf} --enable-debug=yes"
econf ${myconf}
}
src_test() {
unset DBUS_SESSION_BUS_ADDRESS
# Exporting HOME fixes tests using XDG directories spec since all defaults
# are based on $HOME. It is also backward compatible with functions not
# yet ported to this spec.
XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
}
src_install() {
emake DESTDIR="${D}" install || die "Installation failed"
set_gtk2_confdir
dodir ${GTK2_CONFDIR} || die "dodir failed"
keepdir ${GTK2_CONFDIR}
# see bug #133241
echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
insinto /etc/gtk-2.0
doins "${T}"/gtkrc || die "doins gtkrc failed"
# Enable xft in environment as suggested by <utx@gentoo.org>
echo "GDK_USE_XFT=1" > "${T}"/50gtk2
doenvd "${T}"/50gtk2 || die "doenvd failed"
dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
# add -framework Carbon to the .pc files
use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
done
# Clean up useless la files
find "${ED}"/usr/$(get_libdir)/gtk-2.0/ -name "*.la" -delete
python_convert_shebangs 2 "${ED}"usr/bin/gtk-builder-convert
}
pkg_postinst() {
set_gtk2_confdir
# gtk.immodules should be in their CHOST directories respectively.
gtk-query-immodules-2.0 > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" \
|| ewarn "Failed to run gtk-query-immodules-2.0"
if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
elog "aware location. Removing deprecated file."
rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
fi
# pixbufs are now handled by x11-libs/gdk-pixbuf
if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
elog "Removing deprecated file."
rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
fi
# two checks needed since we dropped multilib conditional
if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
elog "Removing deprecated file."
rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
fi
if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
elog "to do that you can use qfile from portage-utils:"
elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
fi
if ! has_version "app-text/evince"; then
elog "Please install app-text/evince for print preview functionality."
elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
elog "add it to your gtkrc."
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-09 17:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-09 17:18 [gentoo-commits] gentoo-x86 commit in x11-libs/gtk+: gtk+-2.22.1-r1.ebuild ChangeLog gtk+-2.24.0.ebuild gtk+-2.22.1.ebuild gtk+-2.18.9.ebuild gtk+-2.22.0.ebuild Gilles Dartiguelongue (eva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox