diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-02-05 20:39:36 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-02-05 22:33:59 +0100 |
commit | dfd380d5027f9113fe1b15516757d2914d602787 (patch) | |
tree | 774be29ac9ed09770fe8f65041fb004f880c754b /source | |
parent | 201ae578a4cd9577f795e2d25dd65ec8533c51d3 (diff) | |
download | current-dfd380d5027f9113fe1b15516757d2914d602787.tar.gz current-dfd380d5027f9113fe1b15516757d2914d602787.tar.xz |
Sun Feb 5 20:39:36 UTC 202320230205203936
ap/htop-3.2.2-x86_64-1.txz: Upgraded.
l/fuse3-3.13.1-x86_64-1.txz: Upgraded.
l/pangomm-2.46.3-x86_64-1.txz: Upgraded.
l/tevent-0.14.1-x86_64-1.txz: Upgraded.
n/dnsmasq-2.89-x86_64-1.txz: Upgraded.
x/libX11-1.8.4-x86_64-1.txz: Upgraded.
x/xkeyboard-config-2.38-noarch-1.txz: Upgraded.
x/xvidtune-1.0.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rw-r--r-- | source/l/FTBFSlog | 3 | ||||
-rwxr-xr-x | source/l/pangomm/pangomm.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/qt5-webkit/qt5-webkit.SlackBuild | 5 | ||||
-rw-r--r-- | source/l/qt5-webkit/webkit-offlineasm-warnings-ruby27.patch | 46 | ||||
-rw-r--r-- | source/x/x11/build/libX11 | 2 | ||||
-rw-r--r-- | source/x/x11/build/xvidtune | 2 | ||||
-rw-r--r-- | source/x/x11/patch/libX11.patch | 1 | ||||
-rw-r--r-- | source/x/x11/patch/libX11/eb1c272ab5230d548077b9f59aca4b3457c3a8f8.patch | 205 |
8 files changed, 56 insertions, 210 deletions
diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog index b9cb22dda..d8746414c 100644 --- a/source/l/FTBFSlog +++ b/source/l/FTBFSlog @@ -1,3 +1,6 @@ +Sun Feb 5 20:29:10 UTC 2023 + qt5-webkit: Fix build with ruby-3.2.0. Thanks to nobodino and marav. ++--------------------------+ Tue Nov 1 18:49:18 UTC 2022 glibc: fix build with make-4.4. Thanks to nobodino and marav. +--------------------------+ diff --git a/source/l/pangomm/pangomm.SlackBuild b/source/l/pangomm/pangomm.SlackBuild index 957d36808..3e8ccc990 100755 --- a/source/l/pangomm/pangomm.SlackBuild +++ b/source/l/pangomm/pangomm.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pangomm VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/qt5-webkit/qt5-webkit.SlackBuild b/source/l/qt5-webkit/qt5-webkit.SlackBuild index d13457aac..be52d842f 100755 --- a/source/l/qt5-webkit/qt5-webkit.SlackBuild +++ b/source/l/qt5-webkit/qt5-webkit.SlackBuild @@ -2,7 +2,7 @@ # Copyright 2015 Heinz Wiesinger, Amsterdam, The Netherlands # Copyright 2016, 2017, 2018, 2019 Eric Hameleers, Eindhoven, NL -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2020, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -103,6 +103,9 @@ zcat $CWD/qt5-webkit.bison27.patch.gz | patch -p1 --verbose || exit 1 # Fix for glib-2.68.0: zcat $CWD/qt5-webkit.glib-2.68.0.diff.gz | patch -p1 --verbose || exit 1 +# Fix for Ruby 3.2.x: +zcat $CWD/webkit-offlineasm-warnings-ruby27.patch | patch -p1 --verbose || exit 1 + # -DU_DEFINE_FALSE_AND_TRUE=1 since recent icu4c no longer defines these otherwise. export CFLAGS="$SLKCFLAGS -DU_DEFINE_FALSE_AND_TRUE=1" diff --git a/source/l/qt5-webkit/webkit-offlineasm-warnings-ruby27.patch b/source/l/qt5-webkit/webkit-offlineasm-warnings-ruby27.patch new file mode 100644 index 000000000..d25c3b1d6 --- /dev/null +++ b/source/l/qt5-webkit/webkit-offlineasm-warnings-ruby27.patch @@ -0,0 +1,46 @@ +From c7d19a492d97f9282a546831beb918e03315f6ef Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro <aperez@igalia.com> +Date: Wed, 15 Jan 2020 22:15:38 +0000 +Subject: [PATCH] Offlineasm warnings with newer Ruby versions + https://bugs.webkit.org/show_bug.cgi?id=206233 + +Reviewed by Yusuke Suzuki. + +Avoid a warning about using Object#=~ on Annotation instances, which +has been deprecated in Ruby 2.7. + +* offlineasm/parser.rb: Swap checks to prevent applying the =~ operator +to Annotation instances, which do not define it. + + +Canonical link: https://commits.webkit.org/219400@main +git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254637 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/JavaScriptCore/ChangeLog | 13 +++++++++++++ + Source/JavaScriptCore/offlineasm/parser.rb | 6 +++--- + 2 files changed, 16 insertions(+), 3 deletions(-) + +diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb +index 791c81a9868d..f14c873e2dbd 100644 +--- a/Source/JavaScriptCore/offlineasm/parser.rb ++++ b/Source/JavaScriptCore/offlineasm/parser.rb +@@ -628,9 +628,7 @@ def parseSequence(final, comment) + firstCodeOrigin = @tokens[@idx].codeOrigin + list = [] + loop { +- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) +- break +- elsif @tokens[@idx].is_a? Annotation ++ if @tokens[@idx].is_a? Annotation + # This is the only place where we can encounter a global + # annotation, and hence need to be able to distinguish between + # them. +@@ -644,6 +642,8 @@ def parseSequence(final, comment) + list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string) + @annotation = nil + @idx += 2 # Consume the newline as well. ++ elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) ++ break + elsif @tokens[@idx] == "\n" + # ignore + @idx += 1 diff --git a/source/x/x11/build/libX11 b/source/x/x11/build/libX11 index 0cfbf0888..d00491fd7 100644 --- a/source/x/x11/build/libX11 +++ b/source/x/x11/build/libX11 @@ -1 +1 @@ -2 +1 diff --git a/source/x/x11/build/xvidtune b/source/x/x11/build/xvidtune index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/xvidtune +++ b/source/x/x11/build/xvidtune @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/patch/libX11.patch b/source/x/x11/patch/libX11.patch deleted file mode 100644 index 4ba7a9dda..000000000 --- a/source/x/x11/patch/libX11.patch +++ /dev/null @@ -1 +0,0 @@ -zcat $CWD/patch/libX11/eb1c272ab5230d548077b9f59aca4b3457c3a8f8.patch.gz | patch -p1 --backup --suffix=.orig || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/libX11/eb1c272ab5230d548077b9f59aca4b3457c3a8f8.patch b/source/x/x11/patch/libX11/eb1c272ab5230d548077b9f59aca4b3457c3a8f8.patch deleted file mode 100644 index badc4e5eb..000000000 --- a/source/x/x11/patch/libX11/eb1c272ab5230d548077b9f59aca4b3457c3a8f8.patch +++ /dev/null @@ -1,205 +0,0 @@ -From eb1c272ab5230d548077b9f59aca4b3457c3a8f8 Mon Sep 17 00:00:00 2001 -From: GaryOderNichts <garyodernichts@gmail.com> -Date: Sat, 17 Dec 2022 16:28:40 +0100 -Subject: [PATCH] Fix a9e845 and 797755 Allow X*IfEvent() to reenter libX11 - ---- - include/X11/Xlibint.h | 9 +++++- - src/ChkIfEv.c | 5 +++- - src/IfEvent.c | 5 +++- - src/PeekIfEv.c | 5 +++- - src/locking.c | 65 +++++++++---------------------------------- - 5 files changed, 33 insertions(+), 56 deletions(-) - -diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h -index e20c4833..50099b43 100644 ---- a/include/X11/Xlibint.h -+++ b/include/X11/Xlibint.h -@@ -43,6 +43,10 @@ from The Open Group. - #include <X11/Xproto.h> /* to declare xEvent */ - #include <X11/XlibConf.h> /* for configured options like XTHREADS */ - -+#ifdef XTHREADS -+#include <X11/Xthreads.h> -+#endif -+ - /* The Xlib structs are full of implicit padding to properly align members. - We can't clean that up without breaking ABI, so tell clang not to bother - complaining about it. */ -@@ -207,7 +211,10 @@ struct _XDisplay - - XIOErrorExitHandler exit_handler; - void *exit_handler_data; -- CARD32 in_ifevent; -+ CARD32 in_ifevent; -+#ifdef XTHREADS -+ xthread_t ifevent_thread; -+#endif - }; - - #define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n) -diff --git a/src/ChkIfEv.c b/src/ChkIfEv.c -index b32c2d3e..66636696 100644 ---- a/src/ChkIfEv.c -+++ b/src/ChkIfEv.c -@@ -49,8 +49,11 @@ Bool XCheckIfEvent ( - unsigned long qe_serial = 0; - int n; /* time through count */ - -- dpy->in_ifevent++; - LockDisplay(dpy); -+#ifdef XTHREADS -+ dpy->ifevent_thread = xthread_self(); -+#endif -+ dpy->in_ifevent++; - prev = NULL; - for (n = 3; --n >= 0;) { - for (qelt = prev ? prev->next : dpy->head; -diff --git a/src/IfEvent.c b/src/IfEvent.c -index 54c37f00..35c592e3 100644 ---- a/src/IfEvent.c -+++ b/src/IfEvent.c -@@ -48,8 +48,11 @@ XIfEvent ( - register _XQEvent *qelt, *prev; - unsigned long qe_serial = 0; - -- dpy->in_ifevent++; - LockDisplay(dpy); -+#ifdef XTHREADS -+ dpy->ifevent_thread = xthread_self(); -+#endif -+ dpy->in_ifevent++; - prev = NULL; - while (1) { - for (qelt = prev ? prev->next : dpy->head; -diff --git a/src/PeekIfEv.c b/src/PeekIfEv.c -index 68c028b7..754749a7 100644 ---- a/src/PeekIfEv.c -+++ b/src/PeekIfEv.c -@@ -49,8 +49,11 @@ XPeekIfEvent ( - register _XQEvent *prev, *qelt; - unsigned long qe_serial = 0; - -- dpy->in_ifevent++; - LockDisplay(dpy); -+#ifdef XTHREADS -+ dpy->ifevent_thread = xthread_self(); -+#endif -+ dpy->in_ifevent++; - prev = NULL; - while (1) { - for (qelt = prev ? prev->next : dpy->head; -diff --git a/src/locking.c b/src/locking.c -index c550603e..3625bd27 100644 ---- a/src/locking.c -+++ b/src/locking.c -@@ -240,7 +240,9 @@ static void _XUnlockDisplay( - if (lock_hist_loc >= LOCK_HIST_SIZE) - lock_hist_loc = 0; - #endif /* XTHREADS_WARN */ -- xmutex_unlock(dpy->lock->mutex); -+ -+ if (dpy->in_ifevent == 0 || !xthread_equal(dpy->ifevent_thread, xthread_self())) -+ xmutex_unlock(dpy->lock->mutex); - } - - -@@ -453,63 +455,24 @@ static void _XDisplayLockWait( - } - - static void _XLockDisplay( -- Display *dpy -- XTHREADS_FILE_LINE_ARGS -- ); -- --static void _XIfEventLockDisplay( - Display *dpy - XTHREADS_FILE_LINE_ARGS - ) - { -- /* assert(dpy->in_ifevent); */ --} -+ struct _XErrorThreadInfo *ti; - --static void _XInternalLockDisplay( -- Display *dpy, -- Bool wskip -- XTHREADS_FILE_LINE_ARGS -- ); -+ if (dpy->in_ifevent && xthread_equal(dpy->ifevent_thread, xthread_self())) -+ return; - --static void _XIfEventInternalLockDisplay( -- Display *dpy, -- Bool wskip -- XTHREADS_FILE_LINE_ARGS -- ) --{ -- /* assert(dpy->in_ifevent); */ --} -- --static void _XIfEventUnlockDisplay( -- Display *dpy -- XTHREADS_FILE_LINE_ARGS -- ) --{ -- if (dpy->in_ifevent == 0) { -- dpy->lock_fns->lock_display = _XLockDisplay; -- dpy->lock_fns->unlock_display = _XUnlockDisplay; -- dpy->lock->internal_lock_display = _XInternalLockDisplay; -- UnlockDisplay(dpy); -- } else -- return; --} -- --static void _XLockDisplay( -- Display *dpy -- XTHREADS_FILE_LINE_ARGS -- ) --{ --#ifdef XTHREADS -- struct _XErrorThreadInfo *ti; --#endif - #ifdef XTHREADS_WARN - _XLockDisplayWarn(dpy, file, line); - #else - xmutex_lock(dpy->lock->mutex); - #endif -+ - if (dpy->lock->locking_level > 0) -- _XDisplayLockWait(dpy); --#ifdef XTHREADS -+ _XDisplayLockWait(dpy); -+ - /* - * Skip the two function calls below which may generate requests - * when LockDisplay is called from within _XError. -@@ -517,14 +480,9 @@ static void _XLockDisplay( - for (ti = dpy->error_threads; ti; ti = ti->next) - if (ti->error_thread == xthread_self()) - return; --#endif -+ - _XIDHandler(dpy); - _XSeqSyncFunction(dpy); -- if (dpy->in_ifevent) { -- dpy->lock_fns->lock_display = _XIfEventLockDisplay; -- dpy->lock_fns->unlock_display = _XIfEventUnlockDisplay; -- dpy->lock->internal_lock_display = _XIfEventInternalLockDisplay; -- } - } - - /* -@@ -537,6 +495,9 @@ static void _XInternalLockDisplay( - XTHREADS_FILE_LINE_ARGS - ) - { -+ if (dpy->in_ifevent && xthread_equal(dpy->ifevent_thread, xthread_self())) -+ return; -+ - #ifdef XTHREADS_WARN - _XLockDisplayWarn(dpy, file, line); - #else --- -GitLab - |