Skip to Content.
Sympa Menu

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

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 (abaa27bbae9e340a5baec74f10d7241d8a2715dc)
  • Date: Fri, 21 Apr 2017 19:27:50 +0000

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

devel/qxmledit/DEPENDS | 1
devel/qxmledit/DETAILS | 6 +-
devel/qxmledit/HISTORY | 4 +
libs/re2/DETAILS | 4 -
libs/re2/HISTORY | 3 +
net/fping/DETAILS | 8 +--
net/fping/HISTORY | 3 +
qt5-cmake/webkitqt/HISTORY | 3 +
qt5-cmake/webkitqt/PRE_BUILD | 2
qt5-cmake/webkitqt/icu-fixes.patch | 52
---------------------
qt5-cmake/webkitqt/patches/0001-icu-58-patch.patch | 52
+++++++++++++++++++++
qt5-cmake/webkitqt/patches/0002-icu-59-fix.patch | 25 ++++++++++
12 files changed, 101 insertions(+), 62 deletions(-)

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

webkitqt - fix for icu-59

commit 27e9b6882467d0e38336ff7143e3d3da6286d6ea
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qxmledit: => 0.9.6

commit 4901d67cbfa650c877ad8e4b0ef6d020b1b068bf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fping: => 3.16

commit b80293281c402f8cfe867f62f2dfc998008a25c1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

re2: => 2017-04-01

diff --git a/devel/qxmledit/DEPENDS b/devel/qxmledit/DEPENDS
index 4e5f215..a1b8b78 100755
--- a/devel/qxmledit/DEPENDS
+++ b/devel/qxmledit/DEPENDS
@@ -1,6 +1,7 @@
depends -sub CXX gcc &&
depends QT &&
if is_depends_enabled $SPELL qtbase;then
+ depends qtscxml &&
depends qtsvg &&
depends qtxmlpatterns
fi
diff --git a/devel/qxmledit/DETAILS b/devel/qxmledit/DETAILS
index 69d8e67..1bc370c 100755
--- a/devel/qxmledit/DETAILS
+++ b/devel/qxmledit/DETAILS
@@ -1,9 +1,9 @@
SPELL=qxmledit
- VERSION=0.9.5
-
SOURCE_HASH=sha512:d54672af9154dcae4486b72a14024f23bcec834dae9c6ec082496b532d750d2411f64ae0dfbd66da7817027e2f4cd6ed1bc7e065ceb822ef2e4d60d14a308609
+ VERSION=0.9.6
+
SOURCE_HASH=sha512:d2cf6ae630a84305b10d4a362859500b52e4d6e03e4f1852b953178ac023a13eb9e90f8da8cf6633dcf5a3cfbf5a44affb69465eb91240ccc22b0256100a685f
SOURCE=$SPELL-$VERSION-src.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://qxmledit.org
+ WEB_SITE=https://qxmledit.org
SOURCE_URL[0]=https://sourceforge.net/projects/qxmledit/files/$SOURCE
LICENSE[0]=LGPL
ENTERED=20140125
diff --git a/devel/qxmledit/HISTORY b/devel/qxmledit/HISTORY
index 854983d..627f019 100644
--- a/devel/qxmledit/HISTORY
+++ b/devel/qxmledit/HISTORY
@@ -1,3 +1,7 @@
+2017-04-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.6
+ * DEPENDS: add qtscxml
+
2017-01-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.5

diff --git a/libs/re2/DETAILS b/libs/re2/DETAILS
index 632e33b..efd21cf 100755
--- a/libs/re2/DETAILS
+++ b/libs/re2/DETAILS
@@ -1,6 +1,6 @@
SPELL=re2
- VERSION=2017-01-01
-
SOURCE_HASH=sha512:52ec99fe1bfb2754e11e3767a561208f14c3e5c03142c37b43df7cf5a406896396854a3776ae536ddf293a770d8ca80f9c761c2c476394693a5954c15550a731
+ VERSION=2017-04-01
+
SOURCE_HASH=sha512:59aa92582b2bbd44311ea92aa6bbeb5d3e8d9b115b7fb83f911b6e5680a650c2b22759d935298e1b1b3f5c44014bcc2defb22b136473ad9ed7c4ea006834a700
SOURCE=$SPELL-v$VERSION.tar.gz
SOURCE_URL=https://github.com/google/re2/archive/$VERSION.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/libs/re2/HISTORY b/libs/re2/HISTORY
index d971cda..2647e55 100644
--- a/libs/re2/HISTORY
+++ b/libs/re2/HISTORY
@@ -1,3 +1,6 @@
+2017-04-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2017-04-01
+
2017-01-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2017-01-01

diff --git a/net/fping/DETAILS b/net/fping/DETAILS
index d168d1e..ed70320 100755
--- a/net/fping/DETAILS
+++ b/net/fping/DETAILS
@@ -1,12 +1,12 @@
SPELL=fping
- VERSION=3.15
+ VERSION=3.16
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://www.fping.org/dist/$SOURCE
-
SOURCE_HASH=sha512:0483657427b8525a737e715a7c669048199affc1c95661e841790f45f4118e0355266fe27828b3778754bd791f2c8ead22d569ebae87795172e996c4fec1898a
+ SOURCE_URL[0]=https://www.fping.org/dist/$SOURCE
+
SOURCE_HASH=sha512:c97c338ef2f7fe0a904ca495503ed5d8745d449ea1821917658538db93683e37f019bc6f78abad8c7eed4ea8accba3b27f126b3af436f79bfd6f3f15d957c805
DOCS="ChangeLog doc/README.1992 $DOCS"
DOC_DIRS=""
- WEB_SITE=http://www.fping.org/
+ WEB_SITE=https://www.fping.org/
ENTERED=20020326
KEYWORDS="net"
SHORT="utility to ping multiple hosts at once"
diff --git a/net/fping/HISTORY b/net/fping/HISTORY
index cf4495e..2dd35b0 100644
--- a/net/fping/HISTORY
+++ b/net/fping/HISTORY
@@ -1,3 +1,6 @@
+2017-04-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.16
+
2017-01-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.15

diff --git a/qt5-cmake/webkitqt/HISTORY b/qt5-cmake/webkitqt/HISTORY
index 378034b..edafc1a 100644
--- a/qt5-cmake/webkitqt/HISTORY
+++ b/qt5-cmake/webkitqt/HISTORY
@@ -1,3 +1,6 @@
+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

diff --git a/qt5-cmake/webkitqt/PRE_BUILD b/qt5-cmake/webkitqt/PRE_BUILD
index 994e5f7..73aab20 100755
--- a/qt5-cmake/webkitqt/PRE_BUILD
+++ b/qt5-cmake/webkitqt/PRE_BUILD
@@ -3,5 +3,5 @@ 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 &&
+apply_patch_dir &&
sed -i '/ASSERT(dynamic_cast/D'
Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
diff --git a/qt5-cmake/webkitqt/icu-fixes.patch
b/qt5-cmake/webkitqt/icu-fixes.patch
deleted file mode 100644
index 1d44fd4..0000000
--- a/qt5-cmake/webkitqt/icu-fixes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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
-
diff --git a/qt5-cmake/webkitqt/patches/0001-icu-58-patch.patch
b/qt5-cmake/webkitqt/patches/0001-icu-58-patch.patch
new file mode 100644
index 0000000..4511b1f
--- /dev/null
+++ b/qt5-cmake/webkitqt/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/webkitqt/patches/0002-icu-59-fix.patch
b/qt5-cmake/webkitqt/patches/0002-icu-59-fix.patch
new file mode 100644
index 0000000..9a0169d
--- /dev/null
+++ b/qt5-cmake/webkitqt/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
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (abaa27bbae9e340a5baec74f10d7241d8a2715dc), Treeve Jelbert, 04/21/2017

Archive powered by MHonArc 2.6.24.

Top of Page