diff --git a/x11-libs/scintilla/patches/scintilla-4.1.0.patchset b/x11-libs/scintilla/patches/scintilla-4.1.0.patchset deleted file mode 100644 index 283016801..000000000 --- a/x11-libs/scintilla/patches/scintilla-4.1.0.patchset +++ /dev/null @@ -1,23 +0,0 @@ -From 0a8aea4cac2953deecdcdfadfab82c2e54dc38cb Mon Sep 17 00:00:00 2001 -From: Kacper Kasper -Date: Wed, 18 Jul 2018 17:07:19 +0200 -Subject: Remove wrong check - -* On 32-bit Haiku ptrdiff_t is long, not int. This causes - undefined symbol errors when loading the shared object. - -diff --git a/src/RunStyles.cxx b/src/RunStyles.cxx -index 44d6942..06b3852 100644 ---- a/src/RunStyles.cxx -+++ b/src/RunStyles.cxx -@@ -309,7 +309,5 @@ void RunStyles::Check() const { - - template class Scintilla::RunStyles; - template class Scintilla::RunStyles; --#if PTRDIFF_MAX != INT_MAX - template class Scintilla::RunStyles; - template class Scintilla::RunStyles; --#endif --- -2.16.4 - diff --git a/x11-libs/scintilla/scintilla-4.1.0.recipe b/x11-libs/scintilla/scintilla-4.1.1.recipe similarity index 84% rename from x11-libs/scintilla/scintilla-4.1.0.recipe rename to x11-libs/scintilla/scintilla-4.1.1.recipe index de9fe3f91..e79cd18a5 100644 --- a/x11-libs/scintilla/scintilla-4.1.0.recipe +++ b/x11-libs/scintilla/scintilla-4.1.1.recipe @@ -13,13 +13,12 @@ colours and multiple fonts." HOMEPAGE="https://scintilla.org" COPYRIGHT="1998-2018 Neil Hodgson" LICENSE="Scintilla" -REVISION="3" -SOURCE_URI="https://prdownloads.sf.net/scintilla/scintilla410.tgz" -CHECKSUM_SHA256="3b070bd73f612ee91b3251036257c2bfd0c0cd32821e00874faec44d90d9c594" +REVISION="1" +SOURCE_URI="https://scintilla.org/scintilla411.tgz" +CHECKSUM_SHA256="8484ab7ca37a130e6811ffcdaf3f86c7971435fc2a1fa6bcafab6ee46a311980" SOURCE_DIR="scintilla" -SOURCE_URI_2="https://prdownloads.sf.net/scintilla/scintillahaiku410.tgz" -CHECKSUM_SHA256_2="822bdf86af3ac72ee2d88a96412bb0c43b709c52472c354bf36d87eb32165db6" -PATCHES="scintilla-4.1.0.patchset" +SOURCE_URI_2="https://downloads.sf.net/scintilla/scintillahaiku411.tgz" +CHECKSUM_SHA256_2="ed8ee746c2613ceb296e8d42c707086d7bfb8cc8ca7588c66349ad109e07cee6" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86"