From ce83aefbd7e304de4b7db3ff8a6a2327dc6f496f6cdc292a67e1e81dfe2bb5a8 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 7 Aug 2014 16:14:03 +0000 Subject: [PATCH 1/4] - Update to 8.6.2rc0, detailed change log will follow. - Obsoletes tk-fix-pkgconfig-file.patch. OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tk?expand=0&rev=45 --- tk.changes | 6 ++++++ tk.spec | 7 ++----- tk8.6.1-src.tar.gz | 3 --- tk8.6.2rc0-src.tar.gz | 3 +++ 4 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 tk8.6.1-src.tar.gz create mode 100644 tk8.6.2rc0-src.tar.gz diff --git a/tk.changes b/tk.changes index f4b96a1..13dc938 100644 --- a/tk.changes +++ b/tk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 7 16:11:21 UTC 2014 - max@suse.com + +- Update to 8.6.2rc0, detailed change log will follow. +- Obsoletes tk-fix-pkgconfig-file.patch. + ------------------------------------------------------------------- Mon Mar 31 02:35:59 UTC 2014 - badshah400@gmail.com diff --git a/tk.spec b/tk.spec index cef8149..3bf4026 100644 --- a/tk.spec +++ b/tk.spec @@ -25,9 +25,9 @@ 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 +%define rrc rc0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Graphical User Interface Toolkit for Tcl License: BSD-3-Clause @@ -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.2rc0-src.tar.gz b/tk8.6.2rc0-src.tar.gz new file mode 100644 index 0000000..728bf19 --- /dev/null +++ b/tk8.6.2rc0-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b565106233d4b295064b3f232c535f737baecf46073107ec21172b7bf084e835 +size 4245798 From 7668109b15d1f2fe83771452e3f87d9551b33af13f7f04a4b53cacbde86f27e0 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 19 Aug 2014 16:13:15 +0000 Subject: [PATCH 2/4] - Update to 8.6.2rc1, detailed change log will follow. OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tk?expand=0&rev=46 --- tk.changes | 4 ++-- tk.spec | 2 +- tk8.6.2rc0-src.tar.gz | 3 --- tk8.6.2rc1-src.tar.gz | 3 +++ 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 tk8.6.2rc0-src.tar.gz create mode 100644 tk8.6.2rc1-src.tar.gz diff --git a/tk.changes b/tk.changes index 13dc938..e227adc 100644 --- a/tk.changes +++ b/tk.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Thu Aug 7 16:11:21 UTC 2014 - max@suse.com +Tue Aug 19 16:12:40 UTC 2014 - max@suse.com -- Update to 8.6.2rc0, detailed change log will follow. +- Update to 8.6.2rc1, detailed change log will follow. - Obsoletes tk-fix-pkgconfig-file.patch. ------------------------------------------------------------------- diff --git a/tk.spec b/tk.spec index 3bf4026..4c2112a 100644 --- a/tk.spec +++ b/tk.spec @@ -27,7 +27,7 @@ BuildRequires: tcl-devel Url: http://www.tcl.tk Version: 8.6.2 Release: 0 -%define rrc rc0 +%define rrc rc1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Graphical User Interface Toolkit for Tcl License: BSD-3-Clause diff --git a/tk8.6.2rc0-src.tar.gz b/tk8.6.2rc0-src.tar.gz deleted file mode 100644 index 728bf19..0000000 --- a/tk8.6.2rc0-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b565106233d4b295064b3f232c535f737baecf46073107ec21172b7bf084e835 -size 4245798 diff --git a/tk8.6.2rc1-src.tar.gz b/tk8.6.2rc1-src.tar.gz new file mode 100644 index 0000000..71cf033 --- /dev/null +++ b/tk8.6.2rc1-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae6a71ebd779cedb557569a6854fbbbd36bfeb6c5128d3fa7e4ac9a0467bc989 +size 4246182 From 6516c6e7bde54ed12ea9ff9f051b052d26b201ba1ed4684ac210dd1e43c3ac15 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Fri, 29 Aug 2014 13:02:27 +0000 Subject: [PATCH 3/4] Accepting request 246833 from home:vwallfahrer:branches:devel:languages:tcl - 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 OBS-URL: https://build.opensuse.org/request/show/246833 OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tk?expand=0&rev=47 --- tk.changes | 16 +++++++++++++--- tk.spec | 2 +- tk8.6.2-src.tar.gz | 3 +++ tk8.6.2rc1-src.tar.gz | 3 --- 4 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 tk8.6.2-src.tar.gz delete mode 100644 tk8.6.2rc1-src.tar.gz diff --git a/tk.changes b/tk.changes index e227adc..1618969 100644 --- a/tk.changes +++ b/tk.changes @@ -1,8 +1,18 @@ ------------------------------------------------------------------- -Tue Aug 19 16:12:40 UTC 2014 - max@suse.com +Thu Aug 28 14:37:33 UTC 2014 - vwallfahrer@suse.com -- Update to 8.6.2rc1, detailed change log will follow. -- Obsoletes tk-fix-pkgconfig-file.patch. +- 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 4c2112a..49df7ea 100644 --- a/tk.spec +++ b/tk.spec @@ -27,7 +27,7 @@ BuildRequires: tcl-devel Url: http://www.tcl.tk Version: 8.6.2 Release: 0 -%define rrc rc1 +%define rrc %nil BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Graphical User Interface Toolkit for Tcl License: BSD-3-Clause 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 diff --git a/tk8.6.2rc1-src.tar.gz b/tk8.6.2rc1-src.tar.gz deleted file mode 100644 index 71cf033..0000000 --- a/tk8.6.2rc1-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae6a71ebd779cedb557569a6854fbbbd36bfeb6c5128d3fa7e4ac9a0467bc989 -size 4246182 From 7e7094e045b526adf46e5ed860120a71ba6408b5a4cb64b4131df9ba3b3068f2 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Fri, 29 Aug 2014 13:20:03 +0000 Subject: [PATCH 4/4] Remove tk-fix-pkgconfig-file.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/tk?expand=0&rev=48 --- tk-fix-pkgconfig-file.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 tk-fix-pkgconfig-file.patch 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}