From b47c6e51e234b080c00c0f15c293cccac736fc8364560df0c6475c1e977f067b Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 17 Mar 2012 12:20:23 +0000 Subject: [PATCH] Accepting request 109573 from graphics removed darktable-fix-deprecation.patch and gconf depends kept source package as it is, not converted to bzip2 - Upgrade to release 1.0 + new cameras supported * Leica M9 * NX100/NX5/NX10/NX11 * Panasonic DMC-GX1 * Pentax K-r * Canon Powershot S100 * Olympus XZ-1 * Olympus E-P3 * Sony DSLR A330 * Sony NEX-5N * Canon EOS 1000D * Canon EOS 600D * Sony Alpha 390 * Fuji Finepix HS20EXR + new and updated translations (we now have chinese!) + new image cache * faster concurrent access and insertion * reduces needed memory * more thumbnails stored on disk * read embedded jpegs for creating thumbnails (faster folder import) + increased general speed on sqlite3 (journaled, pagesize optimizations) + reworked, modular ui + keyboard shortcuts support - key accelerators (GSoC) + quicktool bar: exposure, presets and styles + new color picker + web gallery export now with next/prev buttons per image + removed gconf: not used anymore, we have our own backend (forwarded request 109474 from toganm) OBS-URL: https://build.opensuse.org/request/show/109573 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=11 --- darktable-0.9.3.tar.bz2 | 3 --- darktable-1.0.tar.gz | 3 +++ darktable-fix-deprecation.patch | 46 --------------------------------- darktable.changes | 37 ++++++++++++++++++++++++++ darktable.spec | 21 ++------------- 5 files changed, 42 insertions(+), 68 deletions(-) delete mode 100644 darktable-0.9.3.tar.bz2 create mode 100644 darktable-1.0.tar.gz delete mode 100644 darktable-fix-deprecation.patch diff --git a/darktable-0.9.3.tar.bz2 b/darktable-0.9.3.tar.bz2 deleted file mode 100644 index 2fbc5eb..0000000 --- a/darktable-0.9.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6feb2c82b81df7f527c04c051b71dca8c75d47a2eb73ce25106fa268f4ee5344 -size 1849653 diff --git a/darktable-1.0.tar.gz b/darktable-1.0.tar.gz new file mode 100644 index 0000000..74eb806 --- /dev/null +++ b/darktable-1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75e2a1905dc262d771a0064b461b4419a6dc914776ed18cc6a45b8294c175b72 +size 2535774 diff --git a/darktable-fix-deprecation.patch b/darktable-fix-deprecation.patch deleted file mode 100644 index d4cf975..0000000 --- a/darktable-fix-deprecation.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2449428b79acb5313f316095e757a19573bf473e Mon Sep 17 00:00:00 2001 -From: johannes hanika -Date: Tue, 7 Feb 2012 21:26:53 +1300 -Subject: [PATCH] tried to work around g_thread_init() deprecation. - ---- - src/common/pwstorage/backend_kwallet.c | 4 ++++ - src/gui/gtk.c | 4 ++++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -Index: darktable-0.9.3/src/common/pwstorage/backend_kwallet.c -=================================================================== ---- darktable-0.9.3.orig/src/common/pwstorage/backend_kwallet.c -+++ darktable-0.9.3/src/common/pwstorage/backend_kwallet.c -@@ -201,10 +201,14 @@ const backend_kwallet_context_t* dt_pwst - // NULL the context - memset(_context, 0, sizeof(backend_kwallet_context_t)); - -+#if GLIB_MAJOR_VERSION <= 2 -+#if GLIB_MINOR_VERSION < 31 - // Initialize threading in dbus-glib - it should be fine for - // dbus_g_thread_init to be called multiple times. - if (!g_thread_supported()) - g_thread_init(NULL); -+#endif -+#endif - dbus_g_thread_init(); - - GError* error = NULL; -Index: darktable-0.9.3/src/gui/gtk.c -=================================================================== ---- darktable-0.9.3.orig/src/gui/gtk.c -+++ darktable-0.9.3/src/gui/gtk.c -@@ -1211,8 +1211,12 @@ dt_gui_gtk_init(dt_gui_gtk_t *gui, int a - memset(gui->snapshot, 0, sizeof(gui->snapshot)); - for(int k=0; k<4; k++) snprintf(gui->snapshot[k].filename, 30, "/tmp/dt_snapshot_%d.png", k); - gui->presets_popup_menu = NULL; -+#if GLIB_MAJOR_VERSION <= 2 -+#if GLIB_MINOR_VERSION < 31 - if (!g_thread_supported ()) g_thread_init(NULL); - gdk_threads_init(); -+#endif -+#endif - gdk_threads_enter(); - gtk_init (&argc, &argv); - diff --git a/darktable.changes b/darktable.changes index 7e00309..f43d9fa 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,4 +1,41 @@ ------------------------------------------------------------------- +Thu Mar 15 07:52:17 UTC 2012 - toganm@opensuse.org + +- Upgrade to release 1.0 + + new cameras supported + * Leica M9 + * NX100/NX5/NX10/NX11 + * Panasonic DMC-GX1 + * Pentax K-r + * Canon Powershot S100 + * Olympus XZ-1 + * Olympus E-P3 + * Sony DSLR A330 + * Sony NEX-5N + * Canon EOS 1000D + * Canon EOS 600D + * Sony Alpha 390 + * Fuji Finepix HS20EXR + + new and updated translations (we now have chinese!) + + new image cache + * faster concurrent access and insertion + * reduces needed memory + * more thumbnails stored on disk + * read embedded jpegs for creating thumbnails (faster folder + import) + + increased general speed on sqlite3 (journaled, pagesize + optimizations) + + reworked, modular ui + + keyboard shortcuts support - key accelerators (GSoC) + + quicktool bar: exposure, presets and styles + + new color picker + + web gallery export now with next/prev buttons per image + + removed gconf: not used anymore, we have our own backend + + bugfixes + + there have been issues with memory on 32-bit systems. seems to + be okay currently, but something to keep in mind. use 64-bits + if you can +------------------------------------------------------------------- Tue Feb 28 12:06:27 UTC 2012 - fcrozat@suse.com - Add darktable-fix-deprecation.patch to fix glib deprecation. diff --git a/darktable.spec b/darktable.spec index ea0268d..4d94d1c 100644 --- a/darktable.spec +++ b/darktable.spec @@ -17,12 +17,10 @@ Name: darktable -Version: 0.9.3 +Version: 1.0 Release: 0 Url: http://darktable.sourceforge.net -Source0: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM darktable-fix-deprecation.patch fcrozat@suse.com -- fix glib deprecation (git) -Patch0: darktable-fix-deprecation.patch +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel BuildRequires: OpenEXR-devel @@ -30,7 +28,6 @@ BuildRequires: cmake BuildRequires: dbus-1-glib-devel BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: gconf2-devel BuildRequires: gnome-keyring-devel BuildRequires: gtk2-devel BuildRequires: intltool @@ -51,7 +48,6 @@ BuildRequires: update-desktop-files Summary: A virtual Lighttable and Darkroom License: GPL-3.0+ Group: Productivity/Graphics/Viewers -%gconf_schemas_requires %description darktable is a virtual lighttable and darkroom for photographers: it manages @@ -61,7 +57,6 @@ lighttable. it also enables you to develop raw images and enhance them. %prep %setup -q -%patch0 -p1 %build [ ! -d "build" ] && mkdir build @@ -72,7 +67,6 @@ export CFLAGS="$CXXFLAGS" cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL=%{_lib} \ - -DDONT_INSTALL_GCONF_SCHEMAS:BOOLEAN=ON \ -DCMAKE_BUILD_TYPE=Release \ -DBINARY_PACKAGE_BUILD=1 \ -DINSTALL_IOP_EXPERIMENTAL=Off -DINSTALL_IOP_LEGACY=Off .. @@ -82,31 +76,20 @@ cmake \ cd build %make_install cd .. -%__mkdir_p %{buildroot}%{_sysconfdir}/gconf/schemas -install -m644 data/darktable.schemas %{buildroot}%{_sysconfdir}/gconf/schemas %suse_update_desktop_file darktable find %{buildroot}%{_libdir} -name "*.la" -delete %find_lang darktable -%find_gconf_schemas -cat darktable.schemas_list >> darktable.lang %__mkdir_p %{buildroot}%{_defaultdocdir} %__mv %{buildroot}%{_datadir}/doc/darktable %{buildroot}%{_defaultdocdir} %fdupes %{buildroot} -%pre -f %{name}.schemas_pre - -%preun -f %{name}.schemas_preun - -%posttrans -f %{name}.schemas_posttrans - %files -f darktable.lang %defattr(-,root,root) %doc doc/AUTHORS doc/TODO doc/LICENSE %{_bindir}/darktable %{_bindir}/darktable-cltest -%{_bindir}/darktable-faster %{_libdir}/darktable %{_datadir}/applications/darktable.desktop %{_datadir}/darktable