[pkgsrc/trunk]: pkgsrc/x11/gtksourceview Under a system without GNU regex, th...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d2bcdeea9542
branches:  trunk
changeset: 467856:d2bcdeea9542
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Feb 07 15:21:43 2004 +0000

description:
Under a system without GNU regex, this package builds an internal copy of
it.  This copy defines the standard regcomp and friends functions, which
are also present in NetBSD.  The problem is that the copy gets linked into
the libgtksourceview shared library and, when loaded into memory, shadows
native regex functions.

The problem exposes itself at least in gedit through gnome-vfs2.  The later
executes regcomp, expecting the native one to be called, but instead the
one from the libgtksourceview library appears, making the program crash.

Apply a patch to ensure these internal GNU regex functions do not colish
with native ones.  Bump PKGREVISION to 8.

diffstat:

 x11/gtksourceview/Makefile         |   4 ++--
 x11/gtksourceview/buildlink2.mk    |   4 ++--
 x11/gtksourceview/distinfo         |   3 ++-
 x11/gtksourceview/patches/patch-ab |  16 ++++++++++++++++
 4 files changed, 22 insertions(+), 5 deletions(-)

diffs (63 lines):

diff -r 91acedb10730 -r d2bcdeea9542 x11/gtksourceview/Makefile
--- a/x11/gtksourceview/Makefile        Sat Feb 07 14:39:39 2004 +0000
+++ b/x11/gtksourceview/Makefile        Sat Feb 07 15:21:43 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/07 15:21:43 jmmv Exp $
 #
 
 DISTNAME=      gtksourceview-0.7.0
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtksourceview/0.7/}
 
diff -r 91acedb10730 -r d2bcdeea9542 x11/gtksourceview/buildlink2.mk
--- a/x11/gtksourceview/buildlink2.mk   Sat Feb 07 14:39:39 2004 +0000
+++ b/x11/gtksourceview/buildlink2.mk   Sat Feb 07 15:21:43 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/01/03 18:49:57 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/02/07 15:21:43 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use gtksourceview.
 #
@@ -9,7 +9,7 @@
 GTKSOURCEVIEW_BUILDLINK2_MK=   # defined
 
 BUILDLINK_PACKAGES+=                   gtksourceview
-BUILDLINK_DEPENDS.gtksourceview?=              gtksourceview>=0.7.0nb5
+BUILDLINK_DEPENDS.gtksourceview?=              gtksourceview>=0.7.0nb8
 BUILDLINK_PKGSRCDIR.gtksourceview?=            ../../x11/gtksourceview
 
 EVAL_PREFIX+=  BUILDLINK_PREFIX.gtksourceview=gtksourceview
diff -r 91acedb10730 -r d2bcdeea9542 x11/gtksourceview/distinfo
--- a/x11/gtksourceview/distinfo        Sat Feb 07 14:39:39 2004 +0000
+++ b/x11/gtksourceview/distinfo        Sat Feb 07 15:21:43 2004 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/10/24 21:55:34 cube Exp $
+$NetBSD: distinfo,v 1.3 2004/02/07 15:21:43 jmmv Exp $
 
 SHA1 (gtksourceview-0.7.0.tar.gz) = 8a9b39e396ded558ad1c87e1b2f3d87bcf08b6c2
 Size (gtksourceview-0.7.0.tar.gz) = 731348 bytes
 SHA1 (patch-aa) = 59d0856b4005b0d38d8517c3775123ff432a2a0a
+SHA1 (patch-ab) = ebcbe2266b8aa57282fb885e2fcb8fbbec655d0f
diff -r 91acedb10730 -r d2bcdeea9542 x11/gtksourceview/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gtksourceview/patches/patch-ab        Sat Feb 07 15:21:43 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2004/02/07 15:21:43 jmmv Exp $
+
+--- gtksourceview/gnu-regex/regex.h.orig       2003-05-15 09:00:56.000000000 +0200
++++ gtksourceview/gnu-regex/regex.h
+@@ -22,6 +22,11 @@
+ #ifndef _REGEX_H
+ #define _REGEX_H 1
+ 
++#define regcomp  gtksourceview_regcomp
++#define regexec  gtksourceview_regexec
++#define regerror gtksourceview_regerror
++#define regfree  gtksourceview_regfree
++
+ /* Allow the use in C++ code.  */
+ #ifdef __cplusplus
+ extern "C" {