diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..05a0e946187b8160d0c54c23a9f8100f44e0f43b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..a210cfc03c9228cca272e629a56935473cd358e0 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/qt5-qtsvg diff --git a/qt5-qtsvg.spec b/qt5-qtsvg.spec index 9afb1fe88e9d7f0940c407b922a7cf45e288c1cf..670bc37be4a2fe408eb30c9467a32216a0c0fe4d 100644 --- a/qt5-qtsvg.spec +++ b/qt5-qtsvg.spec @@ -2,17 +2,15 @@ Summary: Qt5 - Support for rendering and displaying SVG Name: qt5-%{qt_module} -Version: 5.15.10 +Version: 5.15.16 Release: 1 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -Url: http://www.qt.io +Url: https://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz -Patch0: qtsvg-CVE-2023-32573.patch - BuildRequires: make BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: pkgconfig(zlib) @@ -28,7 +26,7 @@ displaying SVG drawings in widgets and on other paint devices. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: qt5-qtbase-devel%{?_isa} +Requires: qt5-qtbase-devel%{?_isa} >= %{version} %description devel %{summary}. @@ -43,12 +41,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %autosetup -n qtsvg-everywhere-src-%{version} -p1 %build -%{qmake_qt5} - -%make_build +%qmake_qt5 +%qmake_qt5_build %install -make install INSTALL_ROOT=%{buildroot} +%qmake_qt5_install pushd %{buildroot}%{_qt5_libdir} for prl_file in libQt5*.prl ; do @@ -60,9 +57,6 @@ for prl_file in libQt5*.prl ; do done popd - -%ldconfig_scriptlets - %files %license LICENSE.* %{_qt5_libdir}/libQt5Svg.so.5* @@ -84,6 +78,9 @@ popd %changelog +* Tue Apr 08 2025 Funda Wang - 5.15.16-1 +- update to version 5.15.16 + * Mon Aug 21 2023 huayadong - 5.15.10-1 - update to version 5.15.10-1 diff --git a/qtsvg-CVE-2023-32573.patch b/qtsvg-CVE-2023-32573.patch deleted file mode 100644 index 0554756a92cff2c239b5d251d72759be32f02724..0000000000000000000000000000000000000000 --- a/qtsvg-CVE-2023-32573.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/src/svg/qsvgfont_p.h -+++ b/src/svg/qsvgfont_p.h -@@ -74,6 +74,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); -@@ -86,9 +87,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 m_glyphs; - }; - - ---- a/src/svg/qsvghandler.cpp -+++ b/src/svg/qsvghandler.cpp -@@ -2668,7 +2668,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); diff --git a/qtsvg-everywhere-opensource-src-5.15.10.tar.xz b/qtsvg-everywhere-opensource-src-5.15.10.tar.xz deleted file mode 100644 index 9777af4a0356995473d899e6a7ab49c5916e4225..0000000000000000000000000000000000000000 Binary files a/qtsvg-everywhere-opensource-src-5.15.10.tar.xz and /dev/null differ diff --git a/qtsvg-everywhere-opensource-src-5.15.16.tar.xz b/qtsvg-everywhere-opensource-src-5.15.16.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..7afa736f13d14e7f7542b4b377965b5d4c5356b1 --- /dev/null +++ b/qtsvg-everywhere-opensource-src-5.15.16.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc4e320084bc2882dc6e55229045ce99469946deab8c075aae06413e27100bc1 +size 1881028