Dominique Leuenberger 2021-07-13 20:37:06 +00:00 committed by Git OBS Bridge
commit 374c33c82b
14 changed files with 34 additions and 41 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7fc3f851da9bcd7c5053ecd09f21aa3eb6103be98a6c58f52010b6f22174941e
size 4456192

View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCYBrTiQAKCRAY3KEj+Um9
O6rdAJ9yx4GRjpss4biOnlLJUpeteCVxbgCeInuCZaioxIxNuKXchp8d52FuiS8=
=6TVX
-----END PGP SIGNATURE-----

3
darktable-3.6.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:86bcd0184af38b93c3688dffd3d5c19cc65f268ecf9358d649fa11fe26c70a39
size 4691608

View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQTxD5aGZSsOlJ/NlMMY3KEj+Um9OwUCYNNSMAAKCRAY3KEj+Um9
O9+ZAJ9stGW0/DfUJ/3Naobgly01zWYvYACfcT5PetEe46MiPNNSXiGu//ggKZ0=
=ZDbV
-----END PGP SIGNATURE-----

View File

@ -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.orig/src/common/exif.cc 2021-06-20 19:40:04.426410553 +0200
+++ darktable-2.4.0rc2~git33.5175e5ed8/src/common/exif.cc +++ darktable/src/common/exif.cc 2021-06-20 19:46:21.658809959 +0200
@@ -175,6 +175,13 @@ static bool dt_exif_read_xmp_tag(Exiv2:: @@ -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) +#if ! GLIB_CHECK_VERSION(2,40,0)
+static gboolean _str_is_ascii(const char *str) +static gboolean _str_is_ascii(const char *str)
@ -15,8 +15,8 @@ Index: darktable-2.4.0rc2~git33.5175e5ed8/src/common/exif.cc
+#endif +#endif
// FIXME: according to http://www.exiv2.org/doc/classExiv2_1_1Metadatum.html#63c2b87249ba96679c29e01218169124 // FIXME: according to http://www.exiv2.org/doc/classExiv2_1_1Metadatum.html#63c2b87249ba96679c29e01218169124
// there is no need to pass xmpData // there is no need to pass iptcData
@@ -1294,7 +1301,11 @@ int dt_exif_read_blob(uint8_t **buf, con @@ -1776,7 +1783,11 @@ int dt_exif_read_blob(uint8_t **buf, con
if(res != NULL) if(res != NULL)
{ {
char *desc = (char *)res->data; char *desc = (char *)res->data;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca1405f56cdff29dbca860fd031b02d1b3bcc9dabe1604b44ac16a80bcd75e64
size 16307772

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0b9fddcdd9244456d391f798ec5c27a57e2f34e3eb4ea2ef9bcf110e4f4a06a0
size 16358723

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0e4bab204afcb77be5ebe844e114e513b308213b3c5647b634c78b35e5d05048
size 16300682

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4cf3a52b2abf5634d9f14f560f86545fe5239333992c40cc93ad226767d22263
size 16241791

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Jul 3 06:51:09 UTC 2021 - Andreas Schneider <asn@cryptomilk.org>
- 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 <asn@cryptomilk.org> Wed Feb 10 17:05:34 UTC 2021 - Andreas Schneider <asn@cryptomilk.org>

View File

@ -4,7 +4,7 @@ Section: graphics
Priority: optional Priority: optional
Binary: darktable darktable-tools-basecurve darktable-tools-noise Binary: darktable darktable-tools-basecurve darktable-tools-noise
Architecture: any-amd64 any-arm64 Architecture: any-amd64 any-arm64
Version: 3.4.1-1.1 Version: 3.6.0-1.1
Homepage: http://www.darktable.org/ Homepage: http://www.darktable.org/
Build-Depends: cmake, Build-Depends: cmake,
debhelper (>= 10), debhelper (>= 10),

View File

@ -103,7 +103,7 @@
%endif %endif
Name: darktable Name: darktable
Version: 3.4.1 Version: 3.6.0
Release: 0 Release: 0
%define pkg_name darktable %define pkg_name darktable
%define pkg_version %{version} %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 Source1: https://github.com/darktable-org/darktable/releases/download/release-%{version}/%{pkg_name}-%{version}.tar.xz.asc
Source2: %{pkg_name}-rpmlintrc Source2: %{pkg_name}-rpmlintrc
# #
Source10: https://github.com/darktable-org/darktable/releases/download/release-3.4.0/darktable-usermanual.pdf Source10: https://darktable-org.github.io/dtdocs/darktable_user_manual.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
# This is not online yet? # This is not online yet?
Source14: darktable-lua-api.pdf Source14: darktable-lua-api.pdf
# #
@ -278,7 +275,6 @@ This package provides the user manual in PDF format.
%prep %prep
%autosetup -p1 -n %{pkg_name}-%{version} %autosetup -p1 -n %{pkg_name}-%{version}
cp %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} .
cp %{SOURCE99} . cp %{SOURCE99} .
# Remove bundled OpenCL headers. # Remove bundled OpenCL headers.
@ -362,7 +358,7 @@ make %{_smp_mflags} VERBOSE=1
%find_lang darktable %find_lang darktable
cp -av %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} doc/TODO \ cp -av %{SOURCE10} %{SOURCE14} \
%{buildroot}%{_defaultdocdir}/%{pkg_name} %{buildroot}%{_defaultdocdir}/%{pkg_name}
rm %{buildroot}%{_defaultdocdir}/%{pkg_name}/LICENSE rm %{buildroot}%{_defaultdocdir}/%{pkg_name}/LICENSE
@ -401,8 +397,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>/dev/null || :
%{_datadir}/applications/darktable.desktop %{_datadir}/applications/darktable.desktop
%{_datadir}/darktable %{_datadir}/darktable
%exclude %{_datadir}/%{pkg_name}/tools/basecurve/ %exclude %{_datadir}/%{pkg_name}/tools/basecurve/
%dir %{_datadir}/appdata %dir %{_datadir}/metainfo
%{_datadir}/appdata/darktable.appdata.xml %{_datadir}/metainfo/darktable.appdata.xml
%{_datadir}/icons/hicolor/*/apps/darktable* %{_datadir}/icons/hicolor/*/apps/darktable*
%{_mandir}/man1/darktable*.1* %{_mandir}/man1/darktable*.1*
%if %{with translated_manpages} %if %{with translated_manpages}

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c6a55e7ac3e3b59e58841cd8ef4b5a301be2f6025220a7ec8809385c683c6483
size 34294054

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:40f32369346ca50f12e8bd5bfe55cf7c626dcd3417a6b65e53739fd8337e800b oid sha256:851f6f1978b5b044000bc222302c6b6492ff89f94408756c258b88aceef07cf6
size 21088 size 21156