Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 May 2018 10:50:20 +0000 (UTC)
From:      Ruslan Makhmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r468823 - in head/databases/tsearch_extras: . files
Message-ID:  <201805021050.w42AoKau066974@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rm
Date: Wed May  2 10:50:20 2018
New Revision: 468823
URL: https://svnweb.freebsd.org/changeset/ports/468823

Log:
  databases/tsearch_extras: update to 0.3
  
  - add upstream patch to fix build with PostgreSQL 10.x

Added:
  head/databases/tsearch_extras/files/
  head/databases/tsearch_extras/files/patch-tsearch_extras.c   (contents, props changed)
Modified:
  head/databases/tsearch_extras/Makefile
  head/databases/tsearch_extras/distinfo

Modified: head/databases/tsearch_extras/Makefile
==============================================================================
--- head/databases/tsearch_extras/Makefile	Wed May  2 10:49:13 2018	(r468822)
+++ head/databases/tsearch_extras/Makefile	Wed May  2 10:50:20 2018	(r468823)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	tsearch_extras
-PORTVERSION=	0.2
+PORTVERSION=	0.3
 CATEGORIES=	databases
 
 MAINTAINER=	rm@FreeBSD.org

Modified: head/databases/tsearch_extras/distinfo
==============================================================================
--- head/databases/tsearch_extras/distinfo	Wed May  2 10:49:13 2018	(r468822)
+++ head/databases/tsearch_extras/distinfo	Wed May  2 10:50:20 2018	(r468823)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469800079
-SHA256 (zulip-tsearch_extras-0.2_GH0.tar.gz) = cb52159a609627c032183cdb2adff0e5fe90476c1d5c614d3d51a556562a8ec6
-SIZE (zulip-tsearch_extras-0.2_GH0.tar.gz) = 4428
+TIMESTAMP = 1525257515
+SHA256 (zulip-tsearch_extras-0.3_GH0.tar.gz) = 5bf3bd1a3b6b8dbee636e69177ca980315f6d5bce69d3c10020e65daedb6d2e3
+SIZE (zulip-tsearch_extras-0.3_GH0.tar.gz) = 4666

Added: head/databases/tsearch_extras/files/patch-tsearch_extras.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/tsearch_extras/files/patch-tsearch_extras.c	Wed May  2 10:50:20 2018	(r468823)
@@ -0,0 +1,24 @@
+
+Upstream patch for building with PostgreSQL 10.x
+https://github.com/zulip/tsearch_extras/issues/3
+
+diff --git a/tsearch_extras.c b/tsearch_extras.c
+index 062dcdb..7464c71 100644
+--- tsearch_extras.c
++++ tsearch_extras.c
+@@ -77,9 +77,15 @@ ts_match_locs_setup(Oid cfgId, TsMatchesData *mdata, text* in, TSQuery query)
+ 
+ 	hlparsetext(cfgId, &prs, query, VARDATA(in), VARSIZE(in) - VARHDRSZ);
+ 
++	#if PG_VERSION_NUM >= 100000
++	headline_options = lappend(headline_options,
++											  makeDefElem(pstrdup("HighlightAll"),
++											  (Node *) makeString(pstrdup("1")), -1));
++	#else
+ 	headline_options = lappend(headline_options,
+ 											  makeDefElem(pstrdup("HighlightAll"),
+ 											  (Node *) makeString(pstrdup("1"))));
++	#endif
+ 
+ 	FunctionCall3(&(prsobj->prsheadline),
+ 				  PointerGetDatum(&prs),



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805021050.w42AoKau066974>