From de90104a46870fd360810330401567c6e4a85dbde1b2b068b0531e13cd411fb9 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 5 Sep 2017 18:23:53 +0000 Subject: [PATCH] Accepting request 521513 from home:wolfi323:branches:KDE:Extra - Add 0001-Fix-build-with-cmake-3.9.patch to fix build with latest cmake in Factory (kde#382680) OBS-URL: https://build.opensuse.org/request/show/521513 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/tellico?expand=0&rev=32 --- 0001-Fix-build-with-cmake-3.9.patch | 885 ++++++++++++++++++++++++++++ tellico.changes | 6 + tellico.spec | 5 + 3 files changed, 896 insertions(+) create mode 100644 0001-Fix-build-with-cmake-3.9.patch diff --git a/0001-Fix-build-with-cmake-3.9.patch b/0001-Fix-build-with-cmake-3.9.patch new file mode 100644 index 0000000..c973147 --- /dev/null +++ b/0001-Fix-build-with-cmake-3.9.patch @@ -0,0 +1,885 @@ +From 2fe6ae58de0d88c396cf5479398b2c65f00c3789 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer +Date: Tue, 5 Sep 2017 18:40:44 +0200 +Subject: [PATCH] Fix build with cmake 3.9 + +This is a backport of commit a64ee137d08d54ff49acc9938e3dfbcdca52f3eb +to 3.0.2 and also contains some other commits necessary to make the +build succeed: +55f341a0b76f605b9cc1325c1365e1143d9f5ede +6cd6b8b899615bd6442726952fd60918536445fa +c6ceb0bd2cdb17ab97a14ff79030b14baa087a92 +0786e21519cc10058b15a2cb0ff76942d1ce29a7 +d3054ddb252ad600b250f9e8a839442b317fd231 +--- + CMakeLists.txt | 2 +- + src/CMakeLists.txt | 1 + + src/cite/CMakeLists.txt | 1 + + src/cite/lyxpipe.cpp | 2 +- + src/config/CMakeLists.txt | 30 ++++++++++++++++++++++++++ + src/{core => config}/tellico-1-3-update.pl | 0 + src/{core => config}/tellico-rename.upd | 0 + src/{core => config}/tellico.upd | 0 + src/{core => config}/tellico_config.kcfg | 3 --- + src/{core => config}/tellico_config.kcfgc | 1 + + src/{core => config}/tellico_config_addons.cpp | 0 + src/{core => config}/tellico_config_addons.h | 0 + src/configdialog.cpp | 2 +- + src/core/CMakeLists.txt | 23 ++------------------ + src/detailedlistview.cpp | 2 +- + src/document.cpp | 6 +++--- + src/entryview.cpp | 2 +- + src/exportdialog.cpp | 2 +- + src/fetch/CMakeLists.txt | 1 + + src/fetchdialog.cpp | 4 ++-- + src/fieldformat.cpp | 2 +- + src/images/CMakeLists.txt | 1 + + src/images/imagedirectory.cpp | 2 +- + src/images/imagefactory.cpp | 2 +- + src/mainwindow.cpp | 6 +++--- + src/models/CMakeLists.txt | 3 ++- + src/models/entrymodel.cpp | 2 +- + src/models/entrysortmodel.cpp | 2 +- + src/{utils => models}/fieldcomparison.cpp | 2 +- + src/{utils => models}/fieldcomparison.h | 6 +++--- + src/models/groupsortmodel.cpp | 2 +- + src/{utils => models}/stringcomparison.cpp | 2 +- + src/{utils => models}/stringcomparison.h | 10 ++++----- + src/newstuff/CMakeLists.txt | 1 + + src/reportdialog.cpp | 2 +- + src/tests/CMakeLists.txt | 17 +++++++++------ + src/tests/citetest.cpp | 2 +- + src/tests/comparisontest.cpp | 3 +-- + src/tests/documenttest.cpp | 2 +- + src/tests/formattest.cpp | 2 +- + src/tests/htmlexportertest.cpp | 2 +- + src/tests/lcctest.cpp | 3 +-- + src/translators/boardgamegeekimporter.cpp | 2 +- + src/translators/goodreadsimporter.cpp | 2 +- + src/translators/htmlexporter.cpp | 2 +- + src/utils/CMakeLists.txt | 4 +--- + src/viewstack.cpp | 2 +- + 47 files changed, 92 insertions(+), 78 deletions(-) + create mode 100644 src/config/CMakeLists.txt + rename src/{core => config}/tellico-1-3-update.pl (100%) + rename src/{core => config}/tellico-rename.upd (100%) + rename src/{core => config}/tellico.upd (100%) + rename src/{core => config}/tellico_config.kcfg (99%) + rename src/{core => config}/tellico_config.kcfgc (75%) + rename src/{core => config}/tellico_config_addons.cpp (100%) + rename src/{core => config}/tellico_config_addons.h (100%) + rename src/{utils => models}/fieldcomparison.cpp (99%) + rename src/{utils => models}/fieldcomparison.h (92%) + rename src/{utils => models}/stringcomparison.cpp (99%) + rename src/{utils => models}/stringcomparison.h (86%) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 67c9d3c6..943da821 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -247,7 +247,7 @@ remove_definitions(-DQT_NO_STL) + include_directories(${LIBXML2_INCLUDE_DIR} + ${LIBXSLT_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +- ${Tellico_SOURCE_DIR}/src/core ++ ${Tellico_SOURCE_DIR}/src/config + ${Tellico_SOURCE_DIR}/src/3rdparty) + + set(TELLICO_DATA_INSTALL_DIR ${KDE_INSTALL_DATADIR}/tellico) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7af65e02..e3393fd8 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,4 +1,5 @@ + ADD_SUBDIRECTORY( core ) ++ADD_SUBDIRECTORY(config ) + ADD_SUBDIRECTORY( gui ) + ADD_SUBDIRECTORY( collections ) + ADD_SUBDIRECTORY( images ) +diff --git a/src/cite/CMakeLists.txt b/src/cite/CMakeLists.txt +index c90ed142..3192a2d8 100644 +--- a/src/cite/CMakeLists.txt ++++ b/src/cite/CMakeLists.txt +@@ -9,6 +9,7 @@ add_library(cite STATIC ${cite_STAT_SRCS}) + target_link_libraries(cite + core + utils ++ config + Qt5::Core + Qt5::Widgets + ) +diff --git a/src/cite/lyxpipe.cpp b/src/cite/lyxpipe.cpp +index 860cb506..da5d5fe4 100644 +--- a/src/cite/lyxpipe.cpp ++++ b/src/cite/lyxpipe.cpp +@@ -25,7 +25,7 @@ + #include "lyxpipe.h" + #include "../collection.h" + #include "../utils/bibtexhandler.h" +-#include "../core/tellico_config.h" ++#include "../config/tellico_config.h" + #include "../tellico_debug.h" + + #include +diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt +new file mode 100644 +index 00000000..2b48e871 +--- /dev/null ++++ b/src/config/CMakeLists.txt +@@ -0,0 +1,30 @@ ++########### next target ############### ++ ++SET(config_STAT_SRCS ++ tellico_config_addons.cpp ++ ) ++ ++SET(config_KCFG_SRCS ++ tellico_config.kcfgc ++ ) ++ ++kconfig_add_kcfg_files(config_STAT_SRCS ${config_KCFG_SRCS}) ++ ++ADD_CUSTOM_TARGET(tellico_config DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tellico_config.h) ++ ++add_library(config STATIC ${config_STAT_SRCS}) ++ ++TARGET_LINK_LIBRARIES(config ++ Qt5::Core ++ KF5::I18n ++ KF5::ConfigCore ++ KF5::ConfigGui ++ KF5::ConfigWidgets ++ ) ++ ++########### install files ############### ++ ++INSTALL(FILES tellico_config.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} ) ++INSTALL(FILES tellico-rename.upd tellico.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} ) ++ ++INSTALL(PROGRAMS tellico-1-3-update.pl DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} ) +diff --git a/src/core/tellico-1-3-update.pl b/src/config/tellico-1-3-update.pl +similarity index 100% +rename from src/core/tellico-1-3-update.pl +rename to src/config/tellico-1-3-update.pl +diff --git a/src/core/tellico-rename.upd b/src/config/tellico-rename.upd +similarity index 100% +rename from src/core/tellico-rename.upd +rename to src/config/tellico-rename.upd +diff --git a/src/core/tellico.upd b/src/config/tellico.upd +similarity index 100% +rename from src/core/tellico.upd +rename to src/config/tellico.upd +diff --git a/src/core/tellico_config.kcfg b/src/config/tellico_config.kcfg +similarity index 99% +rename from src/core/tellico_config.kcfg +rename to src/config/tellico_config.kcfg +index 683b0df9..5446ac3b 100644 +--- a/src/core/tellico_config.kcfg ++++ b/src/config/tellico_config.kcfg +@@ -6,9 +6,6 @@ + xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 + http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > + +-KLocalizedString +-KColorScheme +-QFontDatabase + + + +diff --git a/src/core/tellico_config.kcfgc b/src/config/tellico_config.kcfgc +similarity index 75% +rename from src/core/tellico_config.kcfgc +rename to src/config/tellico_config.kcfgc +index 7cf7c9c4..cb63e81d 100644 +--- a/src/core/tellico_config.kcfgc ++++ b/src/config/tellico_config.kcfgc +@@ -7,3 +7,4 @@ Mutators=true + MemberVariables=private + CustomAdditions=true + GlobalEnums=true ++SourceIncludeFiles=KColorScheme,KLocalizedString,QFontDatabase +diff --git a/src/core/tellico_config_addons.cpp b/src/config/tellico_config_addons.cpp +similarity index 100% +rename from src/core/tellico_config_addons.cpp +rename to src/config/tellico_config_addons.cpp +diff --git a/src/core/tellico_config_addons.h b/src/config/tellico_config_addons.h +similarity index 100% +rename from src/core/tellico_config_addons.h +rename to src/config/tellico_config_addons.h +diff --git a/src/configdialog.cpp b/src/configdialog.cpp +index 66d8148a..8fd23478 100644 +--- a/src/configdialog.cpp ++++ b/src/configdialog.cpp +@@ -36,7 +36,7 @@ + #include "tellico_kernel.h" + #include "utils/tellico_utils.h" + #include "utils/string_utils.h" +-#include "core/tellico_config.h" ++#include "config/tellico_config.h" + #include "images/imagefactory.h" + #include "gui/combobox.h" + #include "gui/collectiontypecombo.h" +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index d8d6477e..f7b8f387 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -3,34 +3,15 @@ + SET(core_STAT_SRCS + filehandler.cpp + netaccess.cpp +- tellico_config_addons.cpp + tellico_strings.cpp + ) + +-SET(core_KCFG_SRCS +- tellico_config.kcfgc +- ) +- +-kconfig_add_kcfg_files(core_STAT_SRCS ${core_KCFG_SRCS}) +- +-ADD_CUSTOM_TARGET(tellico_config DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tellico_config.h) +- + add_library(core STATIC ${core_STAT_SRCS}) + + TARGET_LINK_LIBRARIES(core +- images +- utils + Qt5::Core +- KF5::ConfigCore +- KF5::ConfigGui +- KF5::ConfigWidgets ++ Qt5::Xml ++ KF5::I18n + KF5::JobWidgets + KF5::KIOWidgets + ) +- +-########### install files ############### +- +-INSTALL(FILES tellico_config.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} ) +-INSTALL(FILES tellico-rename.upd tellico.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} ) +- +-INSTALL(PROGRAMS tellico-1-3-update.pl DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} ) +diff --git a/src/detailedlistview.cpp b/src/detailedlistview.cpp +index 33f18e16..ac0ed2b3 100644 +--- a/src/detailedlistview.cpp ++++ b/src/detailedlistview.cpp +@@ -30,7 +30,7 @@ + #include "entry.h" + #include "tellico_debug.h" + #include "tellico_kernel.h" +-#include "core/tellico_config.h" ++#include "config/tellico_config.h" + #include "models/entrymodel.h" + #include "models/entrysortmodel.h" + #include "models/modelmanager.h" +diff --git a/src/document.cpp b/src/document.cpp +index 1462806c..bb66f7a1 100644 +--- a/src/document.cpp ++++ b/src/document.cpp +@@ -28,17 +28,17 @@ + #include "translators/tellicozipexporter.h" + #include "translators/tellicoxmlexporter.h" + #include "collection.h" +-#include "filehandler.h" ++#include "core/filehandler.h" + #include "borrower.h" + #include "fieldformat.h" +-#include "tellico_strings.h" ++#include "core/tellico_strings.h" + #include "images/imagefactory.h" + #include "images/imagedirectory.h" + #include "images/image.h" + #include "images/imageinfo.h" + #include "utils/stringset.h" + #include "progressmanager.h" +-#include "core/tellico_config.h" ++#include "config/tellico_config.h" + #include "entrycomparison.h" + #include "utils/guiproxy.h" + #include "tellico_debug.h" +diff --git a/src/entryview.cpp b/src/entryview.cpp +index 32810113..8d5de40f 100644 +--- a/src/entryview.cpp ++++ b/src/entryview.cpp +@@ -33,7 +33,7 @@ + #include "tellico_kernel.h" + #include "utils/tellico_utils.h" + #include "core/filehandler.h" +-#include "core/tellico_config.h" ++#include "config/tellico_config.h" + #include "gui/drophandler.h" + #include "document.h" + #include "../utils/datafileregistry.h" +diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp +index 59ba8596..66b67689 100644 +--- a/src/exportdialog.cpp ++++ b/src/exportdialog.cpp +@@ -24,7 +24,7 @@ + + #include "exportdialog.h" + #include "collection.h" +-#include "filehandler.h" ++#include "core/filehandler.h" + #include "controller.h" + #include "document.h" + #include "tellico_debug.h" +diff --git a/src/fetch/CMakeLists.txt b/src/fetch/CMakeLists.txt +index 63d496c4..331c6def 100644 +--- a/src/fetch/CMakeLists.txt ++++ b/src/fetch/CMakeLists.txt +@@ -69,6 +69,7 @@ TARGET_LINK_LIBRARIES(fetch + KF5::Archive + KF5::IconThemes + KF5::JobWidgets ++ KF5::KIOWidgets + ) + + IF(${KF5KIO_VERSION} VERSION_GREATER "5.18.0") +diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp +index 91f2587f..006d9eae 100644 +--- a/src/fetchdialog.cpp ++++ b/src/fetchdialog.cpp +@@ -28,12 +28,12 @@ + #include "fetch/fetchmanager.h" + #include "fetch/fetcher.h" + #include "fetch/fetchresult.h" +-#include "core/tellico_config.h" ++#include "config/tellico_config.h" + #include "entryview.h" + #include "utils/isbnvalidator.h" + #include "utils/upcvalidator.h" + #include "tellico_kernel.h" +-#include "filehandler.h" ++#include "core/filehandler.h" + #include "collection.h" + #include "entry.h" + #include "document.h" +diff --git a/src/fieldformat.cpp b/src/fieldformat.cpp +index e21ec7a8..b35f9781 100644 +--- a/src/fieldformat.cpp ++++ b/src/fieldformat.cpp +@@ -23,7 +23,7 @@ + ***************************************************************************/ + + #include "fieldformat.h" +-#include "core/tellico_config.h" ++#include "config/tellico_config.h" + + using Tellico::FieldFormat; + +diff --git a/src/images/CMakeLists.txt b/src/images/CMakeLists.txt +index cfc8bfe4..d058a23f 100644 +--- a/src/images/CMakeLists.txt ++++ b/src/images/CMakeLists.txt +@@ -9,6 +9,7 @@ add_library(images STATIC ${images_STAT_SRCS}) + + TARGET_LINK_LIBRARIES(images + core ++ config + utils + KF5::KIOCore + KF5::Archive +diff --git a/src/images/imagedirectory.cpp b/src/images/imagedirectory.cpp +index 4dc5be67..fc371c52 100644 +--- a/src/images/imagedirectory.cpp ++++ b/src/images/imagedirectory.cpp +@@ -24,7 +24,7 @@ + + #include "imagedirectory.h" + #include "image.h" +-#include "filehandler.h" ++#include "../core/filehandler.h" + #include "../tellico_debug.h" + + #include +diff --git a/src/images/imagefactory.cpp b/src/images/imagefactory.cpp +index 499ad19e..7c7fd2b4 100644 +--- a/src/images/imagefactory.cpp ++++ b/src/images/imagefactory.cpp +@@ -29,7 +29,7 @@ + #include "imageinfo.h" + #include "imagedirectory.h" + #include "../core/filehandler.h" +-#include "../core/tellico_config.h" ++#include "../config/tellico_config.h" + #include "../utils/tellico_utils.h" + #include "../tellico_debug.h" + +diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp +index 8eefa772..c70b84b6 100644 +--- a/src/mainwindow.cpp ++++ b/src/mainwindow.cpp +@@ -40,7 +40,7 @@ + #include "controller.h" + #include "importdialog.h" + #include "exportdialog.h" +-#include "filehandler.h" // needed so static mainWindow variable can be set ++#include "core/filehandler.h" // needed so static mainWindow variable can be set + #include "translators/htmlexporter.h" // for printing + #include "entryview.h" + #include "entryiconview.h" +@@ -52,13 +52,13 @@ + #include "fetchdialog.h" + #include "reportdialog.h" + #include "bibtexkeydialog.h" +-#include "tellico_strings.h" ++#include "core/tellico_strings.h" + #include "filterview.h" + #include "loanview.h" + #include "fetch/fetchmanager.h" + #include "fetch/fetcherinitializer.h" + #include "cite/actionmanager.h" +-#include "core/tellico_config.h" ++#include "config/tellico_config.h" + #include "core/netaccess.h" + #include "dbusinterface.h" + #include "models/models.h" +diff --git a/src/models/CMakeLists.txt b/src/models/CMakeLists.txt +index 58c695b5..4eaf40bd 100644 +--- a/src/models/CMakeLists.txt ++++ b/src/models/CMakeLists.txt +@@ -7,18 +7,19 @@ SET(models_STAT_SRCS + entrymodel.cpp + entryselectionmodel.cpp + entrysortmodel.cpp ++ fieldcomparison.cpp + filtermodel.cpp + groupsortmodel.cpp + modeliterator.cpp + modelmanager.cpp + modeltest.cpp ++ stringcomparison.cpp + ) + + add_library(tellicomodels STATIC ${models_STAT_SRCS}) + + target_link_libraries(tellicomodels + core +- utils + images + Qt5::Core + Qt5::Gui +diff --git a/src/models/entrymodel.cpp b/src/models/entrymodel.cpp +index 8db78f47..bb50836b 100644 +--- a/src/models/entrymodel.cpp ++++ b/src/models/entrymodel.cpp +@@ -31,7 +31,7 @@ + #include "../document.h" + #include "../images/image.h" + #include "../images/imagefactory.h" +-#include "../core/tellico_config.h" ++#include "../config/tellico_config.h" + #include "../tellico_debug.h" + + namespace { +diff --git a/src/models/entrysortmodel.cpp b/src/models/entrysortmodel.cpp +index 792ae81d..f11ffeb6 100644 +--- a/src/models/entrysortmodel.cpp ++++ b/src/models/entrysortmodel.cpp +@@ -24,7 +24,7 @@ + + #include "entrysortmodel.h" + #include "models.h" +-#include "../utils/fieldcomparison.h" ++#include "fieldcomparison.h" + #include "../field.h" + #include "../entry.h" + +diff --git a/src/utils/fieldcomparison.cpp b/src/models/fieldcomparison.cpp +similarity index 99% +rename from src/utils/fieldcomparison.cpp +rename to src/models/fieldcomparison.cpp +index a5aadb27..f842c9b4 100644 +--- a/src/utils/fieldcomparison.cpp ++++ b/src/models/fieldcomparison.cpp +@@ -36,7 +36,7 @@ + Tellico::FieldComparison* Tellico::FieldComparison::create(Data::FieldPtr field_) { + if(!field_) { + myWarning() << "No field for creating a field comparison"; +- return 0; ++ return nullptr; + } + if(field_->type() == Data::Field::Image) { + return new ImageComparison(field_); +diff --git a/src/utils/fieldcomparison.h b/src/models/fieldcomparison.h +similarity index 92% +rename from src/utils/fieldcomparison.h +rename to src/models/fieldcomparison.h +index d0da0dea..82b81cfe 100644 +--- a/src/utils/fieldcomparison.h ++++ b/src/models/fieldcomparison.h +@@ -59,7 +59,7 @@ public: + using FieldComparison::compare; + + protected: +- virtual int compare(const QString& str1, const QString& str2); ++ virtual int compare(const QString& str1, const QString& str2) Q_DECL_OVERRIDE; + + private: + StringComparison* m_stringComparison; +@@ -72,7 +72,7 @@ public: + using FieldComparison::compare; + + protected: +- virtual int compare(const QString& str1, const QString& str2); ++ virtual int compare(const QString& str1, const QString& str2) Q_DECL_OVERRIDE; + }; + + class ChoiceComparison : public FieldComparison { +@@ -82,7 +82,7 @@ public: + using FieldComparison::compare; + + protected: +- virtual int compare(const QString& str1, const QString& str2); ++ virtual int compare(const QString& str1, const QString& str2) Q_DECL_OVERRIDE; + + private: + QStringList m_values; +diff --git a/src/models/groupsortmodel.cpp b/src/models/groupsortmodel.cpp +index 0326a755..483a0e2f 100644 +--- a/src/models/groupsortmodel.cpp ++++ b/src/models/groupsortmodel.cpp +@@ -24,9 +24,9 @@ + + #include "groupsortmodel.h" + #include "models.h" ++#include "stringcomparison.h" + #include "../field.h" + #include "../entrygroup.h" +-#include "../utils/stringcomparison.h" + #include "../document.h" + #include "../tellico_debug.h" + +diff --git a/src/utils/stringcomparison.cpp b/src/models/stringcomparison.cpp +similarity index 99% +rename from src/utils/stringcomparison.cpp +rename to src/models/stringcomparison.cpp +index 6623bea9..515be2a1 100644 +--- a/src/utils/stringcomparison.cpp ++++ b/src/models/stringcomparison.cpp +@@ -46,7 +46,7 @@ namespace { + Tellico::StringComparison* Tellico::StringComparison::create(Data::FieldPtr field_) { + if(!field_) { + myWarning() << "No field for creating a string comparison"; +- return 0; ++ return nullptr; + } + if(field_->type() == Data::Field::Number || field_->type() == Data::Field::Rating) { + return new NumberComparison(); +diff --git a/src/utils/stringcomparison.h b/src/models/stringcomparison.h +similarity index 86% +rename from src/utils/stringcomparison.h +rename to src/models/stringcomparison.h +index 31071ded..b0108849 100644 +--- a/src/utils/stringcomparison.h ++++ b/src/models/stringcomparison.h +@@ -43,25 +43,25 @@ public: + class BoolComparison : public StringComparison { + public: + BoolComparison(); +- virtual int compare(const QString& str1, const QString& str2); ++ virtual int compare(const QString& str1, const QString& str2) Q_DECL_OVERRIDE; + }; + + class TitleComparison : public StringComparison { + public: + TitleComparison(); +- virtual int compare(const QString& str1, const QString& str2); ++ virtual int compare(const QString& str1, const QString& str2) Q_DECL_OVERRIDE; + }; + + class NumberComparison : public StringComparison { + public: + NumberComparison(); +- virtual int compare(const QString& str1, const QString& str2); ++ virtual int compare(const QString& str1, const QString& str2) Q_DECL_OVERRIDE; + }; + + class LCCComparison : public StringComparison { + public: + LCCComparison(); +- virtual int compare(const QString& str1, const QString& str2); ++ virtual int compare(const QString& str1, const QString& str2) Q_DECL_OVERRIDE; + + private: + int compareLCC(const QStringList& cap1, const QStringList& cap2) const; +@@ -71,7 +71,7 @@ private: + class ISODateComparison : public StringComparison { + public: + ISODateComparison(); +- virtual int compare(const QString& str1, const QString& str2); ++ virtual int compare(const QString& str1, const QString& str2) Q_DECL_OVERRIDE; + }; + + } +diff --git a/src/newstuff/CMakeLists.txt b/src/newstuff/CMakeLists.txt +index 5a7f6963..db29b82b 100644 +--- a/src/newstuff/CMakeLists.txt ++++ b/src/newstuff/CMakeLists.txt +@@ -14,6 +14,7 @@ TARGET_LINK_LIBRARIES(newstuff + Qt5::Gui + KF5::ConfigCore + KF5::KIOCore ++ KF5::Archive + ) + + INSTALL(FILES tellico-template.knsrc tellico-script.knsrc DESTINATION ${KDE_INSTALL_CONFDIR}) +diff --git a/src/reportdialog.cpp b/src/reportdialog.cpp +index 77dc6ab9..198a461e 100644 +--- a/src/reportdialog.cpp ++++ b/src/reportdialog.cpp +@@ -35,7 +35,7 @@ + #include "utils/cursorsaver.h" + #include "utils/datafileregistry.h" + #include "utils/tellico_utils.h" +-#include "core/tellico_config.h" ++#include "config/tellico_config.h" + + #include + #include +diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt +index b3f8330a..0e1c0677 100644 +--- a/src/tests/CMakeLists.txt ++++ b/src/tests/CMakeLists.txt +@@ -11,7 +11,7 @@ add_executable(entitytest entitytest.cpp) + ecm_mark_nongui_executable(entitytest) + add_test(entitytest entitytest) + ecm_mark_as_test(entitytest) +-TARGET_LINK_LIBRARIES(entitytest utils Qt5::Test ) ++TARGET_LINK_LIBRARIES(entitytest utils config Qt5::Test ) + + add_executable(cuecattest cuecattest.cpp) + ecm_mark_nongui_executable(cuecattest) +@@ -35,25 +35,25 @@ add_executable(lcctest lcctest.cpp ../field.cpp ../fieldformat.cpp) + ecm_mark_nongui_executable(lcctest) + add_test(lcctest lcctest) + ecm_mark_as_test(lcctest) +-TARGET_LINK_LIBRARIES(lcctest utils core Qt5::Test) ++TARGET_LINK_LIBRARIES(lcctest tellicomodels Qt5::Test) + + add_executable(formattest formattest.cpp ../fieldformat.cpp) + ecm_mark_nongui_executable(formattest) + add_test(formattest formattest) + ecm_mark_as_test(formattest) +-TARGET_LINK_LIBRARIES(formattest core Qt5::Test) ++TARGET_LINK_LIBRARIES(formattest config Qt5::Test) + + add_executable(fieldtest fieldtest.cpp ../field.cpp ../fieldformat.cpp) + ecm_mark_nongui_executable(fieldtest) + add_test(fieldtest fieldtest) + ecm_mark_as_test(fieldtest) +-TARGET_LINK_LIBRARIES(fieldtest core Qt5::Test) ++TARGET_LINK_LIBRARIES(fieldtest config utils Qt5::Test) + + add_executable(comparisontest comparisontest.cpp ../field.cpp ../fieldformat.cpp) + ecm_mark_nongui_executable(comparisontest) + add_test(comparisontest comparisontest) + ecm_mark_as_test(comparisontest) +-TARGET_LINK_LIBRARIES(comparisontest utils core Qt5::Test) ++TARGET_LINK_LIBRARIES(comparisontest tellicomodels Qt5::Test) + + add_executable(imagetest imagetest.cpp ../utils/tellico_utils.cpp ../utils/guiproxy.cpp ../utils/cursorsaver.cpp) + ecm_mark_nongui_executable(imagetest) +@@ -101,6 +101,7 @@ TARGET_LINK_LIBRARIES(translatorstest + KF5::I18n + KF5::Archive + KF5::KIOWidgets ++ KF5::ConfigWidgets + ${LIBXML2_LIBRARIES} + ${LIBXSLT_LIBRARIES} + ${LIBXSLT_EXSLT_LIBRARIES} +@@ -111,6 +112,7 @@ set(TELLICO_TEST_LIBS + collections + utils + images ++ core + tellicomodels + Qt5::Test + KF5::KIOCore +@@ -197,15 +199,16 @@ add_executable(bibtexmltest bibtexmltest.cpp + ecm_mark_nongui_executable(bibtexmltest) + add_test(bibtexmltest bibtexmltest) + ecm_mark_as_test(bibtexmltest) +-TARGET_LINK_LIBRARIES(bibtexmltest translatorstest ${TELLICO_TEST_LIBS}) ++TARGET_LINK_LIBRARIES(bibtexmltest translatorstest core ${TELLICO_TEST_LIBS}) + + add_executable(citetest citetest.cpp + ../collections/bibtexcollection.cpp ++ ../core/filehandler.cpp + ) + ecm_mark_nongui_executable(citetest) + add_test(citetest citetest) + ecm_mark_as_test(citetest) +-TARGET_LINK_LIBRARIES(citetest cite tellicotest Qt5::Test) ++TARGET_LINK_LIBRARIES(citetest cite tellicotest config images Qt5::Test) + ADD_DEPENDENCIES(citetest tellico_config) + + add_executable(ciwtest ciwtest.cpp +diff --git a/src/tests/citetest.cpp b/src/tests/citetest.cpp +index b51bf7a6..b34a7929 100644 +--- a/src/tests/citetest.cpp ++++ b/src/tests/citetest.cpp +@@ -27,7 +27,7 @@ + #include "citetest.h" + #include "../cite/lyxpipe.h" + #include "../cite/clipboard.h" +-#include "../core/tellico_config.h" ++#include "../config/tellico_config.h" + #include "../collections/bibtexcollection.h" + + #include +diff --git a/src/tests/comparisontest.cpp b/src/tests/comparisontest.cpp +index 89a8d19b..f65ca197 100644 +--- a/src/tests/comparisontest.cpp ++++ b/src/tests/comparisontest.cpp +@@ -25,8 +25,7 @@ + #undef QT_NO_CAST_FROM_ASCII + + #include "comparisontest.h" +- +-#include "../utils/stringcomparison.h" ++#include "../models/stringcomparison.h" + + #include + +diff --git a/src/tests/documenttest.cpp b/src/tests/documenttest.cpp +index 1f0ba8b6..9c1b18bc 100644 +--- a/src/tests/documenttest.cpp ++++ b/src/tests/documenttest.cpp +@@ -28,7 +28,7 @@ + #include "../document.h" + #include "../images/imagefactory.h" + #include "../images/image.h" +-#include "../core/tellico_config.h" ++#include "../config/tellico_config.h" + #include "../collections/bookcollection.h" + #include "../collectionfactory.h" + +diff --git a/src/tests/formattest.cpp b/src/tests/formattest.cpp +index a92b7380..962680cb 100644 +--- a/src/tests/formattest.cpp ++++ b/src/tests/formattest.cpp +@@ -27,7 +27,7 @@ + #include "formattest.h" + + #include "../fieldformat.h" +-#include "../core/tellico_config.h" ++#include "../config/tellico_config.h" + + #include + +diff --git a/src/tests/htmlexportertest.cpp b/src/tests/htmlexportertest.cpp +index 42d8a9a8..c09e62d2 100644 +--- a/src/tests/htmlexportertest.cpp ++++ b/src/tests/htmlexportertest.cpp +@@ -33,7 +33,7 @@ + #include "../document.h" + #include "../images/imagefactory.h" + #include "../utils/datafileregistry.h" +-#include "../core/tellico_config.h" ++#include "../config/tellico_config.h" + + #include + #include +diff --git a/src/tests/lcctest.cpp b/src/tests/lcctest.cpp +index 08da8e06..a653bd25 100644 +--- a/src/tests/lcctest.cpp ++++ b/src/tests/lcctest.cpp +@@ -25,8 +25,7 @@ + #undef QT_NO_CAST_FROM_ASCII + + #include "lcctest.h" +- +-#include "../utils/stringcomparison.h" ++#include "../models/stringcomparison.h" + + #include + +diff --git a/src/translators/boardgamegeekimporter.cpp b/src/translators/boardgamegeekimporter.cpp +index 2bb35f0c..1ac70cbe 100644 +--- a/src/translators/boardgamegeekimporter.cpp ++++ b/src/translators/boardgamegeekimporter.cpp +@@ -26,7 +26,7 @@ + #include "../collections/boardgamecollection.h" + #include "xslthandler.h" + #include "tellicoimporter.h" +-#include "filehandler.h" ++#include "../core/filehandler.h" + #include "../utils/datafileregistry.h" + #include "../tellico_debug.h" + +diff --git a/src/translators/goodreadsimporter.cpp b/src/translators/goodreadsimporter.cpp +index eecb7e65..d03d05b0 100644 +--- a/src/translators/goodreadsimporter.cpp ++++ b/src/translators/goodreadsimporter.cpp +@@ -25,7 +25,7 @@ + #include "goodreadsimporter.h" + #include "xslthandler.h" + #include "tellicoimporter.h" +-#include "filehandler.h" ++#include "../core/filehandler.h" + #include "../utils/datafileregistry.h" + #include "../tellico_debug.h" + +diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp +index acc712b0..79ef0039 100644 +--- a/src/translators/htmlexporter.cpp ++++ b/src/translators/htmlexporter.cpp +@@ -29,7 +29,7 @@ + #include "../document.h" + #include "../core/filehandler.h" + #include "../core/netaccess.h" +-#include "../core/tellico_config.h" ++#include "../config/tellico_config.h" + #include "../core/tellico_strings.h" + #include "../images/image.h" + #include "../images/imagefactory.h" +diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt +index a5851007..e5fa2b24 100644 +--- a/src/utils/CMakeLists.txt ++++ b/src/utils/CMakeLists.txt +@@ -4,13 +4,11 @@ SET(utils_STAT_SRCS + bibtexhandler.cpp + cursorsaver.cpp + datafileregistry.cpp +- fieldcomparison.cpp + guiproxy.cpp + iso5426converter.cpp + iso6937converter.cpp + isbnvalidator.cpp + lccnvalidator.cpp +- stringcomparison.cpp + string_utils.cpp + tellico_utils.cpp + upcvalidator.cpp +@@ -21,7 +19,6 @@ SET(utils_STAT_SRCS + add_library(utils STATIC ${utils_STAT_SRCS}) + + TARGET_LINK_LIBRARIES(utils +- images # for FieldComparison + Qt5::Core + Qt5::Widgets + Qt5::Xml +@@ -30,4 +27,5 @@ TARGET_LINK_LIBRARIES(utils + KF5::I18n + KF5::WidgetsAddons + KF5::Codecs ++ KF5::KIOCore + ) +diff --git a/src/viewstack.cpp b/src/viewstack.cpp +index 0d25d274..9cf75093 100644 +--- a/src/viewstack.cpp ++++ b/src/viewstack.cpp +@@ -26,7 +26,7 @@ + #include "detailedlistview.h" + #include "entryiconview.h" + #include "models/entrymodel.h" +-#include "core/tellico_config.h" ++#include "config/tellico_config.h" + + #include + +-- +2.13.5 + diff --git a/tellico.changes b/tellico.changes index 0a6d64e..54cba96 100644 --- a/tellico.changes +++ b/tellico.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 5 16:59:07 UTC 2017 - wbauer@tmo.at + +- Add 0001-Fix-build-with-cmake-3.9.patch to fix build with latest + cmake in Factory (kde#382680) + ------------------------------------------------------------------- Tue Mar 28 10:03:20 UTC 2017 - wbauer@tmo.at diff --git a/tellico.spec b/tellico.spec index 2c386d6..49f34cc 100644 --- a/tellico.spec +++ b/tellico.spec @@ -24,6 +24,8 @@ License: GPL-2.0+ Group: Productivity/Office/Other Url: http://tellico-project.org/ Source0: http://tellico-project.org/files/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch: 0001-Fix-build-with-cmake-3.9.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: karchive-devel @@ -85,6 +87,9 @@ stamps, trading cards, comic books, and wines. %prep %setup -q +%if 0%{?suse_version} > 1320 +%patch -p1 +%endif %build %cmake_kf5 "-DENABLE_WEBCAM=true" -d build