Reinhard Max 2011-07-01 11:19:49 +00:00 committed by Git OBS Bridge
parent 8c1eac790c
commit 82def38c0a
5 changed files with 36 additions and 72 deletions

View File

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

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Fri Jul 1 11:18:51 UTC 2011 - max@novell.com
- New patchlevel release 8.5.10:
* (bug fix)[3057573] specify combobox text fg color
* (bug fix)[2829363] [$tv see] open item -> sched display
* (bug fix)[3085489] crash in [tag add/remove]
* (enhancement) Updated German messages.
* (platform) VS 2005 SP1 MSVC compiler
* (bug fix)[3071836] crash in tk_getSaveFile
* (bug fix)[3154705] tk_messageBox close button disabled
* (enhancement) add [ttk::entry validate]
* (bug fix)[3205260] crash in [wm manage]
* (bug fix)[3181181] tearoff submenu fix
* (bug fix)[3205464] [wm forget] loses window
* (bug fix)[3223850] ttk button state disabled during click
* (bug fix)[3000002] ttk scrollbar size Appearance
* (bug fix)[3239768] Win menu font support
* (bug fix)[3129527] stop buffer overflows
* (feature change)[2997657] No -container for [labelframe]
* (bug fix)[723765] [grid remove] lost -in value
* (bug fix)[3291543] mem corrupt when [$canvas dchars] removes
all coords of a polygon
* (bug fix)[2949774] cascade menu unpost
* (bug fix)[2546087] [console] treatment of '\0'
* (bug fix)[2358545] Restore "08" in spinbox configured with
-from and -to (porter)
* (bug fix)[2484771] modal dialog settings
* (bug fix)[3175610] incomplete line item refresh
* (bug fix)[3062331] crash in unset traces
- tk-xft.patch has been integrated upstream.
-------------------------------------------------------------------
Tue Mar 8 14:19:25 UTC 2011 - max@novell.com

View File

@ -21,7 +21,7 @@
Name: tk
BuildRequires: tcl-devel xorg-x11-devel
Url: http://www.tcl.tk
Version: 8.5.9
Version: 8.5.10
Release: 5
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Graphical User Interface Toolkit for Tcl
@ -41,7 +41,6 @@ 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
@ -89,7 +88,6 @@ Authors:
%prep
%setup -q -n %name%version
%patch0
%patch1
%build
cd unix

3
tk8.5.10-src.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:046e3425a17ddc5942e0277b6f071821d5530dc60b1118df774ea5383a9594bc
size 3048759

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:23b21b9fe735fe1ee4c296995943ed44380e42e50afa3e2931c3d481b3551dc9
size 3061658