Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d88d6796325a5e52346e89d53255aa50c0847710)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (d88d6796325a5e52346e89d53255aa50c0847710)
  • Date: Thu, 16 Mar 2017 08:14:30 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 ++
qt5-cmake/webkitqt/BUILD | 15 ++++++++++
qt5-cmake/webkitqt/CONFIGURE | 1
qt5-cmake/webkitqt/CONFLICTS | 1
qt5-cmake/webkitqt/DEPENDS | 31 ++++++++++++++++++++++
qt5-cmake/webkitqt/DETAILS | 16 +++++++++++
qt5-cmake/webkitqt/HISTORY | 9 ++++++
qt5-cmake/webkitqt/PRE_BUILD | 7 ++++
qt5-cmake/webkitqt/PROVIDES | 1
qt5-cmake/webkitqt/icu-fixes.patch | 52
+++++++++++++++++++++++++++++++++++++
10 files changed, 136 insertions(+)

New commits:
commit d88d6796325a5e52346e89d53255aa50c0847710
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

webkitqt: tp5

diff --git a/ChangeLog b/ChangeLog
index af7d206..0d0acc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-03-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * qt5-cmake/webkitqt: added, modern webkiy for qt5
+
2017-03-11 Vlad Glagolev <stealth AT sourcemage.org>
* fonts-x11/zevv-peep: new spell, monospace bitmap programming font
aimed for FullHD displays
diff --git a/qt5-cmake/webkitqt/BUILD b/qt5-cmake/webkitqt/BUILD
new file mode 100755
index 0000000..5b8c110
--- /dev/null
+++ b/qt5-cmake/webkitqt/BUILD
@@ -0,0 +1,15 @@
+OPTS+=" -DUSE_LD_GOLD=0" &&
+CXXFLAGS+=" -fno-delete-null-pointer-checks" &&
+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+=" -DSHARED_CORE=0" #??
+OPTS+=" -DUSE_QT_MULTIMEDIA=0"
+OPTS+=" -Wno-dev"
+default_build
diff --git a/qt5-cmake/webkitqt/CONFIGURE b/qt5-cmake/webkitqt/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/qt5-cmake/webkitqt/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/qt5-cmake/webkitqt/CONFLICTS b/qt5-cmake/webkitqt/CONFLICTS
new file mode 100755
index 0000000..fb79bbc
--- /dev/null
+++ b/qt5-cmake/webkitqt/CONFLICTS
@@ -0,0 +1 @@
+conflicts qtwebkit
diff --git a/qt5-cmake/webkitqt/DEPENDS b/qt5-cmake/webkitqt/DEPENDS
new file mode 100755
index 0000000..708f22b
--- /dev/null
+++ b/qt5-cmake/webkitqt/DEPENDS
@@ -0,0 +1,31 @@
+source $GRIMOIRE/QT5_DEPENDS &&
+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 mesalib &&
+depends sqlite &&
+depends zlib &&
+optional_depends gstreamer-1.0 ' -DUSE_GSTREAMER=1' ' -DUSE_GSTREAMER=0'
'GStreamer support' &&
+optional_depends hyphen ' -DUSE_LIBHYPHEN=1' ' -DUSE_LIBHYPHEN=0'
'hyphenation support' &&
+optional_depends qtlocation ' -DENABLE_GEOLOCATION=1' '
-DENABLE_GEOLOCATION=0' '' &&
+#optional_depends qtmultimedia ' -DUSE_QT_MULTIMEDIA=1' '
-DUSE_QT_MULTIMEDIA=0' 'multimedias support' &&
+optional_depends qtsensors ' -DENABLE_DEVICE_ORIENTATION=1' '
-DENABLE_DEVICE_ORIENTATION=0' 'device orientation/motion features'
+#optional_depends DEVICE-MANAGER '' '' 'hardware detection' &&
+#optional_depends qtdeclarative '' '' 'QML support' &&
+#optional_depends qtwebchannel '' '' ''
+
+# wayland libx11
diff --git a/qt5-cmake/webkitqt/DETAILS b/qt5-cmake/webkitqt/DETAILS
new file mode 100755
index 0000000..7406565
--- /dev/null
+++ b/qt5-cmake/webkitqt/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=webkitqt
+ SPELLX=qtwebkit
+ VERSION=tp5
+
SOURCE_HASH=sha512:62d3eb97e01cff204f401b06b8aa7f0d9e1d86d62f27b07990699867f135a908a6b669ca1bbabd5ee01d5b6263404d443cdce6819a7d99345e9f4bae9f9e8045
+ 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
new file mode 100644
index 0000000..378034b
--- /dev/null
+++ b/qt5-cmake/webkitqt/HISTORY
@@ -0,0 +1,9 @@
+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
new file mode 100755
index 0000000..994e5f7
--- /dev/null
+++ b/qt5-cmake/webkitqt/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+rm -r Source/WebCore/icu &&
+rm -r Source/WTF/icu &&
+rm -r Source/JavaScriptCore/icu &&
+patch -p1 < $SPELL_DIRECTORY/icu-fixes.patch &&
+sed -i '/ASSERT(dynamic_cast/D'
Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
diff --git a/qt5-cmake/webkitqt/PROVIDES b/qt5-cmake/webkitqt/PROVIDES
new file mode 100644
index 0000000..9473416
--- /dev/null
+++ b/qt5-cmake/webkitqt/PROVIDES
@@ -0,0 +1 @@
+WEBKIT_QT
diff --git a/qt5-cmake/webkitqt/icu-fixes.patch
b/qt5-cmake/webkitqt/icu-fixes.patch
new file mode 100644
index 0000000..1d44fd4
--- /dev/null
+++ b/qt5-cmake/webkitqt/icu-fixes.patch
@@ -0,0 +1,52 @@
+From e19f24503f3804c00ad5e098c790d92da3ca8f54 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sun, 21 Aug 2016 14:37:30 +0200
+Subject: [PATCH] icu fixes
+
+---
+ 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.11.1
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d88d6796325a5e52346e89d53255aa50c0847710), Treeve Jelbert, 03/16/2017

Archive powered by MHonArc 2.6.24.

Top of Page