From 23d60130c6992bee7afbe62ab0b86641a2d05b37 Mon Sep 17 00:00:00 2001 From: zhanglu Date: Sat, 11 Jan 2020 19:34:52 +0800 Subject: [PATCH 1/2] del patches to be consistent with open source --- tk-8.6.5-fix-xft.patch | 15 --------------- tk-8.6.5-make.patch | 13 ------------- tk-8.6.7-conf.patch | 19 ------------------- tk-8.6.7-no-fonts-fix.patch | 13 ------------- tk.spec | 10 ++++------ 5 files changed, 4 insertions(+), 66 deletions(-) delete mode 100644 tk-8.6.5-fix-xft.patch delete mode 100644 tk-8.6.5-make.patch delete mode 100644 tk-8.6.7-conf.patch delete mode 100644 tk-8.6.7-no-fonts-fix.patch diff --git a/tk-8.6.5-fix-xft.patch b/tk-8.6.5-fix-xft.patch deleted file mode 100644 index de10c9d..0000000 --- a/tk-8.6.5-fix-xft.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/unix/configure.in b/unix/configure.in -index cb412af..abfd43b 100755 ---- a/unix/configure.in -+++ b/unix/configure.in -@@ -479,8 +479,8 @@ if test $tk_aqua = no; then - XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" - 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_CFLAGS=`pkg-config --cflags xft freetype2 2>/dev/null` || found_xft="no" -+ XFT_LIBS=`pkg-config --libs xft freetype2 2>/dev/null` || found_xft="no" - fi - AC_MSG_RESULT([$found_xft]) - dnl make sure that compiling against Xft header file doesn't bomb diff --git a/tk-8.6.5-make.patch b/tk-8.6.5-make.patch deleted file mode 100644 index 1ede285..0000000 --- a/tk-8.6.5-make.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/unix/Makefile.in b/unix/Makefile.in -index 96f1408..05270c6 100644 ---- a/unix/Makefile.in -+++ b/unix/Makefile.in -@@ -739,7 +739,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-conf.patch b/tk-8.6.7-conf.patch deleted file mode 100644 index b5dfb16..0000000 --- a/tk-8.6.7-conf.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/unix/tcl.m4 b/unix/tcl.m4 -index 8a802fb..46a08c1 100644 ---- a/unix/tcl.m4 -+++ b/unix/tcl.m4 -@@ -1402,12 +1402,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} -shared ${CFLAGS} ${LDFLAGS}' -+ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -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.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 d409aa4..a40b6ae 100644 --- a/tk.spec +++ b/tk.spec @@ -3,7 +3,7 @@ Name: tk Version: 8.6.8 -Release: 2 +Release: 3 Summary: The graphical toolkit for the Tcl scripting language Epoch: 1 License: TCL @@ -15,11 +15,6 @@ BuildRequires: tcl-devel = %{epoch}:%{version} autoconf libX11-devel libXft-deve Conflicts: itcl <= 3.2 Obsoletes: tile <= 0.8.2 Provides: tile = 0.8.2 -#Acknowledge patches 0001-0004 from redhat or fedora. -Patch0001: tk-8.6.5-make.patch -Patch0002: tk-8.6.7-conf.patch -Patch0003: tk-8.6.5-fix-xft.patch -Patch0004: tk-8.6.7-no-fonts-fix.patch Patch6001: Bugfix-4966cad4d4-Now-function-NotebookPlaceSlaves-i.patch Patch6002: Fix-382712ade6-X11-event-generate-.-KeyPress-segfaul.patch @@ -119,5 +114,8 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu %{_mandir}/man3/* %changelog +* Sat Jan 11 2020 zhangrui - 1:8.6.8-3 +- del patches to be consistent with open source + * Wed Sep 18 2019 Zaiwang Li - 1:8.6.8-2 - Init package -- Gitee From bda1183663545257a9e758958fc8bd52aa1b93d5 Mon Sep 17 00:00:00 2001 From: zhanglu Date: Sat, 11 Jan 2020 19:39:54 +0800 Subject: [PATCH 2/2] del patches to be consistent with open source --- tk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tk.spec b/tk.spec index a40b6ae..a9c0d70 100644 --- a/tk.spec +++ b/tk.spec @@ -91,8 +91,8 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu %ldconfig_postun %files -%doc README changes license.terms %defattr(-,root,root,-) +%doc README changes license.terms %{_bindir}/wish* %{_datadir}/%{name}%{majorver} %exclude %{_datadir}/%{name}%{majorver}/tkAppInit.c @@ -110,8 +110,8 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu %files help %{_mandir}/man1/* -%{_mandir}/mann/* %{_mandir}/man3/* +%{_mandir}/mann/* %changelog * Sat Jan 11 2020 zhangrui - 1:8.6.8-3 -- Gitee