1 |
radhermit 14/06/21 06:56:00 |
2 |
|
3 |
Modified: ChangeLog photoprint-0.4.2_pre2.ebuild |
4 |
Log: |
5 |
Fix gettext version mismatches (bug #514082). |
6 |
|
7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
8 |
|
9 |
Revision Changes Path |
10 |
1.5 media-gfx/photoprint/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/photoprint/ChangeLog?rev=1.5&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/photoprint/ChangeLog?rev=1.5&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/photoprint/ChangeLog?r1=1.4&r2=1.5 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/photoprint/ChangeLog,v |
19 |
retrieving revision 1.4 |
20 |
retrieving revision 1.5 |
21 |
diff -u -r1.4 -r1.5 |
22 |
--- ChangeLog 11 Jun 2012 17:23:09 -0000 1.4 |
23 |
+++ ChangeLog 21 Jun 2014 06:56:00 -0000 1.5 |
24 |
@@ -1,6 +1,9 @@ |
25 |
# ChangeLog for media-gfx/photoprint |
26 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/photoprint/ChangeLog,v 1.4 2012/06/11 17:23:09 radhermit Exp $ |
28 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/photoprint/ChangeLog,v 1.5 2014/06/21 06:56:00 radhermit Exp $ |
30 |
+ |
31 |
+ 21 Jun 2014; Tim Harder <radhermit@g.o> photoprint-0.4.2_pre2.ebuild: |
32 |
+ Fix gettext version mismatches (bug #514082). |
33 |
|
34 |
11 Jun 2012; Tim Harder <radhermit@g.o> photoprint-0.4.2_pre2.ebuild, |
35 |
+files/photoprint-0.4.2_pre2-glib-2.32.patch: |
36 |
|
37 |
|
38 |
|
39 |
1.5 media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild?rev=1.5&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild?rev=1.5&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild?r1=1.4&r2=1.5 |
44 |
|
45 |
Index: photoprint-0.4.2_pre2.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild,v |
48 |
retrieving revision 1.4 |
49 |
retrieving revision 1.5 |
50 |
diff -u -r1.4 -r1.5 |
51 |
--- photoprint-0.4.2_pre2.ebuild 11 Jun 2012 17:23:09 -0000 1.4 |
52 |
+++ photoprint-0.4.2_pre2.ebuild 21 Jun 2014 06:56:00 -0000 1.5 |
53 |
@@ -1,6 +1,6 @@ |
54 |
-# Copyright 1999-2012 Gentoo Foundation |
55 |
+# Copyright 1999-2014 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild,v 1.4 2012/06/11 17:23:09 radhermit Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/photoprint/photoprint-0.4.2_pre2.ebuild,v 1.5 2014/06/21 06:56:00 radhermit Exp $ |
59 |
|
60 |
EAPI=4 |
61 |
|
62 |
@@ -38,9 +38,11 @@ |
63 |
"${FILESDIR}"/${P}-underlinking.patch \ |
64 |
"${FILESDIR}"/${P}-glib-2.32.patch |
65 |
|
66 |
- # Ships with po/Makefile.in.in from gettext-0.17 |
67 |
- # which fails with >=gettext-0.18 |
68 |
- sed -i -e "/AM_GNU_GETTEXT_VERSION/s/17/18/" configure.ac || die |
69 |
+ # don't specify a gettext version |
70 |
+ sed -i "/^AM_GNU_GETTEXT_VERSION/d" configure.ac || die |
71 |
+ |
72 |
+ # avoid gettext version mismatches (bug #514082) |
73 |
+ sed -i "/^GETTEXT_MACRO_VERSION/s/=.*/= @GETTEXT_MACRO_VERSION@/" po/Makefile.in.in || die |
74 |
|
75 |
eautoreconf |
76 |
} |