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

Updating link to change in openSUSE:Factory/digikam revision 160.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=0a6bc8745f14567dd84651dbf4cfd5fb
This commit is contained in:
OBS User buildservice-autocommit 2017-08-26 09:52:51 +00:00 committed by Git OBS Bridge
parent 6e08dc8525
commit 197a0e9cb1
3 changed files with 13349 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
digikam.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Aug 26 09:16:31 UTC 2017 - fabian@ritter-vogt.de
- Add patch to fix build with cmake 3.9:
* fix-build-cmake39.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jun 25 10:12:45 UTC 2017 - fabian@ritter-vogt.de Sun Jun 25 10:12:45 UTC 2017 - fabian@ritter-vogt.de

7
digikam.spec
View File

@ -26,6 +26,8 @@ Url: http://www.digikam.org/
Source0: http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz Source0: http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE find_libastro-qt5.patch -- fix build of geolocation support in Leap 42.1 # PATCH-FIX-OPENSUSE find_libastro-qt5.patch -- fix build of geolocation support in Leap 42.1
Patch0: find_libastro-qt5.patch Patch0: find_libastro-qt5.patch
# PATCH-FIX-UPSTREAM
Patch1: fix-build-cmake39.patch
#This pulls in QWebEngine, which is not available on ppc64 #This pulls in QWebEngine, which is not available on ppc64
%ifarch %ix86 x86_64 %arm aarch64 mips mips64 %ifarch %ix86 x86_64 %arm aarch64 mips mips64
BuildRequires: akonadi-contact-devel BuildRequires: akonadi-contact-devel
@ -76,8 +78,8 @@ BuildRequires: threadweaver-devel >= 5.1.0
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
BuildRequires: cmake(KF5CalendarCore) BuildRequires: cmake(KF5CalendarCore)
BuildRequires: pkgconfig(Qt5Core) >= 5.6.0
BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core) >= 5.6.0
BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Svg)
@ -169,6 +171,9 @@ The main digikam libraries that are being shared between showfoto and digikam
# we renamed libastro to libastro-qt5 in Leap 42.1, make FindMARBLE.cmake find it # we renamed libastro to libastro-qt5 in Leap 42.1, make FindMARBLE.cmake find it
%patch0 -p1 %patch0 -p1
%endif %endif
pushd core
%patch1 -p1
popd
# Remove build time references so build-compare can do its work # 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') FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')

13337
fix-build-cmake39.patch Normal file
View File

File diff suppressed because it is too large Load Diff