From c9c6894d1c61f6cf5fcefa7b501a220141a976e196b649f46117e20017ccbded Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Mon, 6 Dec 2021 15:51:42 +0000 Subject: [PATCH] Accepting request 935979 from home:frispete:blender - Update to version 0.2.18 (no changelog supplied) - Removed 0001-Fix-build-with-Qt-5.15.patch - Adjusted tupitube.quazip5.patch OBS-URL: https://build.opensuse.org/request/show/935979 OBS-URL: https://build.opensuse.org/package/show/graphics/tupitube?expand=0&rev=15 --- 0001-Fix-build-with-Qt-5.15.patch | 35 ------------------------------- tupitube.changes | 7 +++++++ tupitube.desk-0.2.17.tar.gz | 3 --- tupitube.desk-0.2.18.tar.gz | 3 +++ tupitube.quazip5.patch | 10 ++++----- tupitube.spec | 6 +++--- 6 files changed, 18 insertions(+), 46 deletions(-) delete mode 100644 0001-Fix-build-with-Qt-5.15.patch delete mode 100644 tupitube.desk-0.2.17.tar.gz create mode 100644 tupitube.desk-0.2.18.tar.gz diff --git a/0001-Fix-build-with-Qt-5.15.patch b/0001-Fix-build-with-Qt-5.15.patch deleted file mode 100644 index 23c9ac3..0000000 --- a/0001-Fix-build-with-Qt-5.15.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 05c79e59b74c137227b87dea2a37a8a3453254c5 Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Thu, 4 Jun 2020 23:47:00 +0200 -Subject: [PATCH] Fix build with Qt 5.15 - ---- - src/components/exposure/tupexposuretable.cpp | 2 ++ - src/framework/gui/tslider.cpp | 1 + - 2 files changed, 3 insertions(+) - -Index: tupitube.desk/src/components/exposure/tupexposuretable.cpp -=================================================================== ---- tupitube.desk.orig/src/components/exposure/tupexposuretable.cpp -+++ tupitube.desk/src/components/exposure/tupexposuretable.cpp -@@ -36,6 +36,8 @@ - #include "tupexposuretable.h" - #include "tconfig.h" - -+#include -+ - class TUPITUBE_EXPORT TupExposureVerticalHeader : public QHeaderView - { - public: -Index: tupitube.desk/src/framework/gui/tslider.cpp -=================================================================== ---- tupitube.desk.orig/src/framework/gui/tslider.cpp -+++ tupitube.desk/src/framework/gui/tslider.cpp -@@ -38,6 +38,7 @@ - #include "tapplicationproperties.h" - - #include -+#include - - TSlider::TSlider(Qt::Orientation orientation, TSlider::Mode mode, const QColor &start, const QColor &end, QWidget *parent) : QGraphicsView(parent) - { diff --git a/tupitube.changes b/tupitube.changes index 1cba2c4..b2ac6c9 100644 --- a/tupitube.changes +++ b/tupitube.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 6 10:05:57 UTC 2021 - Hans-Peter Jansen + +- Update to version 0.2.18 (no changelog supplied) +- Removed 0001-Fix-build-with-Qt-5.15.patch +- Adjusted tupitube.quazip5.patch + ------------------------------------------------------------------- Tue Mar 30 09:43:54 UTC 2021 - Luigi Baldoni diff --git a/tupitube.desk-0.2.17.tar.gz b/tupitube.desk-0.2.17.tar.gz deleted file mode 100644 index 8672ec6..0000000 --- a/tupitube.desk-0.2.17.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e266490757a38a02dfa37405e4704993238f8af3060163e17830a85b22d9ba15 -size 8892528 diff --git a/tupitube.desk-0.2.18.tar.gz b/tupitube.desk-0.2.18.tar.gz new file mode 100644 index 0000000..cc6018c --- /dev/null +++ b/tupitube.desk-0.2.18.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b765e39426531c383cc88cda62c5331efe5f965d02ec079e55eddd077749a4aa +size 6563244 diff --git a/tupitube.quazip5.patch b/tupitube.quazip5.patch index 1a7621a..4380a66 100644 --- a/tupitube.quazip5.patch +++ b/tupitube.quazip5.patch @@ -7,8 +7,8 @@ diff -Nur tupitube.desk/configure.tests/quazip/main.cpp new/configure.tests/quaz -#include "quazip/quazip.h" -#include "quazip/quazipfile.h" -+#include "QuaZip-Qt5-1.1/quazip/quazip.h" -+#include "QuaZip-Qt5-1.1/quazip/quazipfile.h" ++#include "QuaZip-Qt5-1.2/quazip/quazip.h" ++#include "QuaZip-Qt5-1.2/quazip/quazipfile.h" #include int main() @@ -47,9 +47,9 @@ diff -Nur tupitube.desk/src/libtupi/tuppackagehandler.cpp new/src/libtupi/tuppac -#include "quazip/quazip.h" -#include "quazip/quazipfile.h" -#include "quazip/JlCompress.h" -+#include "QuaZip-Qt5-1.1/quazip/quazip.h" -+#include "QuaZip-Qt5-1.1/quazip/quazipfile.h" -+#include "QuaZip-Qt5-1.1/quazip/JlCompress.h" ++#include "QuaZip-Qt5-1.2/quazip/quazip.h" ++#include "QuaZip-Qt5-1.2/quazip/quazipfile.h" ++#include "QuaZip-Qt5-1.2/quazip/JlCompress.h" TupPackageHandler::TupPackageHandler() { diff --git a/tupitube.spec b/tupitube.spec index b7b41d2..9afbf26 100644 --- a/tupitube.spec +++ b/tupitube.spec @@ -22,7 +22,7 @@ %define _tupilib %{_libdir}/%{name} %define _tupidata %{_datadir}/%{name} Name: tupitube -Version: 0.2.17 +Version: 0.2.18 Release: 0 Summary: 2D vectorial/animation tool License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -31,8 +31,6 @@ URL: https://maefloresta.com Source0: https://sourceforge.net/projects/tupi2d/files/Source%20Code/tupitube.desk-%{version}.tar.gz Source99: tupitube-rpmlintrc Patch0: tupitube.quazip5.patch -# PATCH-FIX-UPSTREAM -Patch1: 0001-Fix-build-with-Qt-5.15.patch BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ @@ -159,6 +157,8 @@ rm -f %{buildroot}%{_tupilib}/raster/*.so %dir %{_tupilib} %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop +%dir %{_datadir}/metainfo +%{_datadir}/metainfo/tupitube.appdata.xml %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/mime/packages/%{name}.xml %{_datadir}/pixmaps/%{name}.png