| 1 |
pacho 13/09/29 09:30:01 |
| 2 |
|
| 3 |
Modified: gtk-engines-qtpixmap-0.28-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix compile with latest automake (#469828) |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.12 x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild?rev=1.12&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild?rev=1.12&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild?r1=1.11&r2=1.12 |
| 15 |
|
| 16 |
Index: gtk-engines-qtpixmap-0.28-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild,v |
| 19 |
retrieving revision 1.11 |
| 20 |
retrieving revision 1.12 |
| 21 |
diff -u -r1.11 -r1.12 |
| 22 |
--- gtk-engines-qtpixmap-0.28-r2.ebuild 5 May 2012 04:10:06 -0000 1.11 |
| 23 |
+++ gtk-engines-qtpixmap-0.28-r2.ebuild 29 Sep 2013 09:30:01 -0000 1.12 |
| 24 |
@@ -1,10 +1,12 @@ |
| 25 |
-# Copyright 1999-2012 Gentoo Foundation |
| 26 |
+# Copyright 1999-2013 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild,v 1.11 2012/05/05 04:10:06 jdhore Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild,v 1.12 2013/09/29 09:30:01 pacho Exp $ |
| 30 |
|
| 31 |
-EAPI="1" |
| 32 |
+EAPI=5 |
| 33 |
+GCONF_DEBUG="no" |
| 34 |
+GNOME2_LA_PUNT="yes" |
| 35 |
|
| 36 |
-inherit autotools eutils |
| 37 |
+inherit autotools eutils gnome2 |
| 38 |
|
| 39 |
MY_P="QtPixmap-${PV}" |
| 40 |
|
| 41 |
@@ -19,34 +21,29 @@ |
| 42 |
IUSE="" |
| 43 |
|
| 44 |
RDEPEND="x11-libs/gtk+:2" |
| 45 |
+ |
| 46 |
DEPEND="${RDEPEND} |
| 47 |
- virtual/pkgconfig" |
| 48 |
+ virtual/pkgconfig |
| 49 |
+" |
| 50 |
|
| 51 |
S=${WORKDIR}/${MY_P} |
| 52 |
|
| 53 |
-src_unpack() { |
| 54 |
- unpack ${A} |
| 55 |
- cd "${S}" |
| 56 |
- |
| 57 |
+src_prepare() { |
| 58 |
# Add switches to enable/disable gtk1 and gtk2 engines in the configure |
| 59 |
# script. |
| 60 |
epatch "${FILESDIR}/${P}-gtk_switches.patch" |
| 61 |
- sed -i \ |
| 62 |
- -e 's/AC_CHECK_COMPILERS/AC_PROG_CC/' \ |
| 63 |
- configure.in |
| 64 |
- rm acinclude.m4 |
| 65 |
- eautoreconf |
| 66 |
-} |
| 67 |
|
| 68 |
-src_compile() { |
| 69 |
- local myconf="--enable-gtk2 --disable-gtk1" |
| 70 |
+ sed -i -e 's/AC_CHECK_COMPILERS/AC_PROG_CC/' configure.in || die |
| 71 |
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die |
| 72 |
|
| 73 |
- econf $myconf || die "Configuration failed" |
| 74 |
- emake || die "Compilation failed" |
| 75 |
-} |
| 76 |
+ rm acinclude.m4 |
| 77 |
|
| 78 |
-src_install() { |
| 79 |
- emake DESTDIR="${D}" install || die "Installation failed" |
| 80 |
+ eautoreconf |
| 81 |
+ gnome2_src_prepare |
| 82 |
+} |
| 83 |
|
| 84 |
- dodoc AUTHORS ChangeLog README |
| 85 |
+src_configure() { |
| 86 |
+ gnome2_src_configure \ |
| 87 |
+ --enable-gtk2 \ |
| 88 |
+ --disable-gtk1 |
| 89 |
} |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.15 x11-themes/gtk-engines-qtpixmap/ChangeLog |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/gtk-engines-qtpixmap/ChangeLog?rev=1.15&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/gtk-engines-qtpixmap/ChangeLog?rev=1.15&content-type=text/plain |
| 97 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-themes/gtk-engines-qtpixmap/ChangeLog?r1=1.14&r2=1.15 |
| 98 |
|
| 99 |
Index: ChangeLog |
| 100 |
=================================================================== |
| 101 |
RCS file: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtpixmap/ChangeLog,v |
| 102 |
retrieving revision 1.14 |
| 103 |
retrieving revision 1.15 |
| 104 |
diff -u -r1.14 -r1.15 |
| 105 |
--- ChangeLog 5 May 2012 04:10:06 -0000 1.14 |
| 106 |
+++ ChangeLog 29 Sep 2013 09:30:01 -0000 1.15 |
| 107 |
@@ -1,6 +1,10 @@ |
| 108 |
# ChangeLog for x11-themes/gtk-engines-qtpixmap |
| 109 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtpixmap/ChangeLog,v 1.14 2012/05/05 04:10:06 jdhore Exp $ |
| 111 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 112 |
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qtpixmap/ChangeLog,v 1.15 2013/09/29 09:30:01 pacho Exp $ |
| 113 |
+ |
| 114 |
+ 29 Sep 2013; Pacho Ramos <pacho@g.o> |
| 115 |
+ gtk-engines-qtpixmap-0.28-r2.ebuild: |
| 116 |
+ Fix compile with latest automake (#469828) |
| 117 |
|
| 118 |
05 May 2012; Jeff Horelick <jdhore@g.o> |
| 119 |
gtk-engines-qtpixmap-0.28-r2.ebuild: |
| 120 |
@@ -117,4 +121,3 @@ |
| 121 |
|
| 122 |
22 Jul 2003; Brad Laue <brad@g.o> qtpixmap-0.25.ebuild: |
| 123 |
Add qtpixmap, a dependency of gtk-engines-geramik |
| 124 |
- |
Archives