[csw-devel] SF.net SVN: gar:[21279] csw/mgar/pkg/tracker/trunk
slowfranklin at users.sourceforge.net
slowfranklin at users.sourceforge.net
Wed Jun 5 13:59:03 CEST 2013
Revision: 21279
http://gar.svn.sourceforge.net/gar/?rev=21279&view=rev
Author: slowfranklin
Date: 2013-06-05 11:59:03 +0000 (Wed, 05 Jun 2013)
Log Message:
-----------
tracker/trunk: Move libs to seperate packages, fix deps
Modified Paths:
--------------
csw/mgar/pkg/tracker/trunk/Makefile
Added Paths:
-----------
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-06-05 10:08:43 UTC (rev 21278)
+++ csw/mgar/pkg/tracker/trunk/Makefile 2013-06-05 11:59:03 UTC (rev 21279)
@@ -6,7 +6,7 @@
VERSION = 0.15.2
GARTYPE = v2
-DESCRIPTION = semantic data storage for desktop and mobile devices
+DESCRIPTION = Gnome Tracker, semantic data storage
define BLURB
Tracker is a semantic data storage for desktop and mobile devices.
Tracker uses W3C standards for RDF ontologies using Nepomuk with
@@ -38,55 +38,87 @@
BUILD_DEP_PKGS += CSWlibpng-dev
BUILD_DEP_PKGS += CSWlibuuid-dev
-RUNTIME_DEP_PKGS += CSWlibuuid1
-RUNTIME_DEP_PKGS += CSWlibgsf
-RUNTIME_DEP_PKGS += CSWzlib
-RUNTIME_DEP_PKGS += CSWggettext
-RUNTIME_DEP_PKGS += CSWglib2
-RUNTIME_DEP_PKGS += CSWgio-fam-backend
-RUNTIME_DEP_PKGS += CSWlibiconv2
-RUNTIME_DEP_PKGS += CSWlibsqlite3-0
-RUNTIME_DEP_PKGS += CSWlibxml2
-RUNTIME_DEP_PKGS += CSWlibz1
-RUNTIME_DEP_PKGS += CSWlibpoppler
-RUNTIME_DEP_PKGS += CSWlibgif4
-RUNTIME_DEP_PKGS += CSWlibjpeg7
-RUNTIME_DEP_PKGS += CSWlibtiff3
-RUNTIME_DEP_PKGS += CSWlibicu46
-RUNTIME_DEP_PKGS += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibgsf1-114
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibicui18n51
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibicuuc51
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibuuid1
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibgif4
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-sparql0-16-0
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-miner0-16-0
+RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker-extract0-16-0
+RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWtracker
+RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibuuid1
+RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibtracker-sparql0-16-0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWtracker
+RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibexif12
+RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibtracker-sparql0-16-0
+RUNTIME_DEP_PKGS_CSWlibtracker-extract0-16-0 += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWtracker
+RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibtracker-sparql0-16-0
+RUNTIME_DEP_PKGS_CSWlibtracker-miner0-16-0 += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-miner0-16-0
+RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWtracker
+RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-extract0-16-0
+RUNTIME_DEP_PKGS_CSWlibtracker0-16-dev += CSWlibtracker-sparql0-16-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
# Packages
-PACKAGES += CSWlibtracker0-16
-PACKAGES += CSWlibtracker-dev
PACKAGES += CSWtracker
+SPKG_DESC_CSWtracker = $(DESCRIPTION)
-# Catalog names
-CATALOGNAME_CSWlibtracker0-16 = libtracker0_16
-CATALOGNAME_CSWlibtracker-dev = libtracker_dev
+PACKAGES += CSWlibtracker-extract0-16-0
+SPKG_DESC_CSWlibtracker-extract0-16-0 += $(DESCRIPTION), libtracker-extract-0.16.so.0
+PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so\.0\.1502\.0)
+PKGFILES_CSWlibtracker-extract0-16-0 += $(call baseisadirs,$(libdir),libtracker-extract-0\.16\.so\.0(\.\d+)*)
-# Package descriptions
-SPKG_DESC_CSWlibtracker0-16 = Gnome Tracker, libraries
-SPKG_DESC_CSWlibtracker-dev = Gnome Tracker, development files
-SPKG_DESC_CSWtracker = Gnome Tracker
+PACKAGES += CSWlibtracker-miner0-16-0
+SPKG_DESC_CSWlibtracker-miner0-16-0 += $(DESCRIPTION), libtracker-miner-0.16.so.0
+PKGFILES_CSWlibtracker-miner0-16-0 += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so\.0\.1502\.0)
+PKGFILES_CSWlibtracker-miner0-16-0 += $(call baseisadirs,$(libdir),libtracker-miner-0\.16\.so\.0(\.\d+)*)
-# Package payload
-PKGFILES_CSWlibtracker0-16 += $(call pkgfiles_lib,libtracker-extract-0.16.so)
-PKGFILES_CSWlibtracker0-16 += $(call pkgfiles_lib,libtracker-miner-0.16.so)
-PKGFILES_CSWlibtracker0-16 += $(call pkgfiles_lib,libtracker-sparql-0.16.so)
-PKGFILES_CSWlibtracker0-16 += $(call baseisadirs,$(libdir),tracker-0\.16/extract-modules/libextract-.*\.so)
-PKGFILES_CSWlibtracker0-16 += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-common\.so.*)
-PKGFILES_CSWlibtracker0-16 += $(call baseisadirs,$(libdir),tracker-0\.16/libtracker-data\.so.*)
+PACKAGES += CSWlibtracker-sparql0-16-0
+SPKG_DESC_CSWlibtracker-sparql0-16-0 += $(DESCRIPTION), libtracker-sparql-0.16.so.0
+PKGFILES_CSWlibtracker-sparql0-16-0 += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so\.0\.1502\.0)
+PKGFILES_CSWlibtracker-sparql0-16-0 += $(call baseisadirs,$(libdir),libtracker-sparql-0\.16\.so\.0(\.\d+)*)
-PKGFILES_CSWlibtracker-dev += $(PKGFILES_DEVEL)
+PACKAGES += CSWlibtracker0-16-dev
+SPKG_DESC_CSWlibtracker0-16-dev += $(DESCRIPTION), development files
+PKGFILES_CSWlibtracker0-16-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/libtracker-extract-0.16.so
+PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/libtracker-miner-0.16.so
+PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/libtracker-sparql-0.16.so
+PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/tracker-0.16/libtracker-common.so
+PKGFILES_CSWlibtracker0-16-dev += /opt/csw/lib/tracker-0.16/libtracker-data.so
-# Inter-package deps
-RUNTIME_DEP_PKGS_CSWlibtracker-dev += CSWlibtracker0-16
-RUNTIME_DEP_PKGS_CSWtracker += CSWlibtracker0-16
+
# For gettext
CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
Added: csw/mgar/pkg/tracker/trunk/files/0002-strnlen-replacement-function.patch
===================================================================
--- csw/mgar/pkg/tracker/trunk/files/0002-strnlen-replacement-function.patch (rev 0)
+++ csw/mgar/pkg/tracker/trunk/files/0002-strnlen-replacement-function.patch 2013-06-05 11:59:03 UTC (rev 21279)
@@ -0,0 +1,65 @@
+From 514a5a199b799f240acf9275d54fe8210e0be284 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
+
+---
+ config.h.in | 3 +++
+ configure | 10 ++++++++++
+ src/libtracker-data/tracker-db-journal.c | 8 ++++++++
+ 3 files changed, 21 insertions(+)
+
+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 @@
+
+ /* Defined for compilers not supporting __FUNCTION__ */
+ #undef __FUNCTION__
++
++/* 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)
++{
++ const char *end = memchr (str, 0, max);
++ return end ? (size_t)(end - str) : max;
++}
++#endif
++
+ #if GLIB_CHECK_VERSION (2, 24, 2)
+ static gboolean tracker_db_journal_rotate (GError **error);
+ #endif /* GLib check */
+--
+1.8.1.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