Accepting request 1206365 from graphics

OBS-URL: https://build.opensuse.org/request/show/1206365
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tupitube?expand=0&rev=10

tupitube.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct  8 16:14:40 UTC 2024 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 0.2.22 (no changelog supplied)
+- Force build against ffmpeg-4 in Factory
+- Drop tupitube.quazip5.patch (no longer required)
+
 -------------------------------------------------------------------
 Fri Mar  3 13:01:05 UTC 2023 - Hans-Peter Jansen <hpj@urpla.net>
 

tupitube.desk-0.2.18.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b765e39426531c383cc88cda62c5331efe5f965d02ec079e55eddd077749a4aa
-size 6563244

tupitube.desk-0.2.22.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8470fc72b257bbb7dcef629224f30186711bb2c4f4e2001c34fa5361bf932b12
+size 8975447

tupitube.quazip5.patch

@@ -1,58 +0,0 @@
-Index: tupitube.desk/configure.tests/quazip/main.cpp
-===================================================================
---- tupitube.desk.orig/configure.tests/quazip/main.cpp
-+++ tupitube.desk/configure.tests/quazip/main.cpp
-@@ -33,8 +33,8 @@
-  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
-  ***************************************************************************/
- 
--#include "quazip/quazip.h"
--#include "quazip/quazipfile.h"
-+#include <quazip/quazip.h>
-+#include <quazip/quazipfile.h>
- #include <QFile>
- 
- int main()
-Index: tupitube.desk/qonf/test.rb
-===================================================================
---- tupitube.desk.orig/qonf/test.rb
-+++ tupitube.desk/qonf/test.rb
-@@ -103,7 +103,7 @@ class Test
-                          qmakeLine = "'LIBS += #{extraLib}'"
-                          qmakeLine += " 'INCLUDEPATH += #{extraInclude}'"
-                       else
--                         extraLib = "-lquazip-qt5"
-+                         extraLib = "-lquazip1-qt5"
-                          qmakeLine = "'LIBS += #{extraLib}'"
-                       end
-                    else
-@@ -165,10 +165,10 @@ class Test
-         if conf.hasArgument?("with-quazip")
-            config.addLib("-lquazip")
-         else
--           config.addLib("-lquazip-qt5")
-+           config.addLib("-lquazip1-qt5")
-         end
- 
--        # config.addLib("-lquazip-qt5")
-+        # config.addLib("-lquazip1-qt5")
-         
-         parser.defines.each { |define|
-             config.addDefine(define)
-Index: tupitube.desk/src/libtupi/tuppackagehandler.cpp
-===================================================================
---- tupitube.desk.orig/src/libtupi/tuppackagehandler.cpp
-+++ tupitube.desk/src/libtupi/tuppackagehandler.cpp
-@@ -34,9 +34,9 @@
-  ***************************************************************************/
- 
- #include "tuppackagehandler.h"
--#include "quazip/quazip.h"
--#include "quazip/quazipfile.h"
--#include "quazip/JlCompress.h"
-+#include <quazip/quazip.h>
-+#include <quazip/quazipfile.h>
-+#include <quazip/JlCompress.h>
- 
- TupPackageHandler::TupPackageHandler()
- {

tupitube.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package tupitube
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 # Copyright (c) 2016 Packman Team <packman@links2linux.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -22,20 +22,17 @@
 %define	_tupilib  %{_libdir}/%{name}
 %define	_tupidata %{_datadir}/%{name}
 Name:           tupitube
-Version:        0.2.18
+Version:        0.2.22
 Release:        0
 Summary:        2D vectorial/animation tool
 License:        GPL-2.0-or-later AND GPL-3.0-or-later
 Group:          Productivity/Graphics/Vector Editors
-URL:            https://maefloresta.com
+URL:            https://www.tupitube.com
 Source0:        https://sourceforge.net/projects/tupi2d/files/Source%20Code/tupitube.desk-%{version}.tar.gz
 Source99:       tupitube-rpmlintrc
-Patch0:         tupitube.quazip5.patch
-BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  libquazip-qt5-devel
 BuildRequires:  pkgconfig
 BuildRequires:  ruby
 BuildRequires:  update-desktop-files
@@ -48,12 +45,25 @@ BuildRequires:  pkgconfig(Qt5PrintSupport)
 BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5Xml)
 BuildRequires:  pkgconfig(glib-2.0)
+%if 0%{?suse_version} > 1500
+BuildRequires:  pkgconfig(libavcodec) = 58.134.100
+BuildRequires:  pkgconfig(libavdevice) = 58.13.100
+BuildRequires:  pkgconfig(libavformat) = 58.76.100
+BuildRequires:  pkgconfig(libavutil) = 56.70.100
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libswscale) = 5.9.100
+%else
 BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavdevice)
 BuildRequires:  pkgconfig(libavformat)
 BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libswscale)
+%endif
+BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(quazip1-qt5)
+BuildRequires:  pkgconfig(sndfile)
 BuildRequires:  pkgconfig(theora)
 BuildRequires:  pkgconfig(zlib)
 Requires:       %{name}-plugins
@@ -98,11 +108,8 @@ sed -i '/require .os/d' qonf/configure.rb
 # Configure failed. error was: undefined method `exists?' for File:Class
 sed -i 's|File.exists|File.exist|' configure.rb qonf/test.rb
 
-# Fix 'E: spurious-executable-perm'
+# Configure failed. error was: undefined method `exists?' for module FileTest
-chmod -x COPYING README* launcher/tupitube.xml
+sed -e 's|FileTest.exists|FileTest.exist|' configure.rb
-
-# Fix 'W: wrong-script-end-of-line-encoding'
-dos2unix src/shell/html/css/tupitube.css
 
 # Add path to ffmpeg
 ffmpeg_include=$(pkg-config --cflags-only-I libavutil)
@@ -123,8 +130,7 @@ sed -i '/^#!/d' src/mypaint/raster/main/brushes/label-brush-mypaint.sh
 	--bindir=%{_tupibin} \
 	--libdir=%{_tupilib} \
 	--sharedir=%{_tupidata}
-
+%make_build
-make %{?_smp_mflags}
 
 %install
 %make_install