r38409 - in /desktop/unstable/brasero/debian: changelog patches/04_tracker-0.16.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jun  5 21:30:09 2013
New Revision: 38409

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38409
Log:
Add 04_tracker-0.16.patch in preparation for the tracker 0.16 transition.
Still build against tracker 0.14 for now.

Added:
    desktop/unstable/brasero/debian/patches/04_tracker-0.16.patch
Modified:
    desktop/unstable/brasero/debian/changelog
    desktop/unstable/brasero/debian/patches/series

Modified: desktop/unstable/brasero/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/changelog?rev=38409&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/changelog [utf-8] (original)
+++ desktop/unstable/brasero/debian/changelog [utf-8] Wed Jun  5 21:30:09 2013
@@ -7,6 +7,8 @@
   * Port to new documentation infrastructure. Use yelp-tools instead of
     gnome-doc-utils.
   * Port to GStreamer 1.0. Update dependencies accordingly.
+  * Add 04_tracker-0.16.patch in preparation for the tracker 0.16 transition.
+    Still build against tracker 0.14 for now.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 11 Oct 2012 23:38:28 +0200
 

Added: desktop/unstable/brasero/debian/patches/04_tracker-0.16.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/04_tracker-0.16.patch?rev=38409&op=file
==============================================================================
--- desktop/unstable/brasero/debian/patches/04_tracker-0.16.patch (added)
+++ desktop/unstable/brasero/debian/patches/04_tracker-0.16.patch [utf-8] Wed Jun  5 21:30:09 2013
@@ -1,0 +1,49 @@
+commit 45cecda00ae84b4aaa872430ff3e8ad40bd98df6
+Author: Kalev Lember <kalevlember at gmail.com>
+Date:   Sun Jan 27 23:25:54 2013 +0100
+
+    build: Simplify tracker version searching and support 0.16 API
+    
+    Use an iterator instead of a deep dependency tree. This should simplify
+    adding support for new tracker versions in the future.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=692664
+
+diff --git a/configure.ac b/configure.ac
+index ce79401..d77bffe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -382,21 +382,22 @@ AC_ARG_ENABLE(search,
+ 			esac],
+ 			[enable_search="auto"])
+ 
++if test x"$enable_search" != "xno"; then
++        # Try to figure out the tracker API version to use
++        tracker_api="0.10"
++        m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16]],
++                              [PKG_CHECK_EXISTS([tracker-sparql-VERSION >= $TRACKER_REQUIRED],
++                                                [tracker_api="VERSION"])
++                              ])
++fi
++
+ if test x"$enable_search" = "xauto"; then
+-        PKG_CHECK_EXISTS([tracker-sparql-0.14 >= $TRACKER_REQUIRED],
+-                          [enable_search=yes],
+-                          [PKG_CHECK_EXISTS([tracker-sparql-0.12 >= $TRACKER_REQUIRED],
+-                                            [enable_search=yes],
+-                                            [PKG_CHECK_EXISTS([tracker-sparql-0.10 >= $TRACKER_REQUIRED],
+-                                                              [enable_search=yes],
+-                                                              [enable_search=no])])])
++        PKG_CHECK_EXISTS([tracker-sparql-$tracker_api >= $TRACKER_REQUIRED],
++                         [enable_search=yes],
++                         [enable_search=no])
+ fi
+ 
+ if test x"$enable_search" = "xyes"; then
+-        PKG_CHECK_EXISTS([tracker-sparql-0.14 >= $TRACKER_REQUIRED],
+-                         [tracker_api=0.14],
+-                         [PKG_CHECK_EXISTS([tracker-sparql-0.12 >= $TRACKER_REQUIRED],
+-                                           [tracker_api=0.12], [tracker_api=0.10])])
+ 	PKG_CHECK_MODULES(BRASERO_SEARCH, tracker-sparql-$tracker_api >= $TRACKER_REQUIRED)
+ 	AC_DEFINE(BUILD_SEARCH, 1, [define if you  want to use search pane])
+ 	AC_DEFINE(BUILD_TRACKER, 1, [define if you  want to use search pane])

Modified: desktop/unstable/brasero/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/brasero/debian/patches/series?rev=38409&op=diff
==============================================================================
--- desktop/unstable/brasero/debian/patches/series [utf-8] (original)
+++ desktop/unstable/brasero/debian/patches/series [utf-8] Wed Jun  5 21:30:09 2013
@@ -1,2 +1,3 @@
 01_grafted_folders.patch
 03_cue-invalid-frame-75.patch
+04_tracker-0.16.patch