pool/digikam
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 721993 from KDE:Extra

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/721993
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=181
This commit is contained in:
Dominique Leuenberger 2019-08-09 14:55:07 +00:00 committed by Git OBS Bridge
commit 4936d12ded
7 changed files with 26 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch
View File

@ -21,14 +21,14 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index cd482ea..bc3772b 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -318,7 +318,7 @@ find_package(Marble)
@@ -323,7 +323,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.
find_package(ImageMagick COMPONENTS Magick++) # For QImage loader fail back to ImageMagick codecs.
find_package(ImageMagick COMPONENTS Magick++ MagickCore)
--
2.14.0

100
Fix-build-with-QtWebEngine-5.6.patch
View File

@ -1,100 +0,0 @@
From 27b90c533f99cd4f67f99ef5c506f80db6c012af Mon Sep 17 00:00:00 2001
From: Gilles Caulier <caulier.gilles@gmail.com>
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

109
Fix-compilation-with-Qt-5.6.patch
View File

@ -1,109 +0,0 @@
From dbc7b17f4d61fda327f273e30a85c8d59c913a16 Mon Sep 17 00:00:00 2001
From: Gilles Caulier <caulier.gilles@gmail.com>
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

3
digikam-6.1.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c487be4047d73f179cddff26355b6f3b270f407f73009d14b37f2c12039fffe7
size 332466544

3
digikam-6.2.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28762ea0f03a82e3b2473c0682a358c9b83f5013aec827dd5ab6556a1f29baeb
size 339472960

20
digikam.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Aug 5 15:19:28 UTC 2019 - wbauer@tmo.at
- Update to 6.2.0
* https://www.digikam.org/news/2019-08-04-6.2.0_release_announcement/
- New features (from NEWS):
IconView : HiDPI support for 4K screens.
General : Internal Libraw updated to last stable 0.19.3.
New camera supported:
Canon A560, FujiFilm X-T30, Nikon Coolpix A1000, Z6, Z7,
Olympus E-M1X, Sony ILCE-6400, Several dng files from
phones and drones.
Full camera List supported:
https://www.libraw.org/supported-cameras-snapshot-201903
- 310 bugs fixed
- Drop patches merged upstream:
* Fix-compilation-with-Qt-5.6.patch
* Fix-build-with-QtWebEngine-5.6.patch
- Refresh 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch
-------------------------------------------------------------------
Mon Apr 29 08:37:34 UTC 2019 - wbauer@tmo.at

8
digikam.spec
View File

@ -19,7 +19,7 @@
%define soversion 6
%bcond_without lang
Name: digikam
Version: 6.1.0
Version: 6.2.0
Release: 0
Summary: A KDE Photo Manager
License: GPL-2.0-or-later
@ -28,10 +28,6 @@ URL: http://www.digikam.org/
Source0: http://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch -- The OpenGL slideshow depends on Desktop GL, see kde#383715
Patch0: 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch
# PATCH-FIX-UPSTREAM
Patch1: Fix-compilation-with-Qt-5.6.patch
# PATCH-FIX-UPSTREAM
Patch2: Fix-build-with-QtWebEngine-5.6.patch
BuildRequires: QtAV-devel >= 1.12
BuildRequires: bison
BuildRequires: boost-devel
@ -173,8 +169,6 @@ The main digikam libraries that are being shared between showfoto and digikam
# Disable OpenGL slideshow on embedded platforms
%patch0 -p1
%endif
%patch1 -p1
%patch2 -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')