From 1208c68b68683b99e6174ae0d5ff1e54386f889b0adb5d7f0322a32dfc1a0b50 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Sun, 8 Nov 2020 20:52:23 +0000 Subject: [PATCH] Accepting request 846923 from home:Kieltux:branches:graphics - Update to version 0.2.16: - no changelog supplied upstream - Rebase tupitube.quazip5.patch OBS-URL: https://build.opensuse.org/request/show/846923 OBS-URL: https://build.opensuse.org/package/show/graphics/tupitube?expand=0&rev=11 --- tupitube.changes | 7 ++++++ tupitube.desk-0.2.15.tar.gz | 3 --- tupitube.desk-0.2.16.tar.gz | 3 +++ tupitube.quazip5.patch | 45 +++++++++++++++++++------------------ tupitube.spec | 5 ++++- 5 files changed, 37 insertions(+), 26 deletions(-) delete mode 100644 tupitube.desk-0.2.15.tar.gz create mode 100644 tupitube.desk-0.2.16.tar.gz diff --git a/tupitube.changes b/tupitube.changes index 336b23f..1630c55 100644 --- a/tupitube.changes +++ b/tupitube.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Nov 8 06:42:17 UTC 2020 - Carsten Ziepke + +- Update to version 0.2.16: + - no changelog supplied upstream +- Rebase tupitube.quazip5.patch + ------------------------------------------------------------------- Tue Jul 7 10:50:01 UTC 2020 - Luigi Baldoni diff --git a/tupitube.desk-0.2.15.tar.gz b/tupitube.desk-0.2.15.tar.gz deleted file mode 100644 index 1727991..0000000 --- a/tupitube.desk-0.2.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:700433296de253539c3ec3189c9eeffa5fd1b864f3010fac38259ac5ac40d8a4 -size 8794006 diff --git a/tupitube.desk-0.2.16.tar.gz b/tupitube.desk-0.2.16.tar.gz new file mode 100644 index 0000000..b3f9164 --- /dev/null +++ b/tupitube.desk-0.2.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daedd818c7782ab88116d9a0f1401c6bcf874453d93381acefdd4a746625bc2e +size 8874838 diff --git a/tupitube.quazip5.patch b/tupitube.quazip5.patch index d5c11f8..1a7621a 100644 --- a/tupitube.quazip5.patch +++ b/tupitube.quazip5.patch @@ -1,44 +1,45 @@ -diff --git a/configure.tests/quazip/main.cpp b/configure.tests/quazip/main.cpp -index dacfcd1..3e06e40 100755 ---- a/configure.tests/quazip/main.cpp -+++ b/configure.tests/quazip/main.cpp +diff -Nur tupitube.desk/configure.tests/quazip/main.cpp new/configure.tests/quazip/main.cpp +--- tupitube.desk/configure.tests/quazip/main.cpp 2020-08-15 03:55:13.000000000 +0200 ++++ new/configure.tests/quazip/main.cpp 2020-11-08 08:21:32.051836695 +0100 @@ -33,8 +33,8 @@ * along with this program. If not, see . * ***************************************************************************/ -#include "quazip/quazip.h" -#include "quazip/quazipfile.h" -+#include "quazip5/quazip.h" -+#include "quazip5/quazipfile.h" ++#include "QuaZip-Qt5-1.1/quazip/quazip.h" ++#include "QuaZip-Qt5-1.1/quazip/quazipfile.h" #include int main() -diff --git a/qonf/test.rb b/qonf/test.rb -index a73280f..4f4b59f 100755 ---- a/qonf/test.rb -+++ b/qonf/test.rb -@@ -103,7 +103,7 @@ class Test +diff -Nur tupitube.desk/qonf/test.rb new/qonf/test.rb +--- tupitube.desk/qonf/test.rb 2020-08-15 03:55:13.000000000 +0200 ++++ new/qonf/test.rb 2020-11-08 08:21:42.415752963 +0100 +@@ -103,7 +103,7 @@ qmakeLine = "'LIBS += #{extraLib}'" qmakeLine += " 'INCLUDEPATH += #{extraInclude}'" else - extraLib = "-lquazip-qt5" -+ extraLib = "-lquazip5" ++ extraLib = "-lquazip1-qt5" qmakeLine = "'LIBS += #{extraLib}'" end else -@@ -176,7 +176,7 @@ class Test +@@ -165,10 +165,10 @@ if conf.hasArgument?("with-quazip") config.addLib("-lquazip") else - config.addLib("-lquazip-qt5") -+ config.addLib("-lquazip5") ++ config.addLib("-lquazip1-qt5") end - # config.addLib("-lquazip-qt5") -diff --git a/src/libtupi/tuppackagehandler.cpp b/src/libtupi/tuppackagehandler.cpp -index 8885859..971e90d 100755 ---- a/src/libtupi/tuppackagehandler.cpp -+++ b/src/libtupi/tuppackagehandler.cpp +- # config.addLib("-lquazip-qt5") ++ # config.addLib("-lquazip1-qt5") + + parser.defines.each { |define| + config.addDefine(define) +diff -Nur tupitube.desk/src/libtupi/tuppackagehandler.cpp new/src/libtupi/tuppackagehandler.cpp +--- tupitube.desk/src/libtupi/tuppackagehandler.cpp 2020-08-15 03:55:40.000000000 +0200 ++++ new/src/libtupi/tuppackagehandler.cpp 2020-11-08 08:21:32.051836695 +0100 @@ -34,9 +34,9 @@ ***************************************************************************/ @@ -46,9 +47,9 @@ index 8885859..971e90d 100755 -#include "quazip/quazip.h" -#include "quazip/quazipfile.h" -#include "quazip/JlCompress.h" -+#include "quazip5/quazip.h" -+#include "quazip5/quazipfile.h" -+#include "quazip5/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" TupPackageHandler::TupPackageHandler() { diff --git a/tupitube.spec b/tupitube.spec index 7fa16f6..0c6266f 100644 --- a/tupitube.spec +++ b/tupitube.spec @@ -22,7 +22,7 @@ %define _tupilib %{_libdir}/%{name} %define _tupidata %{_datadir}/%{name} Name: tupitube -Version: 0.2.15 +Version: 0.2.16 Release: 0 Summary: 2D vectorial/animation tool License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -93,6 +93,9 @@ This package contains plugins for %{name}. %prep %autosetup -p1 -n tupitube.desk +# Fix `require': cannot load such file -- os (LoadError) +sed -i '/require .os/d' qonf/configure.rb + # Fix 'E: spurious-executable-perm' chmod -x COPYING README* launcher/tupitube.xml