| 1 |
jlec 12/11/29 15:23:02 |
| 2 |
|
| 3 |
Modified: tk-8.4.15-aqua.patch |
| 4 |
Added: tk-8.5.10-conf.patch |
| 5 |
Removed: remove-control-v-8.4.9.diff tk-CVE-2007-4851.patch |
| 6 |
Log: |
| 7 |
dev-lang/tk: Version Bump, #444296; Cleaned old |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 70EB7916) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.2 dev-lang/tk/files/tk-8.4.15-aqua.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/files/tk-8.4.15-aqua.patch?rev=1.2&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/files/tk-8.4.15-aqua.patch?rev=1.2&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/files/tk-8.4.15-aqua.patch?r1=1.1&r2=1.2 |
| 17 |
|
| 18 |
Index: tk-8.4.15-aqua.patch |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/files/tk-8.4.15-aqua.patch,v |
| 21 |
retrieving revision 1.1 |
| 22 |
retrieving revision 1.2 |
| 23 |
diff -u -r1.1 -r1.2 |
| 24 |
--- tk-8.4.15-aqua.patch 15 Jun 2010 12:10:15 -0000 1.1 |
| 25 |
+++ tk-8.4.15-aqua.patch 29 Nov 2012 15:23:01 -0000 1.2 |
| 26 |
@@ -1,14 +1,5 @@ |
| 27 |
--- unix/Makefile.in |
| 28 |
+++ unix/Makefile.in |
| 29 |
-@@ -280,7 +280,7 @@ |
| 30 |
- TK_RSRC_FILE = @TK_RSRC_FILE@ |
| 31 |
- WISH_RSRC_FILE = @WISH_RSRC_FILE@ |
| 32 |
- REZ = @REZ@ |
| 33 |
--REZ_SWITCHES = @REZ_FLAGS@ -i $(GENERIC_DIR) -i $(TCL_GENERIC_DIR) |
| 34 |
-+REZ_SWITCHES = @REZ_FLAGS@ -i $(GENERIC_DIR) -i $(TCL_GENERIC_DIR) -i @GENTOO_PORTAGE_EPREFIX@/usr/include |
| 35 |
- |
| 36 |
- #---------------------------------------------------------------- |
| 37 |
- # The information below is modified by the configure script when |
| 38 |
@@ -468,7 +468,7 @@ |
| 39 |
|
| 40 |
AQUA_HDRS = $(MAC_OSX_DIR)/tkMacOSX.h $(GENERIC_DIR)/tkIntXlibDecls.h |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 dev-lang/tk/files/tk-8.5.10-conf.patch |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/files/tk-8.5.10-conf.patch?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/files/tk-8.5.10-conf.patch?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: tk-8.5.10-conf.patch |
| 50 |
=================================================================== |
| 51 |
unix/tcl.m4 | 6 +++--- |
| 52 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 53 |
|
| 54 |
diff --git a/unix/tcl.m4 b/unix/tcl.m4 |
| 55 |
index 3974753..9c36eb5 100644 |
| 56 |
--- a/unix/tcl.m4 |
| 57 |
+++ b/unix/tcl.m4 |
| 58 |
@@ -1420,12 +1420,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ |
| 59 |
# get rid of the warnings. |
| 60 |
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" |
| 61 |
|
| 62 |
- SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' |
| 63 |
+ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -Wl,-soname,${@}' |
| 64 |
DL_OBJS="tclLoadDl.o" |
| 65 |
DL_LIBS="-ldl" |
| 66 |
LDFLAGS="$LDFLAGS -Wl,--export-dynamic" |
| 67 |
AS_IF([test $doRpath = yes], [ |
| 68 |
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) |
| 69 |
+ CC_SEARCH_FLAGS='']) |
| 70 |
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} |
| 71 |
AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) |
| 72 |
AS_IF([test $do64bit = yes], [ |
| 73 |
@@ -1452,7 +1452,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ |
| 74 |
SHLIB_CFLAGS="-fPIC" |
| 75 |
SHLIB_SUFFIX=".so" |
| 76 |
|
| 77 |
- SHLIB_LD='${CC} -shared' |
| 78 |
+ SHLIB_LD='${CC} ${CFLAGS} -shared' |
| 79 |
DL_OBJS="" |
| 80 |
DL_LIBS="-ldl" |
| 81 |
LDFLAGS="$LDFLAGS -Wl,--export-dynamic" |
Archives