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 <p...@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 <ast...@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 <p...@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
-}
