diff --git a/.gitignore b/.gitignore index c862d81..0ed6aa4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/digikam-6.1.0.tar.xz +/digikam-6.2.0.tar.xz diff --git a/digikam-5.7.0-glibc_powf64.patch b/digikam-5.7.0-glibc_powf64.patch deleted file mode 100644 index 82652a8..0000000 --- a/digikam-5.7.0-glibc_powf64.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- digikam-5.7.0/core/libs/rawengine/libraw/internal/dcraw_common.cpp.orig 2017-09-05 09:51:22.000000000 +0100 -+++ digikam-5.7.0/core/libs/rawengine/libraw/internal/dcraw_common.cpp 2018-01-10 02:46:30.990330876 +0000 -@@ -5773,7 +5773,7 @@ static float my_roundf(float x) { - static float _CanonConvertAperture(ushort in) - { - if ((in == (ushort)0xffe0) || (in == (ushort)0x7fff)) return 0.0f; -- return powf64(2.0, in/64.0); -+ return powf64(2.0f, float(in/64.0)); - } - - static float _CanonConvertEV (short in) -@@ -6726,7 +6726,7 @@ void CLASS PentaxLensInfo (unsigned id, - if (table_buf[iLensData+9] && - (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f)) - imgdata.lens.makernotes.CurFocal = -- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2); -+ 10*(table_buf[iLensData+9]>>2) * powf64(4.0f, (float)((table_buf[iLensData+9] & 0x03)-2)); - if (table_buf[iLensData+10] & 0xf0) - imgdata.lens.makernotes.MaxAp4CurFocal = - powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); -@@ -7648,7 +7648,7 @@ void CLASS parse_makernote_0xc634(int ba - { - unsigned char cc; - fread(&cc, 1, 1, ifp); -- iso_speed = (int)(100.0 * powf64(2.0, (double)(cc) / 12.0 - 5.0)); -+ iso_speed = (int)(100.0 * powf64(2.0f, (float)((double)(cc) / 12.0 - 5.0))); - break; - } - } -@@ -9151,15 +9151,15 @@ void CLASS parse_makernote (int base, in - } - if (tag == 4 && len > 26 && len < 35) { - if ((i=(get4(),get2())) != 0x7fff && (!iso_speed || iso_speed == 65535)) -- iso_speed = 50 * powf64(2.0, i/32.0 - 4); -+ iso_speed = 50 * powf64(2.0f, (float)(i/32.0 - 4)); - #ifdef LIBRAW_LIBRARY_BUILD - get4(); - #else - if ((i=(get2(),get2())) != 0x7fff && !aperture) -- aperture = powf64(2.0, i/64.0); -+ aperture = powf64(2.0f, (float)(i/64.0)); - #endif - if ((i=get2()) != 0xffff && !shutter) -- shutter = powf64(2.0, (short) i/-32.0); -+ shutter = powf64(2.0f, (short) i/-32.0); - wbi = (get2(),get2()); - shot_order = (get2(),get2()); - } -@@ -9768,11 +9768,11 @@ void CLASS parse_exif (int base) - case 36868: get_timestamp(0); break; - case 37377: if ((expo = -getreal(type)) < 128 && shutter == 0.) - tiff_ifd[tiff_nifds-1].t_shutter = -- shutter = powf64(2.0, expo); -+ shutter = powf64(2.0f, (float)expo); - break; - case 37378: // 0x9202 ApertureValue - if ((fabs(ape = getreal(type))<256.0) && (!aperture)) -- aperture = powf64(2.0, ape/2); -+ aperture = powf64(2.0f, (float)ape/2); - break; - case 37385: flash_used = getreal(type); break; - case 37386: focal_len = getreal(type); break; -@@ -11716,9 +11716,9 @@ void CLASS parse_ciff (int offset, int l - aperture = _CanonConvertAperture((get2(),get2())); - imgdata.lens.makernotes.CurAp = aperture; - #else -- aperture = powf64(2.0, (get2(),(short)get2())/64.0); -+ aperture = powf64(2.0f, (get2(),(short)get2())/64.0); - #endif -- shutter = powf64(2.0,-((short)get2())/32.0); -+ shutter = powf64(2.0f,(float)(-((short)get2())/32.0)); - wbi = (get2(),get2()); - if (wbi > 17) wbi = 0; - fseek (ifp, 32, SEEK_CUR); diff --git a/digikam-5.9.0-doc_translated.patch b/digikam-5.9.0-doc_translated.patch deleted file mode 100644 index fb9b264..0000000 --- a/digikam-5.9.0-doc_translated.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up digikam-5.9.0/doc-translated/ca/CMakeLists.txt.doc_translated digikam-5.9.0/doc-translated/ca/CMakeLists.txt ---- digikam-5.9.0/doc-translated/ca/CMakeLists.txt.doc_translated 2018-03-19 04:42:01.000000000 -0500 -+++ digikam-5.9.0/doc-translated/ca/CMakeLists.txt 2018-03-28 07:44:44.626219821 -0500 -@@ -1,2 +1,2 @@ - KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/ca/ SUBDIR digikam ) --KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/ca/ SUBDIR digikam ) -\ No newline at end of file -+KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/ca/ SUBDIR showfoto ) -diff -up digikam-5.9.0/doc-translated/nl/CMakeLists.txt.doc_translated digikam-5.9.0/doc-translated/nl/CMakeLists.txt ---- digikam-5.9.0/doc-translated/nl/CMakeLists.txt.doc_translated 2018-03-19 04:42:01.000000000 -0500 -+++ digikam-5.9.0/doc-translated/nl/CMakeLists.txt 2018-03-28 07:42:57.451481343 -0500 -@@ -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.9.0/doc-translated/sv/CMakeLists.txt.doc_translated digikam-5.9.0/doc-translated/sv/CMakeLists.txt ---- digikam-5.9.0/doc-translated/sv/CMakeLists.txt.doc_translated 2018-03-19 04:42:01.000000000 -0500 -+++ digikam-5.9.0/doc-translated/sv/CMakeLists.txt 2018-03-28 07:42:57.453481357 -0500 -@@ -1,2 +1,2 @@ - KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/sv/ SUBDIR digikam ) --KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/sv/ SUBDIR digikam ) -\ No newline at end of file -+KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/sv/ SUBDIR showfoto ) -diff -up digikam-5.9.0/doc-translated/uk/CMakeLists.txt.doc_translated digikam-5.9.0/doc-translated/uk/CMakeLists.txt ---- digikam-5.9.0/doc-translated/uk/CMakeLists.txt.doc_translated 2018-03-19 04:42:01.000000000 -0500 -+++ digikam-5.9.0/doc-translated/uk/CMakeLists.txt 2018-03-28 07:42:57.453481357 -0500 -@@ -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-6.2.0-Wall.patch b/digikam-6.2.0-Wall.patch new file mode 100644 index 0000000..ef4e22c --- /dev/null +++ b/digikam-6.2.0-Wall.patch @@ -0,0 +1,12 @@ +diff -up digikam-6.2.0/core/libs/facesengine/CMakeLists.txt.Wall digikam-6.2.0/core/libs/facesengine/CMakeLists.txt +--- digikam-6.2.0/core/libs/facesengine/CMakeLists.txt.Wall 2019-07-31 11:12:57.000000000 -0500 ++++ digikam-6.2.0/core/libs/facesengine/CMakeLists.txt 2019-08-03 09:56:28.694088905 -0500 +@@ -95,7 +95,7 @@ if(ENABLE_FACESENGINE_DNN) + # Dlib DNN generate plenty of wrong warnings. Remove these workaround later when code will be ported to OpenCV DNN. + REMOVE_GCC_COMPILER_WARNINGS("-Wextra") + REMOVE_GCC_COMPILER_WARNINGS("-Wundef") +- REMOVE_GCC_COMPILER_WARNINGS("-Wall") ++ #REMOVE_GCC_COMPILER_WARNINGS("-Wall") + + DISABLE_CLANG_COMPILER_WARNINGS("4.99.99" "-Wno-cast-align") + DISABLE_CLANG_COMPILER_WARNINGS("4.99.99" "-Wno-sign-compare") diff --git a/digikam.spec b/digikam.spec index 25104d4..4cede31 100644 --- a/digikam.spec +++ b/digikam.spec @@ -4,8 +4,8 @@ Name: digikam Summary: A digital camera accessing & photo management application -Version: 6.1.0 -Release: 8%{?dist} +Version: 6.2.0 +Release: 1%{?dist} License: GPLv2+ URL: http://www.digikam.org/ @@ -27,8 +27,7 @@ Source10: digikam-import.desktop ## upstream patches ## upstreamable patches -# doc-translated FTBFS, https://bugs.kde.org/show_bug.cgi?id=377597 -Patch100: digikam-5.9.0-doc_translated.patch +Patch100: digikam-6.2.0-Wall.patch %if 0%{?ninja} BuildRequires: ninja-build @@ -41,6 +40,7 @@ BuildRequires: doxygen BuildRequires: extra-cmake-modules BuildRequires: gettext BuildRequires: gcc-c++ +BuildRequires: ImageMagick-devel ImageMagick-c++-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: marble-astro-devel @@ -69,7 +69,7 @@ BuildRequires: pkgconfig(Qt5WebEngine) BuildRequires: pkgconfig(Qt5WebKit) %endif %endif -BuildRequires: kf5-libkipi-devel >= 16.03 +#BuildRequires: kf5-libkipi-devel >= 16.03 BuildRequires: kf5-libksane-devel >= 16.03 BuildRequires: kf5-kconfig-devel BuildRequires: kf5-kdoctools-devel @@ -156,11 +156,11 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version}%{?beta:-%{beta}} -#patch100 -p1 -b .doc_translated - # EVIV2_MIN_VERSION sed -i -e "s|0.26|0.25|g" core/CMakeLists.txt +%patch100 -p1 -b .Wall + %build mkdir %{_target_platform} @@ -180,7 +180,7 @@ popd %if 0%{?ninja} %ninja_build -C %{_target_platform} %else -%make_build -C %{_target_platform} +%make_build -C %{_target_platform} VERBOSE= %endif @@ -269,6 +269,9 @@ update-desktop-database -q &> /dev/null %changelog +* Wed Jul 31 2019 Rex Dieter - 6.2.0-1 +- digikam-6.2.0 + * Wed Jul 24 2019 Fedora Release Engineering - 6.1.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 9a6ecd0..2a9aa72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (digikam-6.1.0.tar.xz) = 36cffce4fdb751dafc45b2d447fbbd1134b7dc59c19eb6f7aebcf8d66327f6d8a49e787e346984cc842c81dc033ff8f7f8614a81073d99a0c6902770a26053da +SHA512 (digikam-6.2.0.tar.xz) = 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56