On Thu, Nov 02, 2023 at 08:18:48AM +0100, Rafael Sadowski wrote:
> On Wed Nov 01, 2023 at 10:31:39PM +0100, Theo Buehler wrote:
> > I ran a bulk with the full diff removing syscall from libc and kernel
> > applied. Here's what broke or threw a warning. Running nm on .o files
> > in WRKDIR didn't find any unexpected 'syscall U'.
> >
> > Non-Go ports with warnings or build failures. Some details at the end:
> >
> > net/torsocks probably BROKEN
> > print/luametatex easy fix
> > x11/qt{5,6}/qtwebengine easy fix
> >
>
> Yes easy fxies. OK?
ok tb
>
> diff --git a/x11/qt5/qtwebengine/Makefile b/x11/qt5/qtwebengine/Makefile
> index e12acdac3cf..644b03f442b 100644
> --- a/x11/qt5/qtwebengine/Makefile
> +++ b/x11/qt5/qtwebengine/Makefile
> @@ -15,7 +15,7 @@ COMMENT = Chromium-based web engine for Qt5
> # Many parts are copied from www/chromium port, so keep in sync
> DISTNAME = qtwebengine-everywhere-opensource-src-${QT5_WEBENGINE_VERSION}
> QT5NAME = QtWebEngine
> -REVISION = 7
> +REVISION = 8
>
> CATEGORIES = www
>
> diff --git a/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_libusb_src_libusb_os_threads_posix_c b/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_libusb_src_libusb_os_threads_posix_c
> new file mode 100644
> index 00000000000..06e5ab9cfe0
> --- /dev/null
> +++ b/x11/qt5/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_libusb_src_libusb_os_threads_posix_c
> @@ -0,0 +1,25 @@
> +Index: src/3rdparty/chromium/third_party/libusb/src/libusb/os/threads_posix.c
> +--- src/3rdparty/chromium/third_party/libusb/src/libusb/os/threads_posix.c.orig
> ++++ src/3rdparty/chromium/third_party/libusb/src/libusb/os/threads_posix.c
> +@@ -19,9 +19,11 @@
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +-#if defined(__linux__) || defined(__OpenBSD__)
> ++#if defined(__linux__)
> + # include <unistd.h>
> + # include <sys/syscall.h>
> ++#elif defined(__OpenBSD__)
> ++# include <unistd.h>
> + #elif defined(__APPLE__)
> + # include <mach/mach.h>
> + #elif defined(__CYGWIN__)
> +@@ -65,7 +67,7 @@ int usbi_get_tid(void)
> + #elif defined(__OpenBSD__)
> + /* The following only works with OpenBSD > 5.1 as it requires
> + real thread support. For 5.1 and earlier, -1 is returned. */
> +- ret = syscall(SYS_getthrid);
> ++ ret = getthrid();
> + #elif defined(__APPLE__)
> + ret = mach_thread_self();
> + mach_port_deallocate(mach_task_self(), ret);
> diff --git a/x11/qt6/qtwebengine/Makefile b/x11/qt6/qtwebengine/Makefile
> index bef97fa5491..8efd86a431f 100644
> --- a/x11/qt6/qtwebengine/Makefile
> +++ b/x11/qt6/qtwebengine/Makefile
> @@ -11,7 +11,7 @@ DPB_PROPERTIES += lonesome
> QT6NAME = QtWebEngine
> COMMENT = Qt chromium based web engine
> PKGSPEC = qt6-qtwebengine-${QT6_PKGSPEC}
> -REVISION = 0
> +REVISION = 1
>
> USE_WXNEEDED = Yes
> USE_NOBTCFI = Yes
> diff --git a/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_libusb_src_libusb_os_threads_posix_c b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_libusb_src_libusb_os_threads_posix_c
> new file mode 100644
> index 00000000000..06e5ab9cfe0
> --- /dev/null
> +++ b/x11/qt6/qtwebengine/patches/patch-src_3rdparty_chromium_third_party_libusb_src_libusb_os_threads_posix_c
> @@ -0,0 +1,25 @@
> +Index: src/3rdparty/chromium/third_party/libusb/src/libusb/os/threads_posix.c
> +--- src/3rdparty/chromium/third_party/libusb/src/libusb/os/threads_posix.c.orig
> ++++ src/3rdparty/chromium/third_party/libusb/src/libusb/os/threads_posix.c
> +@@ -19,9 +19,11 @@
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +-#if defined(__linux__) || defined(__OpenBSD__)
> ++#if defined(__linux__)
> + # include <unistd.h>
> + # include <sys/syscall.h>
> ++#elif defined(__OpenBSD__)
> ++# include <unistd.h>
> + #elif defined(__APPLE__)
> + # include <mach/mach.h>
> + #elif defined(__CYGWIN__)
> +@@ -65,7 +67,7 @@ int usbi_get_tid(void)
> + #elif defined(__OpenBSD__)
> + /* The following only works with OpenBSD > 5.1 as it requires
> + real thread support. For 5.1 and earlier, -1 is returned. */
> +- ret = syscall(SYS_getthrid);
> ++ ret = getthrid();
> + #elif defined(__APPLE__)
> + ret = mach_thread_self();
> + mach_port_deallocate(mach_task_self(), ret);
No comments:
Post a Comment