SF.net SVN: gar:[22354] csw/mgar/pkg/tracker/trunk

slowfranklin at users.sourceforge.net slowfranklin at users.sourceforge.net
Sun Nov 3 08:25:13 CET 2013


Revision: 22354
          http://gar.svn.sourceforge.net/gar/?rev=22354&view=rev
Author:   slowfranklin
Date:     2013-11-03 07:25:11 +0000 (Sun, 03 Nov 2013)
Log Message:
-----------
tracker/trunk: Update to 0.16.3

Modified Paths:
--------------
    csw/mgar/pkg/tracker/trunk/Makefile
    csw/mgar/pkg/tracker/trunk/checksums
    csw/mgar/pkg/tracker/trunk/files/0001-Force-linking-with-CC-not-CXX.patch
    csw/mgar/pkg/tracker/trunk/files/0002-strnlen-replacement-function.patch

Modified: csw/mgar/pkg/tracker/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tracker/trunk/Makefile	2013-11-03 01:09:29 UTC (rev 22353)
+++ csw/mgar/pkg/tracker/trunk/Makefile	2013-11-03 07:25:11 UTC (rev 22354)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = tracker
-VERSION = 0.16.2
+VERSION = 0.16.3
 GARTYPE = v2
 
 DESCRIPTION = Gnome Tracker, semantic data storage
@@ -109,14 +109,11 @@
 RUNTIME_DEP_PKGS_CSWlibtracker-common += CSWlibglib2-0-0
 
 PATCHFILES += 0001-Force-linking-with-CC-not-CXX.patch
-PATCHFILES += 0002-strnlen-replacement-function.patch
 PATCHFILES += 0003-Replace-uuid_unparse_lower-with-uuid_unparse.patch
 PATCHFILES += 0004-_XOPEN_SOURCE-hides-non-standard-stuff-__EXTENSIONS_.patch
 PATCHFILES += 0005-exempi-xmp.h-is-missing-a-stdbool.h-include.patch
-# Submitted upstream, should be in 0.16.3
-PATCHFILES += 0008-libtracker-common-Use-procfs-psinfo-instead-of-cmdli.patch
-PATCHFILES += 0008-libtracker-common-Use-procfs-psinfo-instead-of-cmdli2.patch
-PATCHFILES += 0008-Remove-log-calls-in-signal-handler.patch
+# Submitted upstream, should be in 0.16.4
+PATCHFILES += 0002-strnlen-replacement-function.patch
 
 # Packages
 PACKAGES += CSWtracker

Modified: csw/mgar/pkg/tracker/trunk/checksums
===================================================================
--- csw/mgar/pkg/tracker/trunk/checksums	2013-11-03 01:09:29 UTC (rev 22353)
+++ csw/mgar/pkg/tracker/trunk/checksums	2013-11-03 07:25:11 UTC (rev 22354)
@@ -1 +1 @@
-aff0080e06cd9304c40a08a0400dd7e5  tracker-0.16.2.tar.xz
+060cef194a4ac9e28927a33bec8cce54  tracker-0.16.3.tar.xz

Modified: csw/mgar/pkg/tracker/trunk/files/0001-Force-linking-with-CC-not-CXX.patch
===================================================================
--- csw/mgar/pkg/tracker/trunk/files/0001-Force-linking-with-CC-not-CXX.patch	2013-11-03 01:09:29 UTC (rev 22353)
+++ csw/mgar/pkg/tracker/trunk/files/0001-Force-linking-with-CC-not-CXX.patch	2013-11-03 07:25:11 UTC (rev 22354)
@@ -1,20 +1,20 @@
-From 418c1723f87ae488294d9744657ce5a34e49c4f1 Mon Sep 17 00:00:00 2001
+From eb09edeb8c9b0a6212331f75f6017ea8010c3e3f Mon Sep 17 00:00:00 2001
 From: Ralph Boehme <sloowfranklin at gmail.com>
-Date: Mon, 29 Apr 2013 07:39:43 +0200
+Date: Fri, 1 Nov 2013 18:13:22 +0100
 Subject: [PATCH] Force linking with CC, not CXX
 
 Linking with CXX introduces bizarre linker errors where dependent
 libs are linked with their relative sourcetree path even in the final
 installed libarary.
 ---
- src/libtracker-extract/Makefile.in |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ src/libtracker-extract/Makefile.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/libtracker-extract/Makefile.in b/src/libtracker-extract/Makefile.in
-index 0ce7b1d..3d046e9 100644
+index 9cd71d5..b3b4b2e 100644
 --- a/src/libtracker-extract/Makefile.in
 +++ b/src/libtracker-extract/Makefile.in
-@@ -74,7 +74,7 @@ DIST_COMMON = $(libtracker_extractinclude_HEADERS) $(noinst_HEADERS) \
+@@ -101,7 +101,7 @@ DIST_COMMON = $(top_srcdir)/Makefile.decl $(srcdir)/Makefile.in \
  @HAVE_MEEGOTOUCH_TRUE@	tracker-encoding-meegotouch.cpp                \
  @HAVE_MEEGOTOUCH_TRUE@	tracker-encoding-meegotouch.h
  
@@ -23,9 +23,9 @@
  @HAVE_INTROSPECTION_TRUE at am__append_4 = TrackerExtract-$(TRACKER_API_VERSION).gir
  subdir = src/libtracker-extract
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -152,8 +152,8 @@ AM_V_lt = $(am__v_lt_ at AM_V@)
- am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+@@ -180,8 +180,8 @@ am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
  am__v_lt_0 = --silent
+ am__v_lt_1 = 
  libtracker_extract_ at TRACKER_API_VERSION@_la_LINK = $(LIBTOOL) \
 -	$(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 -	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
@@ -33,19 +33,10 @@
 +	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(libtracker_extract_ at TRACKER_API_VERSION@_la_LDFLAGS) \
  	$(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-@@ -531,7 +531,7 @@ GTESTER_REPORT = gtester-report
+ AM_V_P = $(am__v_P_ at AM_V@)
+@@ -734,7 +734,7 @@ clean-libLTLIBRARIES:
+ 	}
  
- # initialize variables for unconditional += appending
- TEST_PROGS = 
--AM_CPPFLAGS = \
-+AM_CFLAGS = \
- 	$(BUILD_CFLAGS)                                \
- 	-I$(top_srcdir)/src                            \
- 	-I$(top_builddir)/src                          \
-@@ -662,7 +662,7 @@ clean-libLTLIBRARIES:
- 	  rm -f "$${dir}/so_locations"; \
- 	done
  libtracker-extract- at TRACKER_API_VERSION@.la: $(libtracker_extract_ at TRACKER_API_VERSION@_la_OBJECTS) $(libtracker_extract_ at TRACKER_API_VERSION@_la_DEPENDENCIES) $(EXTRA_libtracker_extract_ at TRACKER_API_VERSION@_la_DEPENDENCIES) 
 -	$(AM_V_CXXLD)$(libtracker_extract_ at TRACKER_API_VERSION@_la_LINK) -rpath $(libdir) $(libtracker_extract_ at TRACKER_API_VERSION@_la_OBJECTS) $(libtracker_extract_ at TRACKER_API_VERSION@_la_LIBADD) $(LIBS)
 +	$(AM_V_CCLD)$(libtracker_extract_ at TRACKER_API_VERSION@_la_LINK) -rpath $(libdir) $(libtracker_extract_ at TRACKER_API_VERSION@_la_OBJECTS) $(libtracker_extract_ at TRACKER_API_VERSION@_la_LIBADD) $(LIBS)
@@ -53,5 +44,5 @@
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
 -- 
-1.7.9.2
+1.8.3.4
 

Modified: csw/mgar/pkg/tracker/trunk/files/0002-strnlen-replacement-function.patch
===================================================================
--- csw/mgar/pkg/tracker/trunk/files/0002-strnlen-replacement-function.patch	2013-11-03 01:09:29 UTC (rev 22353)
+++ csw/mgar/pkg/tracker/trunk/files/0002-strnlen-replacement-function.patch	2013-11-03 07:25:11 UTC (rev 22354)
@@ -1,65 +1,45 @@
-From 514a5a199b799f240acf9275d54fe8210e0be284 Mon Sep 17 00:00:00 2001
+From ca217d15b61c048bc54e321d354e7ffcb3764277 Mon Sep 17 00:00:00 2001
 From: Ralph Boehme <sloowfranklin at gmail.com>
-Date: Wed, 5 Jun 2013 12:07:33 +0200
-Subject: [PATCH] strnlen replacement function
+Date: Sat, 2 Nov 2013 12:09:41 +0100
+Subject: [PATCH] Add strnlen() compat function
 
 ---
- config.h.in                              |  3 +++
- configure                                | 10 ++++++++++
- src/libtracker-data/tracker-db-journal.c |  8 ++++++++
- 3 files changed, 21 insertions(+)
+ src/libtracker-common/tracker-os-dependant-unix.c | 9 +++++++++
+ src/libtracker-common/tracker-os-dependant.h      | 4 ++++
+ 2 files changed, 13 insertions(+), 0 deletion(-)
 
-diff --git a/config.h.in b/config.h.in
-index dfdee13..4ee3de5 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -269,3 +269,6 @@
+diff --git a/src/libtracker-common/tracker-os-dependant-unix.c b/src/libtracker-common/tracker-os-dependant-unix.c
+index 24108f4..4aa99f6 100644
+--- a/src/libtracker-common/tracker-os-dependant-unix.c
++++ b/src/libtracker-common/tracker-os-dependant-unix.c
+@@ -349,3 +349,12 @@
  
- /* Defined for compilers not supporting __FUNCTION__ */
- #undef __FUNCTION__
+ 	return TRUE;
+ }
 +
-+/* Define if we have strnlen */
-+#undef HAVE_STRNLEN
-diff --git a/configure b/configure
-index d124120..c3ca95f 100755
---- a/configure
-+++ b/configure
-@@ -17385,6 +17385,16 @@ _ACEOF
- fi
- done
- 
-+for ac_func in strnlen
-+do :
-+  ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
-+if test "x$ac_cv_func_strnlen" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRNLEN 1
-+_ACEOF
-+
-+fi
-+done
- 
- CFLAGS="$CFLAGS"
- 
-diff --git a/src/libtracker-data/tracker-db-journal.c b/src/libtracker-data/tracker-db-journal.c
-index a664675..834933a 100644
---- a/src/libtracker-data/tracker-db-journal.c
-+++ b/src/libtracker-data/tracker-db-journal.c
-@@ -120,6 +120,14 @@ static JournalWriter ontology_writer = {0};
- 
- static TransactionFormat current_transaction_format;
- 
 +#ifndef HAVE_STRNLEN
-+size_t strnlen (const char *str, size_t max)
++size_t
++strnlen (const char *str, size_t max)
 +{
-+    const char *end = memchr (str, 0, max);
-+    return end ? (size_t)(end - str) : max;
++	const char *end = memchr (str, 0, max);
++	return end ? (size_t)(end - str) : max;
 +}
++#endif /* HAVE_STRNLEN */
+diff --git a/src/libtracker-common/tracker-os-dependant.h b/src/libtracker-common/tracker-os-dependant.h
+index e92ea45..087cba0 100644
+--- a/src/libtracker-common/tracker-os-dependant.h
++++ b/src/libtracker-common/tracker-os-dependant.h
+@@ -50,6 +50,10 @@ gboolean tracker_spawn_async_with_channels (const gchar **argv,
+ /* Memory limits */
+ gboolean tracker_memory_setrlimits (void);
+ 
++/* Compatibility functions */
++#ifndef HAVE_STRNLEN
++size_t strnlen (const char *str, size_t max);
 +#endif
-+
- #if GLIB_CHECK_VERSION (2, 24, 2)
- static gboolean tracker_db_journal_rotate (GError **error);
- #endif /* GLib check */
+ G_END_DECLS
+ 
+ #endif /* __LIBTRACKER_COMMON_OS_DEPENDANT_H__ */
 -- 
-1.8.1.4
+1.8.4
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list