[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/

[Andreas Sturmlechner]

commit:     f11c24645887b7016c407ac8737981c3802a7213
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 30 18:38:48 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 22:12:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f11c2464

media-gfx/digikam: Fix build w/ Qt-5.7.0

Bug: https://bugs.gentoo.org/639300
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch b/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch
index e2abe9be39c..7001850cd9c 100644
--- a/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch
+++ b/media-gfx/digikam/files/digikam-5.7.0-qt-5.9.3.patch
@@ -3,6 +3,7 @@ From: Maik Qualmann <metzpinguin@gmail.com>
 Date: Tue, 28 Nov 2017 21:29:00 +0100
 Subject: try to fix the Qt-5.9.3 empty album problem CCBUGS: 387373
 
+* asturm: Fix build w/ Qt-5.7
 ---
  libs/database/coredb/coredburl.cpp | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
@@ -19,7 +20,7 @@ index 2c0d0eb..b1bdf71 100644
      url.setScheme(QLatin1String("digikamalbums"));
 -    url.setPath(QLatin1Char('/') + album + QLatin1Char('/') + name);
 +
-+    if (path != QLatin1Char('/'))
++    if (path != QLatin1String("/"))
 +        path += QLatin1Char('/');
 +
 +    url.setPath(path + name);

[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/

[Michael Palimaka]

commit:     303281b3bab8645c86f8cda9dee4fa44d34b4b6b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Dec 27 08:34:13 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 27 10:40:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303281b3

media-gfx/digikam: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6652

 .../digikam/files/digikam-5.5.0-cmake-3.9.patch    | 170 ---------------------
 1 file changed, 170 deletions(-)

diff --git a/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch b/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch
deleted file mode 100644
index d87096a6024..00000000000
--- a/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-commit 7e00441c257e7e9e5dc5ab983fc06046fb72b0c5
-Author: Gilles Caulier <caulier.gilles@gmail.com>
-Date:   Sat Jul 22 15:46:08 2017 +0200
-
-    fix broken linking stage under MacOS with macports.
-    move database models into libdigikamdatabase.
-    Let's others model in place to be included into libdigikamcore
-
-diff --git a/libs/database/CMakeLists.txt b/libs/database/CMakeLists.txt
-index 7d055363fb..a431a36d7b 100644
---- a/libs/database/CMakeLists.txt
-+++ b/libs/database/CMakeLists.txt
-@@ -13,6 +13,18 @@ endif (POLICY CMP0063)
- # Boost uses operator names (and, not, ...)
- string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- 
-+set(libdatabasemodels_SRCS
-+    models/imagemodel.cpp
-+    models/imagefiltermodel.cpp
-+    models/imagefiltermodelpriv.cpp
-+    models/imagefiltermodelthreads.cpp
-+    models/imagefiltersettings.cpp
-+    models/imagelistmodel.cpp
-+    models/imagesortsettings.cpp
-+    models/imagethumbnailmodel.cpp
-+    models/imageversionsmodel.cpp
-+)
-+
- set(libdatabasecore_SRCS
-     server/databaseserverstarter.cpp
-     server/databaseservererror.cpp
-@@ -152,10 +164,10 @@ if(ENABLE_DBUS)
-     include_directories($<TARGET_PROPERTY:Qt5::DBus,INTERFACE_INCLUDE_DIRECTORIES>)
- endif()
- 
--add_library(digikamdatabase_src     OBJECT ${digikamdatabase_LIB_SRCS})
-+add_library(digikamdatabase_src     OBJECT ${digikamdatabase_LIB_SRCS} ${libdatabasemodels_SRCS})
- add_library(digikamdatabasemain_src OBJECT ${libdatabaseutils_SRCS} ${libimgqsort_SRCS})
- add_library(digikamdatabasecore_src OBJECT ${libdatabasecore_SRCS})
--add_library(digikamdatabase         SHARED $<TARGET_OBJECTS:digikamdatabase_src> $<TARGET_OBJECTS:digikamdatabasemodels_src>)
-+add_library(digikamdatabase         $<TARGET_OBJECTS:digikamdatabase_src>)
- 
- generate_export_header(digikamdatabase
-                        BASE_NAME digikam_database
-diff --git a/libs/models/imagefiltermodel.cpp b/libs/database/models/imagefiltermodel.cpp
-similarity index 100%
-rename from libs/models/imagefiltermodel.cpp
-rename to libs/database/models/imagefiltermodel.cpp
-diff --git a/libs/models/imagefiltermodel.h b/libs/database/models/imagefiltermodel.h
-similarity index 100%
-rename from libs/models/imagefiltermodel.h
-rename to libs/database/models/imagefiltermodel.h
-diff --git a/libs/models/imagefiltermodelpriv.cpp b/libs/database/models/imagefiltermodelpriv.cpp
-similarity index 100%
-rename from libs/models/imagefiltermodelpriv.cpp
-rename to libs/database/models/imagefiltermodelpriv.cpp
-diff --git a/libs/models/imagefiltermodelpriv.h b/libs/database/models/imagefiltermodelpriv.h
-similarity index 100%
-rename from libs/models/imagefiltermodelpriv.h
-rename to libs/database/models/imagefiltermodelpriv.h
-diff --git a/libs/models/imagefiltermodelthreads.cpp b/libs/database/models/imagefiltermodelthreads.cpp
-similarity index 100%
-rename from libs/models/imagefiltermodelthreads.cpp
-rename to libs/database/models/imagefiltermodelthreads.cpp
-diff --git a/libs/models/imagefiltermodelthreads.h b/libs/database/models/imagefiltermodelthreads.h
-similarity index 100%
-rename from libs/models/imagefiltermodelthreads.h
-rename to libs/database/models/imagefiltermodelthreads.h
-diff --git a/libs/models/imagefiltersettings.cpp b/libs/database/models/imagefiltersettings.cpp
-similarity index 100%
-rename from libs/models/imagefiltersettings.cpp
-rename to libs/database/models/imagefiltersettings.cpp
-diff --git a/libs/models/imagefiltersettings.h b/libs/database/models/imagefiltersettings.h
-similarity index 100%
-rename from libs/models/imagefiltersettings.h
-rename to libs/database/models/imagefiltersettings.h
-diff --git a/libs/models/imagelistmodel.cpp b/libs/database/models/imagelistmodel.cpp
-similarity index 100%
-rename from libs/models/imagelistmodel.cpp
-rename to libs/database/models/imagelistmodel.cpp
-diff --git a/libs/models/imagelistmodel.h b/libs/database/models/imagelistmodel.h
-similarity index 100%
-rename from libs/models/imagelistmodel.h
-rename to libs/database/models/imagelistmodel.h
-diff --git a/libs/models/imagemodel.cpp b/libs/database/models/imagemodel.cpp
-similarity index 100%
-rename from libs/models/imagemodel.cpp
-rename to libs/database/models/imagemodel.cpp
-diff --git a/libs/models/imagemodel.h b/libs/database/models/imagemodel.h
-similarity index 100%
-rename from libs/models/imagemodel.h
-rename to libs/database/models/imagemodel.h
-diff --git a/libs/models/imagesortsettings.cpp b/libs/database/models/imagesortsettings.cpp
-similarity index 100%
-rename from libs/models/imagesortsettings.cpp
-rename to libs/database/models/imagesortsettings.cpp
-diff --git a/libs/models/imagesortsettings.h b/libs/database/models/imagesortsettings.h
-similarity index 100%
-rename from libs/models/imagesortsettings.h
-rename to libs/database/models/imagesortsettings.h
-diff --git a/libs/models/imagethumbnailmodel.cpp b/libs/database/models/imagethumbnailmodel.cpp
-similarity index 100%
-rename from libs/models/imagethumbnailmodel.cpp
-rename to libs/database/models/imagethumbnailmodel.cpp
-diff --git a/libs/models/imagethumbnailmodel.h b/libs/database/models/imagethumbnailmodel.h
-similarity index 100%
-rename from libs/models/imagethumbnailmodel.h
-rename to libs/database/models/imagethumbnailmodel.h
-diff --git a/libs/models/imageversionsmodel.cpp b/libs/database/models/imageversionsmodel.cpp
-similarity index 100%
-rename from libs/models/imageversionsmodel.cpp
-rename to libs/database/models/imageversionsmodel.cpp
-diff --git a/libs/models/imageversionsmodel.h b/libs/database/models/imageversionsmodel.h
-similarity index 100%
-rename from libs/models/imageversionsmodel.h
-rename to libs/database/models/imageversionsmodel.h
-diff --git a/libs/models/CMakeLists.txt b/libs/models/CMakeLists.txt
-index cbabfaa9b8..804456b955 100644
---- a/libs/models/CMakeLists.txt
-+++ b/libs/models/CMakeLists.txt
-@@ -9,18 +9,6 @@ if (POLICY CMP0063)
-     cmake_policy(SET CMP0063 NEW)
- endif (POLICY CMP0063)
- 
--set(libdatabasemodels_SRCS
--    imagemodel.cpp
--    imagefiltermodel.cpp
--    imagefiltermodelpriv.cpp
--    imagefiltermodelthreads.cpp
--    imagefiltersettings.cpp
--    imagelistmodel.cpp
--    imagesortsettings.cpp
--    imagethumbnailmodel.cpp
--    imageversionsmodel.cpp
--)
--
- set(libalbummodels_SRCS
-     imagealbummodel.cpp
-     imagealbumfiltermodel.cpp
-@@ -52,5 +40,4 @@ endif()
- #for digikam core lib
- add_library(digikamgenericmodels_src OBJECT ${libgenericmodels_SRCS})
- 
--add_library(digikamdatabasemodels_src OBJECT ${libdatabasemodels_SRCS})
--add_library(digikammodels_src OBJECT  ${libalbummodels_SRCS} ${libgenericmodels_SRCS})
-+add_library(digikammodels_src OBJECT ${libalbummodels_SRCS} ${libgenericmodels_SRCS})
-
-From c51043283aa9d2612b88afe0146f0d63c77b08ed Mon Sep 17 00:00:00 2001
-From: Simon Frei <freisim93@gmail.com>
-Date: Wed, 2 Aug 2017 12:12:55 +0200
-Subject: cmake: Fix warning: Remove ECMPackageConfigHelpers (unused)
-
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2aaf56b..9a48492 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,7 +80,6 @@ include(ECMAddTests)
- include(ECMMarkNonGuiExecutable)
- include(ECMGenerateHeaders)
- include(ECMGeneratePriFile)
--include(ECMPackageConfigHelpers)
- include(ECMSetupVersion)
- include(ECMInstallIcons)
- include(ECMAddAppIcon)
--- 
-cgit v0.11.2

[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/

[Andreas Sturmlechner]

commit:     10653a18b21cbe365f877ab4f29c396323ecafbb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 14:15:35 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 16:29:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10653a18

media-gfx/digikam: Drop obsolete 7.0.0_beta3-qt-5.15.patch

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

 .../files/digikam-7.0.0_beta3-qt-5.15.patch        | 51 ----------------------
 1 file changed, 51 deletions(-)

diff --git a/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch b/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch
deleted file mode 100644
index fe865eb73af..00000000000
--- a/media-gfx/digikam/files/digikam-7.0.0_beta3-qt-5.15.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 10fd663f43148fc96ed3afeecf70de15cadd0f8a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 19 Apr 2020 09:55:03 +0200
-Subject: [PATCH] Fix build with Qt 5.15.0
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- .../dplugins/generic/view/presentation/opengl/presentationgl.cpp | 1 +
- core/libs/dimg/filters/curves/curveswidget.cpp                   | 1 +
- core/libs/dimg/filters/levels/histogrampainter.cpp               | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
-index b37699436e..6a4f173ab0 100644
---- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
-+++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
-@@ -44,6 +44,7 @@
- #include <QMatrix>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QTimer>
- #include <QWheelEvent>
-diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp
-index cccccbd156..d0beef9bf2 100644
---- a/core/libs/dimg/filters/curves/curveswidget.cpp
-+++ b/core/libs/dimg/filters/curves/curveswidget.cpp
-@@ -40,6 +40,7 @@
- #include <QColor>
- #include <QFont>
- #include <QFontMetrics>
-+#include <QPainterPath>
- #include <QPaintEvent>
- #include <QMouseEvent>
- 
-diff --git a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp
-index 241d5fc4c8..f11ad4b560 100644
---- a/core/libs/dimg/filters/levels/histogrampainter.cpp
-+++ b/core/libs/dimg/filters/levels/histogrampainter.cpp
-@@ -30,6 +30,7 @@
- // Qt includes
- 
- #include <QPainter>
-+#include <QPainterPath>
- 
- // KDE includes
- 
--- 
-2.26.1
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/

[Andreas Sturmlechner]

commit:     08ff5be3889a03fc8831fa1e59d62b90c78de5af
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Sep 26 16:50:03 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 17:54:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ff5be3

media-gfx/digikam: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../digikam-8.4.0-fix-find_libheif-regex.patch     | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch b/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch
deleted file mode 100644
index cd18ea3ed475..000000000000
--- a/media-gfx/digikam/files/digikam-8.4.0-fix-find_libheif-regex.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a3ff8ad14c1373f7a7d3c1c9aee4e80954e1859e Mon Sep 17 00:00:00 2001
-From: Maik Qualmann <metzpinguin@gmail.com>
-Date: Tue, 23 Jul 2024 12:33:13 +0200
-Subject: [PATCH] escape the input from REGEX MATCHALL CCBUGS: 490690
-
----
- core/cmake/modules/FindLibheif.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/cmake/modules/FindLibheif.cmake b/core/cmake/modules/FindLibheif.cmake
-index fdaf73a4b9e..38876ecc38a 100644
---- a/core/cmake/modules/FindLibheif.cmake
-+++ b/core/cmake/modules/FindLibheif.cmake
-@@ -54,7 +54,7 @@ else()
-     if(HEIF_INCLUDES_DIR)
- 
-         file(STRINGS "${HEIF_INCLUDES_DIR}/libheif/heif_version.h" TMP REGEX "^#define LIBHEIF_VERSION[ \t].*$")
--        string(REGEX MATCHALL "[0-9.]+" HEIF_VERSION ${TMP})
-+        string(REGEX MATCHALL "[0-9.]+" HEIF_VERSION "${TMP}")
- 
-     endif()
- 
--- 
-GitLab
-