Compare commits

...

2 Commits

2 changed files with 31 additions and 9 deletions

View File

@ -0,0 +1,13 @@
diff --git a/core/libs/widgets/text/localizeselector.cpp b/core/libs/widgets/text/localizeselector.cpp
index b284b27..1a87342 100644
--- a/core/libs/widgets/text/localizeselector.cpp
+++ b/core/libs/widgets/text/localizeselector.cpp
@@ -326,7 +326,7 @@ bool s_inlineTranslateString(const QString& text, const QString& trCode, QString
}
else
{
- error = QChar(trengine->error());
+ error = QChar(static_cast<uint>(trengine->error()));
}
return false;

View File

@ -3,8 +3,8 @@
%define pkgver %(echo %version | tr _ -)
Name: digikam
Version: 8.5.0
Release: 4mamba
Version: 8.6.0
Release: 2mamba
Summary: An advanced digital photo management application Linux, Windows and Mac-OSX
Group: Graphical Desktop/Applications/Graphics
Vendor: openmamba
@ -12,6 +12,7 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://www.digikam.org
Source: http://download.kde.org/stable/digikam/%{dirver}/digiKam-%{pkgver}.tar.xz
Patch0: digikam-8.6.0-qt6-6.9.0.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -58,6 +59,7 @@ BuildRequires: libkf6-kconfigwidgets-devel
BuildRequires: libkf6-kcontacts-devel
BuildRequires: libkf6-kcoreaddons-devel
BuildRequires: libkf6-kfilemetadata-devel
BuildRequires: libkf6-kguiaddons-devel
BuildRequires: libkf6-ki18n-devel
BuildRequires: libkf6-kiconthemes-devel
BuildRequires: libkf6-kio-devel
@ -100,17 +102,18 @@ BuildRequires: qt6-qtwebengine-devel
## AUTOBUILDREQ-END
BuildRequires: libkvkontakte-devel
BuildRequires: libopencv-devel >= 4.11.0-2mamba
BuildRequires: libqtav-devel
BuildRequires: ufraw
BuildRequires: mysql
BuildRequires: shared-desktop-ontologies-devel
BuildRequires: soprano-backend-redland
Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release}
Requires: dcraw
Requires: marble
Requires: mariadb
Requires: perl-Image-ExifTool
Requires: qt6-qtbase-sqlite
Recommends: qt6-qtimageformats
Suggests: hugin
Suggests: darktable
Suggests: rawtherapee
%description
digiKam is an advanced digital photo management application for KDE, which makes importing and organizing digital photos a 'snap'.
@ -250,10 +253,10 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release}
%setup -q -n %{name}-%{dirver}
#-D -T
#:<< _EOF
%patch 0 -p1 -b .qt6-6.9.0
%build
#:<< _EOF
%cmake_kde5 -d build \
%cmake \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_WITH_QT6=ON \
-DENABLE_KFILEMETADATASUPPORT=ON \
@ -266,11 +269,11 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release}
-DBUILD_tests=OFF \
-DCMAKE_CXX_FLAGS="%{optflags}"
%make
%cmake_build
%install
[ "%{buildroot}" != / ] && rm -rf %{buildroot}
%makeinstall -C build
%cmake_install
%find_lang %{name} --with-qt --with-man --all-name || touch %{name}.lang
@ -323,6 +326,12 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release}
%{_libdir}/cmake/DigikamPlugin/DigikamPluginConfig.cmake
%changelog
* Fri Apr 11 2025 Silvan Calarco <silvan.calarco@mambasoft.it> 8.6.0-2mamba
- removed requirements for ufraw/dcraw; added new recommends
* Sat Mar 15 2025 Automatic Build System <autodist@openmamba.org> 8.6.0-1mamba
- automatic version update by autodist
* Thu Feb 13 2025 Silvan Calarco <silvan.calarco@mambasoft.it> 8.5.0-4mamba
- rebuilt with opencv 4.11.0