[Midnightbsd-cvs] mports [20051] trunk/textproc/gdome2: fix build of gdome2

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Aug 26 12:17:28 EDT 2015


Revision: 20051
          http://svnweb.midnightbsd.org/mports/?rev=20051
Author:   laffer1
Date:     2015-08-26 12:17:27 -0400 (Wed, 26 Aug 2015)
Log Message:
-----------
fix build of gdome2

Modified Paths:
--------------
    trunk/textproc/gdome2/Makefile

Added Paths:
-----------
    trunk/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c

Removed Paths:
-------------
    trunk/textproc/gdome2/files/patch-gtk-doc__Makefile.in
    trunk/textproc/gdome2/files/patch-ltmain.sh

Modified: trunk/textproc/gdome2/Makefile
===================================================================
--- trunk/textproc/gdome2/Makefile	2015-08-26 16:15:54 UTC (rev 20050)
+++ trunk/textproc/gdome2/Makefile	2015-08-26 16:17:27 UTC (rev 20051)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gdome2
 PORTVERSION=	0.8.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	textproc
 MASTER_SITES=	http://gdome2.cs.unibo.it/tarball/
 

Deleted: trunk/textproc/gdome2/files/patch-gtk-doc__Makefile.in
===================================================================
--- trunk/textproc/gdome2/files/patch-gtk-doc__Makefile.in	2015-08-26 16:15:54 UTC (rev 20050)
+++ trunk/textproc/gdome2/files/patch-gtk-doc__Makefile.in	2015-08-26 16:17:27 UTC (rev 20051)
@@ -1,24 +0,0 @@
---- ./gtk-doc/Makefile.in.orig	Thu May 10 15:24:29 2007
-+++ ./gtk-doc/Makefile.in	Thu May 10 15:28:04 2007
-@@ -105,7 +105,7 @@
- # The directory containing the source code (if it contains documentation).
- DOC_SOURCE_DIR = ../libgdome
- 
--HTML_DIR = @HTML_DIR@
-+HTML_DIR = $(prefix)/share/doc
- 
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- 
-@@ -273,9 +273,9 @@
- 	rm -rf sgml html gdome2-decl-list.txt gdome2-decl.txt 
- 
- install-data-local:
--	-install -d -m 0755 $(TARGET_DIR)
--	-install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR)
--	-install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR)
-+	-install -d -m 0755 $(DESTDIR)$(TARGET_DIR)
-+	-install -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
-+	-install -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
- 	-(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR))
- 
- .PHONY : html sgml templates scan

Added: trunk/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c
===================================================================
--- trunk/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c	                        (rev 0)
+++ trunk/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c	2015-08-26 16:17:27 UTC (rev 20051)
@@ -0,0 +1,20 @@
+Patch from Gentoo to fix libxml2 2.9 api change
+
+Patch by Harris Landgarten.
+
+The patch was submitted on bug 448236, following the announcement on
+https://mail.gnome.org/archives/xml/2012-August/msg00005.html
+--- libgdome/gdomecore/gdome-xml-documentt.c.orig	2003-07-13 06:47:54.000000000 -0400
++++ libgdome/gdomecore/gdome-xml-documentt.c	2012-12-23 08:57:23.000000000 -0500
+@@ -342,7 +342,11 @@
+ 	}
+ 	xmlNodeDumpOutput (out_buff, NULL, (xmlNode *)is, 0, 0, NULL);
+ 	xmlOutputBufferFlush(out_buff);
++#if LIBXML_VERSION < 20900
+ 	ret = g_strndup (out_buff->buffer->content, out_buff->buffer->use);
++#else
++	ret = g_strndup (xmlBufContent(out_buff->buffer), xmlBufUse(out_buff->buffer));
++#endif
+ 	(void)xmlOutputBufferClose(out_buff);
+ 
+ 	return gdome_xml_str_mkref_own (ret);


Property changes on: trunk/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/textproc/gdome2/files/patch-ltmain.sh
===================================================================
--- trunk/textproc/gdome2/files/patch-ltmain.sh	2015-08-26 16:15:54 UTC (rev 20050)
+++ trunk/textproc/gdome2/files/patch-ltmain.sh	2015-08-26 16:17:27 UTC (rev 20051)
@@ -1,41 +0,0 @@
---- ltmain.sh.orig	Wed Apr  2 12:16:23 2003
-+++ ltmain.sh	Wed Apr  2 12:18:19 2003
-@@ -1043,14 +1043,14 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -2441,7 +2441,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
- 	  *)
-@@ -4210,10 +4210,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"



More information about the Midnightbsd-cvs mailing list