Compare commits

...

5 Commits

2 changed files with 104 additions and 68 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,7 +3,7 @@
%define pkgver %(echo %version | tr _ -)
Name: digikam
Version: 8.4.0
Version: 8.6.0
Release: 2mamba
Summary: An advanced digital photo management application Linux, Windows and Mac-OSX
Group: Graphical Desktop/Applications/Graphics
@ -12,32 +12,27 @@ 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
BuildRequires: libICE-devel
BuildRequires: libMagick-devel
BuildRequires: libQt5Concurrent
BuildRequires: libQt5Core
BuildRequires: libQt5DBus
BuildRequires: libQt5Gui
BuildRequires: libQt5Multimedia-devel
BuildRequires: libQt5Network
BuildRequires: libQt5NetworkAuth-devel
BuildRequires: libQt5OpenGL
BuildRequires: libQt5Positioning-devel
BuildRequires: libQt5PrintSupport
BuildRequires: libQt5Sql
BuildRequires: libQt5Svg-devel
BuildRequires: libQt5WebChannel-devel
BuildRequires: libQt5WebEngine-devel
BuildRequires: libQt5Widgets
BuildRequires: libQt5X11Extras-devel
BuildRequires: libQt5Xml
BuildRequires: libQt5XmlPatterns-devel
BuildRequires: libQt6Concurrent
BuildRequires: libQt6Core
BuildRequires: libQt6DBus
BuildRequires: libQt6Gui
BuildRequires: libQt6Network
BuildRequires: libQt6OpenGL
BuildRequires: libQt6PrintSupport
BuildRequires: libQt6Sql
BuildRequires: libQt6Widgets
BuildRequires: libQt6Xml
BuildRequires: libSM-devel
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: libakonadi-contacts-devel
BuildRequires: libakonadi-devel
BuildRequires: libavcodec-devel
BuildRequires: libavdevice-devel
BuildRequires: libavfilter-devel
@ -51,63 +46,74 @@ BuildRequires: libglu-devel
BuildRequires: libglvnd-devel
BuildRequires: libgomp-devel
BuildRequires: libgphoto2-devel
BuildRequires: libgrantleetheme-devel
BuildRequires: libheif-devel
BuildRequires: libjasper-devel
BuildRequires: libjpeg-turbo
BuildRequires: libjxl-devel
BuildRequires: libkauth-devel
BuildRequires: libkcalendarcore-devel
BuildRequires: libkcodecs-devel
BuildRequires: libkcompletion-devel
BuildRequires: libkconfig-devel
BuildRequires: libkconfigwidgets-devel
BuildRequires: libkcoreaddons-devel
BuildRequires: libki18n-devel
BuildRequires: libkiconthemes-devel
BuildRequires: libkio-devel
BuildRequires: libkjobwidgets-devel
BuildRequires: libknotifications-devel
BuildRequires: libknotifyconfig-devel
BuildRequires: libksane5-devel
BuildRequires: libkservice-devel
BuildRequires: libkwidgetsaddons-devel
BuildRequires: libkwindowsystem-devel
BuildRequires: libkxmlgui-devel
BuildRequires: libkf6-kcalendarcore-devel
BuildRequires: libkf6-kcolorscheme-devel
BuildRequires: libkf6-kcompletion-devel
BuildRequires: libkf6-kconfig-devel
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
BuildRequires: libkf6-kitemmodels-devel
BuildRequires: libkf6-kjobwidgets-devel
BuildRequires: libkf6-knotifications-devel
BuildRequires: libkf6-knotifyconfig-devel
BuildRequires: libkf6-kservice-devel
BuildRequires: libkf6-ktexttemplate-devel
BuildRequires: libkf6-kwidgetsaddons-devel
BuildRequires: libkf6-kwindowsystem-devel
BuildRequires: libkf6-kxmlgui-devel
BuildRequires: libkf6-solid-devel
BuildRequires: libkf6-sonnet-devel
BuildRequires: libkf6-threadweaver-devel
BuildRequires: libksane-devel
BuildRequires: liblcms2-devel
BuildRequires: liblensfun-devel
BuildRequires: libopencv-devel
BuildRequires: libperl
BuildRequires: libpng-devel
BuildRequires: libsolid-devel
BuildRequires: libsonnet-devel
BuildRequires: libstdc++6-devel
BuildRequires: libswresample-devel
BuildRequires: libswscale-devel
BuildRequires: libthreadweaver-devel
BuildRequires: libtiff-devel
BuildRequires: libusb-devel
BuildRequires: libva-devel
BuildRequires: libvdpau-devel
BuildRequires: libx265-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: libz-devel
BuildRequires: perl-devel
BuildRequires: qt5-qtdeclarative-devel
BuildRequires: qt6-qtdeclarative-devel
BuildRequires: qt6-qtmultimedia-devel
BuildRequires: qt6-qtnetworkauth-devel
BuildRequires: qt6-qtpositioning-devel
BuildRequires: qt6-qtscxml-devel
BuildRequires: qt6-qtsvg-devel
BuildRequires: qt6-qtwebchannel-devel
BuildRequires: qt6-qtwebengine-devel
## AUTOBUILDREQ-END
BuildRequires: libx265-devel >= 0:4.0-1mamba
BuildRequires: libksane-devel >= 24.02.0
BuildRequires: ufraw
BuildRequires: libkvkontakte-devel
BuildRequires: libopencv-devel >= 4.11.0-2mamba
BuildRequires: mysql
BuildRequires: shared-desktop-ontologies-devel
BuildRequires: soprano-backend-redland
BuildRequires: libkvkontakte-devel
BuildRequires: libqtav-devel
Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release}
Requires: libqt5-sqlite
Requires: dcraw
Requires: marble
Requires: mysql
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'.
@ -243,37 +249,38 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release}
%description -n %{libname}-devel
%{summary}.
%debug_package
%prep
%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 \
-DDIGIKAMSC_COMPILE_DOC=OFF \
-DBUILD_WITH_QT6=ON \
-DENABLE_KFILEMETADATASUPPORT=ON \
-DENABLE_MEDIAPLAYER=ON \
-DENABLE_AKONADICONTACTSUPPORT=ON \
-DENABLE_MYSQLSUPPORT=ON \
-DENABLE_APPSTYLES=ON \
-DENABLE_QWEBENGINE=ON \
-DCMAKE_SKIP_RPATH=OFF \
-DBUILD_tests=OFF \
-DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \
-DCMAKE_CXX_FLAGS="%{optflags}"
%make
#|| %make -j1
%cmake_build
%install
[ "%{buildroot}" != / ] && rm -rf %{buildroot}
%makeinstall -C build
%cmake_install
%find_lang %{name}5_qt --with-qt --with-man --all-name || touch %{name}5_qt.lang
%find_lang %{name} --with-qt --with-man --all-name || touch %{name}.lang
%clean
[ "%{buildroot}" != / ] && rm -rf %{buildroot}
%files -f %{name}5_qt.lang
%files -f %{name}.lang
%defattr(-,root,root)
%{_kde5_bindir}/cleanup_digikamdb
%{_kde5_bindir}/digikam
@ -289,13 +296,11 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release}
%dir %{_datadir}/kxmlgui5/digikam/
%{_datadir}/kxmlgui5/digikam/*
%{_datadir}/kxmlgui5/showfoto/showfotoui5.rc
%{_datadir}/knotifications5/digikam.notifyrc
%{_datadir}/knotifications6/digikam.notifyrc
%{_datadir}/icons/hicolor/*
%{_mandir}/man1/cleanup_digikamdb.*
%{_mandir}/man1/digitaglinktree.*
%files -n %{libname}
%defattr(-,root,root)
%{_kde5_libdir}/libdigikamcore.so.*
@ -303,8 +308,8 @@ Requires: %{libname} = %{?epoch:%epoch:}%{version}-%{release}
%{_kde5_libdir}/libdigikamcore.so
%{_kde5_libdir}/libdigikamdatabase.so
%{_kde5_libdir}/libdigikamgui.so.*
%dir %{_libdir}/qt5/plugins/digikam
%{_libdir}/qt5/plugins/digikam/*
%dir %{_qt6_plugindir}/digikam
%{_qt6_plugindir}/digikam/*
%files -n %{libname}-devel
%defattr(-,root,root)
@ -321,6 +326,24 @@ 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
* Mon Dec 16 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 8.5.0-3mamba
- rebuilt with qt6
* Sun Dec 08 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 8.5.0-2mamba
- require perl-Image-ExifTool providing exiftool
* Sat Nov 16 2024 Automatic Build System <autodist@openmamba.org> 8.5.0-1mamba
- automatic version update by autodist
* Sun Nov 10 2024 Automatic Build System <autodist@mambasoft.it> 8.4.0-2mamba
- rebuilt by autoport with build requirements: libx265-devel>=0:4.0-1mamba