From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7CEAF138334 for ; Sat, 22 Dec 2018 11:44:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 356ADE0ABF; Sat, 22 Dec 2018 11:44:02 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2218E0ABF for ; Sat, 22 Dec 2018 11:44:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 256B1335CEC for ; Sat, 22 Dec 2018 11:44:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E60A500 for ; Sat, 22 Dec 2018 11:43:57 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1545479007.895fe613f223c28a6c7c10bdc2916d76107c5999.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/tellico/, kde-misc/tellico/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/tellico/Manifest kde-misc/tellico/files/tellico-3.1.4-empty-permissions-set.patch kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch kde-misc/tellico/tellico-3.1.4.ebuild X-VCS-Directories: kde-misc/tellico/files/ kde-misc/tellico/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 895fe613f223c28a6c7c10bdc2916d76107c5999 X-VCS-Branch: master Date: Sat, 22 Dec 2018 11:43:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 314cc0e2-f774-4e1b-be05-8a889933857b X-Archives-Hash: 94d6eb1380e2952d3b41cbe3df5284c5 commit: 895fe613f223c28a6c7c10bdc2916d76107c5999 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 22 11:09:26 2018 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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 +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/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 +}