commit: 67e6c3ff3a8869355ab4ecb4e012031f193dd13e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Feb 12 18:30:51 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Feb 12 21:30:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e6c3ff
media-gfx/kphotoalbum: Drop 5.6-r1 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/kphotoalbum/Manifest | 1 - .../files/kphotoalbum-5.6-crashfix.patch | 41 ------------- media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild | 69 ---------------------- 3 files changed, 111 deletions(-) diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest index 6a2b5e30b97..458385027f1 100644 --- a/media-gfx/kphotoalbum/Manifest +++ b/media-gfx/kphotoalbum/Manifest @@ -1,3 +1,2 @@ DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723 SHA512 fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0 DIST kphotoalbum-5.6.1.tar.xz 11773808 BLAKE2B c69cdc0afb455af64fe0624208b6bff34813a8f0341a4d3f21b7dc0462eb51f01574656028de497527c57a7ed70d1ab9dd6fe451ecec1696f09cfa8531dffe77 SHA512 fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7 -DIST kphotoalbum-5.6.tar.xz 11773088 BLAKE2B 933e29a71bbdb678936c1d466894468a62ee0a8903ebbe21d0d9ace619b8b2ceaeaec12bc955bf1513cb53eedc85faa6291549a5f87784323c9c5b556f76d3b3 SHA512 7e950494a9fe591062e488d08f9e675dd0aacacbea640619461cd3bb0ac2fe945f189fe1e30c69614e9ed3751ac3ddfe84d943a0aa2d2f35fc5cd733002938f5 diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch deleted file mode 100644 index 96b752bf075..00000000000 --- a/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 583e10e8356d2ed64f0358ebf107bff35a98db31 Mon Sep 17 00:00:00 2001 -From: Johannes Zarl-Zierl <johan...@zarl-zierl.at> -Date: Sun, 9 Feb 2020 22:51:15 +0100 -Subject: Fix crash when associating a tag with an area. - -If a tag is being associated with an area, the context menu has two -levels: the direct "associate with <last added tag>" and the sub-menu -"associate with..." followed by a list of tags. - -Each version uses a different function signature for -ResizableFrame::associateTags. When refactoring connections to the "new" -signal-slot syntax in commit c38f5136 (thus released in version 5.6), I -applied the wrong signature to the connect statement. - -This resulted in a crash/failed assertion when selecting a tag in the -described way. ---- - AnnotationDialog/ResizableFrame.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/AnnotationDialog/ResizableFrame.cpp b/AnnotationDialog/ResizableFrame.cpp -index f2dba86..44175fb 100644 ---- a/AnnotationDialog/ResizableFrame.cpp -+++ b/AnnotationDialog/ResizableFrame.cpp -@@ -1,4 +1,4 @@ --/* Copyright (C) 2014-2019 The KPhotoAlbum Development Team -+/* Copyright (C) 2014-2020 The KPhotoAlbum Development Team - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public -@@ -522,7 +522,7 @@ void AnnotationDialog::ResizableFrame::addTagActions(QMenu *menu) - submenu->addAction(createAssociateTagAction(tag)); - } - -- connect(submenu, &QMenu::triggered, this, QOverload<>::of(&ResizableFrame::associateTag)); -+ connect(submenu, &QMenu::triggered, this, QOverload<QAction *>::of(&ResizableFrame::associateTag)); - } - } - } --- -cgit v1.1 diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild deleted file mode 100644 index 5c27d00b9ab..00000000000 --- a/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Tool for indexing, searching, and viewing images" -HOMEPAGE="https://www.kphotoalbum.org/"; - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2+ FDL-1.2" -SLOT="5" -IUSE="+kipi map +raw share" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5[sqlite] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - media-gfx/exiv2:= - media-libs/phonon[qt5(+)] - virtual/jpeg:0 - kipi? ( kde-apps/libkipi:5= ) - map? ( kde-apps/libkgeomap:5 ) - raw? ( kde-apps/libkdcraw:5 ) - share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 ) -" -RDEPEND="${DEPEND} - media-video/ffmpeg - kipi? ( kde-apps/kipi-plugins:5 ) -" - -DOCS=( ChangeLog README.md ) - -PATCHES=( "${FILESDIR}/${P}-crashfix.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package kipi KF5Kipi) - $(cmake_use_find_package map KF5KGeoMap) - $(cmake_use_find_package raw KF5KDcraw) - $(cmake_use_find_package share KF5Purpose) - ) - - ecm_src_configure -}
