From 536c3711867ec947c1738f2c4b96f22e4863322d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Nov 2018 09:38:27 +0000 Subject: gentoo resync : 18.11.2018 --- media-gfx/kphotoalbum/Manifest | 5 +- .../kphotoalbum/files/kphotoalbum-5.3-gcc8.patch | 29 ---------- media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild | 67 ---------------------- media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild | 2 +- 4 files changed, 2 insertions(+), 101 deletions(-) delete mode 100644 media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch delete mode 100644 media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild (limited to 'media-gfx/kphotoalbum') diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest index f76e0da32387..fb01cbe6b03c 100644 --- a/media-gfx/kphotoalbum/Manifest +++ b/media-gfx/kphotoalbum/Manifest @@ -1,6 +1,3 @@ -AUX kphotoalbum-5.3-gcc8.patch 1127 BLAKE2B 6bc06c6b30ef6027199c0ad0dd3bcc539ec191faf71d168afeccf2a019e045508a41190b5b93a735c6cea5a7dcb2052e4b550525707bedbd8973b28e2e090a0f SHA512 1b59fa217efa9f5a784f520d2230785b23825184b89a4e58738c10e41e1a43be2a372fe706ed603e8f42fa15731f4226d4f99cacf460c6d03a1c0437522bdadd -DIST kphotoalbum-5.3.tar.xz 11378768 BLAKE2B d71a52fdd5b389bb6353596c50ca4c5e1318128a0158048534512528a9315b7974da2b6685dc26fa74edb5b7f0f399c7910ba2ea5c5bbf50f9b15a7a0a8ebed3 SHA512 8296e9db17d7cc5b34dd29fbe9aeb8f7ab05e286e5d4a692c05f00cd1438dfd32bc48e1c4fd740c5fb932c463ba92fdb0620b9af49d3419ffcfa1354336dd26f DIST kphotoalbum-5.4.tar.xz 11658792 BLAKE2B 5f91dac910cc7022ca8a20f49f286a84586bf7adaed57448c1d811c370a9fb8661469d4e8e73809990e1e1800aaaff8f53c86446d93f99fd55cdddbece01eddc SHA512 d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba -EBUILD kphotoalbum-5.3.ebuild 1660 BLAKE2B 099b204d845146d55eb25cc914dc48d49e7bc0143e216a0c7313f7e4b6a5de458cdf3153b8ebb19473e8d5214f1b17805357f3fbb4498190d9154c8b3a87bc12 SHA512 47d0fee77e027563d5cf1d7a4838493ec4c7fc0ee48e2df66b0c7fdbd013df11654d687b71a1a5cb302bf0f04c3483af19728ad27614b09e63fc3c3244fa5737 -EBUILD kphotoalbum-5.4.ebuild 1525 BLAKE2B 572b7ef7477fbafdfc31422453073f83787c86b4bfbbeb304588379dfaf100b36bfdf400b018c5285e46f23a250d6e093750f69b98aadfbed59793a00dbfe5e1 SHA512 451454cd62874e151dcb4b5ecc3eb7bb25f1b4bf4e6397fe884202d5e04deeb48cf7d572cad60f093def2d0acd9f013c834c3ec4b8096b82cefbadb23b889a88 +EBUILD kphotoalbum-5.4.ebuild 1523 BLAKE2B dae204842bce4e3069d95fc50aa91d5e852387c622faee5a74af801e4b84d23748723d56a393eb656593e0a9845b15315afcf4520d1f923892beb574bf37da8b SHA512 9b413ce49a9968d55a656c2923b3d98968116f55f2dc23c03b6ff7cf5bdb0a235c2360f33797db7f97ef420784fee8ee14dedde3b4e43d613093f604a8dfe335 MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch deleted file mode 100644 index ce52589b23cc..000000000000 --- a/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 47f4c00adaa442cd03b02d44517b5503718f2813 Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Tue, 12 Jun 2018 22:52:06 +0200 -Subject: Fix build with Qt 5.11. - -Summary: 'id' is an int, it doesn't need qPrintable. - -Reviewers: johanneszarl - -Differential Revision: https://phabricator.kde.org/D13329 ---- - RemoteControl/RemoteConnection.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/RemoteControl/RemoteConnection.cpp b/RemoteControl/RemoteConnection.cpp -index 1dacb72..8bc18d0 100644 ---- a/RemoteControl/RemoteConnection.cpp -+++ b/RemoteControl/RemoteConnection.cpp -@@ -105,7 +105,7 @@ void RemoteConnection::dataReceived() - std::unique_ptr command = RemoteCommand::create(static_cast(id)); - command->decode(stream); - protocolDebug() << qPrintable(QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss.zzz"))) -- << ": Received " << qPrintable(id); -+ << ": Received " << id; - - emit gotCommand(*command); - } --- -cgit v0.11.2 diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild deleted file mode 100644 index c5416d5f9a77..000000000000 --- a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -inherit flag-o-matic kde5 - -DESCRIPTION="Tool for indexing, searching, and viewing images" -HOMEPAGE="https://www.kphotoalbum.org/" -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ FDL-1.2" -KEYWORDS="amd64 x86" -IUSE="+kipi +map +raw" - -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtsql 'sqlite') - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - media-gfx/exiv2:= - media-libs/phonon[qt5(+)] - virtual/jpeg:0 - kipi? ( $(add_kdeapps_dep libkipi) ) - map? ( $(add_kdeapps_dep libkgeomap) ) - raw? ( $(add_kdeapps_dep libkdcraw) ) -" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext -" -RDEPEND="${COMMON_DEPEND} - media-video/mplayer - kipi? ( media-plugins/kipi-plugins:5 ) - !media-gfx/kphotoalbum:4 -" - -DOCS=( ChangeLog README ) - -PATCHES=( "${FILESDIR}/${P}-gcc8.patch" ) - -src_configure() { - append-ldflags -fuse-ld=gold #bug #623566 - - local mycmakeargs=( - $(cmake-utils_use_find_package kipi KF5Kipi) - $(cmake-utils_use_find_package map KF5KGeoMap) - $(cmake-utils_use_find_package raw KF5KDcraw) - ) - - kde5_src_configure -} diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild index ff37b76cc7ca..5e0e4683ac6e 100644 --- a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild +++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://www.kphotoalbum.org/" SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2+ FDL-1.2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+kipi +map +raw" DEPEND=" -- cgit v1.2.3