From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- kde-misc/tellico/Manifest | 6 +- .../tellico-3.1.4-empty-permissions-set.patch | 27 +++++++ ...co-3.1.4-xmloutputclosecallback-signature.patch | 30 +++++++ kde-misc/tellico/metadata.xml | 1 + kde-misc/tellico/tellico-3.1.4.ebuild | 91 ++++++++++++++++++++++ 5 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 kde-misc/tellico/files/tellico-3.1.4-empty-permissions-set.patch create mode 100644 kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch create mode 100644 kde-misc/tellico/tellico-3.1.4.ebuild (limited to 'kde-misc/tellico') diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest index 743311184171..37ab06fcd73b 100644 --- a/kde-misc/tellico/Manifest +++ b/kde-misc/tellico/Manifest @@ -1,5 +1,9 @@ AUX tellico-3.1.3-regexp-filtering.patch 1450 BLAKE2B 0149988de7c468ba089fe61aff7d7d0b111576f894d2f80bf4e2ddec13edf59baf575fec007833baa1d2610f045948dc79a89896d9482927bed62df4c341ad53 SHA512 406d30f13b3f9c7adf884ab71658781ceececa9e3befe05338f7d90bc0955ac93bc6d362c1e03a70452da34fb8640907fd89374f896ef33523bc51bdce3208ec AUX tellico-3.1.3-version.patch 586 BLAKE2B a4e6a53891b8418f1abdde2ecd25085c15f7f689e3647be241af605c877798e31a95bc3bd269c6a5103919f13a542cd60a626f7fab4e129b91cacfd80a0bde93 SHA512 72393098706404d200c5c57826ec064db49ace5508577e05d35078f215c204d6cf5921384ee823d4adf0f0d3e3aeb15e29fae214dfe01b21748b36b199e87ed4 +AUX tellico-3.1.4-empty-permissions-set.patch 906 BLAKE2B e46830a15f0f1fa05b1d94c57ecc27c06f7fe269b1eef3f2bb94c378b0d794ec43ebff9904e964741c2a35a46e7b0ea1faeccffff0dc930aa345ba16746cf1aa SHA512 49bc0ffa89049c964e92a15ed1067964ef2a66af3611929c0dc7263b7dfaae8077e0214f03f99359fe71d5c27e22853fdecc5998a4cd81231f7b30aeadce2c0b +AUX tellico-3.1.4-xmloutputclosecallback-signature.patch 918 BLAKE2B 2150dd13332ea01a5524951085dfe4a7032a4cf26776af5818f4caa7764584027112b3f793e3a839ade84979aa75c1e2e7034d5baaff250b9d32c64832d2e930 SHA512 6ceda2d2a10b480539677654a2b21132c17e88a4395016fdb703c09f9ee066a93c834bc9b229730970dd35dca4a110f4c2fea19775062d404f76515fc0fbc0f0 DIST tellico-3.1.3.tar.xz 4607668 BLAKE2B 4c4fb678b16611c448e0fc77f0b5c9e03f344c76d20e6006c03ee12140b647fefa7a3aba2f5312ea8c36f3722418981fb469a6c199f1e115542c784003854d28 SHA512 9024f423f0685e834ed46e7038c5b95fab5b684aaac00d6298e23493fb4290daeda994faf36a0f04973093a477be5506591e6b0e7f57ef5591fb10953ad8ec5e +DIST tellico-3.1.4.tar.xz 4632792 BLAKE2B 29db598ef558fe04618843cad6a58055b5de392f34aeea4860683f04ef4ab20856fd4a01523dc13c2d68023c266de69590e843ea56f912989d57c01e0d701ee2 SHA512 d09183bee13ae9f7c6c5114b76eeeb959a184def559ae239bb880ef9be964e33878530e9c4c0d3baa6f872bf8db155dffb94592e3a857623ab131d2f28f1f139 EBUILD tellico-3.1.3.ebuild 2529 BLAKE2B 58ffc4c9752e884dc2b5632f0929153561ca3429af7aec61abda96e4f988842676d7a0a93d1a087eb6d3e975b53277a2fb1d27d292e403ba46a31cb1964beebc SHA512 ce74db02a19525c1398b1e013e8c95bca7c96d23937ffad4a273c31ce12e89314bcfc87dcbb419d67ef65e4835a280c6efdc0815f3e510de024ab7cb9cf1388d -MISC metadata.xml 597 BLAKE2B 7b88f7d3e9aa4e5a291eb98034886b61d9f68dd0ef694da227287a6e4892fb553fc3c14a84a087dbbccdfbd5a4291e7708f772e2655ba9e314a8627e77871346 SHA512 3e1196598053c7ba9a29d578f20da3da281d0ed27e371716e66c3311e6dc888baa28f72cbe5af768ff8aed50eff84f541b2ba2a62f5f5fe6ef48ed125e4f8300 +EBUILD tellico-3.1.4.ebuild 2563 BLAKE2B 38155782f34da90e1dc92837256b2e5b3ee7859c07f1ef89e252650a35a75313061e8cf2707d824cca5dae03ddb876c8fea8ae2be71f190eb993ad173f9577e7 SHA512 3ac22a47a1b6772b077de1fddb0f19fd952f039d74ce9d4339bf61200ccf9fd4f4fa8a64a279f84c7a4ff028bb1f768578a8a111b1454900d83134e543221ea2 +MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e 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 000000000000..2cb38749f4cf --- /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 +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 000000000000..703af9c23e1e --- /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 +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(context); + *t += QLatin1String("\n"); ++ return 0; + } + + using Tellico::XSLTHandler; +-- +cgit v1.1 + diff --git a/kde-misc/tellico/metadata.xml b/kde-misc/tellico/metadata.xml index e8ba8bd489a0..c982ea5a1ffe 100644 --- a/kde-misc/tellico/metadata.xml +++ b/kde-misc/tellico/metadata.xml @@ -12,5 +12,6 @@ Add support for reading disc IDs from audio CDs + Add support for searching Z39.50 databases 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 000000000000..6045a6415708 --- /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 +} -- cgit v1.2.3