Accepting request 368853 from graphics

1

OBS-URL: https://build.opensuse.org/request/show/368853
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=56

darktable-2.0.1.tar.xz

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

darktable-2.0.2.tar.xz

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

darktable-lua-api.pdf

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

darktable-old-glib.patch

@@ -0,0 +1,45 @@
+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-es.pdf

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

darktable-usermanual-fr.pdf

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

darktable-usermanual.pdf

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f5c46dbf0a2dd2d391f92555abdefe735c6362e51a755b296d71779492b7e945
+oid sha256:ee1714011b05e872cd9d7cd5101e9b936d1aa787a19865bcb50774a2ad0e67a4
-size 12827069
+size 13875563

darktable.changes

@@ -1,3 +1,73 @@
+-------------------------------------------------------------------
+Wed Mar  9 02:37:43 UTC 2016 - adamm@zombino.com
+
+- updating darktable-old-glib.patch:
+  The upstream patch just spins instead of checking the string
+  correctly.
+
+-------------------------------------------------------------------
+Tue Mar  8 13:38:01 UTC 2016 - mrueckert@suse.de
+
+- 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 - mrueckert@suse.de
+
+- add darktable-old-glib.patch to fix building on SLE_12
+
+-------------------------------------------------------------------
+Sun Mar  6 21:37:07 UTC 2016 - mrueckert@suse.de
+
+- 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 - mrueckert@suse.de
+
+- update pdfs to the new 2.0.0 documentation including the
+  translated documentation and the lua api documentation.
+
 -------------------------------------------------------------------
 Wed Feb  3 14:06:46 UTC 2016 - mrueckert@suse.de
 

darktable.spec

@@ -15,14 +15,13 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
+%if ( 0%{?suse_version} > 1310 && 0%{?is_opensuse} ) || 0%{?fedora_version} >= 22 || 0%{?fc22}%{?fc23}%{?fc24}%{?fc25}
-%if 0%{?suse_version} >= 1320 || 0%{?fedora_version} >= 22 || 0%{?fc22}%{?fc23} || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} )
 %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
+Source1:        https://github.com/darktable-org/darktable/releases/download/release-2.0.0/darktable-usermanual.pdf
-Source2:        README.openSUSE
+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 @@ This package provides the user manual in pdf format
 
 %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:1} %{S:2} %{S:3} %{S:4} .
-cp %{S:2} .
+cp %{S:99} .
 
 %if %{with system_opencl}
 # Remove bundled OpenCL headers.
@@ -247,6 +251,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files doc
 %defattr(-,root,root)
-%doc darktable-usermanual.pdf
+%doc darktable-*.pdf
 
 %changelog