rpm/tk
SHA256
1
0
Fork 0
forked from pool/tk
Code Pull Requests Activity

Fix libXft detection in configure

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tk?expand=0&rev=17
This commit is contained in:
Reinhard Max 2011-03-08 14:20:32 +00:00 committed by Git OBS Bridge
parent ee0497bef6
commit 7299269499
4 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
tk-xft.patch Normal file
View File

@ -0,0 +1,66 @@
--- 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

5
tk.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 8 14:19:25 UTC 2011 - max@novell.com
- Fix libXft detection in configure.
-------------------------------------------------------------------
Fri Sep 3 16:45:42 CEST 2010 - max@suse.de

4
tk.patch
View File

@ -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

2
tk.spec
View File

@ -41,6 +41,7 @@ Source0: %name%{version}-src.tar.bz2
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 @@ Authors:
%prep
%setup -q -n %name%version
%patch0
%patch1
%build
cd unix