Accepting request 796699 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/796699 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tellico?expand=0&rev=82
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
c274bfa413
32
Fix-build-with-Qt-5.9.patch
Normal file
32
Fix-build-with-Qt-5.9.patch
Normal file
@ -0,0 +1,32 @@
|
||||
From 48b3238c50314d0a2a5ab62c03868c9dedd7a360 Mon Sep 17 00:00:00 2001
|
||||
From: Wolfgang Bauer <wbauer@tmo.at>
|
||||
Date: Thu, 23 Apr 2020 18:56:39 +0200
|
||||
Subject: [PATCH] Fix build with Qt 5.9
|
||||
|
||||
`qsizetype` is only defined starting with Qt 5.10.
|
||||
To avoid a compiler error, conditionally define it appropriately for
|
||||
older Qt versions (the actual line is copied from Qt 5.10's qglobal.h).
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D29134
|
||||
---
|
||||
src/images/image.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/images/image.h b/src/images/image.h
|
||||
index eb287db9..3081b831 100644
|
||||
--- a/src/images/image.h
|
||||
+++ b/src/images/image.h
|
||||
@@ -30,6 +30,10 @@
|
||||
#include <QByteArray>
|
||||
#include <QPixmap>
|
||||
|
||||
+#if (QT_VERSION < QT_VERSION_CHECK(5, 10, 0))
|
||||
+using qsizetype = QIntegerForSizeof<std::size_t>::Signed;
|
||||
+#endif
|
||||
+
|
||||
namespace Tellico {
|
||||
class ImageFactory;
|
||||
class ImageDirectory;
|
||||
--
|
||||
2.16.4
|
||||
|
||||
30
Use-unnamespaced-hex-for-Qt-lt-5.14.patch
Normal file
30
Use-unnamespaced-hex-for-Qt-lt-5.14.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From aee9e90c1ce0257d12ea85029435db8ffa65a6a1 Mon Sep 17 00:00:00 2001
|
||||
From: Pino Toscano <pino@kde.org>
|
||||
Date: Thu, 23 Apr 2020 09:31:11 +0200
|
||||
Subject: Use unnamespaced hex for Qt < 5.14
|
||||
|
||||
Qt 5.14 moves hex under a Qt namespace, so use it in the right way
|
||||
depending on the Qt version.
|
||||
---
|
||||
src/utils/iso5426converter.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/utils/iso5426converter.cpp b/src/utils/iso5426converter.cpp
|
||||
index 7ea81c7..0c19767 100644
|
||||
--- a/src/utils/iso5426converter.cpp
|
||||
+++ b/src/utils/iso5426converter.cpp
|
||||
@@ -1211,7 +1211,11 @@ QChar Iso5426Converter::getCombiningChar(uint c) {
|
||||
return 0x1EF1; // SMALL LETTER U WITH HORN AND DOT BELOW
|
||||
|
||||
default:
|
||||
+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
|
||||
+ myDebug() << "no match for" << hex << c;
|
||||
+#else
|
||||
myDebug() << "no match for" << Qt::hex << c;
|
||||
+#endif
|
||||
return QChar();
|
||||
}
|
||||
}
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f4456eb31f71151b9786fa171531265b421b2de8140e9adbf6bb584862c42952
|
||||
size 5589552
|
||||
3
tellico-3.3.tar.xz
Normal file
3
tellico-3.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:de08c27a63f3dd9cab085604fda9f94efb3abfd1ffb1e0ec2f7be9fcf79d2fb6
|
||||
size 5618088
|
||||
@ -1,3 +1,38 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 23 13:42:09 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
|
||||
|
||||
- Update to 3.3:
|
||||
Features:
|
||||
* Added new coin collection data source from Colnect.
|
||||
* Updated GiantBomb data source.
|
||||
* Updated IBS.it data source
|
||||
* Updated kino.de data source.
|
||||
* Updated Kinopoisk (КиноПоиск) data source.
|
||||
* Updated Kino-Teatr (Кино-Театр) data source.
|
||||
* Updated BiblioShare data source.
|
||||
* Updated TheGamesDB data source.
|
||||
* Updated Amazon data source. Access keys must be regenerated by
|
||||
users.
|
||||
* Updated MobyGames data source.
|
||||
* Improved z39.50 data source to allow separate character
|
||||
encoding for queries and responses (kde#419670).
|
||||
* Improved the audio file importing to include Album Artist
|
||||
(kde#419348).
|
||||
* Added PlayStation5 and Xbox Series X to recognized video game
|
||||
platforms.
|
||||
Bug Fixes:
|
||||
* Fixed bug with writing invalid XML names (kde#418067).
|
||||
* Updated AlloCiné and MusicBrainz data sources to provide
|
||||
notification that user agents must be enabled (kde#419309).
|
||||
* Improved MobyGames data source to cache platform data, allow
|
||||
user selection of image size, pass through error messages, and
|
||||
use more efficient API calls (kde#416718).
|
||||
* Improved the ISO-5426 character converter.
|
||||
* Updated python scripts to work in python2 or python3.
|
||||
- Add patches to fix build with the lower Qt versions in Leap:
|
||||
* Use-unnamespaced-hex-for-Qt-lt-5.14.patch
|
||||
* Fix-build-with-Qt-5.9.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 30 15:14:58 UTC 2019 - thod_@gmx.de
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package tellico
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LINUX LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,13 +17,17 @@
|
||||
|
||||
|
||||
Name: tellico
|
||||
Version: 3.2.3
|
||||
Version: 3.3
|
||||
Release: 0
|
||||
Summary: A Collection Manager
|
||||
License: GPL-2.0-or-later
|
||||
Group: Productivity/Office/Other
|
||||
URL: https://tellico-project.org/
|
||||
Source0: https://tellico-project.org/files/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch0: Use-unnamespaced-hex-for-Qt-lt-5.14.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch1: Fix-build-with-Qt-5.9.patch
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libcdio-devel
|
||||
@ -80,6 +84,7 @@ stamps, trading cards, comic books, and wines.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autopatch -p1
|
||||
|
||||
%build
|
||||
%cmake_kf5 "-DENABLE_WEBCAM=true" -d build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user