Hello community, here is the log from the commit of package darktable for openSUSE:Factory checked in at 2016-03-14 09:57:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/darktable (Old) and /work/SRC/openSUSE:Factory/.darktable.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "darktable" Changes: -------- --- /work/SRC/openSUSE:Factory/darktable/darktable.changes 2016-02-05 00:32:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.darktable.new/darktable.changes 2016-03-14 09:57:35.000000000 +0100 @@ -1,0 +2,70 @@ +Wed Mar 9 02:37:43 UTC 2016 - [email protected] + +- updating darktable-old-glib.patch: + The upstream patch just spins instead of checking the string + correctly. + +------------------------------------------------------------------- +Tue Mar 8 13:38:01 UTC 2016 - [email protected] + +- updating darktable-old-glib.patch: + instead of having a cumbersome if conditional in the spec file + use the glib_check_version macro in the code + +------------------------------------------------------------------- +Sun Mar 6 22:21:02 UTC 2016 - [email protected] + +- add darktable-old-glib.patch to fix building on SLE_12 + +------------------------------------------------------------------- +Sun Mar 6 21:37:07 UTC 2016 - [email protected] + +- update to 2.0.2 + - General: + * Require glib of at least version 2.40 + - New features: + * Add support for DNGs from x3f_extract + * Support XMP files from Ramperpro timelapse controllers from + ElysiaVisuals + - Bugfixes: + * Fix some problems with sluggish GUI when Lua is compiled in + * Some High DPI fixes + * Small theming fixes + * Fix some strings being too long in the GUI, especially when + using localized versions + * Fix a potential crash with malformed GPX files + * Fix wrong zoom level of the map when searching for a location + * Put XMP metadata into the right Exif fields + * Fix a crash in masks. + * Fix a crash in demosaicing + * Fix Markesteijn demosaicing + * Fix a crash when moving the mouse while going to darkroom + when crop&rotate is active + * Fix discrepancy between CPU and OpenCL codepath in invert + * Fix some crashes with certain TIFF files + * Fix build with GCC6 + * Fix build with osmgpsmap older than 1.1.0 + * Fix compilation when there are spaces in the path names + - Camera support: + * Fujifilm X-Pro2 + - White balance presets: + * Pentax K-S2 + - Noise profiles: + * Fujifilm X-T10 + * Pentax K-S2 + - Translations: + * new: + * Hebrew + * updated: + * German + * Slovak + * Swedish +- simplify and merge conditionals with the snapshot packages + +------------------------------------------------------------------- +Wed Feb 3 14:46:14 UTC 2016 - [email protected] + +- update pdfs to the new 2.0.0 documentation including the + translated documentation and the lua api documentation. + +------------------------------------------------------------------- Old: ---- darktable-2.0.1.tar.xz New: ---- darktable-2.0.2.tar.xz darktable-lua-api.pdf darktable-old-glib.patch darktable-usermanual-es.pdf darktable-usermanual-fr.pdf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ darktable.spec ++++++ --- /var/tmp/diff_new_pack.TEgN2r/_old 2016-03-14 09:57:37.000000000 +0100 +++ /var/tmp/diff_new_pack.TEgN2r/_new 2016-03-14 09:57:37.000000000 +0100 @@ -15,14 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%if 0%{?suse_version} >= 1320 || 0%{?fedora_version} >= 22 || 0%{?fc22}%{?fc23} || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} ) +%if ( 0%{?suse_version} > 1310 && 0%{?is_opensuse} ) || 0%{?fedora_version} >= 22 || 0%{?fc22}%{?fc23}%{?fc24}%{?fc25} %bcond_without osmgpsmap %else %bcond_with osmgpsmap %endif -%if (0%{?suse_version} >= 1310 && 0%{?suse_version} != 1315) || 0%{?rhel_version} > 6 || 0%{?centos_version} > 6 || 0%{?fedora_version} >= 20 || 0%{?el7}%{?fc20}%{?fc21}%{?fc22}%{?fc23} +%if (0%{?suse_version} >= 1310 && 0%{?is_opensuse} ) || 0%{?rhel_version} > 6 || 0%{?centos_version} > 6 || 0%{?fedora_version} >= 20 || 0%{?el7}%{?fc20}%{?fc21}%{?fc22}%{?fc23}%{?fc24}%{?fc25} %bcond_without flickcurl %bcond_without translated_manpages %else @@ -36,7 +35,7 @@ %bcond_with system_lua %endif -%if 0%{?suse_version} > 1320 || 0%{?rhel_version} > 6 || 0%{?centos_version} > 6 || 0%{?fedora_version} >= 20 || 0%{?el7}%{?fc20}%{?fc21}%{?fc22}%{?fc23} +%if 0%{?suse_version} > 1320 || 0%{?rhel_version} > 6 || 0%{?centos_version} > 6 || 0%{?fedora_version} >= 20 || 0%{?el7}%{?fc20}%{?fc21}%{?fc22}%{?fc23}%{?fc24}%{?fc25} %bcond_without system_opencl %else %bcond_with system_opencl @@ -45,12 +44,16 @@ %define cmake_options -DCMAKE_SKIP_RPATH:BOOL=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBINARY_PACKAGE_BUILD=1 -DPROJECT_VERSION:STRING="%{name}-%{version}-%{release}" Name: darktable -Version: 2.0.1 +Version: 2.0.2 Release: 0 Url: http://www.darktable.org/ Source0: https://github.com/darktable-org/darktable/releases/download/release-%{version}/%{name}-%{version}.tar.xz -Source1: https://github.com/darktable-org/darktable/releases/download/release-1.6.0/darktable-usermanual.pdf -Source2: README.openSUSE +Source1: https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-usermanual.pdf +Source2: https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-usermanual-fr.pdf +Source3: https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-usermanual-es.pdf +Source4: https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-lua-api.pdf +Source99: README.openSUSE +Patch: darktable-old-glib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 @@ -145,10 +148,11 @@ %prep %setup -q -n %{name}-%{version} +%patch -p1 chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh tools/basecurve/* tools/noise/* -cp %{S:1} darktable-usermanual.pdf -cp %{S:2} . +cp %{S:1} %{S:2} %{S:3} %{S:4} . +cp %{S:99} . %if %{with system_opencl} # Remove bundled OpenCL headers. @@ -247,6 +251,6 @@ %files doc %defattr(-,root,root) -%doc darktable-usermanual.pdf +%doc darktable-*.pdf %changelog ++++++ darktable-2.0.1.tar.xz -> darktable-2.0.2.tar.xz ++++++ ++++ 16858 lines of diff (skipped) ++++++ darktable-old-glib.patch ++++++ Index: darktable-2.0.2/src/common/exif.cc =================================================================== --- darktable-2.0.2.orig/src/common/exif.cc +++ darktable-2.0.2/src/common/exif.cc @@ -78,6 +78,13 @@ const char *dt_xmp_keys[] static const guint dt_xmp_keys_n = G_N_ELEMENTS(dt_xmp_keys); // the number of XmpBag XmpSeq keys that dt uses +#if ! GLIB_CHECK_VERSION(2,40,0) +static gboolean _str_is_ascii(const char *str) +{ + while(*str) if((guchar)*str++ >= 0x80) return FALSE; + return TRUE; +} +#endif /* a few helper functions inspired by https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2/repository/revisions/master/entry/libkexiv2/kexiv2gps.cpp @@ -1291,7 +1298,11 @@ int dt_exif_read_blob(uint8_t *buf, cons if(res != NULL) { char *desc = (char *)res->data; +#if GLIB_CHECK_VERSION(2,40,0) if(g_str_is_ascii(desc)) +#else + if(_str_is_ascii(desc)) +#endif exifData["Exif.Image.ImageDescription"] = desc; else exifData["Exif.Photo.UserComment"] = desc; Index: darktable-2.0.2/cmake/modules/FindGTK3.cmake =================================================================== --- darktable-2.0.2.orig/cmake/modules/FindGTK3.cmake +++ darktable-2.0.2/cmake/modules/FindGTK3.cmake @@ -84,8 +84,8 @@ find_library(GDKPIXBUF_LIBRARY NAMES gdk # Glib # NOTE: must be one of the macros listed in https://developer.gnome.org/glib/stable/glib-Version-Information.html -find_package(Glib REQUIRED 2.40) -set(GTK3_DEFINITIONS ${GTK3_DEFINITIONS} "-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40") +find_package(Glib REQUIRED 2.32) +set(GTK3_DEFINITIONS ${GTK3_DEFINITIONS} "-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32") set(GTK3_DEFINITIONS ${GTK3_DEFINITIONS} "-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_MIN_REQUIRED") if(NOT Glib_FOUND) ++++++ darktable-usermanual.pdf ++++++ (binary differes)
