[csw-devel] SF.net SVN: gar:[20238] csw/mgar/pkg/xapian-core/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Jan 29 16:58:03 CET 2013
Revision: 20238
http://gar.svn.sourceforge.net/gar/?rev=20238&view=rev
Author: dmichelsen
Date: 2013-01-29 15:58:03 +0000 (Tue, 29 Jan 2013)
Log Message:
-----------
xapian-core/trunk: Update to 1.2.13
Modified Paths:
--------------
csw/mgar/pkg/xapian-core/trunk/Makefile
csw/mgar/pkg/xapian-core/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/xapian-core/trunk/files/quest-fix.patch
Removed Paths:
-------------
csw/mgar/pkg/xapian-core/trunk/files/0001-Fix-include-issue-on-Solaris-9.patch
csw/mgar/pkg/xapian-core/trunk/files/0003-Do-not-bail-out-on-missing-.la.patch
Modified: csw/mgar/pkg/xapian-core/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/Makefile 2013-01-29 10:56:24 UTC (rev 20237)
+++ csw/mgar/pkg/xapian-core/trunk/Makefile 2013-01-29 15:58:03 UTC (rev 20238)
@@ -1,5 +1,5 @@
NAME = xapian-core
-VERSION = 1.2.7
+VERSION = 1.2.13
GARTYPE = v2
DESCRIPTION = An open source search engine library
@@ -13,23 +13,25 @@
DISTFILES = $(NAME)-$(VERSION).tar.gz
-PATCHFILES += 0001-Fix-include-issue-on-Solaris-9.patch
PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch
-PATCHFILES += 0003-Do-not-bail-out-on-missing-.la.patch
+# Use patch until this is fixed:
+# http://trac.xapian.org/ticket/611
+PATCHFILES += quest-fix.patch
+PATCHDIRLEVEL = 0
+
VENDOR_URL = http://xapian.org/
PACKAGES += CSWxapian
SPKG_DESC_CSWxapian = Xapian search engine binaries
# PKGFILES is catchall
RUNTIME_DEP_PKGS_CSWxapian += CSWlibxapian22
-RUNTIME_DEP_PKGS_CSWxapian += CSWstlport
-RUNTIME_DEP_PKGS_CSWxapian += CSWlibz1
+RUNTIME_DEP_PKGS_CSWxapian += CSWlibstlport1
PACKAGES += CSWlibxapian22
SPKG_DESC_CSWlibxapian22 = An open source search engine library, libxapian.so.22
PKGFILES_CSWlibxapian22 = $(call pkgfiles_lib,libxapian.so.22)
-RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWstlport
+RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWlibstlport1
RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWlibz1
PACKAGES += CSWlibxapian-dev
@@ -39,8 +41,12 @@
PKGFILES_CSWlibxapian-dev += .*\.cmake
RUNTIME_DEP_PKGS_CSWlibxapian-dev += CSWlibxapian22
-EXTRA_LD_FLAGS = -norunpath -lCrun
+EXTRA_LD_FLAGS += -norunpath -lCrun
+# We don't need it and if defined the test breaks
+LD_OPTIONS = $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE)
+EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+
BUILD64 = 1
ISAEXEC = 1
Modified: csw/mgar/pkg/xapian-core/trunk/checksums
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/checksums 2013-01-29 10:56:24 UTC (rev 20237)
+++ csw/mgar/pkg/xapian-core/trunk/checksums 2013-01-29 15:58:03 UTC (rev 20238)
@@ -1 +1 @@
-6684eb7a990b9cedf4257f41bfddb584 xapian-core-1.2.7.tar.gz
+d6e15fff5ecae1c03171d64c45ef9685 xapian-core-1.2.13.tar.gz
Deleted: csw/mgar/pkg/xapian-core/trunk/files/0001-Fix-include-issue-on-Solaris-9.patch
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/files/0001-Fix-include-issue-on-Solaris-9.patch 2013-01-29 10:56:24 UTC (rev 20237)
+++ csw/mgar/pkg/xapian-core/trunk/files/0001-Fix-include-issue-on-Solaris-9.patch 2013-01-29 15:58:03 UTC (rev 20238)
@@ -1,24 +0,0 @@
-From 257758591a51f3f361cf38b3e80d14044129c879 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 15 Jul 2011 17:55:41 +0200
-Subject: [PATCH] Fix include issue on Solaris 9
-
----
- tests/soaktest/soaktest.cc | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/tests/soaktest/soaktest.cc b/tests/soaktest/soaktest.cc
-index 2c742c3..37b1aba 100644
---- a/tests/soaktest/soaktest.cc
-+++ b/tests/soaktest/soaktest.cc
-@@ -28,6 +28,7 @@
- #include "testsuite.h"
-
- #include <cstdlib>
-+#include <stdlib.h>
-
- using namespace std;
-
---
-1.7.6
-
Deleted: csw/mgar/pkg/xapian-core/trunk/files/0003-Do-not-bail-out-on-missing-.la.patch
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/files/0003-Do-not-bail-out-on-missing-.la.patch 2013-01-29 10:56:24 UTC (rev 20237)
+++ csw/mgar/pkg/xapian-core/trunk/files/0003-Do-not-bail-out-on-missing-.la.patch 2013-01-29 15:58:03 UTC (rev 20238)
@@ -1,27 +0,0 @@
-From ae30dfc8465c8bbd628d18ee5f7d175cba0ea3ef Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sat, 16 Jul 2011 22:47:51 +0200
-Subject: [PATCH] Do not bail out on missing .la
-
----
- xapian-config.in | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/xapian-config.in b/xapian-config.in
-index 7fdd2ea..6ad567b 100644
---- a/xapian-config.in
-+++ b/xapian-config.in
-@@ -281,8 +281,8 @@ for arg in $actions ; do
- continue
- fi
-
-- echo "$0: Can't find libxapian at LIBRARY_VERSION_SUFFIX@.la to link against." 1>&2
-- exit 1
-+# echo "$0: Can't find libxapian at LIBRARY_VERSION_SUFFIX@.la to link against." 1>&2
-+# exit 1
- fi
-
- set_L_to_library_path
---
-1.7.6
-
Added: csw/mgar/pkg/xapian-core/trunk/files/quest-fix.patch
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/files/quest-fix.patch (rev 0)
+++ csw/mgar/pkg/xapian-core/trunk/files/quest-fix.patch 2013-01-29 15:58:03 UTC (rev 20238)
@@ -0,0 +1,31 @@
+Index: examples/quest.cc
+===================================================================
+--- examples/quest.cc (revision 17016)
++++ examples/quest.cc (working copy)
+@@ -69,14 +69,6 @@
+ return strcmp(f1.s, f2.s) < 0;
+ }
+
+-inline bool operator<(const qp_flag & f, const char * s) {
+- return strcmp(f.s, s) < 0;
+-}
+-
+-inline bool operator<(const char * s, const qp_flag & f) {
+- return strcmp(s, f.s) < 0;
+-}
+-
+ static void show_usage() {
+ cout << "Usage: "PROG_NAME" [OPTIONS] 'QUERY'\n"
+ "NB: QUERY should be quoted to protect it from the shell.\n\n"
+@@ -110,8 +102,10 @@
+ }
+
+ static unsigned
+-decode_qp_flag(const char * f)
++decode_qp_flag(const char * s)
+ {
++ qp_flag f;
++ f.s = s;
+ const qp_flag * p = lower_bound(flag_tab, flag_tab + n_flag_tab, f);
+ if (p == flag_tab + n_flag_tab || f < *p)
+ return 0;
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