Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package digikam for openSUSE:Factory checked
in at 2025-05-02 14:58:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/digikam (Old)
and /work/SRC/openSUSE:Factory/.digikam.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam"
Fri May 2 14:58:53 2025 rev:228 rq:1273865 version:8.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2025-04-09
21:51:01.412021345 +0200
+++ /work/SRC/openSUSE:Factory/.digikam.new.30101/digikam.changes
2025-05-02 14:58:58.560807271 +0200
@@ -1,0 +2,6 @@
+Thu May 1 16:07:49 UTC 2025 - Nico Kruber <nico.kru...@gmail.com>
+
+- Add patch (to revert from upstream to fix builds on Leap 15.6):
+ * digikam-pointer-casting.patch
+
+-------------------------------------------------------------------
New:
----
digikam-pointer-casting.patch
BETA DEBUG BEGIN:
New:- Add patch (to revert from upstream to fix builds on Leap 15.6):
* digikam-pointer-casting.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ digikam.spec ++++++
--- /var/tmp/diff_new_pack.Dge0f1/_old 2025-05-02 14:59:01.044913930 +0200
+++ /var/tmp/diff_new_pack.Dge0f1/_new 2025-05-02 14:59:01.060914616 +0200
@@ -35,6 +35,8 @@
%endif
#PATCH-FIX-UPSTREAM
Patch0: digikam-qt69.patch
+#PATCH-FIX-OPENSUSE
+Patch1: digikam-pointer-casting.patch
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
@@ -101,9 +103,9 @@
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libjxl)
BuildRequires: pkgconfig(libpng)
-BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(libswresample)
BuildRequires: pkgconfig(libswscale)
+BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(vdpau)
@@ -126,8 +128,8 @@
Provides: digikam-plugin-fxfilters = %{version}
Obsoletes: digikam-plugin-fxfilters < %{version}
Provides: digikam-plugin-transform = %{version}
-Obsoletes: digikam-plugin-transform < %{version}
Obsoletes: digikam-libs < %{version}
+Obsoletes: digikam-plugin-transform < %{version}
# Docs no longer included in 6.0.0
Provides: digikam-doc = %{version}
Obsoletes: digikam-doc < %{version}
@@ -174,7 +176,11 @@
%lang_package
%prep
-%autosetup -p1 -n digikam-%{version}
+%setup -n digikam-%{version}
+%patch -P 0 -p1
+%if 0%{?sle_version} == 150600 && 0%{?is_opensuse}
+%patch -P 1 -p1 -R
+%endif
%build
%cmake_kf6 \
++++++ digikam-pointer-casting.patch ++++++
>From d8f881d55a71de1deb9955e02db891af77265bbe Mon Sep 17 00:00:00 2001
From: Gilles Caulier <caulier.gil...@gmail.com>
Date: Wed, 15 Jan 2025 04:38:44 +0000
Subject: [PATCH] cppcheck: fix C-style pointer casting
---
.../thumb/thumbnailcreator_basic.cpp | 15 ++++++++++-----
.../threadimageio/video/videothumbdecoder_p.cpp | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp
b/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp
index 7c54332f964..b04363e5fef 100644
--- a/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp
+++ b/core/libs/threadimageio/thumb/thumbnailcreator_basic.cpp
@@ -210,9 +210,14 @@ QImage ThumbnailCreator::loadPNG(const QString& path) const
png_init_io(png_ptr, f);
png_read_info(png_ptr, info_ptr);
- png_get_IHDR(png_ptr, info_ptr, (png_uint_32*) (&w32),
- (png_uint_32*) (&h32), &bit_depth, &color_type,
- &interlace_type, nullptr, nullptr);
+ png_get_IHDR(png_ptr, info_ptr,
+ reinterpret_cast<png_uint_32*>(&w32),
+ reinterpret_cast<png_uint_32*>(&h32),
+ &bit_depth,
+ &color_type,
+ &interlace_type,
+ nullptr,
+ nullptr);
bool has_grey = 0;
w = w32;
@@ -285,7 +290,7 @@ QImage ThumbnailCreator::loadPNG(const QString& path) const
png_set_expand(png_ptr);
}
- lines = (unsigned char**)malloc(h * sizeof(unsigned char*));
+ lines = reinterpret_cast<unsigned char**>(malloc(h * sizeof(unsigned
char*)));
if (!lines)
{
@@ -317,7 +322,7 @@ QImage ThumbnailCreator::loadPNG(const QString& path) const
for (i = 0 ; i < h ; ++i)
{
- lines[i] = ((unsigned char*)(qimage.bits())) + (i * w * sizeOfUint);
+ lines[i] = (reinterpret_cast<unsigned char*>(qimage.bits())) + (i * w
* sizeOfUint);
}
png_read_image(png_ptr, lines);
diff --git a/core/libs/threadimageio/video/videothumbdecoder_p.cpp
b/core/libs/threadimageio/video/videothumbdecoder_p.cpp
index 3da45632f36..97a1e6e98a4 100644
--- a/core/libs/threadimageio/video/videothumbdecoder_p.cpp
+++ b/core/libs/threadimageio/video/videothumbdecoder_p.cpp
@@ -292,7 +292,7 @@ bool
VideoThumbDecoder::Private::processFilterGraph(AVFrame* const dst,
return false;
}
- av_image_copy(dst->data, dst->linesize, (const
uint8_t**)filterFrame->data, filterFrame->linesize, pixfmt, width, height);
+ av_image_copy(dst->data, dst->linesize,
reinterpret_cast<uint8_t**>(filterFrame->data), filterFrame->linesize, pixfmt,
width, height);
av_frame_unref(filterFrame);
return true;
--
GitLab
