Skip to Content.
Sympa Menu

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

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 (dfae90cac980996958b54762169099a345a51a65)
  • Date: Mon, 15 May 2023 11:16:55 +0000

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

doc/cmark/DETAILS | 4 +-
doc/cmark/HISTORY | 3 +
doc/discount/DETAILS | 4 +-
doc/discount/HISTORY | 3 +
kde-gear/neochat/DEPENDS | 21 +++++++++++--
kde-gear/neochat/HISTORY | 3 +
qt5-cmake/qcoro/DETAILS | 4 +-
qt5-cmake/qcoro/HISTORY | 3 +
qt6/qt6svg/DETAILS | 4 +-
qt6/qt6svg/HISTORY | 4 ++
qt6/qt6svg/PRE_BUILD | 3 +
qt6/qt6svg/patches/CVE-2023-32573-qtsvg-6.5.diff | 36
+++++++++++++++++++++++
12 files changed, 81 insertions(+), 11 deletions(-)

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

qt6svg - SECUTIRY FIX

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

discount: => 2.2.7b

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

cmark: => 0.30.3

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

neochat- qt6 support

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

qcoro: => 0.9.0

diff --git a/doc/cmark/DETAILS b/doc/cmark/DETAILS
index 3310b52..f5fd629 100755
--- a/doc/cmark/DETAILS
+++ b/doc/cmark/DETAILS
@@ -1,8 +1,8 @@
SPELL=cmark
- VERSION=0.30.2
+ VERSION=0.30.3
SOURCE="$SPELL-$VERSION.tar.gz"
+
SOURCE_HASH=sha512:27383bfef95ae1390c26aff0dd2cbca33704e7d20116bf29da4695d2c9a4146b86daba0da1e91bdb9eab95671702f885e832b3d31d51601731f1dc630df5237b
SOURCE_URL[0]=https://github.com/jgm/$SPELL/archive/$VERSION.tar.gz
-
SOURCE_HASH=sha512:aaa9b2103cf89c522f9b42a2b43c07ecf75e07eb42214c0be5de17682ea1faf9c85e3dd28fe91d446b69a34f9980bcab6e276a99b42540c40c9ee1481b3a0d17
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-$VERSION"
WEB_SITE="https://commonmark.org/";
LICENSE[0]="BSD2 MIT"
diff --git a/doc/cmark/HISTORY b/doc/cmark/HISTORY
index fb37df5..017bbc2 100644
--- a/doc/cmark/HISTORY
+++ b/doc/cmark/HISTORY
@@ -1,3 +1,6 @@
+2023-05-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.30.3
+
2022-08-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.30.2

diff --git a/doc/discount/DETAILS b/doc/discount/DETAILS
index d12c557..8c6521b 100755
--- a/doc/discount/DETAILS
+++ b/doc/discount/DETAILS
@@ -1,6 +1,6 @@
SPELL=discount
- VERSION=2.2.7
-
SOURCE_HASH=sha512:1b61eb7c625bb50da0dbe97350a0ccbb15930ccaef449c4b4659950907bce3c0564dabf20578379a7fdd0e375f5d4d5b61acd34db474a85e942b60373688bd08
+ VERSION=2.2.7b
+
SOURCE_HASH=sha512:d68ffb85ae3e6d6ce8a2e506609bd4cb042617e350d113dd632a1ed81adb0b076df75ca4e70e97d43f3a3a2907555a9f28087a3762f41806289c526af3c55806
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://www.pell.portland.or.us/~orc/Code/discount
diff --git a/doc/discount/HISTORY b/doc/discount/HISTORY
index af058be..1b7cb31 100644
--- a/doc/discount/HISTORY
+++ b/doc/discount/HISTORY
@@ -1,3 +1,6 @@
+2023-05-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2.7b
+
2021-12-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.7

diff --git a/kde-gear/neochat/DEPENDS b/kde-gear/neochat/DEPENDS
index b1170fb..5b110bd 100755
--- a/kde-gear/neochat/DEPENDS
+++ b/kde-gear/neochat/DEPENDS
@@ -1,15 +1,30 @@
source $GRIMOIRE/KDE_DEPENDS &&
-depends qtdeclarative &&
-depends qtquickcontrols2 &&
+if is_depends_enabled $SPELL qt6base;then
+ depends qt6declarative &&
+ depends qt6multimedia &&
+ depends qt6svg
+else
+ depends qtdeclarative &&
+ depends qtquickcontrols2 &&
+ depends qtmultimedia &&
+ depends qtsvg
+fi &&
depends kconfig &&
depends kcoreaddons &&
depends kdbusaddons &&
depends knotifications &&
depends ki18n &&
+depends kio &&
depends kirigami2 &&
depends kirigami-addons &&
+depends kitemmodels &&
+depends kwindowsystem &&
+depends qqc2-desktop-style
+depends sonnet &&
+
depends libquotient &&
depends qtkeychain &&
depends kquickimageeditor &&
depends cmark &&
-depends qcoro
+depends qcoro &&
+depends sqlite
diff --git a/kde-gear/neochat/HISTORY b/kde-gear/neochat/HISTORY
index 14b5fce..0c96103 100644
--- a/kde-gear/neochat/HISTORY
+++ b/kde-gear/neochat/HISTORY
@@ -1,3 +1,6 @@
+2023-05-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: qt6 support, extra depends
+
2023-04-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 23.04.0

diff --git a/qt5-cmake/qcoro/DETAILS b/qt5-cmake/qcoro/DETAILS
index c68a0d8..4ef65ee 100755
--- a/qt5-cmake/qcoro/DETAILS
+++ b/qt5-cmake/qcoro/DETAILS
@@ -1,7 +1,7 @@
#source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=qcoro
- VERSION=0.8.0
-
SOURCE_HASH=sha512:bdcf6f9113e5dde57fb56abdeb5106dbba8892ecc6c11d9f4b8b653570ffb0e25f63ee0fe87cd9008e02b99b76f959b9af00b2875420517b13295d6b108db2cc
+ VERSION=0.9.0
+
SOURCE_HASH=sha512:f708e1a82861c39434d6934172246c3280864e933b333b56c0471f1a629f9da65554d1508af4291ac2257ad8df2040655394ae5525d728710de5bd83cef8fbee
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/danvratil/qcoro
diff --git a/qt5-cmake/qcoro/HISTORY b/qt5-cmake/qcoro/HISTORY
index 7b4bad0..e5c945e 100644
--- a/qt5-cmake/qcoro/HISTORY
+++ b/qt5-cmake/qcoro/HISTORY
@@ -1,3 +1,6 @@
+2023-05-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.0
+
2023-02-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8.0
* DEPENDS: fix syntax
diff --git a/qt6/qt6svg/DETAILS b/qt6/qt6svg/DETAILS
index f207e4e..440aa98 100755
--- a/qt6/qt6svg/DETAILS
+++ b/qt6/qt6svg/DETAILS
@@ -6,11 +6,11 @@ QT_URL=https://download.qt.io/official_releases
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
-# SECURITY_PATCH=2
+ SECURITY_PATCH=2
WEB_SITE=https://qt-project.org/
ENTERED=20210116
LICENSE[0]=LGPL
- KEYWORDS="qt6.1.x11 libs"
+ KEYWORDS="qt6"
SHORT=""
cat << EOF
SVG support for qt6
diff --git a/qt6/qt6svg/HISTORY b/qt6/qt6svg/HISTORY
index 0a059c7..46f6dc8 100644
--- a/qt6/qt6svg/HISTORY
+++ b/qt6/qt6svg/HISTORY
@@ -1,3 +1,7 @@
+2023-05-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH=2
+ * CVE-2023-32573-qtsvg-6.5.diffPRE_BUILD: added
+
2023-04-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 6.5.0

diff --git a/qt6/qt6svg/PRE_BUILD b/qt6/qt6svg/PRE_BUILD
new file mode 100755
index 0000000..4604ffc
--- /dev/null
+++ b/qt6/qt6svg/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/qt6/qt6svg/patches/CVE-2023-32573-qtsvg-6.5.diff
b/qt6/qt6svg/patches/CVE-2023-32573-qtsvg-6.5.diff
new file mode 100644
index 0000000..aa86f2a
--- /dev/null
+++ b/qt6/qt6svg/patches/CVE-2023-32573-qtsvg-6.5.diff
@@ -0,0 +1,36 @@
+--- a/src/svg/qsvgfont_p.h
++++ b/src/svg/qsvgfont_p.h
+@@ -38,6 +38,7 @@ public:
+ class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted
+ {
+ public:
++ static constexpr qreal DEFAULT_UNITS_PER_EM = 1000;
+ QSvgFont(qreal horizAdvX);
+
+ void setFamilyName(const QString &name);
+@@ -50,9 +51,7 @@ public:
+ void draw(QPainter *p, const QPointF &point, const QString &str, qreal
pixelSize, Qt::Alignment alignment) const;
+ public:
+ QString m_familyName;
+- qreal m_unitsPerEm;
+- qreal m_ascent;
+- qreal m_descent;
++ qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM;
+ qreal m_horizAdvX;
+ QHash<QChar, QSvgGlyph> m_glyphs;
+ };
+
+
+--- a/src/svg/qsvghandler.cpp
++++ b/src/svg/qsvghandler.cpp
+@@ -2622,7 +2622,7 @@ static bool parseFontFaceNode(QSvgStyleProperty
*parent,
+
+ qreal unitsPerEm = toDouble(unitsPerEmStr);
+ if (!unitsPerEm)
+- unitsPerEm = 1000;
++ unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM;
+
+ if (!name.isEmpty())
+ font->setFamilyName(name);
+
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (dfae90cac980996958b54762169099a345a51a65), Treeve Jelbert, 05/15/2023

Archive powered by MHonArc 2.6.24.

Top of Page