diff --git a/sources b/sources index 199fe22..f8f451b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55b8e33f903210a4e1c8bce0f820657f tk8.5.15-src.tar.gz +63f21c3a0e0cefbd854b4eb29b129ac6 tk8.6.1-src.tar.gz diff --git a/tk-8.5.14-conf.patch b/tk-8.6.1-conf.patch similarity index 88% rename from tk-8.5.14-conf.patch rename to tk-8.6.1-conf.patch index 7ca73ed..77af588 100644 --- a/tk-8.5.14-conf.patch +++ b/tk-8.6.1-conf.patch @@ -1,8 +1,8 @@ diff --git a/unix/tcl.m4 b/unix/tcl.m4 -index 668fa2f..9d30b33 100644 +index 194cf90..c470e36 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 -@@ -1420,12 +1420,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ +@@ -1415,12 +1415,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # get rid of the warnings. #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" diff --git a/tk-8.5.14-fix-xft.patch b/tk-8.6.1-fix-xft.patch similarity index 88% rename from tk-8.5.14-fix-xft.patch rename to tk-8.6.1-fix-xft.patch index c2cb8e1..fbe6596 100644 --- a/tk-8.5.14-fix-xft.patch +++ b/tk-8.6.1-fix-xft.patch @@ -1,8 +1,8 @@ diff --git a/unix/configure.in b/unix/configure.in -index 85f0a1a..013fed0 100755 +index e7bf023..7d12f41 100755 --- a/unix/configure.in +++ b/unix/configure.in -@@ -478,8 +478,8 @@ if test $tk_aqua = no; then +@@ -485,8 +485,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 diff --git a/tk8.5-make.patch b/tk-8.6.1-make.patch similarity index 84% rename from tk8.5-make.patch rename to tk-8.6.1-make.patch index ae4e938..e9ec18f 100644 --- a/tk8.5-make.patch +++ b/tk-8.6.1-make.patch @@ -1,8 +1,8 @@ diff --git a/unix/Makefile.in b/unix/Makefile.in -index 1da2d72..6e925d8 100644 +index 3914940..a69df0e 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in -@@ -715,7 +715,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} +@@ -743,7 +743,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} fi @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ diff --git a/tk-seg_input.patch b/tk-seg_input.patch deleted file mode 100644 index 45e82f6..0000000 --- a/tk-seg_input.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/generic/tkEvent.c b/generic/tkEvent.c -index 03e7283..25bc504 100644 ---- a/generic/tkEvent.c -+++ b/generic/tkEvent.c -@@ -245,16 +245,10 @@ InvokeFocusHandlers( - } - - /* -- * MouseWheel events are not focus specific on Mac OS X. -+ * Only key-related events are directed according to the focus. - */ - --#ifdef MAC_OSX_TK --#define FOCUS_DIRECTED_EVENT_MASK (KeyPressMask|KeyReleaseMask) --#else --#define FOCUS_DIRECTED_EVENT_MASK (KeyPressMask|KeyReleaseMask|MouseWheelMask) --#endif -- -- if (mask & FOCUS_DIRECTED_EVENT_MASK) { -+ if (mask & (KeyPressMask|KeyReleaseMask)) { - (*winPtrPtr)->dispPtr->lastEventTime = eventPtr->xkey.time; - *winPtrPtr = TkFocusKeyEvent(*winPtrPtr, eventPtr); - if (*winPtrPtr == NULL) { -@@ -738,7 +732,7 @@ InvokeGenericHandlers( - int done; - - tsdPtr->handlersActive++; -- done = (*curPtr->proc)(curPtr->clientData, eventPtr); -+ done = curPtr->proc(curPtr->clientData, eventPtr); - tsdPtr->handlersActive--; - if (done) { - return done; -@@ -1346,7 +1340,7 @@ Tk_HandleEvent( - for (handlerPtr = winPtr->handlerList; handlerPtr != NULL; ) { - if ((handlerPtr->mask & mask) != 0) { - ip.nextHandler = handlerPtr->nextPtr; -- (*(handlerPtr->proc))(handlerPtr->clientData, eventPtr); -+ handlerPtr->proc(handlerPtr->clientData, eventPtr); - handlerPtr = ip.nextHandler; - } else { - handlerPtr = handlerPtr->nextPtr; -@@ -1743,7 +1737,7 @@ WindowEventProc( - return 0; - } - if (tsdPtr->restrictProc != NULL) { -- result = (*tsdPtr->restrictProc)(tsdPtr->restrictArg, &wevPtr->event); -+ result = tsdPtr->restrictProc(tsdPtr->restrictArg, &wevPtr->event); - if (result != TK_PROCESS_EVENT) { - if (result == TK_DEFER_EVENT) { - return 0; -@@ -2059,7 +2053,7 @@ TkFinalize( - - firstExitPtr = exitPtr->nextPtr; - Tcl_MutexUnlock(&exitMutex); -- (*exitPtr->proc)(exitPtr->clientData); -+ exitPtr->proc(exitPtr->clientData); - ckfree((char *) exitPtr); - Tcl_MutexLock(&exitMutex); - } -@@ -2109,7 +2103,7 @@ TkFinalizeThread( - */ - - tsdPtr->firstExitPtr = exitPtr->nextPtr; -- (*exitPtr->proc)(exitPtr->clientData); -+ exitPtr->proc(exitPtr->clientData); - ckfree((char *) exitPtr); - } - } diff --git a/tk.spec b/tk.spec index a5c7599..710d3e1 100644 --- a/tk.spec +++ b/tk.spec @@ -1,5 +1,5 @@ -%define majorver 8.5 -%define vers %{majorver}.15 +%define majorver 8.6 +%define vers %{majorver}.1 Summary: The graphical toolkit for the Tcl scripting language Name: tk @@ -21,12 +21,10 @@ BuildRequires: libXft-devel Conflicts: itcl <= 3.2 Obsoletes: tile <= 0.8.2 Provides: tile = 0.8.2 -Patch1: tk8.5-make.patch -Patch2: tk-8.5.14-conf.patch -# this patch isn't needed since tk8.6b1 -Patch3: tk-seg_input.patch +Patch1: tk-8.6.1-make.patch +Patch2: tk-8.6.1-conf.patch # fix implicit linkage of freetype that breaks xft detection (#677692) -Patch4: tk-8.5.14-fix-xft.patch +Patch3: tk-8.6.1-fix-xft.patch %description When paired with the Tcl scripting language, Tk provides a fast and powerful @@ -50,14 +48,13 @@ The package contains the development files and man pages for tk. %patch1 -p1 -b .make %patch2 -p1 -b .conf -%patch3 -p1 -b .seg -%patch4 -p1 -b .fix-xft +%patch3 -p1 -b .fix-xft %build cd unix autoconf %configure -make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver} +make %{?_smp_mflags} CFLAGS="%{optflags}" TK_LIBRARY=%{_datadir}/%{name}%{majorver} %check # do not run "make test" by default since it requires an X display @@ -69,27 +66,23 @@ make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver} %endif %install -rm -rf $RPM_BUILD_ROOT -make install -C unix INSTALL_ROOT=$RPM_BUILD_ROOT TK_LIBRARY=%{_datadir}/%{name}%{majorver} +make install -C unix INSTALL_ROOT=%{buildroot} TK_LIBRARY=%{_datadir}/%{name}%{majorver} -ln -s wish%{majorver} $RPM_BUILD_ROOT%{_bindir}/wish +ln -s wish%{majorver} %{buildroot}%{_bindir}/wish # for linking with -l%%{name} -ln -s lib%{name}%{majorver}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so +ln -s lib%{name}%{majorver}.so %{buildroot}%{_libdir}/lib%{name}.so -mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/{generic/ttk,unix} -find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';' -( cd $RPM_BUILD_ROOT/%{_includedir} +mkdir -p %{buildroot}/%{_includedir}/%{name}-private/{generic/ttk,unix} +find generic unix -name "*.h" -exec cp -p '{}' %{buildroot}/%{_includedir}/%{name}-private/'{}' ';' +( cd %{buildroot}/%{_includedir} for i in *.h ; do - [ -f $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic ; + [ -f %{buildroot}/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i %{buildroot}/%{_includedir}/%{name}-private/generic ; done ) # remove buildroot traces -sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" $RPM_BUILD_ROOT/%{_libdir}/%{name}Config.sh - -%clean -rm -rf $RPM_BUILD_ROOT +sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{buildroot}/%{_libdir}/%{name}Config.sh %pre [ ! -h %{_prefix}/%{_lib}/%{name}%{majorver} ] || rm %{_prefix}/%{_lib}/%{name}%{majorver} @@ -115,10 +108,21 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib%{name}.so %{_libdir}/lib%{name}stub%{majorver}.a %{_libdir}/%{name}Config.sh +%{_libdir}/pkgconfig/tk.pc %{_mandir}/man3/* %{_datadir}/%{name}%{majorver}/tkAppInit.c %changelog +* Thu Apr 24 2014 Jaroslav Škarvada - 1:8.6.1-1 +- New version +- Defuzzified patches + +* Wed Jan 01 2014 Jaroslav Škarvada - 1:8.6.0-1 +- New version + Resolves: rhbz#889201 +- Removed seg_input patch (upstreamed) +- Minor cleanups + * Fri Dec 6 2013 Peter Robinson 1:8.5.15-1 - Update to 8.5.15 @@ -263,10 +267,10 @@ rm -rf $RPM_BUILD_ROOT * Tue Jul 31 2007 Marcela Maslanova - 1:8.4.15-1 - Update tk8.4.15 -* Thu Feb 20 2007 Marcela Maslanova - 1:8.4.13-5 +* Tue Feb 20 2007 Marcela Maslanova - 1:8.4.13-5 - rhbz#226494 review again -* Thu Feb 14 2007 Marcela Maslanova - 1:8.4.13-4 +* Wed Feb 14 2007 Marcela Maslanova - 1:8.4.13-4 - rhbz#226494 review * Sat Feb 10 2007 David Cantrell - 1:8.4.13-3 @@ -459,7 +463,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Jan 07 2002 Florian La Roche - fix config.guess and config.sub to newer versions -* Mon Aug 29 2001 Adrian Havill +* Wed Aug 29 2001 Adrian Havill * Mon Aug 8 2001 Adrian Havill - re-enable glibc string and math inlines; recent gcc is a-ok.