| 1 |
blueness 12/11/04 18:35:33 |
| 2 |
|
| 3 |
Modified: tk-8.5.11-r1.ebuild tk-8.5.11.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Patch 8.5.11 to build on uclibc, bug #441630 |
| 6 |
|
| 7 |
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 dev-lang/tk/tk-8.5.11-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.11-r1.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.11-r1.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.11-r1.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: tk-8.5.11-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11-r1.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- tk-8.5.11-r1.ebuild 3 Aug 2012 19:29:23 -0000 1.2 |
| 23 |
+++ tk-8.5.11-r1.ebuild 4 Nov 2012 18:35:32 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11-r1.ebuild,v 1.2 2012/08/03 19:29:23 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11-r1.ebuild,v 1.3 2012/11/04 18:35:32 blueness Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
@@ -45,6 +45,9 @@ |
| 33 |
# copy the tcl patch |
| 34 |
epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch |
| 35 |
|
| 36 |
+ # Bug 441630 |
| 37 |
+ epatch "${FILESDIR}"/${PN}-8.5.11-fix-name-collision-uclibc.patch |
| 38 |
+ |
| 39 |
# Make sure we use the right pkg-config, and link against fontconfig |
| 40 |
# (since the code base uses Fc* functions). |
| 41 |
sed -i \ |
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.6 dev-lang/tk/tk-8.5.11.ebuild |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild?rev=1.6&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild?rev=1.6&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild?r1=1.5&r2=1.6 |
| 50 |
|
| 51 |
Index: tk-8.5.11.ebuild |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v |
| 54 |
retrieving revision 1.5 |
| 55 |
retrieving revision 1.6 |
| 56 |
diff -u -r1.5 -r1.6 |
| 57 |
--- tk-8.5.11.ebuild 26 Apr 2012 19:49:06 -0000 1.5 |
| 58 |
+++ tk-8.5.11.ebuild 4 Nov 2012 18:35:32 -0000 1.6 |
| 59 |
@@ -1,6 +1,6 @@ |
| 60 |
# Copyright 1999-2012 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v 1.5 2012/04/26 19:49:06 aballier Exp $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v 1.6 2012/11/04 18:35:32 blueness Exp $ |
| 64 |
|
| 65 |
EAPI=4 |
| 66 |
|
| 67 |
@@ -43,6 +43,9 @@ |
| 68 |
# copy the tcl patch |
| 69 |
epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch |
| 70 |
|
| 71 |
+ # Bug 441630 |
| 72 |
+ epatch "${FILESDIR}"/${PN}-8.5.11-fix-name-collision-uclibc.patch |
| 73 |
+ |
| 74 |
sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die |
| 75 |
|
| 76 |
cd "${S}"/unix |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.174 dev-lang/tk/ChangeLog |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.174&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.174&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?r1=1.173&r2=1.174 |
| 85 |
|
| 86 |
Index: ChangeLog |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v |
| 89 |
retrieving revision 1.173 |
| 90 |
retrieving revision 1.174 |
| 91 |
diff -u -r1.173 -r1.174 |
| 92 |
--- ChangeLog 7 Aug 2012 02:34:03 -0000 1.173 |
| 93 |
+++ ChangeLog 4 Nov 2012 18:35:33 -0000 1.174 |
| 94 |
@@ -1,6 +1,11 @@ |
| 95 |
# ChangeLog for dev-lang/tk |
| 96 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 97 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.173 2012/08/07 02:34:03 jer Exp $ |
| 98 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.174 2012/11/04 18:35:33 blueness Exp $ |
| 99 |
+ |
| 100 |
+ 04 Nov 2012; Anthony G. Basile <blueness@g.o> |
| 101 |
+ +files/tk-8.5.11-fix-name-collision-uclibc.patch, tk-8.5.11-r1.ebuild, |
| 102 |
+ tk-8.5.11.ebuild: |
| 103 |
+ Patch 8.5.11 to build on uclibc, bug #441630 |
| 104 |
|
| 105 |
03 Aug 2012; Mike Frysinger <vapier@g.o> tk-8.5.11-r1.ebuild: |
| 106 |
Make sure we link against fontconfig since we use it. |
Archives