From c9163daee0c60b3fb2eed1616d54838bdb337a81 Mon Sep 17 00:00:00 2001 From: David Spencer Date: Sun, 28 Nov 2010 02:49:47 -0600 Subject: graphics/darktable: Updated for version 0.7. Signed-off-by: Robby Workman --- graphics/darktable/darktable-0.6-gkeyring.patch | 66 ------------------------- graphics/darktable/darktable.SlackBuild | 6 +-- graphics/darktable/darktable.info | 6 +-- 3 files changed, 4 insertions(+), 74 deletions(-) delete mode 100644 graphics/darktable/darktable-0.6-gkeyring.patch diff --git a/graphics/darktable/darktable-0.6-gkeyring.patch b/graphics/darktable/darktable-0.6-gkeyring.patch deleted file mode 100644 index 201b1b2213..0000000000 --- a/graphics/darktable/darktable-0.6-gkeyring.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/src/common/pwstorage/backend_gkeyring.c b/src/common/pwstorage/backend_gkeyring.c -index e5fb43f..2dd0d56 100644 ---- a/src/common/pwstorage/backend_gkeyring.c -+++ b/src/common/pwstorage/backend_gkeyring.c -@@ -20,7 +20,9 @@ - - #include "backend_gkeyring.h" - #include "control/conf.h" -+#ifdef HAVE_GNOME_KEYRING - #include -+#endif - #include - #define DARKTABLE_KEYRING PACKAGE_NAME - #undef DARKTABLE_KEYRING -@@ -29,6 +31,7 @@ const backend_gkeyring_context_t* - dt_pwstorage_gkeyring_new() - { - backend_gkeyring_context_t *context = (backend_gkeyring_context_t*)g_malloc(sizeof(backend_gkeyring_context_t)); -+#ifdef HAVE_GNOME_KEYRING - #ifdef DARKTABLE_KEYRING - /* Check if darktable keyring exists, if not create it */ - gboolean keyring_exists = FALSE; -@@ -56,13 +59,14 @@ dt_pwstorage_gkeyring_new() - /* unlock darktable keyring */ - // Keep this locked until accessed.. - //gnome_keyring_lock_sync(DARKTABLE_KEYRING); -- -+#endif - return context; - } - - gboolean - dt_pwstorage_gkeyring_set(const gchar* slot, GHashTable* table) - { -+#ifdef HAVE_GNOME_KEYRING - GnomeKeyringResult result=0; - GnomeKeyringAttributeList * attributes; - gchar name[256]="Darktable account information for "; -@@ -104,6 +108,9 @@ dt_pwstorage_gkeyring_set(const gchar* slot, GHashTable* table) - gnome_keyring_attribute_list_free(attributes); - - return (result == GNOME_KEYRING_RESULT_OK); -+#else -+ return FALSE; -+#endif - } - - GHashTable* -@@ -111,7 +118,7 @@ dt_pwstorage_gkeyring_get(const gchar* slot) - { - - GHashTable* table = g_hash_table_new (g_str_hash,g_str_equal); -- -+#ifdef HAVE_GNOME_KEYRING - /* find item for slot */ - GList *items=NULL; - GnomeKeyringAttributeList *attributes; -@@ -144,5 +151,6 @@ dt_pwstorage_gkeyring_get(const gchar* slot) - gnome_keyring_attribute_list_free(attributes); - gnome_keyring_found_free (items->data); - } -+#endif - return table; - } --- -1.7.1 diff --git a/graphics/darktable/darktable.SlackBuild b/graphics/darktable/darktable.SlackBuild index 6450cf0dcd..28f654a748 100644 --- a/graphics/darktable/darktable.SlackBuild +++ b/graphics/darktable/darktable.SlackBuild @@ -5,7 +5,7 @@ # This script is dedicated to the public domain PRGNAM=darktable -VERSION=${VERSION:-0.6} +VERSION=${VERSION:-0.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,10 +60,6 @@ find . \ # Suppress warning from gconf sed -i -e '/gettext_domain/d' darktable.schemas.in -# Fix --disable-gnome-keyring -# http://sourceforge.net/mailarchive/forum.php?thread_name=4C7B76FF.6010503%40gmail.com&forum_name=darktable-devel -patch -p1 <$CWD/darktable-0.6-gkeyring.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/darktable/darktable.info b/graphics/darktable/darktable.info index 43e658b8bf..efca0e5a3f 100644 --- a/graphics/darktable/darktable.info +++ b/graphics/darktable/darktable.info @@ -1,8 +1,8 @@ PRGNAM="darktable" -VERSION="0.6" +VERSION="0.7" HOMEPAGE="http://darktable.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/darktable/darktable-0.6.tar.gz" -MD5SUM="64a0c4ba2000605137ba2e57434ee3fe" +DOWNLOAD="http://downloads.sourceforge.net/darktable/darktable-0.7.tar.gz" +MD5SUM="8220427138bb66772310f3961adc2ebe" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="David Spencer" -- cgit v1.2.3