| 1 |
ssuominen 11/10/03 09:31:37 |
| 2 |
|
| 3 |
Modified: ChangeLog amsn-0.98.4-r1.ebuild |
| 4 |
Log: |
| 5 |
The libpng15 patch imported from NetBSD is not compatible with libpng14 wrt #376407 by Pacho Ramos |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.106 net-im/amsn/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/amsn/ChangeLog?rev=1.106&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/amsn/ChangeLog?rev=1.106&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/amsn/ChangeLog?r1=1.105&r2=1.106 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v |
| 19 |
retrieving revision 1.105 |
| 20 |
retrieving revision 1.106 |
| 21 |
diff -u -r1.105 -r1.106 |
| 22 |
--- ChangeLog 17 Sep 2011 19:03:45 -0000 1.105 |
| 23 |
+++ ChangeLog 3 Oct 2011 09:31:36 -0000 1.106 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for net-im/amsn |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.105 2011/09/17 19:03:45 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.106 2011/10/03 09:31:36 ssuominen Exp $ |
| 29 |
+ |
| 30 |
+ 03 Oct 2011; Samuli Suominen <ssuominen@g.o> amsn-0.98.4-r1.ebuild: |
| 31 |
+ The libpng15 patch imported from NetBSD is not compatible with libpng14 wrt |
| 32 |
+ #376407 by Pacho Ramos |
| 33 |
|
| 34 |
17 Sep 2011; Samuli Suominen <ssuominen@g.o> amsn-0.98.4-r1.ebuild, |
| 35 |
+files/amsn-0.98.4-libpng15.patch: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 net-im/amsn/amsn-0.98.4-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/amsn/amsn-0.98.4-r1.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/amsn/amsn-0.98.4-r1.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/amsn/amsn-0.98.4-r1.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: amsn-0.98.4-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.98.4-r1.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- amsn-0.98.4-r1.ebuild 17 Sep 2011 19:03:45 -0000 1.2 |
| 52 |
+++ amsn-0.98.4-r1.ebuild 3 Oct 2011 09:31:36 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2011 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.98.4-r1.ebuild,v 1.2 2011/09/17 19:03:45 ssuominen Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.98.4-r1.ebuild,v 1.3 2011/10/03 09:31:36 ssuominen Exp $ |
| 58 |
|
| 59 |
EAPI=2 |
| 60 |
|
| 61 |
@@ -44,8 +44,11 @@ |
| 62 |
epatch \ |
| 63 |
"${FILESDIR}"/${PN}-0.98-noautoupdate.patch \ |
| 64 |
"${FILESDIR}"/${PN}-0.98.4-v4l2.patch \ |
| 65 |
- "${FILESDIR}"/${PN}-0.98.4-amsnplus-ldflags.patch \ |
| 66 |
- "${FILESDIR}"/${PN}-0.98.4-libpng15.patch |
| 67 |
+ "${FILESDIR}"/${PN}-0.98.4-amsnplus-ldflags.patch |
| 68 |
+ |
| 69 |
+ # The NetBSD patch kills backwards compability, see http://bugs.gentoo.org/376407 |
| 70 |
+ has_version '>=media-libs/libpng-1.5:0' && epatch "${FILESDIR}"/${PN}-0.98.4-libpng15.patch |
| 71 |
+ |
| 72 |
# only portage should strip files, bug 285682 |
| 73 |
sed -i -e "s/LDFLAGS += -s/LDFLAGS += /" Makefile.in || die "sed failed" |
| 74 |
# Ships with a 32-bit binary, we want to rebuild it |
Archives