From 105a52233a8a975424b90224c1ce7b97661ad6ea7e1183024ddb3bb32bcf5abc Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sat, 3 Jul 2021 06:51:45 +0000 Subject: [PATCH 1/2] Update to version 3.6.0 OBS-URL: https://build.opensuse.org/package/show/graphics:darktable/darktable?expand=0&rev=25 --- darktable-3.4.1.tar.xz | 3 --- darktable-3.4.1.tar.xz.asc | 6 ------ darktable-3.6.0.tar.xz | 3 +++ darktable-3.6.0.tar.xz.asc | 6 ++++++ darktable-old-glib.patch | 14 +++++++------- darktable-usermanual-de.pdf | 3 --- darktable-usermanual-fr.pdf | 3 --- darktable-usermanual-it.pdf | 3 --- darktable-usermanual.pdf | 3 --- darktable.changes | 6 ++++++ darktable.dsc | 2 +- darktable.spec | 16 ++++++---------- darktable_user_manual.pdf | 3 +++ debian.tar.xz | 4 ++-- 14 files changed, 34 insertions(+), 41 deletions(-) delete mode 100644 darktable-3.4.1.tar.xz delete mode 100644 darktable-3.4.1.tar.xz.asc create mode 100644 darktable-3.6.0.tar.xz create mode 100644 darktable-3.6.0.tar.xz.asc delete mode 100644 darktable-usermanual-de.pdf delete mode 100644 darktable-usermanual-fr.pdf delete mode 100644 darktable-usermanual-it.pdf delete mode 100644 darktable-usermanual.pdf create mode 100644 darktable_user_manual.pdf diff --git a/darktable-3.4.1.tar.xz b/darktable-3.4.1.tar.xz deleted file mode 100644 index 8213276..0000000 --- a/darktable-3.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7fc3f851da9bcd7c5053ecd09f21aa3eb6103be98a6c58f52010b6f22174941e -size 4456192 diff --git a/darktable-3.4.1.tar.xz.asc b/darktable-3.4.1.tar.xz.asc deleted file mode 100644 index c5f9ddc..0000000 --- a/darktable-3.4.1.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCYBrTiQAKCRAY3KEj+Um9 -O6rdAJ9yx4GRjpss4biOnlLJUpeteCVxbgCeInuCZaioxIxNuKXchp8d52FuiS8= -=6TVX ------END PGP SIGNATURE----- diff --git a/darktable-3.6.0.tar.xz b/darktable-3.6.0.tar.xz new file mode 100644 index 0000000..e7051b8 --- /dev/null +++ b/darktable-3.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86bcd0184af38b93c3688dffd3d5c19cc65f268ecf9358d649fa11fe26c70a39 +size 4691608 diff --git a/darktable-3.6.0.tar.xz.asc b/darktable-3.6.0.tar.xz.asc new file mode 100644 index 0000000..7e4a7aa --- /dev/null +++ b/darktable-3.6.0.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCYNNSMAAKCRAY3KEj+Um9 +O9+ZAJ9stGW0/DfUJ/3Naobgly01zWYvYACfcT5PetEe46MiPNNSXiGu//ggKZ0= +=ZDbV +-----END PGP SIGNATURE----- diff --git a/darktable-old-glib.patch b/darktable-old-glib.patch index e1abc41..41a14b2 100644 --- a/darktable-old-glib.patch +++ b/darktable-old-glib.patch @@ -1,10 +1,10 @@ -Index: darktable-2.4.0rc2~git33.5175e5ed8/src/common/exif.cc +Index: darktable/src/common/exif.cc =================================================================== ---- darktable-2.4.0rc2~git33.5175e5ed8.orig/src/common/exif.cc -+++ darktable-2.4.0rc2~git33.5175e5ed8/src/common/exif.cc -@@ -175,6 +175,13 @@ static bool dt_exif_read_xmp_tag(Exiv2:: +--- darktable.orig/src/common/exif.cc 2021-06-20 19:40:04.426410553 +0200 ++++ darktable/src/common/exif.cc 2021-06-20 19:46:21.658809959 +0200 +@@ -591,6 +591,13 @@ static bool dt_exif_read_iptc_tag(Exiv2: } - #define FIND_XMP_TAG(key) dt_exif_read_xmp_tag(xmpData, &pos, key) + #define FIND_IPTC_TAG(key) dt_exif_read_iptc_tag(iptcData, &pos, key) +#if ! GLIB_CHECK_VERSION(2,40,0) +static gboolean _str_is_ascii(const char *str) @@ -15,8 +15,8 @@ Index: darktable-2.4.0rc2~git33.5175e5ed8/src/common/exif.cc +#endif // FIXME: according to http://www.exiv2.org/doc/classExiv2_1_1Metadatum.html#63c2b87249ba96679c29e01218169124 - // there is no need to pass xmpData -@@ -1294,7 +1301,11 @@ int dt_exif_read_blob(uint8_t **buf, con + // there is no need to pass iptcData +@@ -1776,7 +1783,11 @@ int dt_exif_read_blob(uint8_t **buf, con if(res != NULL) { char *desc = (char *)res->data; diff --git a/darktable-usermanual-de.pdf b/darktable-usermanual-de.pdf deleted file mode 100644 index d14cc61..0000000 --- a/darktable-usermanual-de.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca1405f56cdff29dbca860fd031b02d1b3bcc9dabe1604b44ac16a80bcd75e64 -size 16307772 diff --git a/darktable-usermanual-fr.pdf b/darktable-usermanual-fr.pdf deleted file mode 100644 index f3e439e..0000000 --- a/darktable-usermanual-fr.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b9fddcdd9244456d391f798ec5c27a57e2f34e3eb4ea2ef9bcf110e4f4a06a0 -size 16358723 diff --git a/darktable-usermanual-it.pdf b/darktable-usermanual-it.pdf deleted file mode 100644 index d99876b..0000000 --- a/darktable-usermanual-it.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e4bab204afcb77be5ebe844e114e513b308213b3c5647b634c78b35e5d05048 -size 16300682 diff --git a/darktable-usermanual.pdf b/darktable-usermanual.pdf deleted file mode 100644 index cf88cf0..0000000 --- a/darktable-usermanual.pdf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4cf3a52b2abf5634d9f14f560f86545fe5239333992c40cc93ad226767d22263 -size 16241791 diff --git a/darktable.changes b/darktable.changes index 6131763..37a5a30 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 3 06:51:09 UTC 2021 - Andreas Schneider + +- Update to version 3.6.0 + * https://github.com/darktable-org/darktable/releases/tag/release-3.6.0 + ------------------------------------------------------------------- Wed Feb 10 17:05:34 UTC 2021 - Andreas Schneider diff --git a/darktable.dsc b/darktable.dsc index b66200f..5de3110 100644 --- a/darktable.dsc +++ b/darktable.dsc @@ -4,7 +4,7 @@ Section: graphics Priority: optional Binary: darktable darktable-tools-basecurve darktable-tools-noise Architecture: any-amd64 any-arm64 -Version: 3.4.1-1.1 +Version: 3.6.0-1.1 Homepage: http://www.darktable.org/ Build-Depends: cmake, debhelper (>= 10), diff --git a/darktable.spec b/darktable.spec index 75e56f2..5c32cd6 100644 --- a/darktable.spec +++ b/darktable.spec @@ -103,7 +103,7 @@ %endif Name: darktable -Version: 3.4.1 +Version: 3.6.0 Release: 0 %define pkg_name darktable %define pkg_version %{version} @@ -112,10 +112,7 @@ Source0: https://github.com/darktable-org/darktable/releases/download/rel Source1: https://github.com/darktable-org/darktable/releases/download/release-%{version}/%{pkg_name}-%{version}.tar.xz.asc Source2: %{pkg_name}-rpmlintrc # -Source10: https://github.com/darktable-org/darktable/releases/download/release-3.4.0/darktable-usermanual.pdf -Source11: https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual-de.pdf -Source12: https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual-it.pdf -Source13: https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual-fr.pdf +Source10: https://darktable-org.github.io/dtdocs/darktable_user_manual.pdf # This is not online yet? Source14: darktable-lua-api.pdf # @@ -278,7 +275,6 @@ This package provides the user manual in PDF format. %prep %autosetup -p1 -n %{pkg_name}-%{version} -cp %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} . cp %{SOURCE99} . # Remove bundled OpenCL headers. @@ -362,8 +358,8 @@ make %{_smp_mflags} VERBOSE=1 %find_lang darktable -cp -av %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} doc/TODO \ - %{buildroot}%{_defaultdocdir}/%{pkg_name} +cp -av %{SOURCE10} %{SOURCE14} \ + %{buildroot}%{_defaultdocdir}/%{pkg_name} rm %{buildroot}%{_defaultdocdir}/%{pkg_name}/LICENSE %fdupes %{buildroot}/%{_prefix} @@ -401,8 +397,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>/dev/null || : %{_datadir}/applications/darktable.desktop %{_datadir}/darktable %exclude %{_datadir}/%{pkg_name}/tools/basecurve/ -%dir %{_datadir}/appdata -%{_datadir}/appdata/darktable.appdata.xml +%dir %{_datadir}/metainfo +%{_datadir}/metainfo/darktable.appdata.xml %{_datadir}/icons/hicolor/*/apps/darktable* %{_mandir}/man1/darktable*.1* %if %{with translated_manpages} diff --git a/darktable_user_manual.pdf b/darktable_user_manual.pdf new file mode 100644 index 0000000..0846f02 --- /dev/null +++ b/darktable_user_manual.pdf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccb541f69c920249a88f938e4cc5d0a0bea9f40087343a72b75261e2d5fe7658 +size 34294877 diff --git a/debian.tar.xz b/debian.tar.xz index a6d879f..3009211 100644 --- a/debian.tar.xz +++ b/debian.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40f32369346ca50f12e8bd5bfe55cf7c626dcd3417a6b65e53739fd8337e800b -size 21088 +oid sha256:851f6f1978b5b044000bc222302c6b6492ff89f94408756c258b88aceef07cf6 +size 21156 From a3d894f6b7b2a28ff53f1dddfcc82fc8a9860f0a2a1ea67a90f9bc625b208f2a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 13 Jul 2021 05:09:39 +0000 Subject: [PATCH 2/2] Fix darktable_user_manual.pdf OBS-URL: https://build.opensuse.org/package/show/graphics:darktable/darktable?expand=0&rev=26 --- darktable_user_manual.pdf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/darktable_user_manual.pdf b/darktable_user_manual.pdf index 0846f02..daa6b47 100644 --- a/darktable_user_manual.pdf +++ b/darktable_user_manual.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccb541f69c920249a88f938e4cc5d0a0bea9f40087343a72b75261e2d5fe7658 -size 34294877 +oid sha256:c6a55e7ac3e3b59e58841cd8ef4b5a301be2f6025220a7ec8809385c683c6483 +size 34294054