[csw-devel] SF.net SVN: gar:[21967] csw/mgar/pkg/xapian-core/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Sep 20 22:11:36 CEST 2013
Revision: 21967
http://gar.svn.sourceforge.net/gar/?rev=21967&view=rev
Author: dmichelsen
Date: 2013-09-20 20:11:36 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
xapian-core/trunk: Work towards 1.3.1
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/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch
csw/mgar/pkg/xapian-core/trunk/files/0002-Somehow-round-is-missing-in-cmath.patch
csw/mgar/pkg/xapian-core/trunk/files/0003-log-is-ambigous-to-float-and-double.patch
Removed Paths:
-------------
csw/mgar/pkg/xapian-core/trunk/files/quest-fix.patch
Modified: csw/mgar/pkg/xapian-core/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/Makefile 2013-09-20 18:55:12 UTC (rev 21966)
+++ csw/mgar/pkg/xapian-core/trunk/Makefile 2013-09-20 20:11:36 UTC (rev 21967)
@@ -1,5 +1,5 @@
NAME = xapian-core
-VERSION = 1.2.13
+VERSION = 1.3.1
GARTYPE = v2
DESCRIPTION = An open source search engine library
@@ -13,13 +13,20 @@
DISTFILES = $(NAME)-$(VERSION).tar.gz
-PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch
+# PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch
# Use patch until this is fixed:
-# http://trac.xapian.org/ticket/611
-PATCHFILES += quest-fix.patch
-PATCHDIRLEVEL = 0
+# http://trac.xapian.org/ticket/626
+PATCHFILES += 0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch
+# This is strange and needs further examination
+PATCHFILES += 0002-Somehow-round-is-missing-in-cmath.patch
+
+# Use patch until this is fixed:
+# http://trac.xapian.org/ticket/627
+PATCHFILES += 0003-log-is-ambigous-to-float-and-double.patch
+
+
VENDOR_URL = http://xapian.org/
PACKAGES += CSWxapian
@@ -54,3 +61,7 @@
CHECKPKG_OVERRIDES_CSWxapian += file-with-bad-content|/usr/local|root/opt/csw/share/doc/xapian-core/install.html
include gar/category.mk
+
+post-patch:
+ cd $(WORKSRC) && autoreconf -fi
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/xapian-core/trunk/checksums
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/checksums 2013-09-20 18:55:12 UTC (rev 21966)
+++ csw/mgar/pkg/xapian-core/trunk/checksums 2013-09-20 20:11:36 UTC (rev 21967)
@@ -1 +1 @@
-d6e15fff5ecae1c03171d64c45ef9685 xapian-core-1.2.13.tar.gz
+f25d4aff5f6a9a3ded84f8636233721c xapian-core-1.3.1.tar.gz
Added: csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch (rev 0)
+++ csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch 2013-09-20 20:11:36 UTC (rev 21967)
@@ -0,0 +1,26 @@
+From 83506df0b040989eda490611936319f6c9e80cf3 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 20 Sep 2013 21:10:21 +0200
+Subject: [PATCH] Check for explicit value or HAVE_UUID_UNPARSE_LOWER will
+ always be set
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e12b6a0..6542546 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -721,7 +721,7 @@ case $enable_backend_chert$enable_backend_brass in
+ dnl Older versions of libuuid (such as that on CentOS 4.7) don't have
+ dnl uuid_unparse_lower(), only uuid_unparse().
+ AC_LINK_IFELSE([AC_LANG_CALL([], [uuid_unparse_lower])], [found=true], [found=false])
+- if $found ; then
++ if test $found = "true"; then
+ AC_DEFINE([HAVE_UUID_UNPARSE_LOWER], [1],
+ [Define to 1 if you have the 'uuid_unparse_lower' function.])
+ fi
+--
+1.8.3.4
+
Added: csw/mgar/pkg/xapian-core/trunk/files/0002-Somehow-round-is-missing-in-cmath.patch
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/files/0002-Somehow-round-is-missing-in-cmath.patch (rev 0)
+++ csw/mgar/pkg/xapian-core/trunk/files/0002-Somehow-round-is-missing-in-cmath.patch 2013-09-20 20:11:36 UTC (rev 21967)
@@ -0,0 +1,24 @@
+From fb227745970abc9da3e03d31e9fabeb8a2210783 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 20 Sep 2013 21:46:53 +0200
+Subject: [PATCH] Somehow round is missing in cmath
+
+---
+ geospatial/geoencode.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/geospatial/geoencode.cc b/geospatial/geoencode.cc
+index 4eaabb9..339b736 100644
+--- a/geospatial/geoencode.cc
++++ b/geospatial/geoencode.cc
+@@ -27,6 +27,7 @@
+ #include "geoencode.h"
+
+ #include <cmath>
++#include <math.h>
+
+ using namespace std;
+
+--
+1.8.3.4
+
Added: csw/mgar/pkg/xapian-core/trunk/files/0003-log-is-ambigous-to-float-and-double.patch
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/files/0003-log-is-ambigous-to-float-and-double.patch (rev 0)
+++ csw/mgar/pkg/xapian-core/trunk/files/0003-log-is-ambigous-to-float-and-double.patch 2013-09-20 20:11:36 UTC (rev 21967)
@@ -0,0 +1,25 @@
+From bdf4d8e5b1d788ab2ebc4f736ea0c2d837a8dfd0 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 20 Sep 2013 21:47:43 +0200
+Subject: [PATCH] log() is ambigous to float and double
+
+---
+ weight/tfidfweight.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/weight/tfidfweight.cc b/weight/tfidfweight.cc
+index e02ed88..355d438 100644
+--- a/weight/tfidfweight.cc
++++ b/weight/tfidfweight.cc
+@@ -123,7 +123,7 @@ TfIdfWeight::get_wdfn(Xapian::termcount wdf, char c) const
+ return (wdf * wdf);
+ case 'l':
+ if (wdf == 0) return 0;
+- return (1 + log(wdf));
++ return (1 + log((double)wdf));
+ default:
+ return wdf;
+ }
+--
+1.8.3.4
+
Deleted: csw/mgar/pkg/xapian-core/trunk/files/quest-fix.patch
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/files/quest-fix.patch 2013-09-20 18:55:12 UTC (rev 21966)
+++ csw/mgar/pkg/xapian-core/trunk/files/quest-fix.patch 2013-09-20 20:11:36 UTC (rev 21967)
@@ -1,31 +0,0 @@
-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