diff --git a/sources b/sources index 0e242de..ab72381 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tk8.6.10-src.tar.gz) = d12ef3a5bde9e10209a24e9f978bd23360a979d8fa70a859cf750a79ca51067a11ef6df7589303b52fe2a2baed4083583ddaa19e2c7cb433ea523639927f1be5 +SHA512 (tk8.6.12-src.tar.gz) = afe51eb3e2071640ebc57f9ee6979fe91ee7856df8d3c9d55ae70c470cdae2306d2feeb791f46258f529a5c4a07b53974a7574cf3594818cd4e99077b30c697b diff --git a/tk-8.6.10-conf.patch b/tk-8.6.10-conf.patch deleted file mode 100644 index e09a0b1..0000000 --- a/tk-8.6.10-conf.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/unix/tcl.m4 b/unix/tcl.m4 -index 0e146e4..613a276 100644 ---- a/unix/tcl.m4 -+++ b/unix/tcl.m4 -@@ -1410,12 +1410,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ - # get rid of the warnings. - #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" - -- SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' -+ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-soname,${@}' - DL_OBJS="tclLoadDl.o" - DL_LIBS="-ldl" - LDFLAGS="$LDFLAGS -Wl,--export-dynamic" - AS_IF([test $doRpath = yes], [ -- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) -+ CC_SEARCH_FLAGS='']) - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) - AS_IF([test $do64bit = yes], [ diff --git a/tk-8.6.10-make.patch b/tk-8.6.10-make.patch deleted file mode 100644 index 6a970b2..0000000 --- a/tk-8.6.10-make.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/unix/Makefile.in b/unix/Makefile.in -index c6f8c25..a3cc8cb 100644 ---- a/unix/Makefile.in -+++ b/unix/Makefile.in -@@ -744,7 +744,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} - fi - @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" - @@INSTALL_LIB@ -- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" -+ @chmod 755 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" - @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ - $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ - chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ diff --git a/tk-8.6.12-conf.patch b/tk-8.6.12-conf.patch new file mode 100644 index 0000000..42c4353 --- /dev/null +++ b/tk-8.6.12-conf.patch @@ -0,0 +1,22 @@ +diff --git a/unix/tcl.m4 b/unix/tcl.m4 +index f3d08ec..1a8d6b6 100644 +--- a/unix/tcl.m4 ++++ b/unix/tcl.m4 +@@ -1382,7 +1382,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ + # get rid of the warnings. + #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" + +- SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' ++ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-soname,${@}' + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" +@@ -1398,7 +1398,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ + esac + + AS_IF([test $doRpath = yes], [ +- CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"']) ++ CC_SEARCH_FLAGS='']) + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) + AS_IF([test $do64bit = yes], [ diff --git a/tk-8.6.12-make.patch b/tk-8.6.12-make.patch new file mode 100644 index 0000000..8a16722 --- /dev/null +++ b/tk-8.6.12-make.patch @@ -0,0 +1,13 @@ +diff --git a/unix/Makefile.in b/unix/Makefile.in +index 010ba48..2372d57 100644 +--- a/unix/Makefile.in ++++ b/unix/Makefile.in +@@ -745,7 +745,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} + fi + @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" + @@INSTALL_LIB@ +- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" ++ @chmod 755 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" + @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ + $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ + chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ diff --git a/tk-8.6.7-no-fonts-fix.patch b/tk-8.6.7-no-fonts-fix.patch deleted file mode 100644 index f3e3d04..0000000 --- a/tk-8.6.7-no-fonts-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c -index cce59a8..78df47a 100644 ---- a/unix/tkUnixRFont.c -+++ b/unix/tkUnixRFont.c -@@ -271,7 +271,7 @@ InitFont( - */ - - set = FcFontSort(0, pattern, FcTrue, NULL, &result); -- if (!set) { -+ if (!set || set->nfont == 0) { - ckfree(fontPtr); - return NULL; - } diff --git a/tk.spec b/tk.spec index 8a0cd34..c7a722c 100644 --- a/tk.spec +++ b/tk.spec @@ -1,10 +1,10 @@ %define majorver 8.6 -%define vers %{majorver}.10 +%define vers %{majorver}.12 Summary: The graphical toolkit for the Tcl scripting language Name: tk Version: %{vers} -Release: 7%{?dist} +Release: 1%{?dist} Epoch: 1 License: TCL URL: http://tcl.sourceforge.net @@ -19,9 +19,8 @@ BuildRequires: libXft-devel Conflicts: itcl <= 3.2 Obsoletes: tile <= 0.8.2 Provides: tile = 0.8.2 -Patch1: tk-8.6.10-make.patch -Patch2: tk-8.6.10-conf.patch -Patch3: tk-8.6.7-no-fonts-fix.patch +Patch1: tk-8.6.12-make.patch +Patch2: tk-8.6.12-conf.patch # https://core.tcl-lang.org/tk/tktview/dccd82bdc70dc25bb6709a6c14880a92104dda43 Patch4: tk-8.6.10-font-sizes-fix.patch @@ -46,7 +45,6 @@ The package contains the development files and man pages for tk. %patch1 -p1 -b .make %patch2 -p1 -b .conf -%patch3 -p1 -b .no-fonts-fix %patch4 -p1 -b .font-sizes-fix %build @@ -108,6 +106,10 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu %{_datadir}/%{name}%{majorver}/tkAppInit.c %changelog +* Tue Nov 23 2021 Jaroslav Škarvada - 1:8.6.12-1 +- New version + Related: rhbz#1488695 + * Fri Jul 23 2021 Fedora Release Engineering - 1:8.6.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild