* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/files/, kde-misc/tellico/
@ 2017-04-16 17:40 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-04-16 17:40 UTC (permalink / raw
To: gentoo-commits
commit: 1df9dda31e99f0ea609ab5bbd2864334ef3f48db
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 12:09:54 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 17:40:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df9dda3
kde-misc/tellico: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
kde-misc/tellico/Manifest | 1 -
kde-misc/tellico/files/tellico-3.0-kf5cddb.patch | 35 ----------
kde-misc/tellico/tellico-3.0.1-r1.ebuild | 89 ------------------------
3 files changed, 125 deletions(-)
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 372e1d4a13e..2e179c9332c 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,4 +1,3 @@
DIST tellico-2.3.10.tar.bz2 4877384 SHA256 e916101f86b6f843b85be42e8545aa7441cd496cbb9b81590e2e0bd03a58faaa SHA512 a93300900febae996633294fa0b2e5808af62bbebafa718e0ba345f206dcd2836e44b6172621fd1b506fd3e6ae60f5c03514d0f53433188c67e6b92a058b33aa WHIRLPOOL 88ea79b081ae35a6f4bff5a34d9df2e2e85af2435e071d93697d4157e8aff638c881445bfa0f9f1bcf30807ac30280e39f08cbc4c968aee47b963b6447f65bb3
DIST tellico-2.3.11.tar.bz2 5174873 SHA256 3064756f6e1662d07385c37f5821a0f6be8b22b6decad17d6852536016ca2128 SHA512 26a9b49051cbf2f75e89109c0d68d4e91d7b9bd63e3ec99413354cda91ef08b99d2eef3e9dd6f2e017bbbae1a111d3de90115a965f063f6149d36073242c58a9 WHIRLPOOL 1fe854da86baf8babbc4e870ebdbf37f337e300ccbdfb26dbebf9a4146efcf3190671d3f9a132a04960989a7b7a2eda134770467e13dea36ad28ab3c33159258
-DIST tellico-3.0.1.tar.xz 5488680 SHA256 58f1b2778f85b4f514a35278072ffb0ffdfac732840995668a1ff866c98ee19e SHA512 ff2b21e5c7412fc6363b52bc725034252840669ae60f22027d6d0ebaacc59ac52f673c95ad5364cf8604f9ea04008ff47ccf6d55845f16224211296373ce97d7 WHIRLPOOL 07cb3252b2bfa5db10f6445fdd06de3ca9dd74c02de016e44a9c4d401e78bfa1ac3df366e60c344958a52342854b97685f96f8e80e3f286482c037c60abc5ecc
DIST tellico-3.0.2.tar.xz 5492348 SHA256 455b0b24e2046e0a4919677719c4e2dcb1d8076cb49617c4f4fe5908ee40768b SHA512 68ac3063cd12bb59368b6106fe8e580afebeb61dd6db0fbef1751f5d6ed0c9bed04456a5cf1fb7fcfdc52be936670831eb766073a2c370148cf3e89907615a8f WHIRLPOOL 28af59c9add426ebf857a7ff14a91b95cfd093b46568bd2d7d3d4abfa0ed6282a4f3dc0912133e149a2680aab6a17e37e5a0cf21fcd388cf288148a52b95f46d
diff --git a/kde-misc/tellico/files/tellico-3.0-kf5cddb.patch b/kde-misc/tellico/files/tellico-3.0-kf5cddb.patch
deleted file mode 100644
index 28f31e2edf5..00000000000
--- a/kde-misc/tellico/files/tellico-3.0-kf5cddb.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 6325d19525d71051ccbd1dc2a030a0839c95c7d9
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun Feb 12 19:48:26 2017 +0100
-
- Drop search for obsolete Libkcddb, don't be quiet about KF5Cddb
-
- KF5-based releases are found by KF5Cddb since 16.12.0.
-
- REVIEW: 129945
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2b286cf..893b2d6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -128,18 +128,11 @@ if(KDEPIMLIBS_FOUND)
- endif(KDEPIMLIBS_FOUND)
-
- # There is a port of libkcddb to use KF5 style linking and headers
--find_package(KF5Cddb QUIET)
-+find_package(KF5Cddb)
- set_package_properties(KF5Cddb PROPERTIES
- DESCRIPTION "Support for CDDB searches"
-- URL "http://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
-+ URL "https://cgit.kde.org/libkcddb.git"
- TYPE OPTIONAL)
--if(NOT KF5Cddb_FOUND)
-- find_package(Libkcddb 5.0)
-- set_package_properties(Libkcddb PROPERTIES
-- DESCRIPTION "Support for CDDB searches"
-- URL "http://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
-- TYPE OPTIONAL)
--endif(NOT KF5Cddb_FOUND)
-
- find_package(Taglib)
- set_package_properties(Taglib PROPERTIES
diff --git a/kde-misc/tellico/tellico-3.0.1-r1.ebuild b/kde-misc/tellico/tellico-3.0.1-r1.ebuild
deleted file mode 100644
index 6dc82ef7ded..00000000000
--- a/kde-misc/tellico/tellico-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="A collection manager based on KDE Frameworks"
-HOMEPAGE="http://tellico-project.org/"
-SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
-
-COMMON_DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep khtml)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_frameworks_dep sonnet)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- >=dev-perl/Text-BibTeX-0.780.0-r1
- dev-libs/libxml2
- dev-libs/libxslt
- cddb? ( $(add_kdeapps_dep libkcddb) )
- discid? ( media-libs/libdiscid )
- pdf? ( app-text/poppler[qt5] )
- scanner? ( $(add_kdeapps_dep libksane) )
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
- taglib? ( >=media-libs/taglib-1.5 )
- v4l? ( >=media-libs/libv4l-0.8.3 )
- xmp? ( >=media-libs/exempi-2 )
- yaz? ( >=dev-libs/yaz-2:0 )
-"
-DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
- !kde-misc/tellico:4
-"
-
-# tests need network access
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
- $(cmake-utils_use_find_package cddb KF5Cddb)
- $(cmake-utils_use_find_package discid DiscID)
- $(cmake-utils_use_find_package pdf PopplerQt5)
- $(cmake-utils_use_find_package scanner KF5Sane)
- $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
- $(cmake-utils_use_find_package taglib Taglib)
- -DENABLE_WEBCAM=$(usex v4l)
- $(cmake-utils_use_find_package xmp Exempi)
- $(cmake-utils_use_find_package yaz Yaz)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/files/, kde-misc/tellico/
@ 2017-09-30 12:04 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-09-30 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 5afcae3470bfe08736622a85c61d3e4b7618a2cf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 12:02:41 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 12:03:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5afcae34
kde-misc/tellico: Fix build with cmake-3.9
Gentoo-bug: 632172
Package-Manager: Portage-2.3.10, Repoman-2.3.3
.../tellico/files/tellico-3.0.2-cmake-3.9.patch | 788 +++++++++++++++++++++
kde-misc/tellico/tellico-3.0.2-r1.ebuild | 91 +++
2 files changed, 879 insertions(+)
diff --git a/kde-misc/tellico/files/tellico-3.0.2-cmake-3.9.patch b/kde-misc/tellico/files/tellico-3.0.2-cmake-3.9.patch
new file mode 100644
index 00000000000..b31d072850f
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.0.2-cmake-3.9.patch
@@ -0,0 +1,788 @@
+Combination of:
+
+7f4840bb8eb6ee53c875cc6d6748701efcd5a915
+f1c9c315caed8c7d5d05424c07dd7562e430eba8
+cdd7e6d55584972c8e221a1d6e4f2731423deb60
+cb9847a09a834bf3334caae9c912870c66bd593b
+5b0822930907b1e0aa88e666f60c3428a77f011e
+024ef21d36201a2baa51b56409002bb91a07d4f9
+b5b78ab9dc6b1f5c0c34b546bf580d9de3c9e042
+
+to fix build with cmake-3.9.
+Gentoo-bug: 632172
+
+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 <KLocalizedString>
+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 100%
+rename from src/core/tellico_config.kcfg
+rename to src/config/tellico_config.kcfg
+diff --git a/src/core/tellico_config.kcfgc b/src/config/tellico_config.kcfgc
+similarity index 100%
+rename from src/core/tellico_config.kcfgc
+rename to src/config/tellico_config.kcfgc
+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..9e6c6c14 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -3,34 +3,16 @@
+ 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/entryiconview.cpp b/src/entryiconview.cpp
+index 8ba044d1..d1a0eb60 100644
+--- a/src/entryiconview.cpp
++++ b/src/entryiconview.cpp
+@@ -49,7 +49,7 @@ namespace {
+
+ using Tellico::EntryIconView;
+
+-EntryIconView::EntryIconView(QAbstractItemModel* model_, QWidget* parent_)
++EntryIconView::EntryIconView(QWidget* parent_)
+ : QListView(parent_), m_maxAllowedIconWidth(MAX_ENTRY_ICON_SIZE) {
+ setViewMode(QListView::IconMode);
+ setMovement(QListView::Static);
+@@ -60,12 +60,6 @@ EntryIconView::EntryIconView(QAbstractItemModel* model_, QWidget* parent_)
+ setWordWrap(true);
+ setSpacing(ENTRY_ICON_SIZE_PAD);
+
+- Q_ASSERT(::qobject_cast<EntryModel*>(model_));
+- EntrySortModel* sortModel = new EntrySortModel(this);
+- sortModel->setSortRole(EntryPtrRole);
+- sortModel->setSourceModel(model_);
+- setModel(sortModel);
+-
+ connect(this, SIGNAL(doubleClicked(const QModelIndex&)), SLOT(slotDoubleClicked(const QModelIndex&)));
+
+ setWhatsThis(i18n("<qt>The <i>Icon View</i> shows each entry in the collection or group using "
+diff --git a/src/entryiconview.h b/src/entryiconview.h
+index 1dd41eb1..42c1a8e3 100644
+--- a/src/entryiconview.h
++++ b/src/entryiconview.h
+@@ -46,7 +46,7 @@ class EntryIconView : public QListView, public Observer {
+ Q_OBJECT
+
+ public:
+- EntryIconView(QAbstractItemModel* model, QWidget* parent);
++ EntryIconView(QWidget* parent);
+ ~EntryIconView();
+
+ int maxAllowedIconWidth() const { return m_maxAllowedIconWidth; }
+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 <KZip>
+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..00dda6fd 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"
+@@ -745,6 +745,7 @@ void MainWindow::initView() {
+ m_detailedView, SLOT(slotRefreshImages()));
+
+ m_iconView = m_viewStack->iconView();
++ // use the same model in both views so they are sync'ed
+ m_iconView->setModel(m_detailedView->model());
+ Controller::self()->addObserver(m_iconView);
+ m_detailedView->setWhatsThis(i18n("<qt>The <i>Column View</i> shows the value of multiple fields "
+diff --git a/src/models/CMakeLists.txt b/src/models/CMakeLists.txt
+index 58c695b5..8faa5554 100644
+--- a/src/models/CMakeLists.txt
++++ b/src/models/CMakeLists.txt
+@@ -7,18 +7,18 @@ 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 100%
+rename from src/utils/fieldcomparison.cpp
+rename to src/models/fieldcomparison.cpp
+diff --git a/src/utils/fieldcomparison.h b/src/models/fieldcomparison.h
+similarity index 100%
+rename from src/utils/fieldcomparison.h
+rename to src/models/fieldcomparison.h
+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 100%
+rename from src/utils/stringcomparison.cpp
+rename to src/models/stringcomparison.cpp
+diff --git a/src/utils/stringcomparison.h b/src/models/stringcomparison.h
+similarity index 100%
+rename from src/utils/stringcomparison.h
+rename to src/models/stringcomparison.h
+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 <KLocalizedString>
+ #include <KHTMLPart>
+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 <QTest>
+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 <QTest>
+
+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 <QTest>
+
+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 <QTest>
+ #include <QRegExp>
+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 <QTest>
+
+diff --git a/src/models/modeltest.cpp b/src/tests/modeltest.cpp
+similarity index 99%
+rename from src/models/modeltest.cpp
+rename to src/tests/modeltest.cpp
+index 12f41f33..80a39f57 100644
+--- a/src/models/modeltest.cpp
++++ b/src/tests/modeltest.cpp
+@@ -499,6 +499,7 @@ void ModelTest::layoutChanged()
+ */
+ void ModelTest::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
+ {
++// qDebug() << "ratbr" << parent << start << end;
+ Changing c;
+ c.parent = parent;
+ c.oldSize = model->rowCount(parent);
+@@ -514,6 +515,7 @@ void ModelTest::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e
+ */
+ void ModelTest::rowsRemoved(const QModelIndex & parent, int start, int end)
+ {
++// qDebug() << "rr" << parent << start << end;
+ Changing c = remove.pop();
+ Q_ASSERT(c.parent == parent);
+ Q_ASSERT(c.oldSize - (end - start + 1) == model->rowCount(parent));
+diff --git a/src/models/modeltest.h b/src/tests/modeltest.h
+similarity index 100%
+rename from src/models/modeltest.h
+rename to src/tests/modeltest.h
+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..3f292414 100644
+--- a/src/viewstack.cpp
++++ b/src/viewstack.cpp
+@@ -25,8 +25,7 @@
+ #include "viewstack.h"
+ #include "detailedlistview.h"
+ #include "entryiconview.h"
+-#include "models/entrymodel.h"
+-#include "core/tellico_config.h"
++#include "config/tellico_config.h"
+
+ #include <KLocalizedString>
+
+@@ -42,7 +41,7 @@ using Tellico::ViewStack;
+
+ ViewStack::ViewStack(QWidget* parent_) : QWidget(parent_)
+ , m_listView(new DetailedListView(this))
+- , m_iconView(new EntryIconView(m_listView->sourceModel(), this)) {
++ , m_iconView(new EntryIconView(this)) {
+ QBoxLayout* lay = new QVBoxLayout();
+ lay->setMargin(0);
+ lay->setSpacing(0);
diff --git a/kde-misc/tellico/tellico-3.0.2-r1.ebuild b/kde-misc/tellico/tellico-3.0.2-r1.ebuild
new file mode 100644
index 00000000000..e40e2597d7b
--- /dev/null
+++ b/kde-misc/tellico/tellico-3.0.2-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="A collection manager based on KDE Frameworks"
+HOMEPAGE="http://tellico-project.org/"
+SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep khtml)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_frameworks_dep sonnet)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ >=dev-perl/Text-BibTeX-0.780.0-r1
+ dev-libs/libxml2
+ dev-libs/libxslt
+ cddb? ( $(add_kdeapps_dep libkcddb) )
+ discid? ( media-libs/libdiscid )
+ pdf? ( app-text/poppler[qt5] )
+ scanner? ( $(add_kdeapps_dep libksane) )
+ semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+ taglib? ( >=media-libs/taglib-1.5 )
+ v4l? ( >=media-libs/libv4l-0.8.3 )
+ xmp? ( >=media-libs/exempi-2 )
+ yaz? ( >=dev-libs/yaz-2:0 )
+"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+ !kde-misc/tellico:4
+"
+
+# tests need network access
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog README )
+
+PATCHES=( "${FILESDIR}/${P}-cmake-3.9.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
+ $(cmake-utils_use_find_package cddb KF5Cddb)
+ $(cmake-utils_use_find_package discid DiscID)
+ $(cmake-utils_use_find_package pdf PopplerQt5)
+ $(cmake-utils_use_find_package scanner KF5Sane)
+ $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+ $(cmake-utils_use_find_package taglib Taglib)
+ -DENABLE_WEBCAM=$(usex v4l)
+ $(cmake-utils_use_find_package xmp Exempi)
+ $(cmake-utils_use_find_package yaz Yaz)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/files/, kde-misc/tellico/
@ 2019-05-09 19:45 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-05-09 19:45 UTC (permalink / raw
To: gentoo-commits
commit: 87d62982aed70d39a59a22374ac25cd9dfa0a3a5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 9 19:44:34 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 9 19:45:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d62982
kde-misc/tellico: Fix build against [libxml2 using] ICU-64 headers
Closes: https://bugs.gentoo.org/685460
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/tellico/files/tellico-3.1.4-icu-64.patch | 57 +++++++++++++++++++++++
kde-misc/tellico/tellico-3.1.4.ebuild | 1 +
2 files changed, 58 insertions(+)
diff --git a/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch b/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch
new file mode 100644
index 00000000000..5b10e4d259a
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch
@@ -0,0 +1,57 @@
+From 2e552aea8d2391ea3ab8afdb58caf214954a2129 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 9 May 2019 21:16:33 +0200
+Subject: [PATCH] Fix build against ICU 64.1 and later
+
+Summary:
+See also: https://unicode-org.atlassian.net/browse/ICU-20530
+
+Lots of errors of the same kind (libxml/tree.h included within extern "C"):
+
+```
+In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/bits/shared_ptr.h:52,
+ from /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/memory:81,
+ from /usr/include/unicode/localpointer.h:45,
+ from /usr/include/unicode/uenum.h:23,
+ from /usr/include/unicode/ucnv.h:53,
+ from /usr/include/libxml2/libxml/encoding.h:31,
+ from /usr/include/libxml2/libxml/parser.h:810,
+ from /usr/include/libxml2/libxml/globals.h:18,
+ from /usr/include/libxml2/libxml/threads.h:35,
+ from /usr/include/libxml2/libxml/xmlmemory.h:218,
+ from /usr/include/libxml2/libxml/tree.h:1307,
+ from /var/tmp/portage/kde-misc/tellico-9999/work/tellico-9999/src/translators/xslthandler.h:34,
+ from /var/tmp/portage/kde-misc/tellico-9999/work/tellico-9999/src/translators/xsltimporter.cpp:26:
+/usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/bits/shared_ptr_base.h:338:3: error: template with C linkage
+ template<typename _Tp, _Lock_policy _Lp = __default_lock_policy>
+ ^~~~~~~~
+```
+
+Test Plan: Builds fine against ICU 64.2.
+
+Reviewers: #tellico
+
+Differential Revision: https://phabricator.kde.org/D21103
+---
+ src/translators/xslthandler.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/translators/xslthandler.h b/src/translators/xslthandler.h
+index ebbb010b..bb2112da 100644
+--- a/src/translators/xslthandler.h
++++ b/src/translators/xslthandler.h
+@@ -29,9 +29,10 @@
+ #include <QHash>
+ #include <QString>
+
+-extern "C" {
+ // for xmlDocPtr
+ #include <libxml/tree.h>
++
++extern "C" {
+ // for xsltStyleSheetPtr
+ #include <libxslt/xsltInternals.h>
+ }
+--
+2.21.0
+
diff --git a/kde-misc/tellico/tellico-3.1.4.ebuild b/kde-misc/tellico/tellico-3.1.4.ebuild
index 14a4c066ed2..c9cec88bd7e 100644
--- a/kde-misc/tellico/tellico-3.1.4.ebuild
+++ b/kde-misc/tellico/tellico-3.1.4.ebuild
@@ -71,6 +71,7 @@ DOCS=( AUTHORS ChangeLog README )
PATCHES=(
"${FILESDIR}/${P}-xmloutputclosecallback-signature.patch"
"${FILESDIR}/${P}-empty-permissions-set.patch"
+ "${FILESDIR}/${P}-icu-64.patch" # bug #685460
)
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/files/, kde-misc/tellico/
@ 2019-07-04 19:40 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-07-04 19:40 UTC (permalink / raw
To: gentoo-commits
commit: a39a2e47f8a931cafde0ba8e67f3f078ffe93fbd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 4 19:22:07 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 4 19:39:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a39a2e47
kde-misc/tellico: Drop 3.1.4
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/tellico/Manifest | 1 -
.../tellico-3.1.4-empty-permissions-set.patch | 27 -------
kde-misc/tellico/files/tellico-3.1.4-icu-64.patch | 57 --------------
...co-3.1.4-xmloutputclosecallback-signature.patch | 30 -------
kde-misc/tellico/tellico-3.1.4.ebuild | 92 ----------------------
5 files changed, 207 deletions(-)
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index c18bed7d4f0..a8954e0d208 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,2 +1 @@
-DIST tellico-3.1.4.tar.xz 4632792 BLAKE2B 29db598ef558fe04618843cad6a58055b5de392f34aeea4860683f04ef4ab20856fd4a01523dc13c2d68023c266de69590e843ea56f912989d57c01e0d701ee2 SHA512 d09183bee13ae9f7c6c5114b76eeeb959a184def559ae239bb880ef9be964e33878530e9c4c0d3baa6f872bf8db155dffb94592e3a857623ab131d2f28f1f139
DIST tellico-3.2.tar.xz 5596028 BLAKE2B e22cd7b5f1bfb5221379b0e6c12c894314c3f04348ce8e0f82fe5707aa98d99af004486afe9266056c9650636b553e2355fa4caabe7528e60c0fd5af5df2ed9b SHA512 a24985200a70958f727bda3056de357d6cb74fc407197e9d9056573bc606cd6ffbd5bd971ef56acce3cb58f0b98865f5e89b431fe38c1d27b4dceafe49e78fdd
diff --git a/kde-misc/tellico/files/tellico-3.1.4-empty-permissions-set.patch b/kde-misc/tellico/files/tellico-3.1.4-empty-permissions-set.patch
deleted file mode 100644
index 2cb38749f4c..00000000000
--- a/kde-misc/tellico/files/tellico-3.1.4-empty-permissions-set.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From fd2056f2de46fa3be308ad47541f6c7ce8483c91 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Wed, 19 Dec 2018 10:24:51 +0100
-Subject: Properly pass an empty permission set
-
-Use QFileDevice::Permissions() to represent no permissions, instead of
-hardcoding 0.
----
- src/tests/imagejobtest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tests/imagejobtest.cpp b/src/tests/imagejobtest.cpp
-index ee578f8..b387e3b 100644
---- a/src/tests/imagejobtest.cpp
-+++ b/src/tests/imagejobtest.cpp
-@@ -99,7 +99,7 @@ void ImageJobTest::testNonexistant() {
- void ImageJobTest::testUnreadable() {
- QTemporaryFile tmpFile;
- QVERIFY(tmpFile.open());
-- QVERIFY(tmpFile.setPermissions(0));
-+ QVERIFY(tmpFile.setPermissions(QFileDevice::Permissions()));
- QUrl u = QUrl::fromLocalFile(tmpFile.fileName());
-
- Tellico::ImageJob* job = new Tellico::ImageJob(u);
---
-cgit v1.1
-
diff --git a/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch b/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch
deleted file mode 100644
index 5b10e4d259a..00000000000
--- a/kde-misc/tellico/files/tellico-3.1.4-icu-64.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 2e552aea8d2391ea3ab8afdb58caf214954a2129 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 9 May 2019 21:16:33 +0200
-Subject: [PATCH] Fix build against ICU 64.1 and later
-
-Summary:
-See also: https://unicode-org.atlassian.net/browse/ICU-20530
-
-Lots of errors of the same kind (libxml/tree.h included within extern "C"):
-
-```
-In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/bits/shared_ptr.h:52,
- from /usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/memory:81,
- from /usr/include/unicode/localpointer.h:45,
- from /usr/include/unicode/uenum.h:23,
- from /usr/include/unicode/ucnv.h:53,
- from /usr/include/libxml2/libxml/encoding.h:31,
- from /usr/include/libxml2/libxml/parser.h:810,
- from /usr/include/libxml2/libxml/globals.h:18,
- from /usr/include/libxml2/libxml/threads.h:35,
- from /usr/include/libxml2/libxml/xmlmemory.h:218,
- from /usr/include/libxml2/libxml/tree.h:1307,
- from /var/tmp/portage/kde-misc/tellico-9999/work/tellico-9999/src/translators/xslthandler.h:34,
- from /var/tmp/portage/kde-misc/tellico-9999/work/tellico-9999/src/translators/xsltimporter.cpp:26:
-/usr/lib/gcc/x86_64-pc-linux-gnu/8.3.0/include/g++-v8/bits/shared_ptr_base.h:338:3: error: template with C linkage
- template<typename _Tp, _Lock_policy _Lp = __default_lock_policy>
- ^~~~~~~~
-```
-
-Test Plan: Builds fine against ICU 64.2.
-
-Reviewers: #tellico
-
-Differential Revision: https://phabricator.kde.org/D21103
----
- src/translators/xslthandler.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/translators/xslthandler.h b/src/translators/xslthandler.h
-index ebbb010b..bb2112da 100644
---- a/src/translators/xslthandler.h
-+++ b/src/translators/xslthandler.h
-@@ -29,9 +29,10 @@
- #include <QHash>
- #include <QString>
-
--extern "C" {
- // for xmlDocPtr
- #include <libxml/tree.h>
-+
-+extern "C" {
- // for xsltStyleSheetPtr
- #include <libxslt/xsltInternals.h>
- }
---
-2.21.0
-
diff --git a/kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch b/kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch
deleted file mode 100644
index 703af9c23e1..00000000000
--- a/kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 02cde6b20a3a0606aef7bf98a14ca70c7615be2c Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Wed, 19 Dec 2018 10:23:44 +0100
-Subject: Fix signature of xmlOutputCloseCallback function
-
-xmlOutputCloseCallback returns int, so adjust the closeQString callback
-to return 0 (i.e. no error).
----
- src/translators/xslthandler.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/translators/xslthandler.cpp b/src/translators/xslthandler.cpp
-index 32b3e02..3d249fd 100644
---- a/src/translators/xslthandler.cpp
-+++ b/src/translators/xslthandler.cpp
-@@ -52,9 +52,10 @@ static int writeToQString(void* context, const char* buffer, int len) {
- return len;
- }
-
--static void closeQString(void* context) {
-+static int closeQString(void* context) {
- QString* t = static_cast<QString*>(context);
- *t += QLatin1String("\n");
-+ return 0;
- }
-
- using Tellico::XSLTHandler;
---
-cgit v1.1
-
diff --git a/kde-misc/tellico/tellico-3.1.4.ebuild b/kde-misc/tellico/tellico-3.1.4.ebuild
deleted file mode 100644
index c9cec88bd7e..00000000000
--- a/kde-misc/tellico/tellico-3.1.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Collection manager based on KDE Frameworks"
-HOMEPAGE="http://tellico-project.org/"
-SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 x86"
-IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
-
-RDEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep khtml)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_frameworks_dep sonnet)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-libs/libxml2
- dev-libs/libxslt
- >=dev-perl/Text-BibTeX-0.780.0-r1
- cddb? ( $(add_kdeapps_dep libkcddb) )
- discid? ( dev-libs/libcdio:= )
- pdf? ( app-text/poppler[qt5] )
- scanner? ( $(add_kdeapps_dep libksane) )
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
- taglib? ( >=media-libs/taglib-1.5 )
- v4l? ( >=media-libs/libv4l-0.8.3 )
- xmp? ( >=media-libs/exempi-2 )
- yaz? ( >=dev-libs/yaz-2:0 )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
-"
-
-# tests need network access
-RESTRICT+=" test"
-
-DOCS=( AUTHORS ChangeLog README )
-
-PATCHES=(
- "${FILESDIR}/${P}-xmloutputclosecallback-signature.patch"
- "${FILESDIR}/${P}-empty-permissions-set.patch"
- "${FILESDIR}/${P}-icu-64.patch" # bug #685460
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
- $(cmake-utils_use_find_package cddb KF5Cddb)
- $(cmake-utils_use_find_package discid CDIO)
- $(cmake-utils_use_find_package pdf Poppler)
- $(cmake-utils_use_find_package scanner KF5Sane)
- $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
- $(cmake-utils_use_find_package taglib Taglib)
- -DENABLE_WEBCAM=$(usex v4l)
- $(cmake-utils_use_find_package xmp Exempi)
- $(cmake-utils_use_find_package yaz Yaz)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/files/, kde-misc/tellico/
@ 2020-07-18 22:25 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-07-18 22:25 UTC (permalink / raw
To: gentoo-commits
commit: ebf74da77d3d4642fdbce64e806b2585c965da39
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 21:58:29 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 22:24:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf74da7
kde-misc/tellico: Prioritise local copy of FindTaglib.cmake
Fixes build with ECM 5.72 which ships a newer incompatible version.
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/tellico-3.3.1-kf-5.72-findtaglib.patch | 28 ++++++++++++++++++++++
kde-misc/tellico/tellico-3.3.1.ebuild | 2 ++
2 files changed, 30 insertions(+)
diff --git a/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch b/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch
new file mode 100644
index 00000000000..5d77a9816ba
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch
@@ -0,0 +1,28 @@
+From 1051b34db65a45a4fd5f12cad0eebc27325a2be3 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 00ee0035..5b96f25b 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
+
diff --git a/kde-misc/tellico/tellico-3.3.1.ebuild b/kde-misc/tellico/tellico-3.3.1.ebuild
index f39a4200a14..28dc136aec5 100644
--- a/kde-misc/tellico/tellico-3.3.1.ebuild
+++ b/kde-misc/tellico/tellico-3.3.1.ebuild
@@ -71,6 +71,8 @@ DEPEND="${RDEPEND}"
# tests need network access
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-kf-5.72-findtaglib.patch" )
+
src_configure() {
local mycmakeargs=(
-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/files/, kde-misc/tellico/
@ 2022-03-30 6:31 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-03-30 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 6412e0a7d012a72bebb0bfbed2ce0ed1569645ac
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 06:31:23 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 06:31:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6412e0a7
kde-misc/tellico: Drop 3.4.3
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/tellico/Manifest | 1 -
.../tellico/files/tellico-3.4.3-taglib-ifdef.patch | 35 --------
kde-misc/tellico/tellico-3.4.3.ebuild | 94 ----------------------
3 files changed, 130 deletions(-)
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index a35967cfd9ae..1eaf159c108f 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,2 +1 @@
-DIST tellico-3.4.3.tar.xz 6598384 BLAKE2B bbf121bd95974916b914ce63138d71521c6d04d93214945ce3a7340e242024614e2a264af0d36a99186d1ceed96da951112d1ed6fb195465871128736a3c261e SHA512 bf50d60e3647e12804b4bae488adc593ac541aae8c03815a751603fd940686cdbaa16497213d9240983aabdf6b8e0b05419be9cf960425694f21e3c38c39ddfc
DIST tellico-3.4.4.tar.xz 6600432 BLAKE2B 4bac2df68284c9beb9ddbdbcf5824ac22d4a56066c371d7eaea962b81307f96d7ceba1fd446a4f640867a314c357c13d16a2e167356701241007e5a682ecb60b SHA512 6c9f16217ce5ff2d944d3eea3a5f5641b9717cd7d85835fd8b9559e90f6e920046085e8c9e14734d2ffa0a96ee6b8b241e0ccf1739aa2469af7e1bb88667f1d4
diff --git a/kde-misc/tellico/files/tellico-3.4.3-taglib-ifdef.patch b/kde-misc/tellico/files/tellico-3.4.3-taglib-ifdef.patch
deleted file mode 100644
index 94986ea3003d..000000000000
--- a/kde-misc/tellico/files/tellico-3.4.3-taglib-ifdef.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9d450037f708cc2300d2767e5171bb08e48077a9 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sat, 8 Jan 2022 20:35:37 +0100
-Subject: [PATCH] Fix build without HAVE_TAGLIB
-
-Gentoo-bug: https://bugs.gentoo.org/830806
-
-CCBUG: 446551
----
- src/translators/audiofileimporter.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/translators/audiofileimporter.cpp b/src/translators/audiofileimporter.cpp
-index 2b3372f4..a18ed14a 100644
---- a/src/translators/audiofileimporter.cpp
-+++ b/src/translators/audiofileimporter.cpp
-@@ -57,6 +57,7 @@
- #include <QVBoxLayout>
- #include <QApplication>
-
-+#ifdef HAVE_TAGLIB
- namespace {
- bool hasValue(const TagLib::PropertyMap& pmap, const char* key) {
- const TagLib::String keyString(key);
-@@ -70,6 +71,7 @@ namespace {
- QString();
- }
- }
-+#endif
-
- using Tellico::Import::AudioFileImporter;
-
---
-2.34.1
-
diff --git a/kde-misc/tellico/tellico-3.4.3.ebuild b/kde-misc/tellico/tellico-3.4.3.ebuild
deleted file mode 100644
index db4205d4695f..000000000000
--- a/kde-misc/tellico/tellico-3.4.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Collection manager based on KDE Frameworks"
-HOMEPAGE="https://tellico-project.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- SRC_URI="https://tellico-project.org/files/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
-IUSE="bibtex cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
-
-# tests need network access
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/libxml2
- dev-libs/libxslt
- dev-qt/qtcharts:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwebengine:5[widgets]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- kde-frameworks/karchive:5
- kde-frameworks/kcodecs:5
- kde-frameworks/kcompletion:5
- kde-frameworks/kconfig:5
- kde-frameworks/kconfigwidgets:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/kcrash:5
- kde-frameworks/kguiaddons:5
- kde-frameworks/kiconthemes:5
- kde-frameworks/kitemmodels:5
- kde-frameworks/ki18n:5
- kde-frameworks/kjobwidgets:5
- kde-frameworks/kio:5
- kde-frameworks/knewstuff:5
- kde-frameworks/kparts:5
- kde-frameworks/kservice:5
- kde-frameworks/ktextwidgets:5
- kde-frameworks/kwallet:5
- kde-frameworks/kwidgetsaddons:5
- kde-frameworks/kwindowsystem:5
- kde-frameworks/kxmlgui:5
- kde-frameworks/solid:5
- kde-frameworks/sonnet:5
- bibtex? ( >=dev-perl/Text-BibTeX-0.780.0-r1 )
- cddb? ( kde-apps/libkcddb:5 )
- discid? ( dev-libs/libcdio:= )
- pdf? ( app-text/poppler[qt5] )
- scanner? ( kde-apps/libksane:5 )
- semantic-desktop? ( kde-frameworks/kfilemetadata:5 )
- taglib? ( >=media-libs/taglib-1.5 )
- v4l? ( >=media-libs/libv4l-0.8.3 )
- xmp? ( >=media-libs/exempi-2 )
- yaz? ( >=dev-libs/yaz-2:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/gettext
-"
-
-PATCHES=( "${FILESDIR}/${P}-taglib-ifdef.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
- -DENABLE_BTPARSE=$(usex bibtex)
- $(cmake_use_find_package cddb KF5Cddb)
- $(cmake_use_find_package discid CDIO)
- $(cmake_use_find_package pdf Poppler)
- $(cmake_use_find_package scanner KF5Sane)
- $(cmake_use_find_package semantic-desktop KF5FileMetaData)
- $(cmake_use_find_package taglib Taglib)
- -DENABLE_WEBCAM=$(usex v4l)
- $(cmake_use_find_package xmp Exempi)
- $(cmake_use_find_package yaz Yaz)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-03-30 6:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-18 22:25 [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/files/, kde-misc/tellico/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-03-30 6:31 Andreas Sturmlechner
2019-07-04 19:40 Andreas Sturmlechner
2019-05-09 19:45 Andreas Sturmlechner
2017-09-30 12:04 Andreas Sturmlechner
2017-04-16 17:40 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox