* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/
@ 2016-07-21 11:49 Michael Palimaka
0 siblings, 0 replies; 10+ messages in thread
From: Michael Palimaka @ 2016-07-21 11:49 UTC (permalink / raw
To: gentoo-commits
commit: a824a71f8ca4e27178fdc1282895bb56cabd56a5
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 11:48:37 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 11:48:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a824a71f
media-gfx/kphotoalbum: backport patch from upstream fixing build failure with USE="-kipi"
Gentoo-bug: 589282
Package-Manager: portage-2.3.0
.../files/kphotoalbum-4.7.1-nokipi.patch | 24 ++++++++++++++++++++++
media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild | 1 +
2 files changed, 25 insertions(+)
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.7.1-nokipi.patch b/media-gfx/kphotoalbum/files/kphotoalbum-4.7.1-nokipi.patch
new file mode 100644
index 0000000..fbaa5b5
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-4.7.1-nokipi.patch
@@ -0,0 +1,24 @@
+From 6455e21ee1e1d52e9bd35e61f776031d37ca1b6c Mon Sep 17 00:00:00 2001
+From: Tobias Leupold <tobias.leupold@web.de>
+Date: Wed, 20 Jul 2016 22:53:06 +0200
+Subject: [PATCH] Fix building without KIPI.
+
+---
+ Viewer/InfoBox.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Viewer/InfoBox.cpp b/Viewer/InfoBox.cpp
+index 5c619c5..b37c0de 100644
+--- a/Viewer/InfoBox.cpp
++++ b/Viewer/InfoBox.cpp
+@@ -34,6 +34,7 @@
+ #include <KGlobal>
+ #include <KIconLoader>
+ #include <KDebug>
++#include <KLocale>
+
+ // Local includes
+ #include "Browser/BrowserWidget.h"
+--
+2.7.3
+
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild
index f51aea7..397e100 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild
@@ -40,6 +40,7 @@ RDEPEND="${COMMON_DEPEND}
"
DOCS=( ChangeLog README )
+PATCHES=( "${FILESDIR}/${P}-nokipi.patch" )
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/
@ 2023-08-03 15:34 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2023-08-03 15:34 UTC (permalink / raw
To: gentoo-commits
commit: 48e1a66ca8a4046a1695b03951822a37fe515016
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 3 15:18:37 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 3 15:34:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e1a66c
media-gfx/kphotoalbum: drop 5.10.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/kphotoalbum/Manifest | 1 -
.../files/kphotoalbum-5.10.0-exiv2-0.28.patch | 147 ---------------------
media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild | 73 ----------
3 files changed, 221 deletions(-)
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index cfb1fb42f59c..eb90501ca754 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.10.0.tar.xz 12002788 BLAKE2B e20a06f6829c1ac3df51102b09be4e59fe97557b7b51ab4c2ef072f2ea18b9c086acad9cd03dde14549e35ee652f325a558bb634e5760d3b216f9a1c6d681a63 SHA512 6e6e3d3173f2783c05319c6a372553e92b97174a43307d2bd1fdfa0eb6751bab435e61e07e1c33496254e6f53dd95032adf002899c68475dac7af7ad575c28cc
DIST kphotoalbum-5.11.0.tar.xz 12005836 BLAKE2B 1a2872bc791cec6701a4bfe8b6ddac264731f7afdcb35d864bcd07cc0b5e5a4015184a071d9db9735d21b080c898d5ea598d0879bb979032abe464434f6fb821 SHA512 dd521b5e158a691da69e333fcefd3cf48135053c7510dbd7f22d94299059fe58037c56e70b92edfcd1d8d7a55b04f80278ff3bdde08dba16507dc43ca77af96e
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch
deleted file mode 100644
index 2eea9495b735..000000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff --git a/DB/FileInfo.cpp b/DB/FileInfo.cpp
-index dc4c9819b62706c9c7bbfa21f3da7ef7d3f8b6d3..8b4e275c1765e718ed917cb41e7b221ed8d484ef 100644
---- a/DB/FileInfo.cpp
-+++ b/DB/FileInfo.cpp
-@@ -1,5 +1,6 @@
- // SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen <blackie@kde.org>
- // SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-+// SPDX-FileCopyrightText: 2023 Tobias Leupold <tl at stonemx dot de>
- //
- // SPDX-License-Identifier: GPL-2.0-or-later
-
-@@ -13,6 +14,8 @@
- #include <QFileInfo>
- #include <QRegularExpression>
-
-+#include <exiv2/version.hpp>
-+
- using namespace DB;
-
- FileInfo FileInfo::read(const DB::FileName &fileName, DB::ExifMode mode)
-@@ -79,8 +82,14 @@ void DB::FileInfo::parseEXIV2(const DB::FileName &fileName)
- const Exiv2::Exifdatum &datum = m_exifMap["Exif.Image.Orientation"];
-
- int orientation = 0;
-- if (datum.count() > 0)
-+ if (datum.count() > 0) {
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+ orientation = datum.toInt64();
-+#else
- orientation = datum.toLong();
-+#endif
-+ }
-+
- m_angle = orientationToAngle(orientation);
- }
-
-diff --git a/lib/kpaexif/Database.cpp b/lib/kpaexif/Database.cpp
-index 4d0e228c72f5747f9d5b2a4e15871e2a11de4ed9..985713ceb53e60c3c17de80632f902a07ba94b14 100644
---- a/lib/kpaexif/Database.cpp
-+++ b/lib/kpaexif/Database.cpp
-@@ -1,6 +1,6 @@
- // SPDX-FileCopyrightText: 2003-2020 The KPhotoAlbum Development Team
--// SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
--// SPDX-FileCopyrightText: 2022 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-+// SPDX-FileCopyrightText: 2021-2022 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-+// SPDX-FileCopyrightText: 2023 Tobias Leupold <tl at stonemx dot de>
- //
- // SPDX-License-Identifier: GPL-2.0-or-later
-
-@@ -320,7 +320,7 @@ bool Exif::Database::add(const DB::FileName &fileName)
- return false;
-
- try {
-- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
-+ const auto image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
- Q_ASSERT(image.get() != nullptr);
- image->readMetadata();
- Exiv2::ExifData &exifData = image->exifData();
-@@ -341,7 +341,7 @@ bool Exif::Database::add(const DB::FileNameList &list)
-
- for (const DB::FileName &fileName : list) {
- try {
-- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
-+ const auto image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
- Q_ASSERT(image.get() != nullptr);
- image->readMetadata();
- map << DBExifInfo(fileName, image->exifData());
-diff --git a/lib/kpaexif/DatabaseElement.cpp b/lib/kpaexif/DatabaseElement.cpp
-index 4e7ba198e425e81c582c585bb184ec19c31d4985..3d5d56cfbe5028a8e148753979bdae3f0922008d 100644
---- a/lib/kpaexif/DatabaseElement.cpp
-+++ b/lib/kpaexif/DatabaseElement.cpp
-@@ -1,13 +1,15 @@
--/* SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen <blackie@kde.org>
-+// SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen <blackie@kde.org>
-+// SPDX-FileCopyrightText: 2023 Tobias Leupold <tl at stonemx dot de>
-+//
-+// SPDX-License-Identifier: GPL-2.0-or-later
-
-- SPDX-License-Identifier: GPL-2.0-or-later
--*/
- #include "DatabaseElement.h"
-
- #include <kpabase/Logging.h>
-
- #include <QVariant>
- #include <exiv2/exif.hpp>
-+#include <exiv2/version.hpp>
-
- static QString replaceDotWithUnderscore(const char *cstr)
- {
-@@ -76,10 +78,15 @@ QString Exif::IntExifElement::queryString() const
-
- QVariant Exif::IntExifElement::valueFromExif(Exiv2::ExifData &data) const
- {
-- if (data[m_tag].count() > 0)
-- return QVariant { (int)data[m_tag].toLong() };
-- else
-- return QVariant { (int)0 };
-+ if (data[m_tag].count() > 0) {
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+ return QVariant((int) data[m_tag].toInt64());
-+#else
-+ return QVariant((int) data[m_tag].toLong());
-+#endif
-+ } else {
-+ return QVariant(0);
-+ }
- }
-
- Exif::RationalExifElement::RationalExifElement(const char *tag)
-diff --git a/lib/kpaexif/Info.cpp b/lib/kpaexif/Info.cpp
-index 5f77fc8144516434465bd9f21ea2e885054aed37..162a05d14f3fbadd1d776d0eb10589a892bcf86c 100644
---- a/lib/kpaexif/Info.cpp
-+++ b/lib/kpaexif/Info.cpp
-@@ -1,5 +1,6 @@
- // SPDX-FileCopyrightText: 2003-2020 The KPhotoAlbum Development Team
- // SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-+// SPDX-FileCopyrightText: 2023 Tobias Leupold <tl at stonemx dot de>
- //
- // SPDX-License-Identifier: GPL-2.0-or-later
-
-@@ -16,7 +17,6 @@
- #include <QTextCodec>
- #include <exiv2/exv_conf.h>
- #include <exiv2/image.hpp>
--#include <exiv2/version.hpp>
-
- using namespace Exif;
-
-@@ -166,7 +166,7 @@ Info::Info()
- void Exif::writeExifInfoToFile(const DB::FileName &srcName, const QString &destName, const QString &imageDescription)
- {
- // Load Exif from source image
-- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data());
-+ auto image = Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data());
- image->readMetadata();
- Exiv2::ExifData data = image->exifData();
-
-@@ -201,7 +201,7 @@ Exif::Metadata Exif::Info::metadata(const DB::FileName &fileName)
- {
- try {
- Exif::Metadata result;
-- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data());
-+ auto image = Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data());
- Q_ASSERT(image.get() != nullptr);
- image->readMetadata();
- result.exif = image->exifData();
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
deleted file mode 100644
index 6f0b4d7fe491..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-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 CC-BY-SA-4.0"
-SLOT="5"
-IUSE="map phonon +raw share +vlc"
-
-REQUIRED_USE="|| ( phonon vlc )"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[jpeg]
- >=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/libjpeg-turbo:=
- map? ( kde-apps/marble:5 )
- phonon? ( >=media-libs/phonon-4.11.0 )
- raw? ( kde-apps/libkdcraw:5 )
- share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
- vlc? ( media-video/vlc:= )
-"
-RDEPEND="${DEPEND}
- media-video/ffmpeg
-"
-
-DOCS=( CHANGELOG.{md,old} README.md )
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # git master, bug 906469
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_QtAV=ON # bug 758641, last-rited
- $(cmake_use_find_package map Marble)
- $(cmake_use_find_package phonon Phonon4Qt5)
- $(cmake_use_find_package raw KF5KDcraw)
- $(cmake_use_find_package share KF5Purpose)
- $(cmake_use_find_package vlc LIBVLC)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/
@ 2020-02-09 22:28 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2020-02-09 22:28 UTC (permalink / raw
To: gentoo-commits
commit: 31d115347979a361eb9e0aa666c5333a9b9591b2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 22:08:09 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 22:27:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d11534
media-gfx/kphotoalbum: Fix crash when associating a tag with an area
Upstream commit 583e10e8356d2ed64f0358ebf107bff35a98db31
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kphotoalbum-5.6-crashfix.patch | 41 +++++++++++++
media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild | 69 ++++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch
new file mode 100644
index 00000000000..96b752bf075
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch
@@ -0,0 +1,41 @@
+From 583e10e8356d2ed64f0358ebf107bff35a98db31 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl <johannes@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
new file mode 100644
index 00000000000..5c27d00b9ab
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild
@@ -0,0 +1,69 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/
@ 2018-12-31 21:14 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2018-12-31 21:14 UTC (permalink / raw
To: gentoo-commits
commit: 4329dfc748a9f4a27af7fc8833592d7acbc0f85a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 17:30:04 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 21:13:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4329dfc7
media-gfx/kphotoalbum: Fix build with exiv2-0.27
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kphotoalbum-5.4-exiv2-0.27.patch | 61 ++++++++++++++++++++++
media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild | 2 +
2 files changed, 63 insertions(+)
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch
new file mode 100644
index 00000000000..7b7f612b94f
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch
@@ -0,0 +1,61 @@
+From 41c7da0531c8a1eb7046345c2b991e7a5d1e6657 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
+Date: Sun, 30 Dec 2018 23:36:24 +0100
+Subject: Use Exiv2 0.27 if available.
+
+Beginning with version 0.27, Exiv2 ships with cmake package config
+files.
+---
+ CMakeLists.txt | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3012f7a..5dcc29c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,7 +44,17 @@ if(JPEG_FOUND)
+ include_directories(${JPEG_INCLUDE_DIR})
+ endif()
+
+-find_package(Exiv2 REQUIRED)
++### 2018-12-30 jzarl
++# When Exiv2 0.26 can be deprecated, FindExiv2.cmake should be removed
++# and only find_package(exiv2) should be used
++find_package(exiv2 CONFIG QUIET)
++if(exiv2_FOUND)
++ # search againg with REQUIRED, so that the feature summary correctly shows exiv as required dependency
++ find_package(exiv2 CONFIG REQUIRED)
++ set(EXIV2_LIBRARIES exiv2lib)
++else()
++ find_package(Exiv2 REQUIRED)
++endif()
+
+ find_package(KF5Kipi 5.1.0)
+ set_package_properties(KF5Kipi
+--
+cgit v1.1
+From cf4f7645b3c94246a1fcf664f1c865a93ae2b684 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
+Date: Sun, 30 Dec 2018 23:43:14 +0100
+Subject: Fix compilation with exiv2 0.27
+
+---
+ Exif/Info.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Exif/Info.cpp b/Exif/Info.cpp
+index be4c88f..9545360 100644
+--- a/Exif/Info.cpp
++++ b/Exif/Info.cpp
+@@ -28,7 +28,8 @@
+ #include <QFile>
+
+ #include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exv_conf.h>
++#include <exiv2/version.hpp>
+
+ using namespace Exif;
+
+--
+cgit v1.1
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
index ce7c3284e2a..6aaff0db914 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
@@ -49,6 +49,8 @@ RDEPEND="${DEPEND}
DOCS=( ChangeLog README )
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package kipi KF5Kipi)
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/
@ 2018-11-12 23:00 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2018-11-12 23:00 UTC (permalink / raw
To: gentoo-commits
commit: 12d78f8099c7e87660c384d5133f9be371308577
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 12 18:56:45 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 12 23:00:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d78f80
media-gfx/kphotoalbum: Drop 5.3
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/kphotoalbum/Manifest | 1 -
.../kphotoalbum/files/kphotoalbum-5.3-gcc8.patch | 29 ----------
media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild | 67 ----------------------
3 files changed, 97 deletions(-)
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 868408acaea..94b929ebd44 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.3.tar.xz 11378768 BLAKE2B d71a52fdd5b389bb6353596c50ca4c5e1318128a0158048534512528a9315b7974da2b6685dc26fa74edb5b7f0f399c7910ba2ea5c5bbf50f9b15a7a0a8ebed3 SHA512 8296e9db17d7cc5b34dd29fbe9aeb8f7ab05e286e5d4a692c05f00cd1438dfd32bc48e1c4fd740c5fb932c463ba92fdb0620b9af49d3419ffcfa1354336dd26f
DIST kphotoalbum-5.4.tar.xz 11658792 BLAKE2B 5f91dac910cc7022ca8a20f49f286a84586bf7adaed57448c1d811c370a9fb8661469d4e8e73809990e1e1800aaaff8f53c86446d93f99fd55cdddbece01eddc SHA512 d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba
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 ce52589b23c..00000000000
--- 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 <christophe@krop.fr>
-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<RemoteCommand> command = RemoteCommand::create(static_cast<CommandType>(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 c5416d5f9a7..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/
@ 2017-02-15 21:24 Johannes Huber
0 siblings, 0 replies; 10+ messages in thread
From: Johannes Huber @ 2017-02-15 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 75ae6be0e2590f6ac5e245fac6770ebb63b6a93e
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 21:23:46 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 21:24:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ae6be0
media-gfx/kphotoalbum: Fix build w/ ecm 5.31
Revision bump adds upstream patches to fix build with next extra cmake modules
version. This version adds cflags -fno-operator-names by default, which breaks
the build here.
Gentoo-bug: 609470
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/kphotoalbum-5.1-ecm531-1.patch | 19 ++++++
.../files/kphotoalbum-5.1-ecm531-2.patch | 39 +++++++++++
.../files/kphotoalbum-5.1-ecm531-3.patch | 56 ++++++++++++++++
.../files/kphotoalbum-5.1-ecm531-4.patch | 19 ++++++
.../files/kphotoalbum-5.1-ecm531-5.patch | 19 ++++++
media-gfx/kphotoalbum/kphotoalbum-5.1-r1.ebuild | 75 ++++++++++++++++++++++
6 files changed, 227 insertions(+)
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch
new file mode 100644
index 0000000000..bf694951f9
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch
@@ -0,0 +1,19 @@
+commit 8b54a592731e65dec02bbfc83c994fe373bc0dca
+Author: Raymond Wooninck <tittiatcoke@gmail.com>
+Date: Tue Jan 24 20:55:28 2017 +0100
+
+ Fix build with -fno-operator-names
+
+diff --git a/DB/ImageInfo.cpp b/DB/ImageInfo.cpp
+index 59c2c6f9..5eadbb10 100644
+--- a/DB/ImageInfo.cpp
++++ b/DB/ImageInfo.cpp
+@@ -190,7 +190,7 @@ void ImageInfo::rotate( int degrees, RotationMode mode )
+ m_dirty = true;
+ m_angle = ( m_angle + degrees ) % 360;
+
+- if (degrees == 90 or degrees == 270) {
++ if (degrees == 90 || degrees == 270) {
+ m_size.transpose();
+ }
+
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-2.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-2.patch
new file mode 100644
index 0000000000..11cd87cebe
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-2.patch
@@ -0,0 +1,39 @@
+commit 8cc8951ba21b1e54a7cd62e50075e09e8e2f9901
+Author: Raymond Wooninck <tittiatcoke@gmail.com>
+Date: Tue Jan 24 21:06:31 2017 +0100
+
+ Some more fixes for -fno-operator-names
+
+diff --git a/AnnotationDialog/Dialog.cpp b/AnnotationDialog/Dialog.cpp
+index 50e18e70..c44d88dc 100644
+--- a/AnnotationDialog/Dialog.cpp
++++ b/AnnotationDialog/Dialog.cpp
+@@ -1504,7 +1504,7 @@ void AnnotationDialog::Dialog::addTagToCandidateList(QString category, QString t
+ void AnnotationDialog::Dialog::removeTagFromCandidateList(QString category, QString tag)
+ {
+ // Is the deselected tag the last selected positionable tag?
+- if (m_lastSelectedPositionableTag.first == category and m_lastSelectedPositionableTag.second == tag) {
++ if (m_lastSelectedPositionableTag.first == category && m_lastSelectedPositionableTag.second == tag) {
+ m_lastSelectedPositionableTag = QPair<QString, QString>();
+ }
+
+@@ -1534,7 +1534,7 @@ void AnnotationDialog::Dialog::slotShowAreas(bool showAreas)
+ void AnnotationDialog::Dialog::positionableTagRenamed(QString category, QString oldTag, QString newTag)
+ {
+ // Is the renamed tag the last selected positionable tag?
+- if (m_lastSelectedPositionableTag.first == category and m_lastSelectedPositionableTag.second == oldTag) {
++ if (m_lastSelectedPositionableTag.first == category && m_lastSelectedPositionableTag.second == oldTag) {
+ m_lastSelectedPositionableTag.second = newTag;
+ }
+
+@@ -1576,8 +1576,8 @@ void AnnotationDialog::Dialog::checkProposedTagData(
+ foreach (ResizableFrame *area, areas())
+ {
+ if (area != areaToExclude
+- and area->proposedTagData() == tagData
+- and area->tagData().first.isEmpty()) {
++ && area->proposedTagData() == tagData
++ && area->tagData().first.isEmpty()) {
+ area->removeProposedTagData();
+ }
+ }
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-3.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-3.patch
new file mode 100644
index 0000000000..8269676529
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-3.patch
@@ -0,0 +1,56 @@
+commit 3e91323f1faea39a950b84b317a511df2f3b8875
+Author: Raymond Wooninck <tittiatcoke@gmail.com>
+Date: Tue Jan 24 22:01:16 2017 +0100
+
+ More fixes for -fno-operator-names
+
+diff --git a/AnnotationDialog/ImagePreview.cpp b/AnnotationDialog/ImagePreview.cpp
+index e83f03aa..34d90b62 100644
+--- a/AnnotationDialog/ImagePreview.cpp
++++ b/AnnotationDialog/ImagePreview.cpp
+@@ -330,8 +330,8 @@ void ImagePreview::mousePressEvent(QMouseEvent *event)
+ }
+
+ m_areaStart = event->pos();
+- if (m_areaStart.x() < m_minX or m_areaStart.x() > m_maxX or
+- m_areaStart.y() < m_minY or m_areaStart.y() > m_maxY) {
++ if (m_areaStart.x() < m_minX || m_areaStart.x() > m_maxX ||
++ m_areaStart.y() < m_minY || m_areaStart.y() > m_maxY) {
+ // Dragging started outside of the preview image
+ return;
+ }
+@@ -374,7 +374,7 @@ void ImagePreview::mouseReleaseEvent(QMouseEvent *event)
+ return;
+ }
+
+- if (event->button() & Qt::LeftButton and m_selectionRect->isVisible()) {
++ if (event->button() & Qt::LeftButton && m_selectionRect->isVisible()) {
+ m_areaEnd = event->pos();
+ processNewArea();
+ m_selectionRect->hide();
+@@ -583,9 +583,9 @@ bool ImagePreview::fuzzyAreaExists(QList<QRect> &existingAreas, QRect area)
+ // maximumDeviation is 15% of the mean value of the width and height of each area
+ maximumDeviation = float(existingAreas.at(i).width() + existingAreas.at(i).height()) * 0.075;
+ if (
+- distance(existingAreas.at(i).topLeft(), area.topLeft()) < maximumDeviation and
+- distance(existingAreas.at(i).topRight(), area.topRight()) < maximumDeviation and
+- distance(existingAreas.at(i).bottomLeft(), area.bottomLeft()) < maximumDeviation and
++ distance(existingAreas.at(i).topLeft(), area.topLeft()) < maximumDeviation &&
++ distance(existingAreas.at(i).topRight(), area.topRight()) < maximumDeviation &&
++ distance(existingAreas.at(i).bottomLeft(), area.bottomLeft()) < maximumDeviation &&
+ distance(existingAreas.at(i).bottomRight(), area.bottomRight()) < maximumDeviation
+ ) {
+ return true;
+diff --git a/AnnotationDialog/ListSelect.cpp b/AnnotationDialog/ListSelect.cpp
+index 6010c692..80fca8e9 100644
+--- a/AnnotationDialog/ListSelect.cpp
++++ b/AnnotationDialog/ListSelect.cpp
+@@ -413,7 +413,7 @@ void AnnotationDialog::ListSelect::showContextMenu(const QPoint& pos)
+ i18n("Really Delete %1?",item->text(0)),
+ KGuiItem(i18n("&Delete"),QString::fromLatin1("editdelete")) );
+ if ( code == KMessageBox::Continue ) {
+- if (item->checkState(0) == Qt::Checked and m_positionable) {
++ if (item->checkState(0) == Qt::Checked && m_positionable) {
+ // An area could be linked against this. We can use positionableTagDeselected
+ // here, as the procedure is the same as if the tag had been deselected.
+ emit positionableTagDeselected(m_category->name(), item->text(0));
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-4.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-4.patch
new file mode 100644
index 0000000000..c35f6ae75f
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-4.patch
@@ -0,0 +1,19 @@
+commit de72ff88d7b5f69bacfbe556a5175b311657bc49
+Author: Raymond Wooninck <tittiatcoke@gmail.com>
+Date: Tue Jan 24 22:07:59 2017 +0100
+
+ And more of the same
+
+diff --git a/AnnotationDialog/DescriptionEdit.cpp b/AnnotationDialog/DescriptionEdit.cpp
+index 17d12533..dd746fa2 100644
+--- a/AnnotationDialog/DescriptionEdit.cpp
++++ b/AnnotationDialog/DescriptionEdit.cpp
+@@ -28,7 +28,7 @@ AnnotationDialog::DescriptionEdit::~DescriptionEdit()
+
+ void AnnotationDialog::DescriptionEdit::keyPressEvent(QKeyEvent *event)
+ {
+- if (event->key() == Qt::Key_PageUp or event->key() == Qt::Key_PageDown) {
++ if (event->key() == Qt::Key_PageUp || event->key() == Qt::Key_PageDown) {
+ emit pageUpDownPressed(event);
+ } else {
+ QTextEdit::keyPressEvent(event);
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-5.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-5.patch
new file mode 100644
index 0000000000..e6d0ce05fa
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-5.patch
@@ -0,0 +1,19 @@
+commit ea36a73b1e36dc5cf5ca6d78db9491c40c1d6d4c
+Author: Jonathan Riddell <jr@jriddell.org>
+Date: Fri Jan 27 15:32:22 2017 +0000
+
+ More fixes for -fno-operator-names
+
+diff --git a/AnnotationDialog/ResizableFrame.cpp b/AnnotationDialog/ResizableFrame.cpp
+index 2251b2e2..e1afbc00 100644
+--- a/AnnotationDialog/ResizableFrame.cpp
++++ b/AnnotationDialog/ResizableFrame.cpp
+@@ -427,7 +427,7 @@ void AnnotationDialog::ResizableFrame::setTagData(QString category, QString tag,
+ if (changeOrigin == ManualChange) {
+ m_changed = true;
+
+- if (m_detectedFace and ! m_trained and m_previewWidget->automatedTraining()) {
++ if (m_detectedFace && ! m_trained && m_previewWidget->automatedTraining()) {
+ m_preview->trainRecognitionDatabase(m_actualCoordinates, m_tagData);
+ m_trained = true;
+ }
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.1-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.1-r1.ebuild
new file mode 100644
index 0000000000..d95c9c1fd7
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="http://www.kphotoalbum.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="face +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
+ face? ( $(add_kdeapps_dep libkface) )
+ 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}-ecm531-1.patch"
+ "${FILESDIR}/${P}-ecm531-2.patch"
+ "${FILESDIR}/${P}-ecm531-3.patch"
+ "${FILESDIR}/${P}-ecm531-4.patch"
+ "${FILESDIR}/${P}-ecm531-5.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_PLAYGROUND=ON
+ $(cmake-utils_use_find_package face KF5KFace)
+ $(cmake-utils_use_find_package kipi KF5Kipi)
+ $(cmake-utils_use_find_package map KF5KGeoMap)
+ $(cmake-utils_use_find_package raw KF5KDcraw)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/
@ 2017-01-19 16:47 Johannes Huber
0 siblings, 0 replies; 10+ messages in thread
From: Johannes Huber @ 2017-01-19 16:47 UTC (permalink / raw
To: gentoo-commits
commit: a612fa7f82e35f124ed194c76ecccc2ee3e3a1dc
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 16:47:16 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 16:47:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a612fa7f
media-gfx/kphotoalbum: Remove 5.0.1
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/kphotoalbum/Manifest | 1 -
.../files/kphotoalbum-5.0.1-buildbackports.patch | 190 ---------------------
media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild | 67 --------
3 files changed, 258 deletions(-)
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index b02378e..f9b7168 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.0.1.tar.xz 9539204 SHA256 e43beb6cb93d749b30aa171ebce5ac5473b16704ea6d36bf6dcc2ce54328ce55 SHA512 e182e0f594aa1ce2a53ee529990eba0e61b0d694d74a6e0c2bd37d57658c6e3173e9107f49f82afef85b8cb9a84af626d6e060e7f6d992c8606902b16abff848 WHIRLPOOL 4b235af854a5faba228d487498a06112ef138827e7abe14b73b04bc76cb9dabe02a623bf1e15597fcf6acdb79000942622de343fd57f8c02dad82fa1141535f3
DIST kphotoalbum-5.1.tar.xz 9544460 SHA256 9c6e175090fc6de1e7d0565a88e1715496e0b1cfbdfc7a11dd4818694b8504b7 SHA512 fea7b30e164801d1de2622ad1fc1b0d13139646b1e78737b056dad3a1ee81cc401706d4fe1496980e56bb8679d5e2e5beb8c235a6e83649d86b15eebad08db5d WHIRLPOOL aba0637c25844d4818a835dfa504251f564b9caa2992eabad59269cff0bf2370bc92aad56f97020a4cd438016ceb8a9cd4a77266df8bc10940d586b2f978c23e
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch
deleted file mode 100644
index 26eac8d..00000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 87d8f63d5966b36af60e9d4aac95196fcee30f91 Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-Date: Sun, 30 Oct 2016 21:52:03 +0100
-Subject: [PATCH] Review dependency list.
-
-Thanks to kensington for the suggestion!
----
- CMakeLists.txt | 23 ++++++++++++++++++-----
- 1 file changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 120a703..95f46c9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,7 @@ include(FeatureSummary)
-
- find_package(Qt5 REQUIRED COMPONENTS Sql Xml Widgets Network)
- find_package(Phonon4Qt5 REQUIRED)
--find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n KIO DocTools WidgetsAddons Config IconThemes Archive Parts JobWidgets)
-+find_package(KF5 REQUIRED COMPONENTS Archive Completion Config CoreAddons DocTools I18n IconThemes JobWidgets KIO TextWidgets WidgetsAddons)
-
- # enable exceptions:
- kde_enable_exceptions()
-@@ -445,10 +445,23 @@ set(kphotoalbum_SRCS
- add_executable(kphotoalbum ${kphotoalbum_SRCS})
-
- # External components
--target_link_libraries(kphotoalbum ${JPEG_LIBRARY})
--target_link_libraries(kphotoalbum Qt5::Network)
--target_link_libraries(kphotoalbum KF5::KIOCore KF5::CoreAddons KF5::I18n KF5::ConfigCore KF5::ConfigGui KF5::IconThemes KF5::Archive KF5::Parts KF5::JobWidgets KF5::WidgetsAddons)
--target_link_libraries(kphotoalbum Phonon::phonon4qt5)
-+target_link_libraries(kphotoalbum
-+ ${JPEG_LIBRARY}
-+ KF5::Archive
-+ KF5::Completion
-+ KF5::ConfigCore
-+ KF5::ConfigGui
-+ KF5::CoreAddons
-+ KF5::I18n
-+ KF5::IconThemes
-+ KF5::JobWidgets
-+ KF5::KIOCore
-+ KF5::KIOWidgets
-+ KF5::TextWidgets
-+ KF5::WidgetsAddons
-+ Phonon::phonon4qt5
-+ Qt5::Network
-+ )
-
- if(KF5Kipi_FOUND)
- target_link_libraries(kphotoalbum KF5::Kipi)
---
-2.7.3
-
-From e07a6ffd6a96a527e0ac26e9f12eb1bcd7767830 Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-Date: Thu, 8 Dec 2016 22:02:13 +0100
-Subject: [PATCH] Remove bogus dependency on KF5KExiv2
-
----
- CMakeLists.txt | 28 +++++++++++-----------------
- 1 file changed, 11 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1594af0..36228b8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,15 +92,13 @@ set_package_properties(KF5KDcraw
- )
- set(HAVE_KDCRAW ${KF5KDcraw_FOUND} )
-
--find_package(KF5KExiv2)
--# FIXME: most of KPhotoAlbum uses plain libexiv:
- find_package(Exiv2)
--set_package_properties(KF5KExiv2
-+set_package_properties(Exiv2
- PROPERTIES
- TYPE RECOMMENDED
- PURPOSE "Enables image metadata (exiv) support (strongly advised!)"
- )
--set(HAVE_EXIV2 ${KF5KExiv2_FOUND})
-+set(HAVE_EXIV2 ${Exiv2_FOUND})
-
- if(ENABLE_PLAYGROUND)
- find_package(KF5KFace 5.0.0 CONFIG)
-@@ -112,16 +110,12 @@ if(ENABLE_PLAYGROUND)
- set(HAVE_KFACE ${KF5KFace_FOUND})
- endif()
-
--if(KF5KExiv2_FOUND)
-- find_package(KF5KGeoMap)
-- set_package_properties(KF5KGeoMap
-- PROPERTIES
-- TYPE OPTIONAL
-- PURPOSE "Enables support for geographic map location using embedded GPS information."
-- )
--else()
-- message(STATUS "Not searching KF5KGeoMap because of missing dependency KF5KExiv2...")
--endif()
-+find_package(KF5KGeoMap)
-+set_package_properties(KF5KGeoMap
-+ PROPERTIES
-+ TYPE OPTIONAL
-+ PURPOSE "Enables support for geographic map location using embedded GPS information."
-+ )
- set(HAVE_KGEOMAP ${KF5KGeoMap_FOUND})
-
- add_custom_target(
-@@ -433,7 +427,7 @@ add_subdirectory(script)
- add_subdirectory(doc)
-
- set(EXIV2_SRCS)
--if(KF5KExiv2_FOUND AND Qt5Sql_FOUND)
-+if(Exiv2_FOUND AND Qt5Sql_FOUND)
- set(EXIV2_SRCS
- #${CMAKE_CURRENT_SOURCE_DIR}/Browser/ExifFolder.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/Settings/ExifPage.cpp
-@@ -499,8 +493,8 @@ if(KF5KDcraw_FOUND)
- target_link_libraries(kphotoalbum KF5::KDcraw)
- endif()
-
--if(KF5KExiv2_FOUND)
-- target_link_libraries(kphotoalbum KF5::KExiv2 ${EXIV2_LIBRARIES} Qt5::Sql)
-+if(Exiv2_FOUND)
-+ target_link_libraries(kphotoalbum ${EXIV2_LIBRARIES} Qt5::Sql)
- endif()
-
- if(KF5KFace_FOUND)
---
-2.7.3
-
-From b17b99d25645b62838f7731b66d60a7efbbb5385 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sat, 26 Nov 2016 17:06:35 +0100
-Subject: [PATCH] cmake: require KF5::XmlGui
-
-It is used explicitly (see KXmlGuiWindow), so it is needed to look for
-it and link to it.
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5fef0df..b24ab3b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -69,7 +69,7 @@ endforeach()
-
- find_package(Qt5 REQUIRED COMPONENTS Sql Xml Widgets Network)
- find_package(Phonon4Qt5 REQUIRED)
--find_package(KF5 REQUIRED COMPONENTS Archive Completion Config CoreAddons DocTools I18n IconThemes JobWidgets KIO TextWidgets WidgetsAddons)
-+find_package(KF5 REQUIRED COMPONENTS Archive Completion Config CoreAddons DocTools I18n IconThemes JobWidgets KIO TextWidgets XmlGui WidgetsAddons)
-
- find_package(JPEG REQUIRED)
- if(JPEG_FOUND)
-@@ -484,6 +484,7 @@ target_link_libraries(kphotoalbum
- KF5::KIOCore
- KF5::KIOWidgets
- KF5::TextWidgets
-+ KF5::XmlGui
- KF5::WidgetsAddons
- Phonon::phonon4qt5
- Qt5::Network
---
-2.7.3
-
-From e3c1911d5ad54f672cf086b041376f11ad4f446e Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-Date: Thu, 27 Oct 2016 18:12:11 +0200
-Subject: [PATCH] Fix compilation with Qt 5.6.1
-
----
- HTMLGenerator/HTMLDialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/HTMLGenerator/HTMLDialog.cpp b/HTMLGenerator/HTMLDialog.cpp
-index 9aa619d..3e53c58 100644
---- a/HTMLGenerator/HTMLDialog.cpp
-+++ b/HTMLGenerator/HTMLDialog.cpp
-@@ -20,6 +20,7 @@
-
- #include <QCheckBox>
- #include <QComboBox>
-+#include <QDebug>
- #include <QDialogButtonBox>
- #include <QFileDialog>
- #include <QGroupBox>
---
-2.7.3
-
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild
deleted file mode 100644
index 3db7338..00000000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="http://www.kphotoalbum.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="amd64 x86"
-IUSE="+face +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-0.17:=
- media-libs/phonon[qt5]
- virtual/jpeg:0
- face? ( $(add_kdeapps_dep libkface) )
- 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}-buildbackports.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package face KF5KFace)
- $(cmake-utils_use_find_package kipi KF5Kipi)
- $(cmake-utils_use_find_package map KF5KGeoMap)
- $(cmake-utils_use_find_package raw KF5KDcraw)
- )
-
- kde5_src_configure
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/
@ 2016-12-11 19:33 Johannes Huber
0 siblings, 0 replies; 10+ messages in thread
From: Johannes Huber @ 2016-12-11 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 938e22b00a7f0a114b225ee7e5f3429d27d3bc08
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 19:32:03 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 19:33:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=938e22b0
media-gfx/kphotoalbum: Drop slot 4
Package-Manager: portage-2.3.3
media-gfx/kphotoalbum/Manifest | 2 -
.../files/kphotoalbum-4.7.1-nokipi.patch | 24 ----------
media-gfx/kphotoalbum/kphotoalbum-4.5.ebuild | 46 ------------------
media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild | 54 ----------------------
media-gfx/kphotoalbum/metadata.xml | 1 -
5 files changed, 127 deletions(-)
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 1296e6b..b4dab77 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1 @@
-DIST kphotoalbum-4.5.tar.xz 9415984 SHA256 0cdd4e02e9e4f840550a20cc8dca8a017777e4a55db19f0f8b15e903d2c342cd SHA512 57fe89ec55098312ed53b3ba934d42b84de6e5efcb7e30860deaa0162971ba9e2e9eb573268e2918492c79c2b739b5cf7e16bcb0c9a619c189b3b7ccadb9642d WHIRLPOOL 77f2a4c40b84c5e3406f16757d631aaf8968129d99506bed7528cc27216d34980aba246714629a1969a6625a72291596cf115f275d6fdb39ba4bd84cf93d74fe
-DIST kphotoalbum-4.7.2.tar.xz 9519864 SHA256 313214daaaaf2b1dad2c9beb3e56051622155b142fcf67bdbaa65c3fff26790a SHA512 30cb229a4c090981aec474ee9c45f257fe0b2a070ab788712962114868bdcb84e8d2b7f77c4186a30e4654e4196892cd243e7cc5579262d895e5ea2df0213195 WHIRLPOOL 88fb71ecf2925fa1ba43f833e6e47c43b3f38731cfc922027597d34fbd009e7850024a6b45c163f412a36908def97fddae12430bc96a36faa267c8dbaada634b
DIST kphotoalbum-5.0.1.tar.xz 9539204 SHA256 e43beb6cb93d749b30aa171ebce5ac5473b16704ea6d36bf6dcc2ce54328ce55 SHA512 e182e0f594aa1ce2a53ee529990eba0e61b0d694d74a6e0c2bd37d57658c6e3173e9107f49f82afef85b8cb9a84af626d6e060e7f6d992c8606902b16abff848 WHIRLPOOL 4b235af854a5faba228d487498a06112ef138827e7abe14b73b04bc76cb9dabe02a623bf1e15597fcf6acdb79000942622de343fd57f8c02dad82fa1141535f3
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.7.1-nokipi.patch b/media-gfx/kphotoalbum/files/kphotoalbum-4.7.1-nokipi.patch
deleted file mode 100644
index fbaa5b5..00000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-4.7.1-nokipi.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6455e21ee1e1d52e9bd35e61f776031d37ca1b6c Mon Sep 17 00:00:00 2001
-From: Tobias Leupold <tobias.leupold@web.de>
-Date: Wed, 20 Jul 2016 22:53:06 +0200
-Subject: [PATCH] Fix building without KIPI.
-
----
- Viewer/InfoBox.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Viewer/InfoBox.cpp b/Viewer/InfoBox.cpp
-index 5c619c5..b37c0de 100644
---- a/Viewer/InfoBox.cpp
-+++ b/Viewer/InfoBox.cpp
-@@ -34,6 +34,7 @@
- #include <KGlobal>
- #include <KIconLoader>
- #include <KDebug>
-+#include <KLocale>
-
- // Local includes
- #include "Browser/BrowserWidget.h"
---
-2.7.3
-
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.5.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.5.ebuild
deleted file mode 100644
index 7a17a16..00000000
--- a/media-gfx/kphotoalbum/kphotoalbum-4.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ar be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga
-gl hi hne hr hu is it ja km lt mai mr nb nds nl nn pa pl pt pt_BR ro ru se sk
-sv tr ug uk vi zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing images"
-HOMEPAGE="http://www.kphotoalbum.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug +exif +geolocation +kipi +raw"
-
-DEPEND="
- >=dev-qt/qtsql-4.4:4[sqlite]
- media-libs/phonon[qt4]
- virtual/jpeg:0
- exif? ( >=media-gfx/exiv2-0.17:= )
- geolocation? ( $(add_kdeapps_dep marble) )
- kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
- raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )
-"
-RDEPEND="${DEPEND}
- media-video/mplayer
-"
-
-DOCS=( ChangeLog README )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with exif Exiv2)
- $(cmake-utils_use_with geolocation Marble)
- $(cmake-utils_use_with kipi)
- $(cmake-utils_use_with raw Kdcraw)
- )
-
- kde4-base_src_configure
-}
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild
deleted file mode 100644
index 23cd6c3..00000000
--- a/media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_LINGUAS="ar ast be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr
-ga gl hi hne hr hu is it ja km lt mai mr nb nds nl nn pa pl pt pt_BR ro ru se sk
-sv tr ug uk vi zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing images"
-HOMEPAGE="http://www.kphotoalbum.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +exif +face +kipi +map +raw"
-
-REQUIRED_USE="map? ( exif )"
-
-COMMON_DEPEND="
- >=dev-qt/qtsql-4.4:4[sqlite]
- media-libs/phonon[qt4]
- virtual/jpeg:0
- exif? ( >=media-gfx/exiv2-0.17:= )
- face? ( >=kde-apps/libkface-15.08.3:4 )
- kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
- map? ( >=kde-apps/libkgeomap-15.08.3:4 )
- raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )
-"
-DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
- media-video/mplayer
- kipi? ( >=media-plugins/kipi-plugins-4.7.0:4 )
-"
-
-DOCS=( ChangeLog README )
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_Exiv2=$(usex exif)
- -DWITH_Kface=$(usex face)
- -DWITH_Kipi=$(usex kipi)
- -DWITH_KGeoMap=$(usex map)
- -DWITH_Kdcraw=$(usex raw)
- )
-
- kde4-base_src_configure
-}
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index 27e7d6e..22ab0f0 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="face">Enable face detection and recognition using <pkg>kde-apps/libkface</pkg></flag>
- <flag name="geolocation">Add support for <pkg>kde-apps/marble</pkg></flag>
<flag name="kipi">Support for the KDE Image Plugin Interface</flag>
<flag name="map">Enable map display support using <pkg>kde-apps/libkgeomap</pkg></flag>
</use>
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/
@ 2016-12-11 17:44 Michael Palimaka
0 siblings, 0 replies; 10+ messages in thread
From: Michael Palimaka @ 2016-12-11 17:44 UTC (permalink / raw
To: gentoo-commits
commit: 809669c7d78c443c904d0fdc9531edf0ac5ae112
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 17:42:35 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 17:43:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809669c7
media-gfx/kphotoalbum: backport misc build fixes from upstream
Package-Manager: portage-2.3.3
.../files/kphotoalbum-5.0.1-buildbackports.patch | 190 +++++++++++++++++++++
media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild | 12 +-
2 files changed, 193 insertions(+), 9 deletions(-)
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch
new file mode 100644
index 00000000..26eac8d
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch
@@ -0,0 +1,190 @@
+From 87d8f63d5966b36af60e9d4aac95196fcee30f91 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
+Date: Sun, 30 Oct 2016 21:52:03 +0100
+Subject: [PATCH] Review dependency list.
+
+Thanks to kensington for the suggestion!
+---
+ CMakeLists.txt | 23 ++++++++++++++++++-----
+ 1 file changed, 18 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 120a703..95f46c9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@ include(FeatureSummary)
+
+ find_package(Qt5 REQUIRED COMPONENTS Sql Xml Widgets Network)
+ find_package(Phonon4Qt5 REQUIRED)
+-find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n KIO DocTools WidgetsAddons Config IconThemes Archive Parts JobWidgets)
++find_package(KF5 REQUIRED COMPONENTS Archive Completion Config CoreAddons DocTools I18n IconThemes JobWidgets KIO TextWidgets WidgetsAddons)
+
+ # enable exceptions:
+ kde_enable_exceptions()
+@@ -445,10 +445,23 @@ set(kphotoalbum_SRCS
+ add_executable(kphotoalbum ${kphotoalbum_SRCS})
+
+ # External components
+-target_link_libraries(kphotoalbum ${JPEG_LIBRARY})
+-target_link_libraries(kphotoalbum Qt5::Network)
+-target_link_libraries(kphotoalbum KF5::KIOCore KF5::CoreAddons KF5::I18n KF5::ConfigCore KF5::ConfigGui KF5::IconThemes KF5::Archive KF5::Parts KF5::JobWidgets KF5::WidgetsAddons)
+-target_link_libraries(kphotoalbum Phonon::phonon4qt5)
++target_link_libraries(kphotoalbum
++ ${JPEG_LIBRARY}
++ KF5::Archive
++ KF5::Completion
++ KF5::ConfigCore
++ KF5::ConfigGui
++ KF5::CoreAddons
++ KF5::I18n
++ KF5::IconThemes
++ KF5::JobWidgets
++ KF5::KIOCore
++ KF5::KIOWidgets
++ KF5::TextWidgets
++ KF5::WidgetsAddons
++ Phonon::phonon4qt5
++ Qt5::Network
++ )
+
+ if(KF5Kipi_FOUND)
+ target_link_libraries(kphotoalbum KF5::Kipi)
+--
+2.7.3
+
+From e07a6ffd6a96a527e0ac26e9f12eb1bcd7767830 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
+Date: Thu, 8 Dec 2016 22:02:13 +0100
+Subject: [PATCH] Remove bogus dependency on KF5KExiv2
+
+---
+ CMakeLists.txt | 28 +++++++++++-----------------
+ 1 file changed, 11 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1594af0..36228b8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,15 +92,13 @@ set_package_properties(KF5KDcraw
+ )
+ set(HAVE_KDCRAW ${KF5KDcraw_FOUND} )
+
+-find_package(KF5KExiv2)
+-# FIXME: most of KPhotoAlbum uses plain libexiv:
+ find_package(Exiv2)
+-set_package_properties(KF5KExiv2
++set_package_properties(Exiv2
+ PROPERTIES
+ TYPE RECOMMENDED
+ PURPOSE "Enables image metadata (exiv) support (strongly advised!)"
+ )
+-set(HAVE_EXIV2 ${KF5KExiv2_FOUND})
++set(HAVE_EXIV2 ${Exiv2_FOUND})
+
+ if(ENABLE_PLAYGROUND)
+ find_package(KF5KFace 5.0.0 CONFIG)
+@@ -112,16 +110,12 @@ if(ENABLE_PLAYGROUND)
+ set(HAVE_KFACE ${KF5KFace_FOUND})
+ endif()
+
+-if(KF5KExiv2_FOUND)
+- find_package(KF5KGeoMap)
+- set_package_properties(KF5KGeoMap
+- PROPERTIES
+- TYPE OPTIONAL
+- PURPOSE "Enables support for geographic map location using embedded GPS information."
+- )
+-else()
+- message(STATUS "Not searching KF5KGeoMap because of missing dependency KF5KExiv2...")
+-endif()
++find_package(KF5KGeoMap)
++set_package_properties(KF5KGeoMap
++ PROPERTIES
++ TYPE OPTIONAL
++ PURPOSE "Enables support for geographic map location using embedded GPS information."
++ )
+ set(HAVE_KGEOMAP ${KF5KGeoMap_FOUND})
+
+ add_custom_target(
+@@ -433,7 +427,7 @@ add_subdirectory(script)
+ add_subdirectory(doc)
+
+ set(EXIV2_SRCS)
+-if(KF5KExiv2_FOUND AND Qt5Sql_FOUND)
++if(Exiv2_FOUND AND Qt5Sql_FOUND)
+ set(EXIV2_SRCS
+ #${CMAKE_CURRENT_SOURCE_DIR}/Browser/ExifFolder.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/Settings/ExifPage.cpp
+@@ -499,8 +493,8 @@ if(KF5KDcraw_FOUND)
+ target_link_libraries(kphotoalbum KF5::KDcraw)
+ endif()
+
+-if(KF5KExiv2_FOUND)
+- target_link_libraries(kphotoalbum KF5::KExiv2 ${EXIV2_LIBRARIES} Qt5::Sql)
++if(Exiv2_FOUND)
++ target_link_libraries(kphotoalbum ${EXIV2_LIBRARIES} Qt5::Sql)
+ endif()
+
+ if(KF5KFace_FOUND)
+--
+2.7.3
+
+From b17b99d25645b62838f7731b66d60a7efbbb5385 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Sat, 26 Nov 2016 17:06:35 +0100
+Subject: [PATCH] cmake: require KF5::XmlGui
+
+It is used explicitly (see KXmlGuiWindow), so it is needed to look for
+it and link to it.
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5fef0df..b24ab3b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,7 +69,7 @@ endforeach()
+
+ find_package(Qt5 REQUIRED COMPONENTS Sql Xml Widgets Network)
+ find_package(Phonon4Qt5 REQUIRED)
+-find_package(KF5 REQUIRED COMPONENTS Archive Completion Config CoreAddons DocTools I18n IconThemes JobWidgets KIO TextWidgets WidgetsAddons)
++find_package(KF5 REQUIRED COMPONENTS Archive Completion Config CoreAddons DocTools I18n IconThemes JobWidgets KIO TextWidgets XmlGui WidgetsAddons)
+
+ find_package(JPEG REQUIRED)
+ if(JPEG_FOUND)
+@@ -484,6 +484,7 @@ target_link_libraries(kphotoalbum
+ KF5::KIOCore
+ KF5::KIOWidgets
+ KF5::TextWidgets
++ KF5::XmlGui
+ KF5::WidgetsAddons
+ Phonon::phonon4qt5
+ Qt5::Network
+--
+2.7.3
+
+From e3c1911d5ad54f672cf086b041376f11ad4f446e Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
+Date: Thu, 27 Oct 2016 18:12:11 +0200
+Subject: [PATCH] Fix compilation with Qt 5.6.1
+
+---
+ HTMLGenerator/HTMLDialog.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/HTMLGenerator/HTMLDialog.cpp b/HTMLGenerator/HTMLDialog.cpp
+index 9aa619d..3e53c58 100644
+--- a/HTMLGenerator/HTMLDialog.cpp
++++ b/HTMLGenerator/HTMLDialog.cpp
+@@ -20,6 +20,7 @@
+
+ #include <QCheckBox>
+ #include <QComboBox>
++#include <QDebug>
+ #include <QDialogButtonBox>
+ #include <QFileDialog>
+ #include <QGroupBox>
+--
+2.7.3
+
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild
index 85cfa21..7f8ee13 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild
@@ -13,9 +13,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
LICENSE="GPL-2+ FDL-1.2"
KEYWORDS="~amd64 ~x86"
-IUSE="+exif +face +kipi +map +raw"
-
-REQUIRED_USE="map? ( exif )"
+IUSE="+face +kipi +map +raw"
COMMON_DEPEND="
$(add_frameworks_dep karchive)
@@ -37,12 +35,9 @@ COMMON_DEPEND="
$(add_qt_dep qtsql 'sqlite')
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+ >=media-gfx/exiv2-0.17:=
media-libs/phonon[qt5]
virtual/jpeg:0
- exif? (
- $(add_kdeapps_dep libkexiv2)
- >=media-gfx/exiv2-0.17:=
- )
face? ( $(add_kdeapps_dep libkface) )
kipi? ( $(add_kdeapps_dep libkipi) )
map? ( $(add_kdeapps_dep libkgeomap) )
@@ -58,11 +53,10 @@ RDEPEND="${COMMON_DEPEND}
"
DOCS=( ChangeLog README )
+PATCHES=( "${FILESDIR}/${P}-buildbackports.patch" )
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_find_package exif Exiv2)
- $(cmake-utils_use_find_package exif KF5KExiv2)
$(cmake-utils_use_find_package face KF5KFace)
$(cmake-utils_use_find_package kipi KF5Kipi)
$(cmake-utils_use_find_package map KF5KGeoMap)
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/
@ 2015-10-22 13:18 Michael Palimaka
0 siblings, 0 replies; 10+ messages in thread
From: Michael Palimaka @ 2015-10-22 13:18 UTC (permalink / raw
To: gentoo-commits
commit: 3df6fb500cb1b6120065db4a7a972ba84ef49dc1
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Oct 17 10:02:19 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 13:18:11 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df6fb50
media-gfx/kphotoalbum: Add upstream patch to match updated kdelibs4 policy
Package-Manager: portage-2.2.20.1
.../files/kphotoalbum-4.6.2-bump-min-cmake.patch | 31 ++++++++++++++++++++++
media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild | 1 +
2 files changed, 32 insertions(+)
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch b/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch
new file mode 100644
index 0000000..f23a8f8
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch
@@ -0,0 +1,31 @@
+From: David Faure <faure@kde.org>
+Date: Sun, 26 Jul 2015 16:12:24 +0000
+Subject: set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix build accordingly
+X-Git-Url: http://quickgit.kde.org/?p=kphotoalbum.git&a=commitdiff&h=f785317ba88528760886b592aa9604b0c4ba62dd
+---
+set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix build accordingly
+
+(working around the lack of ${KDE4_KMEDIAPLAYER_LIBS})
+
+CCMAIL: kde-buildsystem@kde.org
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR)
++cmake_minimum_required(VERSION 2.8.9)
+ project(kphotoalbum)
+
+ if(POLICY CMP0017)
+@@ -456,7 +456,7 @@
+ target_link_libraries(kphotoalbum Utilities)
+
+ # External components
+-target_link_libraries(kphotoalbum ${KDE4_KIO_LIBS} ${JPEG_LIBRARY} kmediaplayer ${KDE4_PHONON_LIBS})
++target_link_libraries(kphotoalbum ${KDE4_KIO_LIBS} ${JPEG_LIBRARY} ${KDE4_TARGET_PREFIX}kmediaplayer ${KDE4_PHONON_LIBS})
+
+ if(KIPI_FOUND)
+ target_link_libraries(kphotoalbum ${KIPI_LIBRARIES})
+
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
index d83e74c..ad86cca 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
@@ -40,6 +40,7 @@ RDEPEND="${COMMON_DEPEND}
kipi? ( >=media-plugins/kipi-plugins-4.7.0 )
"
+PATCHES=( "${FILESDIR}/${P}-bump-min-cmake.patch" )
DOCS=( ChangeLog README )
src_configure() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-08-03 15:34 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-21 11:49 [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2023-08-03 15:34 Andreas Sturmlechner
2020-02-09 22:28 Andreas Sturmlechner
2018-12-31 21:14 Andreas Sturmlechner
2018-11-12 23:00 Andreas Sturmlechner
2017-02-15 21:24 Johannes Huber
2017-01-19 16:47 Johannes Huber
2016-12-11 19:33 Johannes Huber
2016-12-11 17:44 Michael Palimaka
2015-10-22 13:18 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox