Accepting request 747165 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/747165 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tellico?expand=0&rev=80
This commit is contained in:
commit
a49c1fdc40
@ -1,38 +0,0 @@
|
|||||||
commit 43851a0a655a3a961f289087bdea989aa32cc028
|
|
||||||
Author: Luca Beltrame <lbeltrame@kde.org>
|
|
||||||
Date: Sun Jul 21 09:21:16 2019 +0200
|
|
||||||
|
|
||||||
Fix build with Qt 5.13
|
|
||||||
|
|
||||||
(cherry picked from commit 43e6bbb4721adc83d8b2a77bd51d9efaf7aefd6b)
|
|
||||||
|
|
||||||
diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp
|
|
||||||
index 724370e2..e6502bb0 100644
|
|
||||||
--- a/src/gui/datewidget.cpp
|
|
||||||
+++ b/src/gui/datewidget.cpp
|
|
||||||
@@ -35,6 +35,7 @@
|
|
||||||
#include <QPushButton>
|
|
||||||
#include <QHBoxLayout>
|
|
||||||
#include <QFrame>
|
|
||||||
+#include <QDate>
|
|
||||||
#include <QEvent>
|
|
||||||
#include <QMenu>
|
|
||||||
#include <QWidgetAction>
|
|
||||||
commit d3c56eca11cd059d4348ab6696822c23d85af61a
|
|
||||||
Author: Robby Stephenson <robby@periapsis.org>
|
|
||||||
Date: Sun Jul 21 19:17:35 2019 -0400
|
|
||||||
|
|
||||||
Fix apparent build problem on Jenkins
|
|
||||||
|
|
||||||
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
|
|
||||||
index d8348e80..8250c562 100644
|
|
||||||
--- a/src/mainwindow.cpp
|
|
||||||
+++ b/src/mainwindow.cpp
|
|
||||||
@@ -108,6 +108,7 @@
|
|
||||||
#include <QMimeType>
|
|
||||||
#include <QMenuBar>
|
|
||||||
#include <QFileDialog>
|
|
||||||
+#include <QMetaMethod>
|
|
||||||
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:38bc369a5341f2a1ba2bb1b4736da1b6eb4d326352d17e5d54e609f93c140bf8
|
|
||||||
size 5604632
|
|
3
tellico-3.2.2.tar.xz
Normal file
3
tellico-3.2.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:ec0595a421011596b39b51e0e88558da2716073f066862e9707571be9de77a9a
|
||||||
|
size 5589296
|
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Nov 10 08:40:10 UTC 2019 - wbauer@tmo.at
|
||||||
|
|
||||||
|
- Update to 3.2.2:
|
||||||
|
Features:
|
||||||
|
* Added importer for LibraryThing.com JSON collection files
|
||||||
|
(kde#411095).
|
||||||
|
Bug Fixes:
|
||||||
|
* Fixed bug with calculating relative file links (kde#410551).
|
||||||
|
* Fixed bug to revert to behavior of selecting newly added
|
||||||
|
entries (kde#413217).
|
||||||
|
* Fixed compilation on KF 5.61 and Qt 5.13.
|
||||||
|
- Drop Fix-build-with-Qt-5_13.patch, merged upstream
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Aug 12 09:07:26 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
|
Mon Aug 12 09:07:26 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
|
||||||
|
|
||||||
|
@ -17,14 +17,13 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: tellico
|
Name: tellico
|
||||||
Version: 3.2.1
|
Version: 3.2.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A Collection Manager
|
Summary: A Collection Manager
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
Group: Productivity/Office/Other
|
Group: Productivity/Office/Other
|
||||||
URL: http://tellico-project.org/
|
URL: https://tellico-project.org/
|
||||||
Source0: http://tellico-project.org/files/%{name}-%{version}.tar.xz
|
Source0: https://tellico-project.org/files/%{name}-%{version}.tar.xz
|
||||||
Patch0: Fix-build-with-Qt-5_13.patch
|
|
||||||
BuildRequires: extra-cmake-modules
|
BuildRequires: extra-cmake-modules
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: libcdio-devel
|
BuildRequires: libcdio-devel
|
||||||
@ -80,7 +79,7 @@ stamps, trading cards, comic books, and wines.
|
|||||||
%lang_package
|
%lang_package
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%setup -q
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 "-DENABLE_WEBCAM=true" -d build
|
%cmake_kf5 "-DENABLE_WEBCAM=true" -d build
|
||||||
|
Loading…
Reference in New Issue
Block a user