diff --git a/tk-fix-pkgconfig-file.patch b/tk-fix-pkgconfig-file.patch deleted file mode 100644 index f905d3a..0000000 --- a/tk-fix-pkgconfig-file.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://core.tcl.tk/tcl/tktview?name=5bcb5026ad51abb7 -Index: tk8.6.1/unix/tk.pc.in -=================================================================== ---- tk8.6.1.orig/unix/tk.pc.in -+++ tk8.6.1/unix/tk.pc.in -@@ -11,5 +11,5 @@ URL: http://www.tcl.tk/ - Version: @TK_VERSION@ - Requires: - Conflicts: --Libs: -L${libdir} @TK_LIBS@ -+Libs: -L${libdir} @TK_LIB_FLAG@ - Cflags: -I${includedir} diff --git a/tk.changes b/tk.changes index f4b96a1..1618969 100644 --- a/tk.changes +++ b/tk.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Aug 28 14:37:33 UTC 2014 - vwallfahrer@suse.com + +- Update to 8.6.2: + * Ocaml trouble with Tk and tailcall splice. + * Accept [image create -format PNG] (upper case). + * fix png wrong component indices + * PNG parser accept uppercase -format + * fix double free of a TkFont + * support PPM maxval up to 65535 + * fix multi-interp font teardown double free + * fix option file \n syntax support + * X: correct fontconfig dependence + * fix @TK_LIBS@ in pkgconfig + * fix autoscroll initiation + ------------------------------------------------------------------- Mon Mar 31 02:35:59 UTC 2014 - badshah400@gmail.com diff --git a/tk.spec b/tk.spec index cef8149..49df7ea 100644 --- a/tk.spec +++ b/tk.spec @@ -25,7 +25,7 @@ BuildRequires: libXt-devel BuildRequires: pkg-config BuildRequires: tcl-devel Url: http://www.tcl.tk -Version: 8.6.1 +Version: 8.6.2 Release: 0 %define rrc %nil BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,8 +52,6 @@ Source2: baselibs.conf Source3: http://tkcon.cvs.sourceforge.net/tkcon/tkcon/tkcon.tcl Patch0: %name.patch Patch1: tk-8.5.12-fix-xft.patch -# PATCH-FIX-UPSTREAM tk-fix-pkgconfig-file.patch badshah400@gmail.com -- Fix undefined token (@TK_LIBS@) in linker flag in pkgconfig file; patch sent upstream -Patch2: tk-fix-pkgconfig-file.patch %description Tk is a graphical user interface toolkit that takes developing desktop @@ -101,7 +99,6 @@ Authors: %setup -q -n %name%version %patch0 %patch1 -p1 -%patch2 -p1 %build cd unix diff --git a/tk8.6.1-src.tar.gz b/tk8.6.1-src.tar.gz deleted file mode 100644 index 5fadc91..0000000 --- a/tk8.6.1-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b691a2e84907392918665fe03a0deb913663a026bed2162185b4a9a14898162c -size 4244010 diff --git a/tk8.6.2-src.tar.gz b/tk8.6.2-src.tar.gz new file mode 100644 index 0000000..b8ec988 --- /dev/null +++ b/tk8.6.2-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afb6639043ec38905afe22b61ca54820217f4d4e81e0ad49f839c16d2bf98579 +size 4246617