Accepting request 462078 from KDE:Extra

1

OBS-URL: https://build.opensuse.org/request/show/462078
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=156

digikam.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar  2 07:48:20 UTC 2017 - jslaby@suse.com
+
+- add hide-functions-that-are-no-longer-available.patch: hide functions
+  that are no longer available in the current Google (kde#376913)
+
 -------------------------------------------------------------------
 Sun Feb 26 13:00:27 UTC 2017 - tittiatcoke@gmail.com
 

digikam.spec

@@ -28,6 +28,8 @@ Source0:        http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
 Patch0:         find_libastro-qt5.patch
 # PATCH-FIX-UPSTREAM fix-build-with-ecm-5.31.patch -- fix build with -fno-operator-names as used by default by extra-cmake-modules 5.31.0
 Patch1:         fix-build-with-ecm-5.31.patch
+# PATCH-FIX-UPSTREAM hide-functions-that-are-no-longer-available.patch -- hide functions that are no longer available in the current Google
+Patch2:         hide-functions-that-are-no-longer-available.patch
 #This pulls in QWebEngine, which is not available on ppc64
 %ifarch %ix86 x86_64 %arm aarch64 mips mips64
 BuildRequires:  akonadi-contact-devel
@@ -171,6 +173,9 @@ The main digikam libraries that are being shared between showfoto and digikam
 %patch0 -p1
 %endif
 %patch1 -p1
+pushd extra/kipi-plugins
+%patch2 -p1
+popd
 
 # 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')

hide-functions-that-are-no-longer-available.patch

@@ -0,0 +1,30 @@
+From f1f3c15931dbc6b8e05451ba23508debac202d96 Mon Sep 17 00:00:00 2001
+From: Maik Qualmann <metzpinguin@gmail.com>
+Date: Sun, 26 Feb 2017 11:24:25 +0100
+Subject: hide functions that are no longer available in the current Google
+ Data API V3 CCBUGS: 376913
+Git-commit: f1f3c15931dbc6b8e05451ba23508debac202d96
+References: kde#376913
+
+---
+ googleservices/gswidget.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/googleservices/gswidget.cpp b/googleservices/gswidget.cpp
+index 149a6a5..fc89c9a 100644
+--- a/googleservices/gswidget.cpp
++++ b/googleservices/gswidget.cpp
+@@ -93,8 +93,10 @@ GoogleServicesWidget::GoogleServicesWidget(QWidget* const parent, KIPI::Interfac
+             m_LeafBox->hide();
+             break;
+         default:
++            getNewAlbmBtn()->hide();    // Google has removed this function in the current API V3.
+             getUploadBox()->hide();
+             getSizeBox()->hide();
++            m_LeafBox->hide();    // Google has removed this function in the current API V3.
+             break;
+     }
+ }
+-- 
+cgit v0.11.2
+