From c1f3d78fc4febe2577c17ac793126b6ff8d92d1f Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sat, 14 Nov 2020 22:50:09 +1100 Subject: [PATCH 1/4] nodejs: 15.1.0 -> 15.2.0 --- nodejs/.signature | 6 +++--- nodejs/Pkgfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nodejs/.signature b/nodejs/.signature index 27446a846..3b24a05b1 100644 --- a/nodejs/.signature +++ b/nodejs/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aYoICENsKhhEJUwpEmVOwzDm8KLRh3jNhLHHlMxowzQBC25j4Do5rz01Fieu4U9lKGGcGlCPvU3FnLRAwL0+wM= -SHA256 (Pkgfile) = 621255ef1e189576fa6d8ee61a8daef0653ddcc5eb2a1944bd945e62802a258c +RWSE3ohX2g5d/ZBppogPA9f6I6Khq4kxSBLOKzqEEagD2bCY35Bk2eSLbOpi4nX/SlNZwj69vZfAnbyva6Fv1hyDJZ7vwVKWHQE= +SHA256 (Pkgfile) = 010f3087954bab8bc2ce4ac44242e72213a7bb1190fbd22d5c7b4923378d859a SHA256 (.footprint) = 104b2e4652f42b4516d11f60b9a571e99c7e690b4a9e3a7c4e3b2d289a2d5973 -SHA256 (node-v15.1.0.tar.xz) = 7353d73f06f263b2c90f77a0a189e3ffeb9ea6c0277800e419e9566acd64a0b9 +SHA256 (node-v15.2.0.tar.xz) = f67a017a753cf6336f47307610f1954e275799883046c6f7ab8638a993e05308 diff --git a/nodejs/Pkgfile b/nodejs/Pkgfile index a5b6a3ef4..8c8320d50 100644 --- a/nodejs/Pkgfile +++ b/nodejs/Pkgfile @@ -7,7 +7,7 @@ # c-ares wait until a newer release than 1.16.1 name=nodejs -version=15.1.0 +version=15.2.0 release=1 source=(https://nodejs.org/dist/v$version/node-v$version.tar.xz) From 80def6f0a0a2f819899b044bed0fb0ade3f379bb Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 15 Nov 2020 00:44:55 +1100 Subject: [PATCH 2/4] qtwebkit: icu 68 fix --- qtwebkit/.signature | 7 +- qtwebkit/Pkgfile | 20 +-- .../qtwebkit-5.212.0_pre20200309-icu-68.patch | 120 ++++++++++++++++++ 3 files changed, 136 insertions(+), 11 deletions(-) create mode 100644 qtwebkit/qtwebkit-5.212.0_pre20200309-icu-68.patch diff --git a/qtwebkit/.signature b/qtwebkit/.signature index a3d8af663..6f7da4375 100644 --- a/qtwebkit/.signature +++ b/qtwebkit/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/eYsR8JAbmdV6MuRAV3ETqqohfT6KqRaVDUWdgLaPsjcqnloe46O5xg6ciYdaHDaFI9kBGnzGsS5+AcFaFa1sgM= -SHA256 (Pkgfile) = a74f3d676d846c2e2cff19594a2d5b0da84d32072bc848cd6d9671c9afe45aa6 +RWSE3ohX2g5d/fiLIH+Mex+q+e4Qt9DfW5vYJkyauVh8uHamwBWDxOEzlvGe+fcv2eJegPrCM+BP6fejvBcsmdCz9lfcO7oWWww= +SHA256 (Pkgfile) = 55114ec2f6c683b8c2a6b885bb94dd2eef43e25974848680d5e2524029f7a44b SHA256 (.footprint) = 839d04c7250b0262d6f81ad2c5ec4182e696bdb0a7c70c298afe2b0614269bc1 -SHA256 (qtwebkit-opensource-src-5.212.tar.xz) = 9a6ed083154c7ec850081102b299afa928ca7e48bbdf2b5f3ae152425e46eb17 +SHA256 (qtwebkit-opensource-src-5.212.tar.xz) = 10cbdaba60aac79d27016aa05bae9ab3ec7b0aed4df163debfbf8fddd66adc14 +SHA256 (qtwebkit-5.212.0_pre20200309-icu-68.patch) = 146829ab233c73e8c5e080babca12f9bfb193621fd3452da57721a0af447214a diff --git a/qtwebkit/Pkgfile b/qtwebkit/Pkgfile index c411898b5..791cc265a 100644 --- a/qtwebkit/Pkgfile +++ b/qtwebkit/Pkgfile @@ -1,20 +1,24 @@ # Description: QtWebKit for qt5. # URL: https://www.qt.io/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: hyphen icu qt5 ruby libxslt +# Depends on: hyphen icu qt5 ruby name=qtwebkit version=5.212 release=1 -source=(https://download.qt.io/snapshots/ci/qtwebkit/$version/latest/src/submodules/$name-opensource-src-$version.tar.xz) +source=(https://download.qt.io/snapshots/ci/qtwebkit/$version/latest/src/submodules/$name-opensource-src-$version.tar.xz + qtwebkit-5.212.0_pre20200309-icu-68.patch) build() { - cmake -S$name-opensource-src-$version -Bbuild -GNinja \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \ - -DCMAKE_BUILD_TYPE=Release \ - -DPORT=Qt \ - -DENABLE_TOOLS=OFF + [ $(pkginfo -i | awk '/^icu / {split($2,a,"."); print a[1]}') -ge 68 ] && \ + patch -d $name-opensource-src-$version -p1 -i $SRC/qtwebkit-5.212.0_pre20200309-icu-68.patch + + cmake -S $name-opensource-src-$version -B build -G Ninja \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_CXX_FLAGS="$CXXFLAGS -DNDEBUG" \ + -D PORT=Qt \ + -D ENABLE_TOOLS=OFF cmake --build build DESTDIR=$PKG cmake --install build diff --git a/qtwebkit/qtwebkit-5.212.0_pre20200309-icu-68.patch b/qtwebkit/qtwebkit-5.212.0_pre20200309-icu-68.patch new file mode 100644 index 000000000..7de72ea61 --- /dev/null +++ b/qtwebkit/qtwebkit-5.212.0_pre20200309-icu-68.patch @@ -0,0 +1,120 @@ +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) From e307b6c05d7c202af5757c1212f92449995e3c67 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 15 Nov 2020 01:25:32 +1100 Subject: [PATCH 3/4] webkitgtk: icu 68 fix --- webkitgtk/.signature | 7 +- webkitgtk/Pkgfile | 6 +- webkitgtk/bug-218522.patch | 131 +++++++++++++++++++++++++++++++++++++ 3 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 webkitgtk/bug-218522.patch diff --git a/webkitgtk/.signature b/webkitgtk/.signature index 0374e94b0..7995d3755 100644 --- a/webkitgtk/.signature +++ b/webkitgtk/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZwkOlc/5KcsxlBA4Nb2Ukpvcg6B5gQugXXSwbyvZ1BqlYJOcK1RgWAR0iFNXVdrrzcBIG3TybF7yAeore10Ugc= -SHA256 (Pkgfile) = 709ae3935e8714017bd937fb2de6204faacc16ede4a3cd1f6193bc0d86b05565 -SHA256 (.footprint) = e8689fde7df02e6c84c61abaa82f57f6b94fb30ae4901c7cf74087f81170d77a +RWSE3ohX2g5d/TW29AO77TGejGu+SVjgcVoyqmytkJffrx9wmThZmQBsezlXW2UbbLjEF6wu/oX/GyhBFO93N/tKSaTOog1G0gA= +SHA256 (Pkgfile) = 459a6675d0f73bb0f530deef8775b954edeba0f3557a61e2ec8dbd193e1f5db4 +SHA256 (.footprint) = 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b SHA256 (webkitgtk-2.30.2.tar.xz) = c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a +SHA256 (bug-218522.patch) = 904dfc225355b1463b25b772a53e7e247acc94bcadc38b7d1d029323b9674ffa diff --git a/webkitgtk/Pkgfile b/webkitgtk/Pkgfile index 39076b828..0dcb48d9e 100644 --- a/webkitgtk/Pkgfile +++ b/webkitgtk/Pkgfile @@ -7,9 +7,13 @@ name=webkitgtk version=2.30.2 release=1 -source=(https://webkitgtk.org/releases/$name-$version.tar.xz) +source=(https://webkitgtk.org/releases/$name-$version.tar.xz + bug-218522.patch) build() { + [ $(pkginfo -i | awk '/^icu / {split($2,a,"."); print a[1]}') -ge 68 ] && \ + patch -d $name-$version -p1 -i $SRC/bug-218522.patch + # Make sure we do not have ccache masquerade directory in PATH. [ -e '/usr/bin/ccache' ] && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" diff --git a/webkitgtk/bug-218522.patch b/webkitgtk/bug-218522.patch new file mode 100644 index 000000000..87d719489 --- /dev/null +++ b/webkitgtk/bug-218522.patch @@ -0,0 +1,131 @@ +--- a/Source/WTF/wtf/text/icu/UTextProvider.h ++++ a/Source/WTF/wtf/text/icu/UTextProvider.h +@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +--- a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp ++++ a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text) + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp ++++ a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp +@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text) + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ a/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -194,7 +194,7 @@ void TextCodecICU::createICUConverter() const + UErrorCode error = U_ZERO_ERROR; + m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close }; + if (m_converter) +- ucnv_setFallback(m_converter.get(), TRUE); ++ ucnv_setFallback(m_converter.get(), true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error) +--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp ++++ a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp +@@ -402,7 +402,7 @@ DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::~DrawingMonitor() + int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor) + { + monitor->didDraw(); +- return FALSE; ++ return false; + } + + void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function&& callback) From 5c321909f0b546a5119e9efe348ed9407061068b Mon Sep 17 00:00:00 2001 From: Juergen Daubert Date: Sat, 14 Nov 2020 19:19:57 +0100 Subject: [PATCH 4/4] imagemagick: update to 7.0.10-38 --- imagemagick/.signature | 6 +++--- imagemagick/Pkgfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/imagemagick/.signature b/imagemagick/.signature index 57b61b91b..48108d1b8 100644 --- a/imagemagick/.signature +++ b/imagemagick/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UZF/5Rna9gEjTuievli2+K/2ctlobHYUUUzUOKGtxI6W3OY9XhiPScQXrTHXdGkssxkkue9M+MiwESD/Jerdw0= -SHA256 (Pkgfile) = 934c56edae0af561c5fdafbd2d33a3934957ed3dec659b0024ffc9e31cd8f773 +RWSE3ohX2g5d/WwuyeI9FRyk8X9i4LsmSvPOkVe13ClAI4UG7gZl+LmKukolUqdHgp7skeMgTZv18ROgCDmzfg5sTjUDmQjDZAI= +SHA256 (Pkgfile) = a73315bf6a02b5fad87237ab44b35d34cc9f4eb54de47f244658c6ad2f6c118c SHA256 (.footprint) = 5b9ac7f84cb50a53789dd64fee5b8d259a37c24f61c7c6b9c3abd77421c43694 -SHA256 (ImageMagick-7.0.10-37.tar.xz) = 9c2d5fd11fc4752986f70996a0975c3c39124500ab53330b09f5921441286d2b +SHA256 (ImageMagick-7.0.10-38.tar.xz) = cdea05de4b9561d2c139cb5cb2701cc1f36c20daefa13e0080746b4f5071eb62 diff --git a/imagemagick/Pkgfile b/imagemagick/Pkgfile index ed3aae7e2..cd7dae4f3 100644 --- a/imagemagick/Pkgfile +++ b/imagemagick/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libtool lcms2 pango xorg-libxt chrpath name=imagemagick -version=7.0.10-37 +version=7.0.10-38 release=1 source=(https://www.imagemagick.org/download/releases/ImageMagick-$version.tar.xz)