Accepting request 812046 from graphics
OBS-URL: https://build.opensuse.org/request/show/812046 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tupitube?expand=0&rev=3
This commit is contained in:
Yuchen Lin
Git OBS Bridge
commit
55f6af6554
38
0001-Fix-build-with-Qt-5.15.patch
Normal file
38
0001-Fix-build-with-Qt-5.15.patch
Normal file
@ -0,0 +1,38 @@
|
||||
From 05c79e59b74c137227b87dea2a37a8a3453254c5 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
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(+)
|
||||
|
||||
diff --git a/src/components/exposure/tupexposuretable.cpp b/src/components/exposure/tupexposuretable.cpp
|
||||
index 53df3bb..da4cfe9 100644
|
||||
--- a/src/components/exposure/tupexposuretable.cpp
|
||||
+++ b/src/components/exposure/tupexposuretable.cpp
|
||||
@@ -36,6 +36,8 @@
|
||||
#include "tupexposuretable.h"
|
||||
#include "tconfig.h"
|
||||
|
||||
+#include <QPainterPath>
|
||||
+
|
||||
class TUPITUBE_EXPORT TupExposureVerticalHeader : public QHeaderView
|
||||
{
|
||||
public:
|
||||
diff --git a/src/framework/gui/tslider.cpp b/src/framework/gui/tslider.cpp
|
||||
index 206055e..de3d13b 100644
|
||||
--- a/src/framework/gui/tslider.cpp
|
||||
+++ b/src/framework/gui/tslider.cpp
|
||||
@@ -38,6 +38,7 @@
|
||||
#include "tapplicationproperties.h"
|
||||
|
||||
#include <QDesktopWidget>
|
||||
+#include <QPainterPath>
|
||||
|
||||
#ifdef TUP_DEBUG
|
||||
#include <QDebug>
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 4 21:14:42 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 0.2.15. No changelog.
|
||||
- Rebase tupitube.quazip5.patch
|
||||
- Drop tupitube.libav.patch. No longer necessary.
|
||||
- Add patch to fix build with Qt 5.15:
|
||||
* 0001-Fix-build-with-Qt-5.15.patch
|
||||
- Spec cleanup
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 22 11:35:59 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d415d21e060b4b46b0408073c6c6e7d80f1e6f14044880d4c58add0d58d330cd
|
||||
size 5989425
|
||||
3
tupitube.desk-0.2.15.tar.gz
Normal file
3
tupitube.desk-0.2.15.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:700433296de253539c3ec3189c9eeffa5fd1b864f3010fac38259ac5ac40d8a4
|
||||
size 8794006
|
||||
@ -1,10 +0,0 @@
|
||||
--- a/configure.tests/libav/main.cpp
|
||||
+++ b/configure.tests/libav/main.cpp
|
||||
@@ -41,7 +41,6 @@ extern "C" {
|
||||
}
|
||||
#endif
|
||||
|
||||
-#include <iostream>
|
||||
|
||||
int main()
|
||||
{
|
||||
@ -1,3 +1,5 @@
|
||||
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
|
||||
@@ -33,8 +33,8 @@
|
||||
@ -11,6 +13,8 @@
|
||||
#include <QFile>
|
||||
|
||||
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
|
||||
@ -31,16 +35,20 @@
|
||||
end
|
||||
|
||||
# config.addLib("-lquazip-qt5")
|
||||
--- a/src/libtupi/tuppackagehandler.h
|
||||
+++ b/src/libtupi/tuppackagehandler.h
|
||||
@@ -38,8 +38,8 @@
|
||||
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
|
||||
@@ -34,9 +34,9 @@
|
||||
***************************************************************************/
|
||||
|
||||
#include "tglobal.h"
|
||||
#include "tapplicationproperties.h"
|
||||
#include "tuppackagehandler.h"
|
||||
-#include "quazip/quazip.h"
|
||||
-#include "quazip/quazipfile.h"
|
||||
-#include "quazip/JlCompress.h"
|
||||
+#include "quazip5/quazip.h"
|
||||
+#include "quazip5/quazipfile.h"
|
||||
+#include "quazip5/JlCompress.h"
|
||||
|
||||
// SQA: Pending to enable in the future
|
||||
// #include "quazip/JlCompress.h"
|
||||
TupPackageHandler::TupPackageHandler()
|
||||
{
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package tupitube
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2016 Packman Team <packman@links2linux.de>
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -22,7 +22,7 @@
|
||||
%define _tupilib %{_libdir}/%{name}
|
||||
%define _tupidata %{_datadir}/%{name}
|
||||
Name: tupitube
|
||||
Version: 0.2.13
|
||||
Version: 0.2.15
|
||||
Release: 0
|
||||
Summary: 2D vectorial/animation tool
|
||||
License: GPL-2.0-or-later
|
||||
@ -30,7 +30,9 @@ Group: Productivity/Graphics/Vector Editors
|
||||
URL: https://maefloresta.com
|
||||
Source0: https://sourceforge.net/projects/tupi2d/files/Source%20Code/tupitube.desk-%{version}.tar.gz
|
||||
Patch0: tupitube.quazip5.patch
|
||||
Patch1: tupitube.libav.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch1: 0001-Fix-build-with-Qt-5.15.patch
|
||||
BuildRequires: dos2unix
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: hicolor-icon-theme
|
||||
@ -38,7 +40,7 @@ BuildRequires: libquazip-qt5-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: ruby
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
|
||||
BuildRequires: pkgconfig(Qt5Core) >= 5.13.0
|
||||
BuildRequires: pkgconfig(Qt5Gui)
|
||||
BuildRequires: pkgconfig(Qt5Multimedia)
|
||||
BuildRequires: pkgconfig(Qt5Network)
|
||||
@ -88,9 +90,13 @@ A design and authoring tool for 2D animation.
|
||||
This package contains plugins for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n tupitube.desk
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%autosetup -p1 -n tupitube.desk
|
||||
|
||||
# Fix 'E: spurious-executable-perm'
|
||||
chmod -x COPYING README*
|
||||
|
||||
# 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)
|
||||
@ -113,47 +119,46 @@ make %{?_smp_mflags}
|
||||
# Create symbolic link
|
||||
install -d %{buildroot}%{_bindir}
|
||||
ln -s %{_tupibin}/%{name}.desk %{buildroot}%{_bindir}/%{name}
|
||||
|
||||
# Remove unneeded links
|
||||
pushd %{buildroot}%{_tupilib}
|
||||
for so in $(find . -maxdepth 1 -name \*.so); do
|
||||
rm -f $so; done
|
||||
popd
|
||||
|
||||
# SVG icon
|
||||
install -Dm 0644 launcher/icons/icon.svg \
|
||||
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
|
||||
|
||||
# fix icon name
|
||||
mv %{buildroot}%{_datadir}/pixmaps/%{name}.desk.png \
|
||||
%{buildroot}%{_datadir}/pixmaps/%{name}.png
|
||||
|
||||
# fix .desktop
|
||||
sed -i -e '/^Exec/cExec=%{name}' -e '/^Icon/cIcon=%{name}' \
|
||||
%{buildroot}%{_datadir}/applications/%{name}.desktop
|
||||
|
||||
# Fix 'W: script-without-shebang' rpmlint warnings
|
||||
find %{buildroot}%{_tupidata} -type f -executable -exec chmod -x {} \;
|
||||
|
||||
# Cleanup
|
||||
rm -f %{buildroot}%{_tupilib}/raster/*.so
|
||||
|
||||
%fdupes %{buildroot}%{_datadir}
|
||||
|
||||
%if 0%{?suse_version} < 1500
|
||||
%post
|
||||
%mime_database_post
|
||||
%icon_theme_cache_post
|
||||
%desktop_database_post
|
||||
|
||||
%postun
|
||||
%mime_database_postun
|
||||
%icon_theme_cache_postun
|
||||
%desktop_database_postun
|
||||
%endif
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc README*
|
||||
%{_bindir}/%{name}
|
||||
%{_tupibin}/
|
||||
%dir %{_tupilib}
|
||||
%{_tupilib}/*.so.*
|
||||
%{_tupidata}/
|
||||
%{_datadir}/pixmaps/%{name}.png
|
||||
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
|
||||
%{_bindir}/%{name}
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
|
||||
%{_datadir}/mime/packages/%{name}.xml
|
||||
%{_datadir}/pixmaps/%{name}.png
|
||||
%{_tupibin}/
|
||||
%{_tupidata}/
|
||||
%{_tupilib}/*.so.*
|
||||
%{_tupilib}/raster/
|
||||
%exclude %{_tupilib}/plugins
|
||||
|
||||
%files plugins
|
||||
|
||||
Loading…
Reference in New Issue
Block a user