public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/files/, media-gfx/kphotoalbum/
@ 2017-02-27 17:29 Johannes Huber
  0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2017-02-27 17:29 UTC (permalink / raw
  To: gentoo-commits

commit:     605212537b1d419072060bd649d818c479a750c5
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 17:29:33 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 17:29:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60521253

media-gfx/kphotoalbum: Remove 5.1-r1

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 deletions(-)

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch
deleted file mode 100644
index bf694951f9..0000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 11cd87cebe..0000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index 8269676529..0000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-3.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
deleted file mode 100644
index c35f6ae75f..0000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-4.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index e6d0ce05fa..0000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index d95c9c1fd7..0000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/files/, media-gfx/kphotoalbum/
@ 2018-08-19  8:26 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-08-19  8:26 UTC (permalink / raw
  To: gentoo-commits

commit:     a335e6425c364c07fafda12eea999ed1d30a3dbb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 19 08:20:47 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 19 08:26:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a335e642

media-gfx/kphotoalbum: Fix build with GCC-8

Package-Manager: Portage-2.3.47, Repoman-2.3.10

 .../kphotoalbum/files/kphotoalbum-5.3-gcc8.patch   | 29 ++++++++++++++++++++++
 media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild       |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch
new file mode 100644
index 00000000000..ce52589b23c
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch
@@ -0,0 +1,29 @@
+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
index ad95715accd..c5416d5f9a7 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
@@ -52,6 +52,8 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=( ChangeLog README )
 
+PATCHES=( "${FILESDIR}/${P}-gcc8.patch" )
+
 src_configure() {
 	append-ldflags -fuse-ld=gold #bug #623566
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/files/, media-gfx/kphotoalbum/
@ 2019-06-20 10:37 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-06-20 10:37 UTC (permalink / raw
  To: gentoo-commits

commit:     49b039d469f5b3287163b508bfea1e63bdc6541e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 09:46:18 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 09:46:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b039d4

media-gfx/kphotoalbum: Drop 5.4.2

Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/kphotoalbum/Manifest                     |  1 -
 .../files/kphotoalbum-5.4-exiv2-0.27.patch         | 61 ---------------------
 media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild     | 62 ----------------------
 3 files changed, 124 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 9d9358bb893..273ba5a8864 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.4.2.tar.xz 11807452 BLAKE2B 45ecdb4fbe3d66770394751911201737b698d2d497bb387871755113d153ef2c01a9b7e4a101f2b465d79801d0f88f084a0d0832550591012b44c70e5b28ff7f SHA512 9a4548141c56dd6426244e646a0d2bfb2eac28797c63ae478a56d6b1c0484ce5e607abcb079e50fcbc0643f7e9a94844a9af6600748ce465b8f66781aa5e3038
 DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723 SHA512 fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0

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
deleted file mode 100644
index 7b7f612b94f..00000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
deleted file mode 100644
index f2dda9ed28e..00000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit 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"
-
-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) )
-"
-RDEPEND="${DEPEND}
-	|| ( media-video/ffmpeg media-video/mplayer )
-	kipi? ( media-plugins/kipi-plugins:5 )
-	!media-gfx/kphotoalbum:4
-"
-
-DOCS=( ChangeLog README )
-
-PATCHES=( "${FILESDIR}/${PN}-5.4-exiv2-0.27.patch" )
-
-src_configure() {
-	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] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/files/, media-gfx/kphotoalbum/
@ 2020-02-12 21:30 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-02-12 21:30 UTC (permalink / raw
  To: gentoo-commits

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 <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
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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/files/, media-gfx/kphotoalbum/
@ 2023-06-08 19:52 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-06-08 19:52 UTC (permalink / raw
  To: gentoo-commits

commit:     5fcdd88ce2c60819bbd2fe42e11eeab640376d0a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  8 19:48:08 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  8 19:48:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fcdd88c

media-gfx/kphotoalbum: Fix build with >=exiv2-0.28

Thanks-to: Tobias Leupold <tl <AT> stonemx.de>
Closes: https://bugs.gentoo.org/906469
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kphotoalbum-5.10.0-exiv2-0.28.patch      | 147 +++++++++++++++++++++
 media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild    |   2 +
 2 files changed, 149 insertions(+)

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
new file mode 100644
index 000000000000..2eea9495b735
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch
@@ -0,0 +1,147 @@
+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
index 84e92e1afc9c..6f0b4d7fe491 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
@@ -57,6 +57,8 @@ RDEPEND="${DEPEND}
 
 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


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-08 19:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-12 21:30 [gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/files/, media-gfx/kphotoalbum/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2023-06-08 19:52 Andreas Sturmlechner
2019-06-20 10:37 Andreas Sturmlechner
2018-08-19  8:26 Andreas Sturmlechner
2017-02-27 17:29 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox