Skip to Content.
Sympa Menu

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

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 (b5da8c32e4bf24beb934d8ad427e5575ac886145)
  • Date: Thu, 17 Nov 2022 07:50:50 +0000

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

kde5-apps/tellico/DETAILS | 4 ++--
kde5-apps/tellico/HISTORY | 3 +++
libs/libnumbertext/DETAILS | 4 ++--
libs/libnumbertext/HISTORY | 3 +++
qt6/qt6webengine/HISTORY | 3 +++
qt6/qt6webengine/PRE_BUILD | 5 ++++-
qt6/qt6webengine/chrome-patches/grit.patch | 23 +++++++++++++++++++++++
7 files changed, 40 insertions(+), 5 deletions(-)

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

qt6webengine - fix build

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

libnumbertext: => 1.0.11

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

tellico: => 3.4.5

diff --git a/kde5-apps/tellico/DETAILS b/kde5-apps/tellico/DETAILS
index cdebc23..69c026c 100755
--- a/kde5-apps/tellico/DETAILS
+++ b/kde5-apps/tellico/DETAILS
@@ -1,6 +1,6 @@
SPELL=tellico
- VERSION=3.4.4
-
SOURCE_HASH=sha512:6c9f16217ce5ff2d944d3eea3a5f5641b9717cd7d85835fd8b9559e90f6e920046085e8c9e14734d2ffa0a96ee6b8b241e0ccf1739aa2469af7e1bb88667f1d4
+ VERSION=3.4.5
+
SOURCE_HASH=sha512:1b8d52da856a3860147dd0c8c69ea99339f99b411555b87ff328f2519385072c544fe97f680363d6bb2cad5056313c4ad07d1c5e0b6021a092dbe93c233709c4
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://tellico-project.org
diff --git a/kde5-apps/tellico/HISTORY b/kde5-apps/tellico/HISTORY
index 390414f..8dd5907 100644
--- a/kde5-apps/tellico/HISTORY
+++ b/kde5-apps/tellico/HISTORY
@@ -1,3 +1,6 @@
+2022-11-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.4.5
+
2022-02-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.4.4

diff --git a/libs/libnumbertext/DETAILS b/libs/libnumbertext/DETAILS
index e9d2a21..529b6c5 100755
--- a/libs/libnumbertext/DETAILS
+++ b/libs/libnumbertext/DETAILS
@@ -1,8 +1,8 @@
SPELL=libnumbertext
- VERSION=1.0.9
+ VERSION=1.0.11
SOURCE="$SPELL-$VERSION.tar.xz"

SOURCE_URL[0]=https://github.com/Numbertext/$SPELL/releases/download/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:17d0c756027d2e23ee8bbba3d437a78a1539071e32240ccf1129f981c60031c3893d3f51c058326db8a3009653c07767e61de0bcc045676ed90af30d1764ef4d
+
SOURCE_HASH=sha512:0c4d2b98d8cef46a2c51c4265f96ac2af6e58d3b8e63e7b6a40134e86d1dc7bec38e048abf227d1ebad7774ba8a6d68a1fac464739914b2d14786c309819c836
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="https://numbertext.github.io/";
LICENSE[0]="BSD-3-Clause"
diff --git a/libs/libnumbertext/HISTORY b/libs/libnumbertext/HISTORY
index b334c6a..d64b468 100644
--- a/libs/libnumbertext/HISTORY
+++ b/libs/libnumbertext/HISTORY
@@ -1,3 +1,6 @@
+2022-11-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.11
+
2022-04-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.9

diff --git a/qt6/qt6webengine/HISTORY b/qt6/qt6webengine/HISTORY
index 3dbb0f7..4b028c2 100644
--- a/qt6/qt6webengine/HISTORY
+++ b/qt6/qt6webengine/HISTORY
@@ -1,3 +1,6 @@
+2022-11-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD chrome-patches: fix build with python-3.11 - upstream
patch
+
2022-11-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 6.4.1

diff --git a/qt6/qt6webengine/PRE_BUILD b/qt6/qt6webengine/PRE_BUILD
index 4604ffc..66e8d84 100755
--- a/qt6/qt6webengine/PRE_BUILD
+++ b/qt6/qt6webengine/PRE_BUILD
@@ -1,3 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches
+apply_patch_dir patches &&
+cd src/3rdparty &&
+apply_patch_dir chrome-patches &&
+cd $SOURCE_DIRECTORY
diff --git a/qt6/qt6webengine/chrome-patches/grit.patch
b/qt6/qt6webengine/chrome-patches/grit.patch
new file mode 100644
index 0000000..5ac50b3
--- /dev/null
+++ b/qt6/qt6webengine/chrome-patches/grit.patch
@@ -0,0 +1,23 @@
+--- a/chromium/tools/grit/grit/util.py
++++ b/chromium/tools/grit/grit/util.py
+@@ -209,7 +209,7 @@ def ReadFile(filename, encoding):
+ mode = 'rb'
+ encoding = None
+ else:
+- mode = 'rU'
++ mode = 'r'
+
+ with io.open(filename, mode, encoding=encoding) as f:
+ return f.read()
+--- a/chromium/PRESUBMIT_test_mocks.py
++++ b/chromium/PRESUBMIT_test_mocks.py
+@@ -129,7 +129,7 @@ class MockInputApi(object):
+ def PresubmitLocalPath(self):
+ return self.presubmit_local_path
+
+- def ReadFile(self, filename, mode='rU'):
++ def ReadFile(self, filename, mode='r'):
+ if hasattr(filename, 'AbsoluteLocalPath'):
+ filename = filename.AbsoluteLocalPath()
+ for file_ in self.files:
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (b5da8c32e4bf24beb934d8ad427e5575ac886145), Treeve Jelbert, 11/17/2022

Archive powered by MHonArc 2.6.24.

Top of Page