public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/, kde-misc/tellico/files/
@ 2017-02-12 19:27 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2017-02-12 19:27 UTC (permalink / raw
  To: gentoo-commits

commit:     e9c0feaec1c93505f8569baa30ecf92f72389d9a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 19:10:09 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 19:26:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9c0feae

kde-misc/tellico: Add back USE=cddb

Reported-by: Arfrever

Package-Manager: portage-2.3.3

 kde-misc/tellico/files/tellico-3.0-kf5cddb.patch | 35 ++++++++++++++++++++++++
 kde-misc/tellico/tellico-3.0.ebuild              | 23 +++++++++-------
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/kde-misc/tellico/files/tellico-3.0-kf5cddb.patch b/kde-misc/tellico/files/tellico-3.0-kf5cddb.patch
new file mode 100644
index 0000000000..28f31e2edf
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.0-kf5cddb.patch
@@ -0,0 +1,35 @@
+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.ebuild b/kde-misc/tellico/tellico-3.0.ebuild
index 2b61d25f3d..32abb1df3c 100644
--- a/kde-misc/tellico/tellico-3.0.ebuild
+++ b/kde-misc/tellico/tellico-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,16 +9,15 @@ KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
-DESCRIPTION="A collection manager for the KDE environment"
+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 )"
-SLOT="5"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug discid pdf scanner semantic-desktop taglib v4l xmp yaz"
+IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
@@ -51,6 +50,7 @@ RDEPEND="
 	dev-libs/btparse
 	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) )
@@ -59,28 +59,31 @@ RDEPEND="
 	v4l? ( >=media-libs/libv4l-0.8.3 )
 	xmp? ( >=media-libs/exempi-2 )
 	yaz? ( >=dev-libs/yaz-2:0 )
-	!kde-misc/tellico:4
 "
-DEPEND="${RDEPEND}
+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}-kf5cddb.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Cddb=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libkcddb=ON
-		-DENABLE_WEBCAM=$(usex v4l)
+		$(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)
 	)


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/, kde-misc/tellico/files/
@ 2017-11-20 18:57 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2017-11-20 18:57 UTC (permalink / raw
  To: gentoo-commits

commit:     6571a7fb275a99ec98a4e72e30a74ff580e9000f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 20 18:57:16 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 18:57:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6571a7fb

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 .../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 deletions(-)

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
deleted file mode 100644
index b31d072850f..00000000000
--- a/kde-misc/tellico/files/tellico-3.0.2-cmake-3.9.patch
+++ /dev/null
@@ -1,788 +0,0 @@
-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
deleted file mode 100644
index e40e2597d7b..00000000000
--- a/kde-misc/tellico/tellico-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,91 +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 )
-
-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] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/, kde-misc/tellico/files/
@ 2018-10-09  8:04 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2018-10-09  8:04 UTC (permalink / raw
  To: gentoo-commits

commit:     c0458e79a84a2ba9539fe221099c1f378a766860
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  9 08:03:29 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  9 08:04:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0458e79

kde-misc/tellico: 3.1.3 version bump

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 kde-misc/tellico/Manifest                          |  1 +
 .../files/tellico-3.1.3-regexp-filtering.patch     | 44 +++++++++++
 kde-misc/tellico/files/tellico-3.1.3-version.patch | 24 ++++++
 kde-misc/tellico/tellico-3.1.3.ebuild              | 91 ++++++++++++++++++++++
 4 files changed, 160 insertions(+)

diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 53566073e26..94dc3e9391d 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1 +1,2 @@
 DIST tellico-3.1.2.tar.xz 4591752 BLAKE2B 9601fa35c068d7c961bef1235cb65609b8c148b64a72771817ac16e3662ebdc35ed9b53944fe1d30c62732f2861e5a668907cc3ea9dc9f682c9e2336b12bea22 SHA512 e86966636123db813f33ad90197950e1afb38d4096e15c785a9d9f2b846872d254cbdaeec7528a13627bf8edc63d409a42fbb35172949b9b45d6a4b5c40ac28f
+DIST tellico-3.1.3.tar.xz 4607668 BLAKE2B 4c4fb678b16611c448e0fc77f0b5c9e03f344c76d20e6006c03ee12140b647fefa7a3aba2f5312ea8c36f3722418981fb469a6c199f1e115542c784003854d28 SHA512 9024f423f0685e834ed46e7038c5b95fab5b684aaac00d6298e23493fb4290daeda994faf36a0f04973093a477be5506591e6b0e7f57ef5591fb10953ad8ec5e

diff --git a/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch b/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch
new file mode 100644
index 00000000000..51a4c2b470f
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.1.3-regexp-filtering.patch
@@ -0,0 +1,44 @@
+From 47f19fac2fdbbf5c5b5124883043e473f8c44edd Mon Sep 17 00:00:00 2001
+From: Robby Stephenson <robby@periapsis.org>
+Date: Tue, 2 Oct 2018 21:02:37 -0400
+Subject: Fix bug when using regexp filter for number fields
+
+Only use a QIntValidator when the filter rule is not a regular
+expression.
+
+BUG: 399323
+FIXED-IN: 3.1.4
+FIXED-IN: 3.2
+---
+ ChangeLog                    | 4 ++++
+ src/gui/filterrulewidget.cpp | 3 ++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 879f4d0..3284dc7 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2018-10-02  Robby Stephenson  <robby@periapsis.org>
++
++	* Fixed bug when using a regular expression for filtering in a number field (Bug 399323).
++
+ 2018-09-02  Robby Stephenson  <robby@periapsis.org>
+ 
+ 	* Released Tellico 3.1.3.
+diff --git a/src/gui/filterrulewidget.cpp b/src/gui/filterrulewidget.cpp
+index 8e3d7b1..aa3718d 100644
+--- a/src/gui/filterrulewidget.cpp
++++ b/src/gui/filterrulewidget.cpp
+@@ -169,7 +169,8 @@ void FilterRuleWidget::slotRuleFunctionChanged(int which_) {
+   } else {
+     m_valueStack->setCurrentWidget(m_ruleValue);
+     m_ruleValue->setPlaceholderText(QString());
+-    if(m_ruleType == Number) {
++    if(m_ruleType == Number &&
++      (data != FilterRule::FuncRegExp && data != FilterRule::FuncNotRegExp)) {
+       m_ruleValue->setValidator(new QIntValidator(this));
+     } else {
+       m_ruleValue->setValidator(nullptr);
+-- 
+cgit v0.11.2

diff --git a/kde-misc/tellico/files/tellico-3.1.3-version.patch b/kde-misc/tellico/files/tellico-3.1.3-version.patch
new file mode 100644
index 00000000000..845d0831617
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.1.3-version.patch
@@ -0,0 +1,24 @@
+From 1aa87a1c1538a0103a1624c663606b8d47566f42 Mon Sep 17 00:00:00 2001
+From: Robby Stephenson <robby@periapsis.org>
+Date: Mon, 3 Sep 2018 08:39:49 -0400
+Subject: Correctly set version number
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 214e2ca..817750b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+ 
+ project(Tellico)
+-set(TELLICO_VERSION "3.1.2+git")
++set(TELLICO_VERSION "3.1.3")
+ 
+ set(QT_MIN_VERSION "5.4.0")
+ 
+-- 
+cgit v0.11.2

diff --git a/kde-misc/tellico/tellico-3.1.3.ebuild b/kde-misc/tellico/tellico-3.1.3.ebuild
new file mode 100644
index 00000000000..f536c9614b6
--- /dev/null
+++ b/kde-misc/tellico/tellico-3.1.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 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-perl/Text-BibTeX-0.780.0-r1
+	dev-libs/libxml2
+	dev-libs/libxslt
+	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}-version.patch"
+	"${FILESDIR}/${P}-regexp-filtering.patch"
+)
+
+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] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/, kde-misc/tellico/files/
@ 2018-12-22 11:43 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2018-12-22 11:43 UTC (permalink / raw
  To: gentoo-commits

commit:     895fe613f223c28a6c7c10bdc2916d76107c5999
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 22 11:09:26 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 11:43:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=895fe613

kde-misc/tellico: 3.1.4 version bump

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-misc/tellico/Manifest                          |  1 +
 .../tellico-3.1.4-empty-permissions-set.patch      | 27 +++++++
 ...co-3.1.4-xmloutputclosecallback-signature.patch | 30 +++++++
 kde-misc/tellico/tellico-3.1.4.ebuild              | 91 ++++++++++++++++++++++
 4 files changed, 149 insertions(+)

diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 599b5f7d931..a4af08a8594 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1 +1,2 @@
 DIST tellico-3.1.3.tar.xz 4607668 BLAKE2B 4c4fb678b16611c448e0fc77f0b5c9e03f344c76d20e6006c03ee12140b647fefa7a3aba2f5312ea8c36f3722418981fb469a6c199f1e115542c784003854d28 SHA512 9024f423f0685e834ed46e7038c5b95fab5b684aaac00d6298e23493fb4290daeda994faf36a0f04973093a477be5506591e6b0e7f57ef5591fb10953ad8ec5e
+DIST tellico-3.1.4.tar.xz 4632792 BLAKE2B 29db598ef558fe04618843cad6a58055b5de392f34aeea4860683f04ef4ab20856fd4a01523dc13c2d68023c266de69590e843ea56f912989d57c01e0d701ee2 SHA512 d09183bee13ae9f7c6c5114b76eeeb959a184def559ae239bb880ef9be964e33878530e9c4c0d3baa6f872bf8db155dffb94592e3a857623ab131d2f28f1f139

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
new file mode 100644
index 00000000000..2cb38749f4c
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.1.4-empty-permissions-set.patch
@@ -0,0 +1,27 @@
+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-xmloutputclosecallback-signature.patch b/kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch
new file mode 100644
index 00000000000..703af9c23e1
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 00000000000..6045a641570
--- /dev/null
+++ b/kde-misc/tellico/tellico-3.1.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 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"
+)
+
+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] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/, kde-misc/tellico/files/
@ 2019-08-11 10:17 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2019-08-11 10:17 UTC (permalink / raw
  To: gentoo-commits

commit:     61c416ffbd6e43e14400f6628fd694a00642b658
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 10:05:27 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 10:17:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61c416ff

kde-misc/tellico: Fix missing header with Frameworks 5.61

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/tellico-3.2.1-missing-header.patch       | 48 ++++++++++++++++++++++
 kde-misc/tellico/tellico-3.2.1.ebuild              |  2 +
 2 files changed, 50 insertions(+)

diff --git a/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch b/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch
new file mode 100644
index 00000000000..cff61fcdb61
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch
@@ -0,0 +1,48 @@
+From 43851a0a655a3a961f289087bdea989aa32cc028 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Sun, 21 Jul 2019 09:21:16 +0200
+Subject: Fix build with Qt 5.13
+
+(cherry picked from commit 43e6bbb4721adc83d8b2a77bd51d9efaf7aefd6b)
+---
+ src/gui/datewidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp
+index 724370e..e6502bb 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>
+-- 
+cgit v1.1
+
+From d3c56eca11cd059d4348ab6696822c23d85af61a Mon Sep 17 00:00:00 2001
+From: Robby Stephenson <robby@periapsis.org>
+Date: Sun, 21 Jul 2019 19:17:35 -0400
+Subject: Fix apparent build problem on Jenkins
+
+---
+ src/mainwindow.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
+index d8348e8..8250c56 100644
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -108,6 +108,7 @@
+ #include <QMimeType>
+ #include <QMenuBar>
+ #include <QFileDialog>
++#include <QMetaMethod>
+ 
+ #include <unistd.h>
+ 
+-- 
+cgit v1.1

diff --git a/kde-misc/tellico/tellico-3.2.1.ebuild b/kde-misc/tellico/tellico-3.2.1.ebuild
index e75e9ba7649..fce0ead957c 100644
--- a/kde-misc/tellico/tellico-3.2.1.ebuild
+++ b/kde-misc/tellico/tellico-3.2.1.ebuild
@@ -66,6 +66,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
+
 # tests need network access
 RESTRICT+=" test"
 


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/, kde-misc/tellico/files/
@ 2020-09-06 16:46 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2020-09-06 16:46 UTC (permalink / raw
  To: gentoo-commits

commit:     ab82830393f3c48cae1826863f827dd40e0d9474
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  5 16:22:23 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 16:45:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab828303

kde-misc/tellico: Drop 3.3.1

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-misc/tellico/Manifest                          |  1 -
 .../files/tellico-3.3.1-kf-5.72-findtaglib.patch   | 28 -------
 kde-misc/tellico/tellico-3.3.1.ebuild              | 91 ----------------------
 3 files changed, 120 deletions(-)

diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 5d53f16c13f..3e7968f6d7a 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,2 +1 @@
-DIST tellico-3.3.1.tar.xz 5619068 BLAKE2B 5b70f42102c2dbb349f343146edb30e94d73b891f7b95fcba87cc19ea6228a62273f9f0321c32037a62cb2cffa2ec61108db519b3387968d2a0ebd1ca332bfd7 SHA512 12d49aba8c99cd16e426ac0144fa7343c5b1348a8c9a0892f30ff274f0e98f9ad7819c03c4ecdd0dc2f826377468ebdab1996828e992fcd293c7ffe4f844ab74
 DIST tellico-3.3.2.tar.xz 5623808 BLAKE2B 2c709a40799f53d8431cc4eeab5d33242e9f967fa9af02c05675730fdb9b249b05c7af17ab8269fec0b53e3d4ad6144213f060aa4b2c32e27bca93bd905d7828 SHA512 4e304553e58ea3cfcc8aabdbe86ea2b1b52edb6d4f690d0f9e5c5c6de152dac25889a7beea3394eac711ef2195efe1bf1f3fd48bf57aece923ed47b975d664d8

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
deleted file mode 100644
index 5d77a9816ba..00000000000
--- a/kde-misc/tellico/files/tellico-3.3.1-kf-5.72-findtaglib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index 17945c0039b..00000000000
--- a/kde-misc/tellico/tellico-3.3.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
-
-BDEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-perl/Text-BibTeX-0.780.0-r1
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	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/khtml: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
-	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}"
-
-# tests need network access
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-kf-5.72-findtaglib.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
-		$(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] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/, kde-misc/tellico/files/
@ 2022-01-09 17:03 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2022-01-09 17:03 UTC (permalink / raw
  To: gentoo-commits

commit:     4fa26bd9039450d46ad06cf145269faaa52519f6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  9 16:58:57 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  9 16:59:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa26bd9

kde-misc/tellico: Fix build with USE=-taglib

Thanks-to: Lars Wendler <polynomial-c <AT> gentoo.org>
Closes: https://bugs.gentoo.org/830806
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../tellico/files/tellico-3.4.3-taglib-ifdef.patch | 35 ++++++++++++++++++++++
 kde-misc/tellico/tellico-3.4.3.ebuild              |  2 ++
 2 files changed, 37 insertions(+)

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
new file mode 100644
index 000000000000..94986ea3003d
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.4.3-taglib-ifdef.patch
@@ -0,0 +1,35 @@
+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
index a83ef948cde1..3c34e17b6b7e 100644
--- a/kde-misc/tellico/tellico-3.4.3.ebuild
+++ b/kde-misc/tellico/tellico-3.4.3.ebuild
@@ -73,6 +73,8 @@ BDEPEND="
 	sys-devel/gettext
 "
 
+PATCHES=( "${FILESDIR}/${P}-taglib-ifdef.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/, kde-misc/tellico/files/
@ 2022-11-16 18:53 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2022-11-16 18:53 UTC (permalink / raw
  To: gentoo-commits

commit:     74606411fb3959f7431ec164653eb203bc330435
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 18:45:01 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 18:52:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74606411

kde-misc/tellico: Fix version check with KF-5.100

Upstream commit 32aef89113a1939b20766bf0e09cce7287b56f40

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../tellico-3.4.4-fix-kf-5.100-version-check.patch | 25 ++++++++++++++++++++++
 kde-misc/tellico/tellico-3.4.4-r1.ebuild           |  6 +++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/kde-misc/tellico/files/tellico-3.4.4-fix-kf-5.100-version-check.patch b/kde-misc/tellico/files/tellico-3.4.4-fix-kf-5.100-version-check.patch
new file mode 100644
index 000000000000..6cbb9aef239c
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.4.4-fix-kf-5.100-version-check.patch
@@ -0,0 +1,25 @@
+From 32aef89113a1939b20766bf0e09cce7287b56f40 Mon Sep 17 00:00:00 2001
+From: Jonathan Esk-Riddell <jr@jriddell.org>
+Date: Fri, 21 Oct 2022 12:03:40 +0100
+Subject: [PATCH] fix version check which breaks on KF5 5.100
+
+---
+ src/newstuff/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/newstuff/CMakeLists.txt b/src/newstuff/CMakeLists.txt
+index b51914fd..c0ebfa54 100644
+--- a/src/newstuff/CMakeLists.txt
++++ b/src/newstuff/CMakeLists.txt
+@@ -19,7 +19,7 @@ TARGET_LINK_LIBRARIES(newstuff
+     )
+ 
+ IF( KF5NewStuff_FOUND )
+-  if(${ECM_VERSION} STRGREATER "5.57.0")
++  if(${ECM_VERSION} VERSION_GREATER "5.57.0")
+     INSTALL(FILES tellico-template.knsrc tellico-script.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
+   else()
+     INSTALL(FILES tellico-template.knsrc tellico-script.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
+-- 
+GitLab
+

diff --git a/kde-misc/tellico/tellico-3.4.4-r1.ebuild b/kde-misc/tellico/tellico-3.4.4-r1.ebuild
index b05e573a3bb4..94c6dab3f550 100644
--- a/kde-misc/tellico/tellico-3.4.4-r1.ebuild
+++ b/kde-misc/tellico/tellico-3.4.4-r1.ebuild
@@ -69,9 +69,9 @@ RDEPEND="
 	yaz? ( >=dev-libs/yaz-2:0= )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${P}-fix-kf-5.100-version-check.patch" )
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/, kde-misc/tellico/files/
@ 2022-12-15 19:26 Andreas Sturmlechner
  0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2022-12-15 19:26 UTC (permalink / raw
  To: gentoo-commits

commit:     ed207b782c11ab28a85b4f1913149a3ec139a53e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 19:24:36 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 19:26:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed207b78

kde-misc/tellico: drop 3.4.4-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-misc/tellico/Manifest                          |  1 -
 .../tellico-3.4.4-fix-kf-5.100-version-check.patch | 25 ------
 kde-misc/tellico/tellico-3.4.4-r1.ebuild           | 92 ----------------------
 3 files changed, 118 deletions(-)

diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 7ffe537bab17..0e8c9312e4e0 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,2 +1 @@
-DIST tellico-3.4.4.tar.xz 6600432 BLAKE2B 4bac2df68284c9beb9ddbdbcf5824ac22d4a56066c371d7eaea962b81307f96d7ceba1fd446a4f640867a314c357c13d16a2e167356701241007e5a682ecb60b SHA512 6c9f16217ce5ff2d944d3eea3a5f5641b9717cd7d85835fd8b9559e90f6e920046085e8c9e14734d2ffa0a96ee6b8b241e0ccf1739aa2469af7e1bb88667f1d4
 DIST tellico-3.4.5.tar.xz 6602152 BLAKE2B cd308a500abaf9b85514e2a20b58bf576ccb3cffaf7d660111dabdeeb500a643aca469d4208163874fe842902b8664956f4d693575c2b1b7562068fdf4994a2d SHA512 1b8d52da856a3860147dd0c8c69ea99339f99b411555b87ff328f2519385072c544fe97f680363d6bb2cad5056313c4ad07d1c5e0b6021a092dbe93c233709c4

diff --git a/kde-misc/tellico/files/tellico-3.4.4-fix-kf-5.100-version-check.patch b/kde-misc/tellico/files/tellico-3.4.4-fix-kf-5.100-version-check.patch
deleted file mode 100644
index 6cbb9aef239c..000000000000
--- a/kde-misc/tellico/files/tellico-3.4.4-fix-kf-5.100-version-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 32aef89113a1939b20766bf0e09cce7287b56f40 Mon Sep 17 00:00:00 2001
-From: Jonathan Esk-Riddell <jr@jriddell.org>
-Date: Fri, 21 Oct 2022 12:03:40 +0100
-Subject: [PATCH] fix version check which breaks on KF5 5.100
-
----
- src/newstuff/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/newstuff/CMakeLists.txt b/src/newstuff/CMakeLists.txt
-index b51914fd..c0ebfa54 100644
---- a/src/newstuff/CMakeLists.txt
-+++ b/src/newstuff/CMakeLists.txt
-@@ -19,7 +19,7 @@ TARGET_LINK_LIBRARIES(newstuff
-     )
- 
- IF( KF5NewStuff_FOUND )
--  if(${ECM_VERSION} STRGREATER "5.57.0")
-+  if(${ECM_VERSION} VERSION_GREATER "5.57.0")
-     INSTALL(FILES tellico-template.knsrc tellico-script.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
-   else()
-     INSTALL(FILES tellico-template.knsrc tellico-script.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
--- 
-GitLab
-

diff --git a/kde-misc/tellico/tellico-3.4.4-r1.ebuild b/kde-misc/tellico/tellico-3.4.4-r1.ebuild
deleted file mode 100644
index 94c6dab3f550..000000000000
--- a/kde-misc/tellico/tellico-3.4.4-r1.ebuild
+++ /dev/null
@@ -1,92 +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}-fix-kf-5.100-version-check.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] 9+ messages in thread
end of thread, other threads:[~2022-12-15 19:27 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-20 18:57 [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/, kde-misc/tellico/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2022-12-15 19:26 Andreas Sturmlechner
2022-11-16 18:53 Andreas Sturmlechner
2022-01-09 17:03 Andreas Sturmlechner
2020-09-06 16:46 Andreas Sturmlechner
2019-08-11 10:17 Andreas Sturmlechner
2018-12-22 11:43 Andreas Sturmlechner
2018-10-09  8:04 Andreas Sturmlechner
2017-02-12 19:27 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox