From 4fa63ebd172b1dbf542ce3e364b4241368a9cf3f Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 19 Oct 2019 12:37:55 +0200 Subject: Deps: rebuilt qt5, qt5-webkit and upgraded sip The qt5 and qt5-webkit packages needed to be rebuilt against the new icu4c. The sip package was upgraded to the version which is also used in Slackware. --- deps/qt5-webkit/patches/qt5-webkit.icu65.patch | 47 ++++++++++++++ deps/qt5-webkit/qt5-webkit.SlackBuild | 9 ++- deps/qt5/patches/qt5.qtbug-77037.patch | 89 ++++++++++++++++++++++++++ deps/qt5/qt5.SlackBuild | 8 ++- deps/sip/.url | 2 +- deps/sip/sip.SlackBuild | 6 +- 6 files changed, 153 insertions(+), 8 deletions(-) create mode 100644 deps/qt5-webkit/patches/qt5-webkit.icu65.patch create mode 100644 deps/qt5/patches/qt5.qtbug-77037.patch (limited to 'deps') diff --git a/deps/qt5-webkit/patches/qt5-webkit.icu65.patch b/deps/qt5-webkit/patches/qt5-webkit.icu65.patch new file mode 100644 index 0000000..fe27d24 --- /dev/null +++ b/deps/qt5-webkit/patches/qt5-webkit.icu65.patch @@ -0,0 +1,47 @@ +# ----------------------------------------------------------------------------- +# Patch obtained from FreeBSD: +# https://svnweb.freebsd.org/ports/head/www/qt5-webkit/files/patch-Source_WebCore_dom_Document.cpp?view=co +# ----------------------------------------------------------------------------- +Regressed by https://github.com/unicode-org/icu/commit/480bec3ea652 + +In file included from Source/WebCore/dom/DOMAllInOne.cpp:67: +Source/WebCore/dom/Document.cpp:4410:39: error: expected ';' after do/while statement + U16_NEXT(characters, i, length, c) + ^ + ; +Source/WebCore/dom/Document.cpp:4415:43: error: expected ';' after do/while statement + U16_NEXT(characters, i, length, c) + ^ + ; +Source/WebCore/dom/Document.cpp:4477:46: error: expected ';' after do/while statement + U16_NEXT(qualifiedName, i, length, c) + ^ + ; + +--- Source/WebCore/dom/Document.cpp.orig 2019-06-26 16:25:02 UTC ++++ Source/WebCore/dom/Document.cpp +@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* character + unsigned i = 0; + + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNameStart(c)) + return false; + + while (i < length) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNamePart(c)) + return false; + } +@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualif + + for (unsigned i = 0; i < length;) { + UChar32 c; +- U16_NEXT(qualifiedName, i, length, c) ++ U16_NEXT(qualifiedName, i, length, c); + if (c == ':') { + if (sawColon) { + ec = NAMESPACE_ERR; + diff --git a/deps/qt5-webkit/qt5-webkit.SlackBuild b/deps/qt5-webkit/qt5-webkit.SlackBuild index d343a87..5bad338 100755 --- a/deps/qt5-webkit/qt5-webkit.SlackBuild +++ b/deps/qt5-webkit/qt5-webkit.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=qt5-webkit SRCVER=${SRCVER:-"5.212.0-alpha3"} VERSION=$(echo $SRCVER | tr - _) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-"-j$(nproc)"} @@ -82,6 +82,9 @@ echo "Extracting qtwebkit-$SRCVER.tar.xz" tar xf $CWD/qtwebkit-$SRCVER.tar.xz || exit 1 cd qtwebkit-$SRCVER || exit 1 +# Fix compilation against icu4c 65.1: +cat $CWD/patches/qt5-webkit.icu65.patch | patch -p0 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -98,8 +101,8 @@ else fi export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS -fpermissive" -export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive" +export CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing" +export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing" export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5" export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}" diff --git a/deps/qt5/patches/qt5.qtbug-77037.patch b/deps/qt5/patches/qt5.qtbug-77037.patch new file mode 100644 index 0000000..4dac59a --- /dev/null +++ b/deps/qt5/patches/qt5.qtbug-77037.patch @@ -0,0 +1,89 @@ +From 0b57f15958f07ef12c8944d6db7a33a6fe9d9c59 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Mon, 23 Sep 2019 13:49:53 +0200 +Subject: Fix building with pulseaudio 13 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The function signature changed though the ABI stayed the same. + +Change-Id: I86ca361b5e4f0c523e1031910df438c23beee876 +Fixes: QTBUG-77037 +Reviewed-by: Jüri Valdmann +--- + chromium/media/audio/pulse/pulse.sigs | 16 ++++++++-------- + chromium/media/audio/pulse/pulse_stub_header.fragment | 11 +++++++++++ + 2 files changed, 19 insertions(+), 8 deletions(-) + +diff --git a/chromium/media/audio/pulse/pulse.sigs b/chromium/media/audio/pulse/pulse.sigs +index 8b5888786a9..daaeb149c13 100644 +--- a/chromium/media/audio/pulse/pulse.sigs ++++ b/chromium/media/audio/pulse/pulse.sigs +@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_context* c, uint32_t idx, p + pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata); + pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata); + pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata); +-pa_context_state_t pa_context_get_state(pa_context* c); ++pa_context_state_t pa_context_get_state(const_pa_context_ptr c); + pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name); + pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata); + void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata); +-pa_operation_state_t pa_operation_get_state(pa_operation* o); ++pa_operation_state_t pa_operation_get_state(const_pa_operation_ptr o); + void pa_context_unref(pa_context* c); + void pa_operation_unref(pa_operation* o); + int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes); +@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_stream_success_cb_t cb, voi + int pa_stream_disconnect(pa_stream* s); + int pa_stream_drop(pa_stream *p); + pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata); +-uint32_t pa_stream_get_device_index(pa_stream* s); ++uint32_t pa_stream_get_device_index(const_pa_stream_ptr s); + int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative); +-pa_stream_state_t pa_stream_get_state(pa_stream* p); ++pa_stream_state_t pa_stream_get_state(const_pa_stream_ptr p); + pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map); + pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p); + pa_proplist* pa_proplist_new(void); +-int pa_proplist_contains(pa_proplist* p, const char* key); ++int pa_proplist_contains(const_pa_proplist_ptr p, const char* key); + void pa_proplist_free(pa_proplist* p); +-const char* pa_proplist_gets(pa_proplist* p, const char* key); ++const char* pa_proplist_gets(const_pa_proplist_ptr p, const char* key); + int pa_proplist_sets(pa_proplist* p, const char* key, const char* value); +-size_t pa_stream_readable_size(pa_stream *p); ++size_t pa_stream_readable_size(const_pa_stream_ptr p); + int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes); + void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata); + void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata); + int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek); + void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata); + void pa_stream_unref(pa_stream* s); +-int pa_context_errno(pa_context *c); ++int pa_context_errno(const_pa_context_ptr c); + const char* pa_strerror(int error); + pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v); +diff --git a/chromium/media/audio/pulse/pulse_stub_header.fragment b/chromium/media/audio/pulse/pulse_stub_header.fragment +index 2a2d3e7552b..cdaa841b29f 100644 +--- a/chromium/media/audio/pulse/pulse_stub_header.fragment ++++ b/chromium/media/audio/pulse/pulse_stub_header.fragment +@@ -5,4 +5,15 @@ extern "C" { + + #include + ++#if PA_MAJOR > 12 ++typedef const pa_context* const_pa_context_ptr; ++typedef const pa_operation* const_pa_operation_ptr; ++typedef const pa_proplist* const_pa_proplist_ptr; ++typedef const pa_stream* const_pa_stream_ptr; ++#else ++typedef pa_context* const_pa_context_ptr; ++typedef pa_operation* const_pa_operation_ptr; ++typedef pa_proplist* const_pa_proplist_ptr; ++typedef pa_stream* const_pa_stream_ptr; ++#endif + } +-- +cgit v1.2.1 + diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild index 079c1a1..88e9bfa 100755 --- a/deps/qt5/qt5.SlackBuild +++ b/deps/qt5/qt5.SlackBuild @@ -69,7 +69,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt5 VERSION=${VERSION:-5.13.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} PKGSRC=$(echo $VERSION |cut -d- -f1) PKGVER=$(echo $VERSION |tr - _) @@ -177,6 +177,12 @@ cd qtbase | patch -p1 --verbose || exit 1 cd - 1>/dev/null +# Make qtwebengine compile against pulseaudio 13, +cd qtwebengine/src/3rdparty + cat $CWD/patches/qt5.qtbug-77037.patch \ + | patch -p1 --verbose || exit 1 +cd - 1>/dev/null + if ! pkg-config --exists libpulse 2>/dev/null ; then # Forcibly disable pulseaudio in qtwebengine: cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1 diff --git a/deps/sip/.url b/deps/sip/.url index f36c949..98c6740 100644 --- a/deps/sip/.url +++ b/deps/sip/.url @@ -1,2 +1,2 @@ -https://www.riverbankcomputing.com/static/Downloads/sip/4.19.18/sip-4.19.18.tar.gz +https://www.riverbankcomputing.com/static/Downloads/sip/4.19.19/sip-4.19.19.tar.gz diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild index e52985b..af83f82 100755 --- a/deps/sip/sip.SlackBuild +++ b/deps/sip/sip.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sip -VERSION=${VERSION:-4.19.18} +VERSION=${VERSION:-4.19.19} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -82,9 +82,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ python2 configure.py \ -b "/usr/bin" \ -- cgit v1.2.3