Accepting request 825789 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/825789 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tellico?expand=0&rev=85
This commit is contained in:
commit
9b09069269
@ -1,33 +0,0 @@
|
||||
From ac8740fd9b4042af476fcf8dbb91c7d212d143e4 Mon Sep 17 00:00:00 2001
|
||||
From: Wolfgang Bauer <wbauer@tmo.at>
|
||||
Date: Tue, 2 Jun 2020 17:12:02 +0200
|
||||
Subject: Fix compilation with Qt 5.9
|
||||
|
||||
`QTimer::callOnTimeout()` only exists since Qt 5.12.
|
||||
|
||||
Connect to the `QTimer::timeout` signal instead, this works with older
|
||||
versions as well and is equivalent according to the Qt documentation.
|
||||
|
||||
BUG: 422354
|
||||
FIXED-IN: 3.3.2
|
||||
Differential Revision: https://phabricator.kde.org/D29841
|
||||
---
|
||||
src/document.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/document.cpp b/src/document.cpp
|
||||
index 3d2b4b1..7807002 100644
|
||||
--- a/src/document.cpp
|
||||
+++ b/src/document.cpp
|
||||
@@ -61,7 +61,7 @@ Document::Document() : QObject(), m_coll(nullptr), m_isModified(false),
|
||||
m_allImagesOnDisk = Config::imageLocation() != Config::ImagesInFile;
|
||||
m_loadImagesTimer.setSingleShot(true);
|
||||
m_loadImagesTimer.setInterval(500);
|
||||
- m_loadImagesTimer.callOnTimeout(this, &Document::slotLoadAllImages);
|
||||
+ connect(&m_loadImagesTimer, &QTimer::timeout, this, &Document::slotLoadAllImages);
|
||||
newDocument(Collection::Book);
|
||||
}
|
||||
|
||||
--
|
||||
cgit v1.1
|
||||
|
@ -1,28 +0,0 @@
|
||||
From d8cc345fe152abeafc0c340e47c84576ac42f0cb Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Riddell <jr@jriddell.org>
|
||||
Date: Fri, 19 Jun 2020 15:35:08 +0100
|
||||
Subject: [PATCH] switch order of cmake modules so it gives priority to the
|
||||
local copy which will be the one it expects. fixes build failure on KDE neon
|
||||
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index af3cc83e..ee885c6a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -20,8 +20,8 @@ endif(POLICY CMP0063)
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
|
||||
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
|
||||
- ${ECM_MODULE_PATH}
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
|
||||
+ ${ECM_MODULE_PATH})
|
||||
|
||||
#include(ECMAddTests)
|
||||
#include(ECMMarkNonGuiExecutable)
|
||||
--
|
||||
GitLab
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f5b1417572e4970571c4e9585d89254767312213607244040d2e598988c5b373
|
||||
size 5619068
|
3
tellico-3.3.2.tar.xz
Normal file
3
tellico-3.3.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:08396461e2637fe2d53c8ff9c9aef9050f5a766f25cb864a41437bddc3d52756
|
||||
size 5623808
|
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 11 11:20:21 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
|
||||
|
||||
- Update to 3.3.2:
|
||||
Bug Fixes:
|
||||
* Updated Allocine data source.
|
||||
* Updated KNewStuff categories so KDE Store uploads are shown.
|
||||
* Updated KinoPoisk data source.
|
||||
* Improved the Goodreads importer.
|
||||
* Fixed compilation with Qt version 5.9 and KDE ECM 5.72.0.
|
||||
- Drop patches merged upstream:
|
||||
* Fix-compilation-with-Qt-5.9.patch
|
||||
* switch-order-of-cmake-modules.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jul 11 13:53:46 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
|
||||
|
||||
|
@ -17,17 +17,13 @@
|
||||
|
||||
|
||||
Name: tellico
|
||||
Version: 3.3.1
|
||||
Version: 3.3.2
|
||||
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: Fix-compilation-with-Qt-5.9.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch1: switch-order-of-cmake-modules.patch
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libcdio-devel
|
||||
@ -84,7 +80,6 @@ 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