sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (80a2f9203652b79ff8aed17c503e2ea605e9631c)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (80a2f9203652b79ff8aed17c503e2ea605e9631c)
- Date: Fri, 23 Mar 2018 14:35:41 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
ChangeLog | 3
qt5-cmake/qtwebkit/BUILD | 12 +
qt5-cmake/qtwebkit/CONFIGURE | 1
qt5-cmake/qtwebkit/CONFLICTS | 1
qt5-cmake/qtwebkit/DEPENDS | 31 +++
qt5-cmake/qtwebkit/DETAILS | 17 +
qt5-cmake/qtwebkit/HISTORY | 29 +++
qt5-cmake/qtwebkit/PRE_BUILD | 6
qt5-cmake/qtwebkit/PROVIDES | 1
qt5-cmake/qtwebkit/patches/0001-icu-58-patch.patch | 52 +++++
qt5-cmake/qtwebkit/patches/0002-icu-59-fix.patch | 25 ++
qt5-cmake/qtwebkit/patches/0003-more-functioanl.h-fixes.patch | 24 ++
qt5-cmake/webkitqt/BUILD | 12 -
qt5-cmake/webkitqt/CONFIGURE | 1
qt5-cmake/webkitqt/CONFLICTS | 1
qt5-cmake/webkitqt/DEPENDS | 33 ---
qt5-cmake/webkitqt/DETAILS | 16 -
qt5-cmake/webkitqt/HISTORY | 21 --
qt5-cmake/webkitqt/PRE_BUILD | 6
qt5-cmake/webkitqt/PROVIDES | 1
qt5-cmake/webkitqt/patches/0001-icu-58-patch.patch | 52 -----
qt5-cmake/webkitqt/patches/0002-icu-59-fix.patch | 25 --
qt5-cmake/webkitqt/patches/0003-more-functioanl.h-fixes.patch | 24 --
qt5-deprecated/qtwebkit/BUILD | 4
qt5-deprecated/qtwebkit/CONFLICTS | 2
qt5-deprecated/qtwebkit/DEPENDS | 24 --
qt5-deprecated/qtwebkit/DETAILS | 16 -
qt5-deprecated/qtwebkit/HISTORY | 94
----------
qt5-deprecated/qtwebkit/PRE_BUILD | 9
qt5-deprecated/qtwebkit/PROVIDES | 1
qt5-deprecated/qtwebkit/icu.patch | 17 -
31 files changed, 202 insertions(+), 359 deletions(-)
New commits:
commit 80a2f9203652b79ff8aed17c503e2ea605e9631c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
qtwebkit: => 5.212
commit f5bbece2ea5cda232957e892461d1425a6a49ef2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
rename webkitqt => qtwebkit
commit 7189bb5e6c68b388b88a91c9f5e50c1e74a5be5a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
delete unbuildable qtwebkit
diff --git a/ChangeLog b/ChangeLog
index d7b9304..1307fe9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2018-03-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * qt5-deprecated/qtwebkit: delete unbuildable spell
+
2018-03-21 Ismael Luceno <ismael AT sourcemage.org>
* audio-plugins/eq10q: new spell, LV2 Equalization Plugin
diff --git a/qt5-cmake/qtwebkit/BUILD b/qt5-cmake/qtwebkit/BUILD
new file mode 100755
index 0000000..66609fa
--- /dev/null
+++ b/qt5-cmake/qtwebkit/BUILD
@@ -0,0 +1,12 @@
+OPTS+=" -DUSE_LD_GOLD=0" &&
+CFLAGS="${CFLAGS/-ffast-math}" &&
+
+OPTS+=" -DPORT=Qt -DSHARED_CORE=1 -DUSE_SYSTEM_MALLOC=1"
+OPTS+=" -DENABLE_TEST_SUPPORT=0"
+OPTS+=" -DENABLE_API_TESTS=0"
+OPTS+=" -DENABLE_SAMPLING_PROFILER=0"
+OPTS+=" -DENABLE_TOUCH_EVENTS=0"
+OPTS+=" -DENABLE_ALLINONE_BUILD=0"
+OPTS+=" -DENABLE_GAMEPAD_DEPRECATED=0"
+OPTS+=" -Wno-dev"
+default_build
diff --git a/qt5-cmake/qtwebkit/CONFIGURE b/qt5-cmake/qtwebkit/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/qt5-cmake/qtwebkit/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/qt5-cmake/qtwebkit/CONFLICTS b/qt5-cmake/qtwebkit/CONFLICTS
new file mode 100755
index 0000000..9060123
--- /dev/null
+++ b/qt5-cmake/qtwebkit/CONFLICTS
@@ -0,0 +1 @@
+conflicts webkitqt
diff --git a/qt5-cmake/qtwebkit/DEPENDS b/qt5-cmake/qtwebkit/DEPENDS
new file mode 100755
index 0000000..c01197a
--- /dev/null
+++ b/qt5-cmake/qtwebkit/DEPENDS
@@ -0,0 +1,31 @@
+source $GRIMOIRE/QT5_DEPENDS &&
+depends qtdeclarative &&
+depends qtwebchannel &&
+depends perl &&
+depends bison &&
+depends flex &&
+depends gperf &&
+depends python &&
+depends RUBY &&
+depends JPEG &&
+#depends freetype2 &&
+depends glib2 &&
+#depends harfbuzz &&
+depends icu &&
+depends libpng &&
+depends libxml2 &&
+depends libxslt &&
+depends MESA &&
+depends sqlite &&
+depends zlib &&
+optional_depends gstreamer-1.0 ' -DUSE_GSTREAMER=1' ' -DUSE_GSTREAMER=0'
'GStreamer support' &&
+if ! is_depends_enabled $SPELL gstreamer-1.0;then
+ optional_depends qtmultimedia ' -DUSE_QT_MULTIMEDIA=1' '
-DUSE_QT_MULTIMEDIA=0' 'multimedias support'
+fi &&
+optional_depends hyphen ' -DUSE_LIBHYPHEN=1' ' -DUSE_LIBHYPHEN=0'
'hyphenation support' &&
+optional_depends libwebp '' '' 'WebP - improved compession of images'
&&
+optional_depends qtlocation ' -DENABLE_GEOLOCATION=1' '
-DENABLE_GEOLOCATION=0' '' &&
+optional_depends qtsensors ' -DENABLE_DEVICE_ORIENTATION=1' '
-DENABLE_DEVICE_ORIENTATION=0' 'device orientation/motion features'
+#optional_depends eudev '' '' 'hardware detection' &&
+
+# wayland libx11
diff --git a/qt5-cmake/qtwebkit/DETAILS b/qt5-cmake/qtwebkit/DETAILS
new file mode 100755
index 0000000..665c2de
--- /dev/null
+++ b/qt5-cmake/qtwebkit/DETAILS
@@ -0,0 +1,17 @@
+URI=http://download.qt.io/snapshots/ci/qtwebkit
+ SPELL=qtwebkit
+ SPELLX=qtwebkit-everywhere-src
+ VERSION=5.212
+VX=1516463897
+
SOURCE_HASH=sha512:b9316ca7e91336bfd4c5d208b862f1e27cf1612dabe32097f3124995f30987fb8ded157f3ea0edbf8ce13a48b565f41ba0dd3e915631737574c2ebadd1628b12
+ SOURCE=$SPELLX-$VERSION.tar.xz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ WEB_SITE=https://qt-project.org
+ SOURCE_URL=$URI/$VERSION/$VX/src/submodules/$SOURCE
+ ENTERED=20160620
+ LICENSE[0]=LGPL
+ KEYWORDS=""
+ SHORT="Modern WebKit support for qt"
+cat << EOF
+Modern WebKit support for qt5
+EOF
diff --git a/qt5-cmake/qtwebkit/HISTORY b/qt5-cmake/qtwebkit/HISTORY
new file mode 100644
index 0000000..3305bc7
--- /dev/null
+++ b/qt5-cmake/qtwebkit/HISTORY
@@ -0,0 +1,29 @@
+2018-03-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: rename spell
+ version 5.212
+ use a snapshot version which builds with multiple qt versions
+ this is now again part of the qt project, with separate numbering
+ * DEPENDS: tweaks
+ * CONFLICTS: adjust
+
+2018-02-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: use MESA
+
+2017-06-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.212.0-alpha2
+ * PRE_BUILD: remove sed usage
+ * BUILD DEPNDS: tweak
+ * patches: add one
+
+2017-04-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD, patches/*: fixes for icu-59
+
+2017-02-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version tp5
+
+2016-08-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version tp3
+
+2016-06-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.x
+ new spell, based on updated version of webkit
diff --git a/qt5-cmake/qtwebkit/PRE_BUILD b/qt5-cmake/qtwebkit/PRE_BUILD
new file mode 100755
index 0000000..127cc54
--- /dev/null
+++ b/qt5-cmake/qtwebkit/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+rm -r Source/WebCore/icu &&
+rm -r Source/WTF/icu &&
+rm -r Source/JavaScriptCore/icu &&
+apply_patch_dir
diff --git a/qt5-cmake/qtwebkit/PROVIDES b/qt5-cmake/qtwebkit/PROVIDES
new file mode 100644
index 0000000..9473416
--- /dev/null
+++ b/qt5-cmake/qtwebkit/PROVIDES
@@ -0,0 +1 @@
+WEBKIT_QT
diff --git a/qt5-cmake/qtwebkit/patches/0001-icu-58-patch.patch
b/qt5-cmake/qtwebkit/patches/0001-icu-58-patch.patch
new file mode 100644
index 0000000..4511b1f
--- /dev/null
+++ b/qt5-cmake/qtwebkit/patches/0001-icu-58-patch.patch
@@ -0,0 +1,52 @@
+From e08161eb9fdb159b5e046fd5c0c659e1f8bd940b Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Fri, 21 Apr 2017 15:42:09 +0200
+Subject: [PATCH 1/2] icu-58 patch
+
+---
+ Source/WTF/wtf/text/StringView.h | 6 +++++-
+ Source/WTF/wtf/unicode/UTF8.h | 4 ++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/Source/WTF/wtf/text/StringView.h
b/Source/WTF/wtf/text/StringView.h
+index 6dd9398..54e30da 100644
+--- a/Source/WTF/wtf/text/StringView.h
++++ b/Source/WTF/wtf/text/StringView.h
+@@ -27,6 +27,11 @@
+ #define StringView_h
+
+ #include <unicode/utypes.h>
++#include <unicode/uvernum.h>
++#if U_ICU_VERSION_MAJOR_NUM>=51
++#include <unicode/utf_old.h>
++#endif
++
+ #include <wtf/Forward.h>
+ #include <wtf/RetainPtr.h>
+ #include <wtf/Vector.h>
+@@ -34,7 +39,6 @@
+ #include <wtf/text/ConversionMode.h>
+ #include <wtf/text/LChar.h>
+ #include <wtf/text/StringCommon.h>
+-
+ // FIXME: Enabling the StringView lifetime checking causes the MSVC build
to fail. Figure out why.
+ // FIXME: Enable StringView lifetime checking once the underlying
assertions have been fixed.
+ #if defined(NDEBUG) || COMPILER(MSVC) || 1
+diff --git a/Source/WTF/wtf/unicode/UTF8.h b/Source/WTF/wtf/unicode/UTF8.h
+index 354aad7..2b5b12a 100644
+--- a/Source/WTF/wtf/unicode/UTF8.h
++++ b/Source/WTF/wtf/unicode/UTF8.h
+@@ -27,6 +27,10 @@
+ #define WTF_UTF8_h
+
+ #include <unicode/utypes.h>
++#include <unicode/uvernum.h>
++#if U_ICU_VERSION_MAJOR_NUM>=51
++#include <unicode/utf_old.h>
++#endif
+ #include <wtf/text/LChar.h>
+
+ namespace WTF {
+--
+2.12.2
+
diff --git a/qt5-cmake/qtwebkit/patches/0002-icu-59-fix.patch
b/qt5-cmake/qtwebkit/patches/0002-icu-59-fix.patch
new file mode 100644
index 0000000..9a0169d
--- /dev/null
+++ b/qt5-cmake/qtwebkit/patches/0002-icu-59-fix.patch
@@ -0,0 +1,25 @@
+From 7bdeb3377938821279843ecf70584a11fa475239 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Fri, 21 Apr 2017 20:18:20 +0200
+Subject: [PATCH 2/2] icu-59 fix
+
+---
+ Source/JavaScriptCore/API/JSStringRef.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/API/JSStringRef.h
b/Source/JavaScriptCore/API/JSStringRef.h
+index 6f45fcb..b9cb5e6 100644
+--- a/Source/JavaScriptCore/API/JSStringRef.h
++++ b/Source/JavaScriptCore/API/JSStringRef.h
+@@ -43,7 +43,7 @@ extern "C" {
+ @typedef JSChar
+ @abstract A Unicode character.
+ */
+- typedef unsigned short JSChar;
++ typedef char16_t JSChar; // icu-59
+ #else
+ typedef wchar_t JSChar;
+ #endif
+--
+2.12.2
+
diff --git a/qt5-cmake/qtwebkit/patches/0003-more-functioanl.h-fixes.patch
b/qt5-cmake/qtwebkit/patches/0003-more-functioanl.h-fixes.patch
new file mode 100644
index 0000000..266df56
--- /dev/null
+++ b/qt5-cmake/qtwebkit/patches/0003-more-functioanl.h-fixes.patch
@@ -0,0 +1,24 @@
+From 5aabcb01e7b6cf814f9076cb6f591859c97d0b2f Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Thu, 29 Jun 2017 09:01:18 +0200
+Subject: [PATCH 3/3] more functioanl.h fixes
+
+---
+ Source/WebCore/dom/SlotAssignment.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/dom/SlotAssignment.h
b/Source/WebCore/dom/SlotAssignment.h
+index 0fcd4dfa..9edd068f 100644
+--- a/Source/WebCore/dom/SlotAssignment.h
++++ b/Source/WebCore/dom/SlotAssignment.h
+@@ -33,6 +33,7 @@
+ #include <wtf/Vector.h>
+ #include <wtf/text/AtomicString.h>
+ #include <wtf/text/AtomicStringHash.h>
++#include <functional>
+
+ namespace WebCore {
+
+--
+2.13.2
+
diff --git a/qt5-cmake/webkitqt/BUILD b/qt5-cmake/webkitqt/BUILD
deleted file mode 100755
index 66609fa..0000000
--- a/qt5-cmake/webkitqt/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-OPTS+=" -DUSE_LD_GOLD=0" &&
-CFLAGS="${CFLAGS/-ffast-math}" &&
-
-OPTS+=" -DPORT=Qt -DSHARED_CORE=1 -DUSE_SYSTEM_MALLOC=1"
-OPTS+=" -DENABLE_TEST_SUPPORT=0"
-OPTS+=" -DENABLE_API_TESTS=0"
-OPTS+=" -DENABLE_SAMPLING_PROFILER=0"
-OPTS+=" -DENABLE_TOUCH_EVENTS=0"
-OPTS+=" -DENABLE_ALLINONE_BUILD=0"
-OPTS+=" -DENABLE_GAMEPAD_DEPRECATED=0"
-OPTS+=" -Wno-dev"
-default_build
diff --git a/qt5-cmake/webkitqt/CONFIGURE b/qt5-cmake/webkitqt/CONFIGURE
deleted file mode 100755
index b2f02c3..0000000
--- a/qt5-cmake/webkitqt/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/qt5-cmake/webkitqt/CONFLICTS b/qt5-cmake/webkitqt/CONFLICTS
deleted file mode 100755
index fb79bbc..0000000
--- a/qt5-cmake/webkitqt/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts qtwebkit
diff --git a/qt5-cmake/webkitqt/DEPENDS b/qt5-cmake/webkitqt/DEPENDS
deleted file mode 100755
index 90072fb..0000000
--- a/qt5-cmake/webkitqt/DEPENDS
+++ /dev/null
@@ -1,33 +0,0 @@
-source $GRIMOIRE/QT5_DEPENDS &&
-depends qtdeclarative &&
-depends qtwebchannel &&
-depends perl &&
-depends bison &&
-depends flex &&
-depends gperf &&
-depends python &&
-depends RUBY &&
-depends JPEG &&
-depends cairo &&
-depends fontconfig &&
-depends freetype2 &&
-depends glib2 &&
-depends harfbuzz &&
-depends icu &&
-depends libpng &&
-depends libwebp &&
-depends libxml2 &&
-depends libxslt &&
-depends MESA &&
-depends sqlite &&
-depends zlib &&
-optional_depends gstreamer-1.0 ' -DUSE_GSTREAMER=1' ' -DUSE_GSTREAMER=0'
'GStreamer support' &&
-if ! is_depends_enabled $SPELL gstreamer-1.0;then
- optional_depends qtmultimedia ' -DUSE_QT_MULTIMEDIA=1' '
-DUSE_QT_MULTIMEDIA=0' 'multimedias support'
-fi &&
-optional_depends hyphen ' -DUSE_LIBHYPHEN=1' ' -DUSE_LIBHYPHEN=0'
'hyphenation support' &&
-optional_depends qtlocation ' -DENABLE_GEOLOCATION=1' '
-DENABLE_GEOLOCATION=0' '' &&
-optional_depends qtsensors ' -DENABLE_DEVICE_ORIENTATION=1' '
-DENABLE_DEVICE_ORIENTATION=0' 'device orientation/motion features'
-#optional_depends DEVICE-MANAGER '' '' 'hardware detection' &&
-
-# wayland libx11
diff --git a/qt5-cmake/webkitqt/DETAILS b/qt5-cmake/webkitqt/DETAILS
deleted file mode 100755
index 9491f03..0000000
--- a/qt5-cmake/webkitqt/DETAILS
+++ /dev/null
@@ -1,16 +0,0 @@
- SPELL=webkitqt
- SPELLX=qtwebkit
- VERSION=5.212.0-alpha2
-
SOURCE_HASH=sha512:b15985aab20c5618dc1f71a0d91f02dbed993516272090a4a12990714bf4c9554ccbdcf9d6a143bf46fcc2c170f691e571114d61686fe49791f8d5c540785758
- SOURCE=$SPELLX-$VERSION.tar.xz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- WEB_SITE="https://github.com/annulen/webkit";
- SOURCE_URL=$WEB_SITE/releases/download/$SPELLX-$VERSION/$SOURCE
-# SOURCE_URL=$WEB_SITE/archive/$SPELLX-$VERSION/$SOURCE
- ENTERED=20160620
- LICENSE[0]=LGPL
- KEYWORDS=""
- SHORT="Modern WebKit support for qt"
-cat << EOF
-Modern WebKit support for qt5
-EOF
diff --git a/qt5-cmake/webkitqt/HISTORY b/qt5-cmake/webkitqt/HISTORY
deleted file mode 100644
index b0e78e6..0000000
--- a/qt5-cmake/webkitqt/HISTORY
+++ /dev/null
@@ -1,21 +0,0 @@
-2018-02-01 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: use MESA
-
-2017-06-29 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.212.0-alpha2
- * PRE_BUILD: remove sed usage
- * BUILD DEPNDS: tweak
- * patches: add one
-
-2017-04-21 Treeve Jelbert <treeve AT sourcemage.org>
- * PRE_BUILD, patches/*: fixes for icu-59
-
-2017-02-06 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version tp5
-
-2016-08-20 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version tp3
-
-2016-06-20 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.x
- new spell, based on updated version of webkit
diff --git a/qt5-cmake/webkitqt/PRE_BUILD b/qt5-cmake/webkitqt/PRE_BUILD
deleted file mode 100755
index 127cc54..0000000
--- a/qt5-cmake/webkitqt/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-rm -r Source/WebCore/icu &&
-rm -r Source/WTF/icu &&
-rm -r Source/JavaScriptCore/icu &&
-apply_patch_dir
diff --git a/qt5-cmake/webkitqt/PROVIDES b/qt5-cmake/webkitqt/PROVIDES
deleted file mode 100644
index 9473416..0000000
--- a/qt5-cmake/webkitqt/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-WEBKIT_QT
diff --git a/qt5-cmake/webkitqt/patches/0001-icu-58-patch.patch
b/qt5-cmake/webkitqt/patches/0001-icu-58-patch.patch
deleted file mode 100644
index 4511b1f..0000000
--- a/qt5-cmake/webkitqt/patches/0001-icu-58-patch.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e08161eb9fdb159b5e046fd5c0c659e1f8bd940b Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Fri, 21 Apr 2017 15:42:09 +0200
-Subject: [PATCH 1/2] icu-58 patch
-
----
- Source/WTF/wtf/text/StringView.h | 6 +++++-
- Source/WTF/wtf/unicode/UTF8.h | 4 ++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/Source/WTF/wtf/text/StringView.h
b/Source/WTF/wtf/text/StringView.h
-index 6dd9398..54e30da 100644
---- a/Source/WTF/wtf/text/StringView.h
-+++ b/Source/WTF/wtf/text/StringView.h
-@@ -27,6 +27,11 @@
- #define StringView_h
-
- #include <unicode/utypes.h>
-+#include <unicode/uvernum.h>
-+#if U_ICU_VERSION_MAJOR_NUM>=51
-+#include <unicode/utf_old.h>
-+#endif
-+
- #include <wtf/Forward.h>
- #include <wtf/RetainPtr.h>
- #include <wtf/Vector.h>
-@@ -34,7 +39,6 @@
- #include <wtf/text/ConversionMode.h>
- #include <wtf/text/LChar.h>
- #include <wtf/text/StringCommon.h>
--
- // FIXME: Enabling the StringView lifetime checking causes the MSVC build
to fail. Figure out why.
- // FIXME: Enable StringView lifetime checking once the underlying
assertions have been fixed.
- #if defined(NDEBUG) || COMPILER(MSVC) || 1
-diff --git a/Source/WTF/wtf/unicode/UTF8.h b/Source/WTF/wtf/unicode/UTF8.h
-index 354aad7..2b5b12a 100644
---- a/Source/WTF/wtf/unicode/UTF8.h
-+++ b/Source/WTF/wtf/unicode/UTF8.h
-@@ -27,6 +27,10 @@
- #define WTF_UTF8_h
-
- #include <unicode/utypes.h>
-+#include <unicode/uvernum.h>
-+#if U_ICU_VERSION_MAJOR_NUM>=51
-+#include <unicode/utf_old.h>
-+#endif
- #include <wtf/text/LChar.h>
-
- namespace WTF {
---
-2.12.2
-
diff --git a/qt5-cmake/webkitqt/patches/0002-icu-59-fix.patch
b/qt5-cmake/webkitqt/patches/0002-icu-59-fix.patch
deleted file mode 100644
index 9a0169d..0000000
--- a/qt5-cmake/webkitqt/patches/0002-icu-59-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7bdeb3377938821279843ecf70584a11fa475239 Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Fri, 21 Apr 2017 20:18:20 +0200
-Subject: [PATCH 2/2] icu-59 fix
-
----
- Source/JavaScriptCore/API/JSStringRef.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/JavaScriptCore/API/JSStringRef.h
b/Source/JavaScriptCore/API/JSStringRef.h
-index 6f45fcb..b9cb5e6 100644
---- a/Source/JavaScriptCore/API/JSStringRef.h
-+++ b/Source/JavaScriptCore/API/JSStringRef.h
-@@ -43,7 +43,7 @@ extern "C" {
- @typedef JSChar
- @abstract A Unicode character.
- */
-- typedef unsigned short JSChar;
-+ typedef char16_t JSChar; // icu-59
- #else
- typedef wchar_t JSChar;
- #endif
---
-2.12.2
-
diff --git a/qt5-cmake/webkitqt/patches/0003-more-functioanl.h-fixes.patch
b/qt5-cmake/webkitqt/patches/0003-more-functioanl.h-fixes.patch
deleted file mode 100644
index 266df56..0000000
--- a/qt5-cmake/webkitqt/patches/0003-more-functioanl.h-fixes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5aabcb01e7b6cf814f9076cb6f591859c97d0b2f Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Thu, 29 Jun 2017 09:01:18 +0200
-Subject: [PATCH 3/3] more functioanl.h fixes
-
----
- Source/WebCore/dom/SlotAssignment.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/WebCore/dom/SlotAssignment.h
b/Source/WebCore/dom/SlotAssignment.h
-index 0fcd4dfa..9edd068f 100644
---- a/Source/WebCore/dom/SlotAssignment.h
-+++ b/Source/WebCore/dom/SlotAssignment.h
-@@ -33,6 +33,7 @@
- #include <wtf/Vector.h>
- #include <wtf/text/AtomicString.h>
- #include <wtf/text/AtomicStringHash.h>
-+#include <functional>
-
- namespace WebCore {
-
---
-2.13.2
-
diff --git a/qt5-deprecated/qtwebkit/BUILD b/qt5-deprecated/qtwebkit/BUILD
deleted file mode 100755
index f412052..0000000
--- a/qt5-deprecated/qtwebkit/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-CXXFLAGS+=" -fno-delete-null-pointer-checks" &&
-CFLAGS="${CFLAGS/-ffast-math}" &&
-OPTS=CONFIG+="shared" &&
-default_build
diff --git a/qt5-deprecated/qtwebkit/CONFLICTS
b/qt5-deprecated/qtwebkit/CONFLICTS
deleted file mode 100755
index ebf43d2..0000000
--- a/qt5-deprecated/qtwebkit/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts qtwebkit y
-conflicts webkitqt
diff --git a/qt5-deprecated/qtwebkit/DEPENDS b/qt5-deprecated/qtwebkit/DEPENDS
deleted file mode 100755
index dfde2e4..0000000
--- a/qt5-deprecated/qtwebkit/DEPENDS
+++ /dev/null
@@ -1,24 +0,0 @@
-depends perl &&
-depends bison &&
-depends flex &&
-depends gperf &&
-depends PYTHON &&
-depends RUBY &&
-depends qtbase &&
-depends qtquickcontrols &&
-depends JPEG &&
-depends libpng &&
-depends libwebp &&
-depends zlib &&
-depends libxml2 &&
-depends libxslt &&
-depends icu &&
-depends sqlite &&
-depends fontconfig &&
-optional_depends DEVICE-MANAGER '' '' 'hardware detection' &&
-optional_depends qtsensors '' '' 'device orientation/motion features' &&
-optional_depends qtdeclarative '' '' 'QML support' &&
-optional_depends qtlocation '' '' 'geolocation support' &&
-optional_depends qtmultimedia '' '' 'multimedia support' &&
-optional_depends qtwebchannel '' '' 'webchannel support'
-
diff --git a/qt5-deprecated/qtwebkit/DETAILS b/qt5-deprecated/qtwebkit/DETAILS
deleted file mode 100755
index 4588353..0000000
--- a/qt5-deprecated/qtwebkit/DETAILS
+++ /dev/null
@@ -1,16 +0,0 @@
-QT_URL=https://download.qt.io/community_releases
- SPELL=qtwebkit
- SPELLX=${SPELL}-opensource-src
- VERSION=5.9.0
-
SOURCE_HASH=sha512:3a889cda4604db66ce95957ca415d68591d8e8cf1f87e4fced2c180e0ff8ed1298260b6048b79cb8f72ad2e1b47be2d58b361cd9d31256f6deee7c1600d046ea
- SOURCE=$SPELLX-$VERSION.tar.xz
- SOURCE_URL=$QT_URL/${VERSION%.?}/$VERSION-final/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- WEB_SITE=https://gitorious.org/qtwebkit
- ENTERED=20131212
- LICENSE[0]=LGPL
- KEYWORDS=""
- SHORT=""
-cat << EOF
-WebKit support for qt5
-EOF
diff --git a/qt5-deprecated/qtwebkit/HISTORY b/qt5-deprecated/qtwebkit/HISTORY
deleted file mode 100644
index d077a8e..0000000
--- a/qt5-deprecated/qtwebkit/HISTORY
+++ /dev/null
@@ -1,94 +0,0 @@
-2017-11-12 Thomas Orgis <sobukus AT sourcemage.org>
- * DEPENDS: qtquickcontrols
-
-2017-05-31 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.9.0
-
-2017-01-23 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.8.0
- * BUILD: tweak
-
-2016-12-14 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.7.1
-
-2016-06-20 Treeve Jelbert <treeve AT sourcemage.org>
- * PROVIDES: added
- * CONFLICTS: add future webkitqt
-
-2016-06-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.7.0
-
-2016-06-08 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.6.1
- this is now a community release
- * pthread.diff: delete extraneous file
-
-2016-05-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: add optional qtwebchannel, qtlocation
- * CONFLICTS: added
-
-2015-10-15 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.5.1
-
-2015-07-02 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.5.0
-
-2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.4.2
- * qtwebkit-glibmutexlocker.patch: deleted
- * PRE_BUILD: adjust
-
-2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
- * DEPENDS: depends -sub CXX gcc (half-automated)
-
-2015-04-24 Thomas Orgis <sobukus AT sourcemage.org>
- * PRE_BUILD, qtwebkit-glibmutexlocker.patch: patch for glib2's
- GMutexLocker to prevent build failure due to name clash
-
-2015-02-23 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.4.1
-
-2015-02-11 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: UDEV => DEVICE-MANAGER
-
-2015-02-04 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: add qtsensors, qtdeclarative, qtmultimedia
-
-2014-12-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: add libwebp
-
-2014-12-10 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.4.0
-
-2014-09-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.3.2
-
-2014-08-10 Treeve Jelbert <treeve AT sourcemage.org>
- * BUILD: fix
-
-2014-06-25 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.3.1
-
-2014-05-20 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.3.0
-
-2014-02-05 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.2.1 (stable)
-
-2014-01-26 Treeve Jelbert <treeve AT sourcemage.org>
- * PRE_BUILD, icu.patch: fix compile with icu-51.1
-2013-12-12 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.2.0
-
-2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.1.1
-
-2013-07-09 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.1.0
-
-2013-04-12 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.0.2
-
-2013-02-12 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.0.1
- new spell, for modular qt5
diff --git a/qt5-deprecated/qtwebkit/PRE_BUILD
b/qt5-deprecated/qtwebkit/PRE_BUILD
deleted file mode 100755
index 3688df6..0000000
--- a/qt5-deprecated/qtwebkit/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-default_pre_build &&
- cd $SOURCE_DIRECTORY &&
- if is_depends_enabled $SPELL python;then
- ln -s /usr/bin/python2 python
- fi
- if is_depends_enabled $SPELL python3;then
- ln -s /usr/bin/python3 python
- fi &&
-patch -p1 < $SCRIPT_DIRECTORY/icu.patch
diff --git a/qt5-deprecated/qtwebkit/PROVIDES
b/qt5-deprecated/qtwebkit/PROVIDES
deleted file mode 100644
index 9473416..0000000
--- a/qt5-deprecated/qtwebkit/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-WEBKIT_QT
diff --git a/qt5-deprecated/qtwebkit/icu.patch
b/qt5-deprecated/qtwebkit/icu.patch
deleted file mode 100644
index a580e81..0000000
--- a/qt5-deprecated/qtwebkit/icu.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Source/WTF/wtf/unicode/icu/UnicodeIcu.h
b/Source/WTF/wtf/unicode/icu/UnicodeIcu.h
-index 4867f65..6409a6d 100644
---- a/Source/WTF/wtf/unicode/icu/UnicodeIcu.h
-+++ b/Source/WTF/wtf/unicode/icu/UnicodeIcu.h
-@@ -31,6 +31,11 @@
- #include <unicode/ustring.h>
- #include <unicode/utf16.h>
-
-+#include <unicode/uvernum.h>
-+#if U_ICU_VERSION_MAJOR_NUM>=51
-+#include <unicode/utf_old.h>
-+#endif
-+
- namespace WTF {
-
- namespace Unicode {
-
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (80a2f9203652b79ff8aed17c503e2ea605e9631c), Treeve Jelbert, 03/23/2018
Archive powered by MHonArc 2.6.24.