summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2013-05-01 03:22:51 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2013-05-01 03:22:51 +0000
commitf96346c923f8754dba0210adb75ea5a077a52c24 (patch)
tree678c62b24fbcd351ae0396ab095b9873e6019da6 /x11-libs
parentDrop old version (diff)
downloadgentoo-2-f96346c923f8754dba0210adb75ea5a077a52c24.tar.gz
gentoo-2-f96346c923f8754dba0210adb75ea5a077a52c24.tar.bz2
gentoo-2-f96346c923f8754dba0210adb75ea5a077a52c24.zip
Fix gtk+-1.2.10-r12's build failure with automake-1.13 (bug #467520, thanks to Ted Tanberry) and remove obsolete version.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/gtk+/ChangeLog8
-rw-r--r--x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch16
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.10-gold.patch29
-rw-r--r--x11-libs/gtk+/gtk+-1.2.10-r12.ebuild22
-rw-r--r--x11-libs/gtk+/gtk+-2.24.12.ebuild253
5 files changed, 35 insertions, 293 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 784d5523f7b6..35f2de8d160d 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/gtk+
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.660 2013/04/23 14:08:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.661 2013/05/01 03:22:51 tetromino Exp $
+
+ 01 May 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+ gtk+-1.2.10-r12.ebuild, -gtk+-2.24.12.ebuild,
+ +files/gtk+-1.2.10-automake-1.13.patch, -files/gtk+-2.24.10-gold.patch:
+ Fix gtk+-1.2.10-r12's build failure with automake-1.13 (bug #467520, thanks
+ to Ted Tanberry) and remove obsolete version.
23 Apr 2013; Jeroen Roovers <jer@gentoo.org> gtk+-2.24.17.ebuild:
Stable for HPPA (bug #466510).
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch b/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch
new file mode 100644
index 000000000000..6df2032c1b7a
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch
@@ -0,0 +1,16 @@
+Fix build failure with automake-1.13; fixed upstream in >=2.24.15 and >=3.0
+https://bugs.gentoo.org/467520
+
+diff --git a/configure.in b/configure.in
+index 27294c8..798a259 100644
+--- a/configure.in
++++ b/configure.in
+@@ -61,7 +61,7 @@ dnl Initialize automake stuff
+ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+
+ # Specify a configuration file
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+
+ dnl Initialize libtool
+ AC_PROG_LIBTOOL
diff --git a/x11-libs/gtk+/files/gtk+-2.24.10-gold.patch b/x11-libs/gtk+/files/gtk+-2.24.10-gold.patch
deleted file mode 100644
index 7c0b298bb647..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.24.10-gold.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- docs/tools/Makefile.am | 1 +
- perf/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
-index 54b77b7..1783f77 100644
---- a/docs/tools/Makefile.am
-+++ b/docs/tools/Makefile.am
-@@ -17,6 +17,7 @@ LDADDS = \
- $(top_builddir)/gtk/$(gtktargetlib) \
- $(GTK_DEP_LIBS) \
- $(GDK_DEP_LIBS) \
-+ $(GMODULE_LIBS) \
- -lm
-
- if USE_X11
-diff --git a/perf/Makefile.am b/perf/Makefile.am
-index 736b6cb..9e67ed4 100644
---- a/perf/Makefile.am
-+++ b/perf/Makefile.am
-@@ -17,7 +17,7 @@ DEPS = \
- LDADDS = \
- $(top_builddir)/gdk/$(gdktargetlib) \
- $(top_builddir)/gtk/$(gtktargetlib) \
-- $(GTK_DEP_LIBS)
-+ $(GTK_DEP_LIBS) $(GMODULE_LIBS)
-
- noinst_PROGRAMS = \
- testperf
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
index 8178b7b647bb..e5076d3c663b 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.16 2012/09/25 15:19:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild,v 1.17 2013/05/01 03:22:51 tetromino Exp $
+EAPI=4
GNOME_TARBALL_SUFFIX="gz"
inherit gnome.org eutils toolchain-funcs autotools
@@ -19,7 +20,7 @@ IUSE="nls debug"
MY_AVAILABLE_LINGUAS=" az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl nn no pl pt_BR pt ro ru sk sl sr sv tr uk vi"
IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
-RDEPEND="=dev-libs/glib-1.2*
+RDEPEND=">=dev-libs/glib-1.2:1
x11-libs/libXi
x11-libs/libXt"
DEPEND="${RDEPEND}
@@ -27,9 +28,7 @@ DEPEND="${RDEPEND}
x11-proto/xextproto
nls? ( sys-devel/gettext dev-util/intltool )"
-src_unpack() {
- unpack ${P}.tar.gz
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}"/${P}-m4.patch
epatch "${FILESDIR}"/${P}-automake.patch
epatch "${FILESDIR}"/${P}-cleanup.patch
@@ -37,10 +36,11 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-1.2-locale_fix.patch
epatch "${FILESDIR}"/${P}-as-needed.patch
sed -i '/libtool.m4/,/AM_PROG_NM/d' acinclude.m4 #168198
+ epatch "${FILESDIR}"/${P}-automake-1.13.patch #467520
eautoreconf
}
-src_compile() {
+src_configure() {
local myconf=
use nls || myconf="${myconf} --disable-nls"
strip-linguas ${MY_AVAILABLE_LINGUAS}
@@ -55,13 +55,15 @@ src_compile() {
--sysconfdir=/etc \
--with-xinput=xfree \
--with-x \
- ${myconf} || die
+ ${myconf}
+}
- emake CC="$(tc-getCC)" || die
+src_compile() {
+ emake CC="$(tc-getCC)"
}
src_install() {
- make install DESTDIR="${D}" || die
+ default
dodoc AUTHORS ChangeLog* HACKING
dodoc NEWS* README* TODO
diff --git a/x11-libs/gtk+/gtk+-2.24.12.ebuild b/x11-libs/gtk+/gtk+-2.24.12.ebuild
deleted file mode 100644
index 179b122454eb..000000000000
--- a/x11-libs/gtk+/gtk+-2.24.12.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.12.ebuild,v 1.13 2012/12/06 06:13:35 tetromino Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic gnome.org virtualx autotools
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cups debug examples +introspection test vim-syntax xinerama"
-
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-COMMON_DEPEND="!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.30:2
- >=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="${COMMON_DEPEND}
- virtual/pkgconfig
- !aqua? (
- x11-proto/xextproto
- x11-proto/xproto
- x11-proto/inputproto
- x11-proto/damageproto
- )
- xinerama? ( x11-proto/xineramaproto )
- >=dev-util/gtk-doc-am-1.11
- test? (
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc )"
-# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
-# Remove blocker after >=vte-0.28.2-r201:0 is stable
-RDEPEND="${COMMON_DEPEND}
- !<x11-libs/vte-0.28.2-r201:0"
-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() {
- # gold detected underlinking
- # Add missing libs, patch sent upstream
- epatch "${FILESDIR}/${PN}-2.24.10-gold.patch"
-
- # 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"
-
- # fix building with gir #372953, upstream bug #642085
- epatch "${FILESDIR}"/${PN}-2.24.7-darwin-quartz-introspection.patch
-
- # marshalers code was pre-generated with glib-2.31, upstream bug #671763
- rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
- perf/marshalers.c || die
-
- # 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
-
- if ! use test; then
- # don't waste time building tests
- strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
- strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
- else
- # 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)"
-
- # Skip tests known to fail
- # https://bugzilla.gnome.org/show_bug.cgi?id=646609
- sed -e '/g_test_add_func.*test_text_access/s:^://:' \
- -i "${S}/gtk/tests/testing.c" || die
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=617473
- sed -i -e 's:pltcheck.sh:$(NULL):g' \
- gtk/Makefile.am || die
-
- # UI tests require immodules already installed; bug #413185
- if ! has_version 'x11-libs/gtk+:2'; then
- ewarn "Disabling UI tests because this is the first install of"
- ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
- ewarn "has been installed."
- sed '/g_test_add_func.*ui-tests/ d' \
- -i gtk/tests/testing.c || die "sed 2 failed"
- fi
- fi
-
- if ! use examples; then
- # don't waste time building demos
- strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
- fi
-
- epatch_user
-
- # http://bugs.gentoo.org/show_bug.cgi?id=371907
- mkdir -p "${S}/m4" || die
- mv "${WORKDIR}/introspection.m4" "${S}/m4macros" || die
- AT_M4DIR=m4macros eautoreconf
- # Use elibtoolize in place of eautoreconf when it will be dropped
- #elibtoolize
-}
-
-src_configure() {
- local myconf="$(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
-
- set_gtk2_confdir
- dodir ${GTK2_CONFDIR}
- keepdir ${GTK2_CONFDIR}
-
- # see bug #133241
- echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
- insinto /etc/gtk-2.0
- doins "${T}"/gtkrc
-
- # Enable xft in environment as suggested by <utx@gentoo.org>
- echo "GDK_USE_XFT=1" > "${T}"/50gtk2
- doenvd "${T}"/50gtk2
-
- dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
- # 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
-
- # dev-util/gtk-builder-convert split off into a separate package, #402905
- rm "${ED}"usr/bin/gtk-builder-convert
-
- find "${D}" -name '*.la' -exec rm -f {} +
-}
-
-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
-}