Hello community, here is the log from the commit of package darktable for openSUSE:Factory checked in at 2012-02-29 14:06:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/darktable (Old) and /work/SRC/openSUSE:Factory/.darktable.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "darktable", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/darktable/darktable.changes 2011-11-08 17:27:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.darktable.new/darktable.changes 2012-02-29 14:06:15.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 28 12:06:27 UTC 2012 - fcrozat@suse.com + +- Add darktable-fix-deprecation.patch to fix glib deprecation. + +------------------------------------------------------------------- New: ---- darktable-fix-deprecation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ darktable.spec ++++++ --- /var/tmp/diff_new_pack.hCJmpp/_old 2012-02-29 14:06:17.000000000 +0100 +++ /var/tmp/diff_new_pack.hCJmpp/_new 2012-02-29 14:06:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package darktable # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,19 @@ # - Name: darktable Version: 0.9.3 -Release: 1 -License: GPL-3.0+ -Group: Productivity/Graphics/Viewers +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 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: Mesa-devel +BuildRequires: OpenEXR-devel BuildRequires: cmake +BuildRequires: dbus-1-glib-devel +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gconf2-devel BuildRequires: gnome-keyring-devel @@ -41,15 +44,13 @@ BuildRequires: liblcms2-devel BuildRequires: librsvg-devel BuildRequires: libtiff-devel -BuildRequires: OpenEXR-devel BuildRequires: pkg-config BuildRequires: sqlite3-devel BuildRequires: update-desktop-files -BuildRequires: fdupes -BuildRequires: dbus-1-glib-devel -BuildRequires: Mesa-devel Summary: A virtual Lighttable and Darkroom +License: GPL-3.0+ +Group: Productivity/Graphics/Viewers %gconf_schemas_requires %description @@ -60,6 +61,7 @@ %prep %setup -q +%patch0 -p1 %build [ ! -d "build" ] && mkdir build ++++++ darktable-fix-deprecation.patch ++++++

From 2449428b79acb5313f316095e757a19573bf473e Mon Sep 17 00:00:00 2001 From: johannes hanika <hanatos@gmail.com> 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); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org