Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2019-04-25 16:20:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Thu Apr 25 16:20:20 2019 rev:179 rq:697163 version:6.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2019-03-26 15:38:53.752337132 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new.5536/digikam.changes 2019-04-25 16:20:33.626075329 +0200 @@ -1,0 +2,38 @@ +Tue Apr 16 10:00:11 UTC 2019 - [email protected] + +- Update to 6.1.0 + * https://www.digikam.org/news/2019-04-14-6.1.0_release_announcement/ +- New features (from NEWS): +General : New plugins interface for digiKam and Showfoto named + dplugins. +General : All export tools become generic plugins and are + shared with Showfoto. +General : Update internal libpgf to last 07193. +General : Add compatiblity with OpenCV version 4. +General : MacOS and AppImage bundles are now published with Qt + 5.11.3. +General : Add new optional configuration option to compile with + Faces Engine Neural Network. +General : Add optional support to ImageMagick codecs to support + extra image formats as XCF, FITS, HEIC, etc. +BQM : Add new advanced settings in resize tool. +BQM : All Batch Queue Manager tools become Bqm plugins. +Editor : All Image Editor tools become Editor plugins and are + shared with Showfoto. +Item View : Add sort items by modification date. +DPlugin : New plugin to copy items to a local storage. +DPlugin : New plugin to set image as Linux desktop wallpaper. +- 138 bugs fixed +- Add digikam-devel subpackage +- Add digikam-plugins subpackage that contains all the plugins +- Move plugins' icons to the -plugins subpackage +- Move enblend-enfuse and hugin Recommends to the -plugins package + as the functionality has been moved to the plugins +- Add pkgconfig(Magic++) BuildRequires to enable the new + ImageMagick support +- Add patches to fix build on Leap 42.3: + * Fix-compilation-with-Qt-5.6.patch + * Fix-build-with-QtWebEngine-5.6.patch +- Refresh 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch + +------------------------------------------------------------------- Old: ---- digikam-6.0.0.tar.xz New: ---- Fix-build-with-QtWebEngine-5.6.patch Fix-compilation-with-Qt-5.6.patch digikam-6.1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.pLHZim/_old 2019-04-25 16:20:40.942074034 +0200 +++ /var/tmp/diff_new_pack.pLHZim/_new 2019-04-25 16:20:40.942074034 +0200 @@ -19,7 +19,7 @@ %define soversion 6 %bcond_without lang Name: digikam -Version: 6.0.0 +Version: 6.1.0 Release: 0 Summary: A KDE Photo Manager License: GPL-2.0-or-later @@ -30,6 +30,10 @@ Patch0: 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch # PATCH-FIX-OPENSUSE Patch1: Lower-minimum-exiv2-version.patch +# PATCH-FIX-UPSTREAM +Patch2: Fix-compilation-with-Qt-5.6.patch +# PATCH-FIX-UPSTREAM +Patch3: Fix-build-with-QtWebEngine-5.6.patch BuildRequires: QtAV-devel >= 1.12 BuildRequires: bison BuildRequires: boost-devel @@ -83,16 +87,16 @@ BuildRequires: cmake(Qt5X11Extras) BuildRequires: cmake(Qt5Xml) BuildRequires: cmake(Qt5XmlPatterns) +BuildRequires: pkgconfig(Magick++) BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavfilter) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libgphoto2) >= 2.4.0 BuildRequires: pkgconfig(libswscale) +Requires: %{name}-plugins Requires: libQt5Sql5-sqlite Recommends: %{name}-lang -Recommends: enblend-enfuse -Recommends: hugin Recommends: marble Recommends: showfoto # Got merged into libimageeditor in 5.2.0 @@ -130,6 +134,23 @@ that enables you to connect to your camera and preview, download, or delete your images, is provided. +%package plugins +Summary: DigiKam plugins +Group: Productivity/Graphics/Viewers +Recommends: enblend-enfuse +Recommends: hugin + +%description plugins +Additional plugins for digiKam. + +%package devel +Summary: DigiKam development files +Group: Development/Libraries/KDE +Requires: libdigikamcore%{soversion} = %{version} + +%description devel +Development headers and libraries for digiKam. + %package -n showfoto Summary: DigiKam: Showfoto Group: Productivity/Graphics/Viewers @@ -141,6 +162,7 @@ %package -n libdigikamcore%{soversion} Summary: The main digikam libraries Group: Development/Libraries/KDE +Recommends: %{name}-plugins %description -n libdigikamcore%{soversion} The main digikam libraries that are being shared between showfoto and digikam @@ -156,6 +178,8 @@ %if 0%{?suse_version} < 1320 %patch1 -p1 %endif +%patch2 -p1 +%patch3 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -180,11 +204,6 @@ %install %kf5_makeinstall -C build -# Not needed, the package doesn't actually provide any shared libraries -rm -f %{buildroot}%{_kf5_libdir}/libdigikamcore.so -rm -f %{buildroot}%{_kf5_libdir}/libdigikamdatabase.so -rm -f %{buildroot}%{_kf5_libdir}/libdigikamgui.so - %if 0%{?suse_version} %suse_update_desktop_file -r org.kde.digikam Qt KDE Graphics Photography %suse_update_desktop_file -r org.kde.showfoto Qt KDE Graphics Photography @@ -206,9 +225,6 @@ %{_kf5_applicationsdir}/org.kde.digikam.desktop %{_kf5_iconsdir}/hicolor/*/actions/ %{_kf5_iconsdir}/hicolor/*/apps/digikam.* -%{_kf5_iconsdir}/hicolor/*/apps/dk-* -%{_kf5_iconsdir}/hicolor/*/apps/expoblending.* -%{_kf5_iconsdir}/hicolor/*/apps/panorama.* %doc %{_kf5_mandir}/man1/cleanup_digikamdb.1%{ext_man} %doc %{_kf5_mandir}/man1/digitaglinktree.1%{ext_man} %{_kf5_sharedir}/digikam/ @@ -219,6 +235,19 @@ %{_kf5_notifydir}/digikam.notifyrc %{_kf5_appstreamdir}/org.kde.digikam.appdata.xml +%files plugins +%{_kf5_iconsdir}/hicolor/*/apps/dk-* +%{_kf5_iconsdir}/hicolor/*/apps/expoblending.* +%{_kf5_iconsdir}/hicolor/*/apps/panorama.* +%{_kf5_plugindir}/digikam/ + +%files devel +%{_includedir}/digikam/ +%{_kf5_cmakedir}/digikam/ +%{_kf5_libdir}/libdigikamcore.so +%{_kf5_libdir}/libdigikamdatabase.so +%{_kf5_libdir}/libdigikamgui.so + %files -n showfoto %{_kf5_bindir}/showfoto %{_kf5_applicationsdir}/org.kde.showfoto.desktop ++++++ 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch ++++++ --- /var/tmp/diff_new_pack.pLHZim/_old 2019-04-25 16:20:40.954074031 +0200 +++ /var/tmp/diff_new_pack.pLHZim/_new 2019-04-25 16:20:40.954074031 +0200 @@ -21,15 +21,15 @@ index cd482ea..bc3772b 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt -@@ -290,7 +290,7 @@ find_package(Marble) +@@ -318,7 +318,7 @@ find_package(Marble) find_package(PkgConfig) find_package(Jasper) # For JPEG 2000 support. find_package(Eigen3) # For Refocus tool. -find_package(OpenGL) # For Presentation tool. +# find_package(OpenGL) # For Presentation tool. - # For Monitor Profiles management with LCMS - find_package(X11) + find_package(ImageMagick COMPONENTS Magick++) # For QImage loader fail back to ImageMagick codecs. + -- 2.14.0 ++++++ Fix-build-with-QtWebEngine-5.6.patch ++++++ >From 27b90c533f99cd4f67f99ef5c506f80db6c012af Mon Sep 17 00:00:00 2001 From: Gilles Caulier <[email protected]> Date: Fri, 19 Apr 2019 14:52:42 +0200 Subject: Apply patch from Wolfgang Bauer to Fix build with QtWebEngine 5.6 Differential Revision: https://phabricator.kde.org/D20681 --- bootstrap.linux | 2 +- core/app/views/stack/welcomepageview.cpp | 5 +++++ core/libs/dplugins/webservices/webwidget_qwebengine.cpp | 3 +++ .../utilities/geolocation/geoiface/widgets/htmlwidget_qwebengine.cpp | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/bootstrap.linux b/bootstrap.linux index 30677b6..4a3b07c 100755 --- a/bootstrap.linux +++ b/bootstrap.linux @@ -87,7 +87,7 @@ $CMAKE_BINARY -G "$MAKEFILES_TYPE" . \ -DENABLE_MEDIAPLAYER=ON \ -DENABLE_DBUS=ON \ -DENABLE_APPSTYLES=ON \ - -DENABLE_QWEBENGINE=OFF \ + -DENABLE_QWEBENGINE=ON \ -DENABLE_FACESENGINE_DNN=ON \ -Wno-dev \ $SOURCEDIR && echo "$MESSAGE" diff --git a/core/app/views/stack/welcomepageview.cpp b/core/app/views/stack/welcomepageview.cpp index 9528933..1491ce7 100644 --- a/core/app/views/stack/welcomepageview.cpp +++ b/core/app/views/stack/welcomepageview.cpp @@ -34,6 +34,9 @@ #include <QWidget> #include <QApplication> #include <QStandardPaths> +#ifdef HAVE_QWEBENGINE +# include <QtWebEngineWidgetsVersion> +#endif // KDE includes @@ -90,8 +93,10 @@ WelcomePageView::WelcomePageView(QWidget* const parent) setContentsMargins(QMargins()); #ifdef HAVE_QWEBENGINE +#if QTWEBENGINEWIDGETS_VERSION >= QT_VERSION_CHECK(5, 7, 0) settings()->setAttribute(QWebEngineSettings::WebGLEnabled, false); settings()->setAttribute(QWebEngineSettings::Accelerated2dCanvasEnabled, false); +#endif WelcomePageViewPage* const wpage = new WelcomePageViewPage(this); setPage(wpage); diff --git a/core/libs/dplugins/webservices/webwidget_qwebengine.cpp b/core/libs/dplugins/webservices/webwidget_qwebengine.cpp index f7f6ed8..e1849b1 100644 --- a/core/libs/dplugins/webservices/webwidget_qwebengine.cpp +++ b/core/libs/dplugins/webservices/webwidget_qwebengine.cpp @@ -26,6 +26,7 @@ // Qt includes #include <QCloseEvent> +#include <QtWebEngineWidgetsVersion> // Local includes @@ -51,8 +52,10 @@ WebWidget::WebWidget(QWidget* const parent) d(new Private()) { d->parent = parent; +#if QTWEBENGINEWIDGETS_VERSION >= QT_VERSION_CHECK(5, 7, 0) settings()->setAttribute(QWebEngineSettings::WebGLEnabled, false); settings()->setAttribute(QWebEngineSettings::Accelerated2dCanvasEnabled, false); +#endif } void WebWidget::closeEvent(QCloseEvent* event) diff --git a/core/utilities/geolocation/geoiface/widgets/htmlwidget_qwebengine.cpp b/core/utilities/geolocation/geoiface/widgets/htmlwidget_qwebengine.cpp index d7ce822..1671cb4 100644 --- a/core/utilities/geolocation/geoiface/widgets/htmlwidget_qwebengine.cpp +++ b/core/utilities/geolocation/geoiface/widgets/htmlwidget_qwebengine.cpp @@ -31,6 +31,7 @@ #include <QResizeEvent> #include <QCoreApplication> #include <QWebEngineSettings> +#include <QtWebEngineWidgetsVersion> // Local includes @@ -121,8 +122,10 @@ HTMLWidget::HTMLWidget(QWidget* const parent) d->parent = parent; setAcceptDrops(false); setFocusPolicy(Qt::WheelFocus); +#if QTWEBENGINEWIDGETS_VERSION >= QT_VERSION_CHECK(5, 7, 0) settings()->setAttribute(QWebEngineSettings::WebGLEnabled, false); settings()->setAttribute(QWebEngineSettings::Accelerated2dCanvasEnabled, false); +#endif d->hpage = new HTMLWidgetPage(this); setPage(d->hpage); -- cgit v1.1 ++++++ Fix-compilation-with-Qt-5.6.patch ++++++ >From dbc7b17f4d61fda327f273e30a85c8d59c913a16 Mon Sep 17 00:00:00 2001 From: Gilles Caulier <[email protected]> Date: Wed, 17 Apr 2019 11:21:18 +0200 Subject: [PATCH] fix compilation with Qt 5.6 REVIEW: D20632 --- core/libs/dimg/filters/curves/curvesbox.cpp | 20 ++++++++++---------- core/libs/dimg/filters/curves/curvesbox.h | 10 +++++++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/core/libs/dimg/filters/curves/curvesbox.cpp b/core/libs/dimg/filters/curves/curvesbox.cpp index d8a534d9aa..be64ac1976 100644 --- a/core/libs/dimg/filters/curves/curvesbox.cpp +++ b/core/libs/dimg/filters/curves/curvesbox.cpp @@ -146,16 +146,16 @@ void CurvesBox::setup() // ------------------------------------------------------------- - QWidget* const typeBox = new QWidget(); + QWidget* const typeBox = new QWidget(); - d->curveFree = new QToolButton; + d->curveFree = new QToolButton; d->curveFree->setIcon(QPixmap(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("digikam/data/curvefree.png")))); d->curveFree->setCheckable(true); d->curveFree->setToolTip(i18n("Curve free mode")); d->curveFree->setWhatsThis(i18n("With this button, you can draw your curve free-hand " "with the mouse.")); - d->curveSmooth = new QToolButton; + d->curveSmooth = new QToolButton; d->curveSmooth->setIcon(QPixmap(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("digikam/data/curvemooth.png")))); d->curveSmooth->setCheckable(true); d->curveSmooth->setToolTip(i18n("Curve smooth mode")); @@ -228,9 +228,9 @@ void CurvesBox::setup() "First option will reset current channel. " "Second option will reset all channels.")); - QMenu* const resetMenu = new QMenu(i18n("&Reset"), d->resetButton); - d->resetChannelAction = new QAction(i18n("Reset &Channel")); - d->resetChannelsAction = new QAction(i18n("Reset &All")); + QMenu* const resetMenu = new QMenu(i18n("&Reset"), d->resetButton); + d->resetChannelAction = new QAction(i18n("Reset &Channel"), nullptr); + d->resetChannelsAction = new QAction(i18n("Reset &All"), nullptr); resetMenu->addAction(d->resetChannelAction); resetMenu->addAction(d->resetChannelsAction); @@ -268,10 +268,10 @@ void CurvesBox::setup() connect(d->curveType, SIGNAL(buttonClicked(int)), this, SLOT(slotCurveTypeChanged(int))); - connect(d->resetChannelAction, SIGNAL(triggered()), + connect(d->resetChannelAction, SIGNAL(triggered()), this, SLOT(slotResetChannel())); - connect(d->resetChannelsAction, SIGNAL(triggered()), + connect(d->resetChannelsAction, SIGNAL(triggered()), this, SLOT(slotResetChannels())); } @@ -358,7 +358,7 @@ void CurvesBox::setChannel(ChannelType channel) { case RedChannel: d->hGradient->setColors(QColor("black"), QColor("red")); - d->vGradient->setColors(QColor("red"), QColor("black")); + d->vGradient->setColors(QColor("red"), QColor("black")); break; case GreenChannel: @@ -368,7 +368,7 @@ void CurvesBox::setChannel(ChannelType channel) case BlueChannel: d->hGradient->setColors(QColor("black"), QColor("blue")); - d->vGradient->setColors(QColor("blue"), QColor("black")); + d->vGradient->setColors(QColor("blue"), QColor("black")); break; default: diff --git a/core/libs/dimg/filters/curves/curvesbox.h b/core/libs/dimg/filters/curves/curvesbox.h index 752395b1e5..6a073ff7ab 100644 --- a/core/libs/dimg/filters/curves/curvesbox.h +++ b/core/libs/dimg/filters/curves/curvesbox.h @@ -51,8 +51,8 @@ public: enum ColorPicker { - NoPicker = -1, - BlackTonal = 0, + NoPicker = -1, + BlackTonal = 0, GrayTonal, WhiteTonal }; @@ -65,7 +65,11 @@ public: public: - CurvesBox(int w, int h, QWidget* const parent=0, bool readOnly=false); + CurvesBox(int w, int h, // Widget size. + QWidget* const parent=0, // Parent widget instance. + bool readOnly=false); // If true : widget with full edition mode capabilities. + // If false : display curve data only without edition. + CurvesBox(int w, int h, // Widget size. const DImg& img, // Image data. QWidget* const parent=0, // Parent widget instance. -- 2.16.4 ++++++ digikam-6.0.0.tar.xz -> digikam-6.1.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/digikam/digikam-6.0.0.tar.xz /work/SRC/openSUSE:Factory/.digikam.new.5536/digikam-6.1.0.tar.xz differ: char 26, line 1
