commit tk for openSUSE:11.4

13 Mar 2011

Hello community,

here is the log from the commit of package tk for openSUSE:11.4
checked in at Mon Mar 14 00:59:43 CET 2011.



--------

--- old-versions/11.4/all/tk/tk.changes	2010-09-03 16:53:35.000000000 +0200
+++ 11.4/tk/tk.changes	2011-03-11 15:16:40.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Mar  8 14:19:25 UTC 2011 - max@novell.com
+
+- Fix libXft detection in configure (bnc#677780).
+
+-------------------------------------------------------------------

Package does not exist at destination yet. Using Fallback old-versions/11.4/all/tk
Destination is old-versions/11.4/UPDATES/all/tk
calling whatdependson for 11.4-i586


New:
----
  tk-xft.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ tk.spec ++++++
--- /var/tmp/diff_new_pack.6Euuof/_old	2011-03-14 00:59:36.000000000 +0100
+++ /var/tmp/diff_new_pack.6Euuof/_new	2011-03-14 00:59:36.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package tk (Version 8.5.9)
+# spec file for package tk
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 BuildRequires:  tcl-devel xorg-x11-devel
 Url:            http://www.tcl.tk
 Version:        8.5.9
-Release:        1
+Release:        3.<RELEASE2>
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Graphical User Interface Toolkit for Tcl
 License:        BSD3c(or similar)
@@ -41,6 +41,7 @@
 Source1:        tk-rpmlintrc
 Source2:        baselibs.conf
 Patch0:         %name.patch
+Patch1:         %name-xft.patch
 
 %description
 Tk is a graphical user interface toolkit that takes developing desktop
@@ -88,6 +89,7 @@
 %prep
 %setup -q -n %name%version
 %patch0
+%patch1
 
 %build
 cd unix

++++++ tk-xft.patch ++++++
--- unix/configure
+++ unix/configure
@@ -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
--- unix/configure.in
+++ unix/configure.in
@@ -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
++++++ tk.patch ++++++
--- /var/tmp/diff_new_pack.6Euuof/_old	2011-03-14 00:59:36.000000000 +0100
+++ /var/tmp/diff_new_pack.6Euuof/_new	2011-03-14 00:59:36.000000000 +0100
@@ -1,6 +1,8 @@
 Index: unix/Makefile.in
 ===================================================================
-@@ -539,7 +540,8 @@ AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(X
+--- unix/Makefile.in.orig
++++ unix/Makefile.in
+@@ -541,7 +541,8 @@ AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(X
  
  AQUA_PRIVATE_HDRS = $(MAC_OSX_DIR)/tkMacOSXPort.h $(MAC_OSX_DIR)/tkMacOSXInt.h
  


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit tk for openSUSE:11.4

root＠hilbert.suse.de