Skip to Content.
Sympa Menu

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

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 (abe81f0e081e1cedfdf2af836aadd7fc12873634)
  • Date: Tue, 2 Jun 2015 14:25:25 +0000

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

qt5/qtwebkit/HISTORY | 4 ++--
qt5/qtwebkit/PRE_BUILD | 3 ++-
qt5/qtwebkit/icu.patch | 17 +++++++++++++++++
3 files changed, 21 insertions(+), 3 deletions(-)

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

partially Revert "qtwebkit - remove patches"

This reverts commit bb4ef076e68b25cd0a162f4f4d6f49106ba3e361.

diff --git a/qt5/qtwebkit/HISTORY b/qt5/qtwebkit/HISTORY
index 79671c8..8f9a953 100644
--- a/qt5/qtwebkit/HISTORY
+++ b/qt5/qtwebkit/HISTORY
@@ -1,7 +1,7 @@
2015-06-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.4.2
- * PRE_BUILD: disable patches
- * *.patch: deleted
+ * qtwebkit-glibmutexlocker.patch: deleted
+ * PRE_BUILD: adjust

2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: depends -sub CXX gcc (half-automated)
diff --git a/qt5/qtwebkit/PRE_BUILD b/qt5/qtwebkit/PRE_BUILD
index b668c26..3688df6 100755
--- a/qt5/qtwebkit/PRE_BUILD
+++ b/qt5/qtwebkit/PRE_BUILD
@@ -5,4 +5,5 @@ default_pre_build &&
fi
if is_depends_enabled $SPELL python3;then
ln -s /usr/bin/python3 python
- fi
+ fi &&
+patch -p1 < $SCRIPT_DIRECTORY/icu.patch
diff --git a/qt5/qtwebkit/icu.patch b/qt5/qtwebkit/icu.patch
new file mode 100644
index 0000000..a580e81
--- /dev/null
+++ b/qt5/qtwebkit/icu.patch
@@ -0,0 +1,17 @@
+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 (abe81f0e081e1cedfdf2af836aadd7fc12873634), Treeve Jelbert, 06/02/2015

Archive powered by MHonArc 2.6.24.

Top of Page