From 42823d8346bfebc1391fb5cf7c7f6c0f096f0f6c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 10 2017 12:12:30 +0000 Subject: digikam-5.4.0 (#1411549) --- diff --git a/.gitignore b/.gitignore index a7e8747..21346d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/digikam-5.3.0.tar.xz +/digikam-5.4.0.tar.xz diff --git a/0034-try-to-fix-crash-under-wayland-native-support-later.patch b/0034-try-to-fix-crash-under-wayland-native-support-later.patch deleted file mode 100644 index fa9620c..0000000 --- a/0034-try-to-fix-crash-under-wayland-native-support-later.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 31e5507db917d7d914f1e3f3c24f5d6777d61f88 Mon Sep 17 00:00:00 2001 -From: Maik Qualmann -Date: Mon, 14 Nov 2016 20:42:18 +0100 -Subject: [PATCH 34/34] try to fix crash under wayland, native support later - CCBUGS: 370392 - ---- - libs/dimg/filters/icc/iccsettings.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libs/dimg/filters/icc/iccsettings.cpp b/libs/dimg/filters/icc/iccsettings.cpp -index 0195df7..c0d3de2 100644 ---- a/libs/dimg/filters/icc/iccsettings.cpp -+++ b/libs/dimg/filters/icc/iccsettings.cpp -@@ -191,6 +191,12 @@ IccProfile IccSettings::Private::profileFromWindowSystem(QWidget* const widget) - { - #ifdef HAVE_X11 - -+ if (!QX11Info::isPlatformX11()) -+ { -+ qCDebug(DIGIKAM_DIMG_LOG) << "Desktop platform is not X11"; -+ return IccProfile(); -+ } -+ - unsigned long appRootWindow; - QString atomName; - --- -2.7.4 - diff --git a/digikam-5.3.0-doc_subdir.patch b/digikam-5.3.0-doc_subdir.patch deleted file mode 100644 index d1433f8..0000000 --- a/digikam-5.3.0-doc_subdir.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up digikam-5.3.0/doc-translated/nl/CMakeLists.txt.doc digikam-5.3.0/doc-translated/nl/CMakeLists.txt ---- digikam-5.3.0/doc-translated/nl/CMakeLists.txt.doc 2016-11-06 04:43:01.000000000 -0600 -+++ digikam-5.3.0/doc-translated/nl/CMakeLists.txt 2016-11-09 11:48:46.145716756 -0600 -@@ -1,2 +1,2 @@ - KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl/ SUBDIR digikam ) --KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl/ SUBDIR digikam ) -\ No newline at end of file -+KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl/ SUBDIR showfoto ) -diff -up digikam-5.3.0/doc-translated/uk/CMakeLists.txt.doc digikam-5.3.0/doc-translated/uk/CMakeLists.txt ---- digikam-5.3.0/doc-translated/uk/CMakeLists.txt.doc 2016-11-06 04:43:01.000000000 -0600 -+++ digikam-5.3.0/doc-translated/uk/CMakeLists.txt 2016-11-09 11:51:18.460349677 -0600 -@@ -1,2 +1,2 @@ - KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk/ SUBDIR digikam ) --KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk/ SUBDIR digikam ) -\ No newline at end of file -+KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk/ SUBDIR showfoto ) diff --git a/digikam.spec b/digikam.spec index 2bb1a05..42aa7e7 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,8 +1,8 @@ Name: digikam Summary: A digital camera accessing & photo management application -Version: 5.3.0 -Release: 5%{?dist} +Version: 5.4.0 +Release: 1%{?dist} License: GPLv2+ URL: http://www.digikam.org/ @@ -13,11 +13,8 @@ Source0: http://download.kde.org/%{?beta:un}stable/digikam/digikam-%{version}%{? Source10: digikam-import.desktop ## upstream patches -Patch34: 0034-try-to-fix-crash-under-wayland-native-support-later.patch ## upstreamable patches -# fix doc subdirs -Patch50: digikam-5.3.0-doc_subdir.patch BuildRequires: boost-devel BuildRequires: eigen3-devel @@ -173,17 +170,14 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} -pushd core -%patch34 -p1 -b .0034 -popd -%patch50 -p1 -b .doc_subdir - %build mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kf5} .. \ + -DENABLE_AKONADICONTACTSUPPORT:BOOL=ON \ -DENABLE_APPSTYLES:BOOL=ON \ + -DENABLE_KFILEMETADATASUPPORT:BOOL=ON \ -DENABLE_MEDIAPLAYER:BOOL=ON \ -DENABLE_MYSQLSUPPORT:BOOL=ON \ -DENABLE_INTERNALMYSQL:BOOL=ON \ @@ -261,18 +255,18 @@ update-desktop-database -q &> /dev/null %files doc %lang(en) %{_kf5_docdir}/HTML/en/digikam/ #lang(it) %{_kf5_docdir}/HTML/it/digikam/ -%lang(nl) %{_kf5_docdir}/HTML/nl/digikam/ +#lang(nl) %{_kf5_docdir}/HTML/nl/digikam/ #lang(pt) %{_kf5_docdir}/HTML/pt/digikam/ #lang(pt_BR) %{_kf5_docdir}/HTML/pt_BR/digikam/ #lang(sv) %{_kf5_docdir}/HTML/sv/digikam/ -%lang(uk) %{_kf5_docdir}/HTML/uk/digikam/ +#lang(uk) %{_kf5_docdir}/HTML/uk/digikam/ %lang(en) %{_kf5_docdir}/HTML/en/showfoto/ #lang(it) %{_kf5_docdir}/HTML/it/showfoto/ -%lang(nl) %{_kf5_docdir}/HTML/nl/showfoto/ +#lang(nl) %{_kf5_docdir}/HTML/nl/showfoto/ #lang(pt) %{_kf5_docdir}/HTML/pt/showfoto/ #lang(pt_BR) %{_kf5_docdir}/HTML/pt_BR/showfoto/ #lang(sv) %{_kf5_docdir}/HTML/sv/showfoto/ -%lang(uk) %{_kf5_docdir}/HTML/uk/showfoto/ +#lang(uk) %{_kf5_docdir}/HTML/uk/showfoto/ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -319,6 +313,9 @@ gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor >& /dev/null ||: %changelog +* Mon Jan 09 2017 Rex Dieter - 5.4.0-1 +- digikam-5.4.0 (#1411549) + * Wed Dec 28 2016 Rich Mattes - 5.3.0-5 - Rebuild for eigen3-3.3.1 diff --git a/sources b/sources index f0900a4..3a93575 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec4b121451c13d6fcaae654ed0e5518a digikam-5.3.0.tar.xz +SHA512 (digikam-5.4.0.tar.xz) = fbcdd160e614630c6518bf748c93b589ad529bf61da469826edf542478cb3589f4f6c6091c34f53214f038080c72b07e4d639fb5f355b382d7ee9d66129f0d50