Accepting request 936065 from graphics
OBS-URL: https://build.opensuse.org/request/show/936065 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tupitube?expand=0&rev=7
This commit is contained in:
commit
5c677ba256
@ -1,35 +0,0 @@
|
||||
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(+)
|
||||
|
||||
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 <QPainterPath>
|
||||
+
|
||||
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 <QDesktopWidget>
|
||||
+#include <QPainterPath>
|
||||
|
||||
TSlider::TSlider(Qt::Orientation orientation, TSlider::Mode mode, const QColor &start, const QColor &end, QWidget *parent) : QGraphicsView(parent)
|
||||
{
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 6 10:05:57 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
|
||||
|
||||
- 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 <aloisio@gmx.com>
|
||||
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e266490757a38a02dfa37405e4704993238f8af3060163e17830a85b22d9ba15
|
||||
size 8892528
|
3
tupitube.desk-0.2.18.tar.gz
Normal file
3
tupitube.desk-0.2.18.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b765e39426531c383cc88cda62c5331efe5f965d02ec079e55eddd077749a4aa
|
||||
size 6563244
|
@ -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 <QFile>
|
||||
|
||||
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()
|
||||
{
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user