[Pkg-tcltk-commits] r1124 - in tk8.5/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Thu Mar 3 17:03:13 UTC 2011
Author: sgolovan
Date: 2011-03-03 17:03:13 +0000 (Thu, 03 Mar 2011)
New Revision: 1124
Added:
tk8.5/trunk/debian/patches/xft.diff
Modified:
tk8.5/trunk/debian/changelog
tk8.5/trunk/debian/patches/series
Log:
* Fixed Xft detection in configure script, which is broken since xft-config
was removed from the libxft-dev package.
Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog 2011-03-03 17:02:21 UTC (rev 1123)
+++ tk8.5/trunk/debian/changelog 2011-03-03 17:03:13 UTC (rev 1124)
@@ -2,8 +2,10 @@
* Moved /usr/share/tcltk/tk8.5/tkConfig.sh back to the /usr/lib/tk8.5
directory because it is architecture dependent.
+ * Fixed Xft detection in configure script, which is broken since xft-config
+ was removed from the libxft-dev package.
- -- Sergei Golovan <sgolovan at debian.org> Fri, 05 Nov 2010 14:06:18 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 03 Mar 2011 20:02:25 +0300
tk8.5 (8.5.9-1) experimental; urgency=low
Modified: tk8.5/trunk/debian/patches/series
===================================================================
--- tk8.5/trunk/debian/patches/series 2011-03-03 17:02:21 UTC (rev 1123)
+++ tk8.5/trunk/debian/patches/series 2011-03-03 17:03:13 UTC (rev 1124)
@@ -1,3 +1,4 @@
+xft.diff
tkport.diff
tklibrary.diff
tkprivate.diff
Added: tk8.5/trunk/debian/patches/xft.diff
===================================================================
--- tk8.5/trunk/debian/patches/xft.diff (rev 0)
+++ tk8.5/trunk/debian/patches/xft.diff 2011-03-03 17:03:13 UTC (rev 1124)
@@ -0,0 +1,94 @@
+Author: Sergei Golovan
+Description: Patch fixes Xft detection and list of libraries to link to.
+Forwarded: yes
+Bug: https://sourceforge.net/tracker/?func=detail&aid=3184834&group_id=12997&atid=112997
+Last-updated: Thu, 03 Mar 2011 11:00:32 +0300
+
+--- tk8.5-8.5.9.orig/unix/configure.in
++++ tk8.5-8.5.9/unix/configure.in
+@@ -530,8 +530,8 @@
+ 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 fontconfig 2>/dev/null` || found_xft="no"
++ XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
+ fi
+ AC_MSG_RESULT([$found_xft])
+ dnl make sure that compiling against Xft header file doesn't bomb
+@@ -552,7 +552,7 @@
+ CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
+ tk_oldLibs=$LIBS
+ LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
+- AC_CHECK_LIB(Xft, FT_New_Face, [], [
++ AC_CHECK_LIB(Xft, XftFontOpen, [], [
+ found_xft=no
+ ])
+ CFLAGS=$tk_oldCFlags
+--- tk8.5-8.5.9.orig/unix/configure
++++ tk8.5-8.5.9/unix/configure
+@@ -10816,8 +10816,8 @@
+ 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 fontconfig 2>/dev/null` || found_xft="no"
++ XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
+ fi
+ echo "$as_me:$LINENO: result: $found_xft" >&5
+ echo "${ECHO_T}$found_xft" >&6
+@@ -10892,9 +10892,9 @@
+ tk_oldLibs=$LIBS
+ LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
+
+-echo "$as_me:$LINENO: checking for FT_New_Face in -lXft" >&5
+-echo $ECHO_N "checking for FT_New_Face in -lXft... $ECHO_C" >&6
+-if test "${ac_cv_lib_Xft_FT_New_Face+set}" = set; then
++echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5
++echo $ECHO_N "checking for XftFontOpen in -lXft... $ECHO_C" >&6
++if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -10912,11 +10912,11 @@
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char FT_New_Face ();
++char XftFontOpen ();
+ int
+ main ()
+ {
+-FT_New_Face ();
++XftFontOpen ();
+ ;
+ return 0;
+ }
+@@ -10943,20 +10943,20 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_lib_Xft_FT_New_Face=yes
++ ac_cv_lib_Xft_XftFontOpen=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_Xft_FT_New_Face=no
++ac_cv_lib_Xft_XftFontOpen=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_FT_New_Face" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xft_FT_New_Face" >&6
+-if test $ac_cv_lib_Xft_FT_New_Face = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5
++echo "${ECHO_T}$ac_cv_lib_Xft_XftFontOpen" >&6
++if test $ac_cv_lib_Xft_XftFontOpen = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBXFT 1
+ _ACEOF
More information about the Pkg-tcltk-commits
mailing list