From d3ba33b555d2c043861a97c98fc119ae4632635b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 15 Aug 2013 17:26:25 +0200 Subject: [PATCH] Added patches --- tk-8.6.0-conf.patch | 19 +++++++++++++++++++ tk-8.6.0-fix-xft.patch | 15 +++++++++++++++ tk8.6-make.patch | 13 +++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 tk-8.6.0-conf.patch create mode 100644 tk-8.6.0-fix-xft.patch create mode 100644 tk8.6-make.patch diff --git a/tk-8.6.0-conf.patch b/tk-8.6.0-conf.patch new file mode 100644 index 0000000..7ba9752 --- /dev/null +++ b/tk-8.6.0-conf.patch @@ -0,0 +1,19 @@ +diff --git a/unix/tcl.m4 b/unix/tcl.m4 +index b13fddd..cd9607f 100644 +--- a/unix/tcl.m4 ++++ b/unix/tcl.m4 +@@ -1408,12 +1408,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ + # get rid of the warnings. + #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" + +- SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' ++ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -Wl,-soname,${@}' + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + AS_IF([test $doRpath = yes], [ +- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) ++ CC_SEARCH_FLAGS='']) + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) + AS_IF([test $do64bit = yes], [ diff --git a/tk-8.6.0-fix-xft.patch b/tk-8.6.0-fix-xft.patch new file mode 100644 index 0000000..bc7dbf6 --- /dev/null +++ b/tk-8.6.0-fix-xft.patch @@ -0,0 +1,15 @@ +diff --git a/unix/configure.in b/unix/configure.in +index abc8a1d..065a6c2 100755 +--- a/unix/configure.in ++++ b/unix/configure.in +@@ -557,8 +557,8 @@ if test $tk_aqua = no; then + XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" + if test "$found_xft" = "no" ; then + found_xft=yes +- XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no" +- XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no" ++ XFT_CFLAGS=`pkg-config --cflags xft freetype2 2>/dev/null` || found_xft="no" ++ XFT_LIBS=`pkg-config --libs xft freetype2 2>/dev/null` || found_xft="no" + fi + AC_MSG_RESULT([$found_xft]) + dnl make sure that compiling against Xft header file doesn't bomb diff --git a/tk8.6-make.patch b/tk8.6-make.patch new file mode 100644 index 0000000..708bb62 --- /dev/null +++ b/tk8.6-make.patch @@ -0,0 +1,13 @@ +diff --git a/unix/Makefile.in b/unix/Makefile.in +index 1df6721..08017a4 100644 +--- a/unix/Makefile.in ++++ b/unix/Makefile.in +@@ -744,7 +744,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} + fi + @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" + @@INSTALL_LIB@ +- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" ++ @chmod 755 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" + @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ + $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ + chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\