Author: qboosh Date: Wed Jun 29 18:48:16 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- BR: pkgconfig, autoconf 2.59
- link patch replaced by better version
---- Files affected:
packages/tk:
tk-link.patch (1.1 -> 1.2) , tk.spec (1.115 -> 1.116)
---- Diffs:
================================================================
Index: packages/tk/tk-link.patch
diff -u packages/tk/tk-link.patch:1.1 packages/tk/tk-link.patch:1.2
--- packages/tk/tk-link.patch:1.1 Tue Jun 28 13:47:15 2011
+++ packages/tk/tk-link.patch Wed Jun 29 20:48:11 2011
@@ -1,11 +1,11 @@
---- tk8.5.10/unix/configure.in~ 2011-06-28 13:37:06.046468296 +0200
-+++ tk8.5.10/unix/configure.in 2011-06-28 13:44:26.978468307 +0200
-@@ -579,6 +579,8 @@
- AC_SUBST(UNIX_FONT_OBJS)
- fi
-
-+LIBS="$LIBS -lfontconfig"
-+
- #--------------------------------------------------------------------
- # Figure out whether "char" is unsigned. If so, set a
- # #define for __CHAR_UNSIGNED__.
+--- tk8.5.10/unix/configure.in.orig 2011-06-29 20:07:08.254526698 +0200
++++ tk8.5.10/unix/configure.in 2011-06-29 20:17:19.254547155 +0200
+@@ -529,7 +529,7 @@
+ 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_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
================================================================
Index: packages/tk/tk.spec
diff -u packages/tk/tk.spec:1.115 packages/tk/tk.spec:1.116
--- packages/tk/tk.spec:1.115 Tue Jun 28 14:13:56 2011
+++ packages/tk/tk.spec Wed Jun 29 20:48:11 2011
@@ -8,7 +8,7 @@
Summary(uk.UTF-8): Tk GUI toolkit для Tcl
Name: tk
%define major 8.5
-%define minor 10
+%define minor 10
Version: %{major}.%{minor}
Release: 3
License: BSD
@@ -30,7 +30,8 @@
Patch11: %{name}-no_tcl_stub.patch
Patch12: %{name}-link.patch
URL: http://www.tcl.tk/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.59
+BuildRequires: pkgconfig
BuildRequires: tcl-devel >= %{version}
BuildRequires: xorg-lib-libXScrnSaver-devel
BuildRequires: xorg-lib-libXext-devel
@@ -242,6 +243,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.116 2011/06/29 18:48:11 qboosh
+- BR: pkgconfig, autoconf 2.59
+- link patch replaced by better version
+
Revision 1.115 2011/06/28 12:13:56 marti
- create dir in better/right way
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tk/tk-link.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tk/tk.spec?r1=1.115&r2=1.116&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
