From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QssME-0006I1-OC for garchives@archives.gentoo.org; Mon, 15 Aug 2011 08:17:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 821A921C0DA; Mon, 15 Aug 2011 08:17:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 28C8021C0DA for ; Mon, 15 Aug 2011 08:17:05 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8701A1B4054 for ; Mon, 15 Aug 2011 08:17:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B5A2E80040 for ; Mon, 15 Aug 2011 08:17:04 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: Subject: [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/cogl/, media-libs/cogl/files/ X-VCS-Repository: proj/gnome X-VCS-Files: media-libs/cogl/cogl-1.7.4.ebuild media-libs/cogl/cogl-1.7.6.ebuild media-libs/cogl/files/cogl-1.7.4-make-install-link-order.patch X-VCS-Directories: media-libs/cogl/ media-libs/cogl/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: a4f2f20c7f3795859b69548d0bbff02b4cc300e6 Date: Mon, 15 Aug 2011 08:17:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c83d32b5e18837a91792287432124a88 commit: a4f2f20c7f3795859b69548d0bbff02b4cc300e6 Author: Alexandre Rostovtsev gmail com> AuthorDate: Mon Aug 15 08:13:38 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon Aug 15 08:13:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Da4f2f20c media-libs/cogl: 1.7.4 =E2=86=92 1.7.6 Version bump with various bugfixes and support for cogl.conf config files. Link order patch was applied upstream. Also, for reasons unknown, the 1.7.6 tarball was only uploaded to clutter-project.org, not to gnome.org. Need to see if this situation becomes permanent. --- .../cogl/{cogl-1.7.4.ebuild =3D> cogl-1.7.6.ebuild} | 15 ++---- .../files/cogl-1.7.4-make-install-link-order.patch | 50 --------------= ------ 2 files changed, 4 insertions(+), 61 deletions(-) diff --git a/media-libs/cogl/cogl-1.7.4.ebuild b/media-libs/cogl/cogl-1.7= .6.ebuild similarity index 81% rename from media-libs/cogl/cogl-1.7.4.ebuild rename to media-libs/cogl/cogl-1.7.6.ebuild index 96d0f7c..b5b0c9b 100644 --- a/media-libs/cogl/cogl-1.7.4.ebuild +++ b/media-libs/cogl/cogl-1.7.6.ebuild @@ -5,9 +5,10 @@ EAPI=3D"4" CLUTTER_LA_PUNT=3D"yes" =20 -# Inherit gnome2 after clutter to download sources from gnome.org -# since clutter-project.org doesn't provide .xz tarballs -inherit autotools clutter eutils gnome2 +# Normally, inherit gnome2 after clutter to download sources from gnome.= org +inherit clutter gnome2 +# XXX: but 1.7.6 wasn't uploaded to gnome.org for some reason :/ +SRC_URI=3D"http://www.clutter-project.org/sources/${PN}/1.7/${P}.tar.xz" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -62,14 +63,6 @@ pkg_setup() { $(use_enable pango cogl-pango)" } =20 -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=3D655026 - epatch "${FILESDIR}/${PN}-1.7.4-make-install-link-order.patch" - eautoreconf - - gnome2_src_prepare -} - src_install() { clutter_src_install } diff --git a/media-libs/cogl/files/cogl-1.7.4-make-install-link-order.pat= ch b/media-libs/cogl/files/cogl-1.7.4-make-install-link-order.patch deleted file mode 100644 index 4786612..0000000 --- a/media-libs/cogl/files/cogl-1.7.4-make-install-link-order.patch +++ /dev/null @@ -1,50 +0,0 @@ -From e70f5a11359c23d9d7424edeffd5cc0d1fa7722d Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Thu, 21 Jul 2011 01:09:04 -0400 -Subject: [PATCH] cogl-pango: prevent linking to systemwide libcogl durin= g - make install (#655026) - -At the moment, on make install, libcogl-pango will link to the -version of libcogl that is installed systemwide. This leads to -interesting problems when the version installed systemwide is -incompatible with the version of cogl being built. - -E.g., when building cogl-1.7.4 (with --enable-cogl-pango and ---prefix=3D/usr) on a system that has cogl-1.7.2 installed in /usr: - -$ make -[...] -$ ldd cogl-pango/.libs/libcogl-pango.so | grep cogl - libcogl.so.2 =3D> /var/tmp/cogl-1.7.4/cogl/.libs/libcogl.so.2 (0x00007e= ff4bfb2000) -$ make DESTDIR=3D/var/tmp/cogl-1.7.4/dest install -[...] -$ ldd /var/tmp/cogl-1.7.4/dest/usr/lib64/libcogl-pango.so | grep cogl - libcogl.so.1 =3D> /usr/lib64/libcogl.so.1 (0x00007f4647747000) - -This problem can be avoided by reordering libcogl_pango_la_LIBADD -to ensure that during make installs' relinking phase, libtool looks -at the libcogl in the build directory before the systemwide libcogl. - -Addresses Gnome bug #655026. ---- - cogl-pango/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am -index afd96d6..9805c58 100644 ---- a/cogl-pango/Makefile.am -+++ b/cogl-pango/Makefile.am -@@ -28,8 +28,8 @@ lib_LTLIBRARIES =3D libcogl-pango.la -=20 - libcogl_pango_la_SOURCES =3D $(source_c) $(source_h) $(source_h_priv) - libcogl_pango_la_CFLAGS =3D $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(M= AINTAINER_CFLAGS) --libcogl_pango_la_LIBADD =3D $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS) --libcogl_pango_la_LIBADD +=3D $(top_builddir)/cogl/libcogl.la -+libcogl_pango_la_LIBADD =3D $(top_builddir)/cogl/libcogl.la -+libcogl_pango_la_LIBADD +=3D $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS) - libcogl_pango_la_LDFLAGS =3D \ - -export-dynamic \ - -export-symbols-regex "^cogl_pango_.*" ---=20 -1.7.6 -