Update and fix recipe for Libdom 0.1.0.

2026-04-23 04:00:05 +02:00 · 2014-06-09 20:14:27 +02:00
parent ad6e04a9f6
commit 74250c8296
4 changed files with 142 additions and 43 deletions
--- a/net-libs/libdom/libdom-0.0.1_HEAD.recipe
+++ b/net-libs/libdom/libdom-0.0.1_HEAD.recipe
@@ -1,21 +0,0 @@
-DESCRIPTION="LibDOM is an implementation of the W3C DOM" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" 
-SRC_URI="git://git.netsurf-browser.org/libdom.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="net-libs/hubbub >= 0.2.0-HEAD"
-
-BUILD()
-{
-	cd libdom-0.0.1-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libdom-0.0.1-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2007 - 2013 J-M Bell"
--- a/net-libs/libdom/libdom-0.1.0.recipe
+++ b/net-libs/libdom/libdom-0.1.0.recipe
@@ -0,0 +1,58 @@
+SUMMARY="LibDOM is an implementation of the W3C DOM" 
+DESCRIPTION="An implementation of the W3C DOM for NetSurf, written in C."
+HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" 
+SRC_URI="http://git.netsurf-browser.org/libdom.git/snapshot/release/0.1.0.tar.gz"
+CHECKSUM_SHA256="1e08a713ff564533a27699f82491f48b384c1336c392d76226356f474f07dfc0"
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	libdom = $portVersion
+"
+
+BUILD_REQUIRES="
+	devel:libexpat
+	devel:libhubbub
+	devel:libparserutils
+	devel:libwapcaplet
+	netsurf_buildsystem
+	xml_parser
+"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+	cmd:perl
+	cmd:pkg_config
+"
+
+SOURCE_DIR="release/$portVersion"
+PATCHES="libdom-0.1.0.recipe"
+BUILD()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+}
+
+INSTALL()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		INCLUDEDIR=$relativeIncludeDir install
+
+	prepareInstalledDevelLib libdom
+	fixPkgconfig libdom
+	packageEntries devel $developDir
+}
+
+TEST()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
+}
+
+LICENSE="MIT"
+COPYRIGHT="2007-2014 J-M Bell"
+
+PROVIDES_devel="
+	libdom_devel = $portVersion
+	devel:libdom = $portVersion
+"
--- a/net-libs/libdom/libdom-0.recipe
+++ b/net-libs/libdom/libdom-0.recipe
@@ -1,22 +0,0 @@
-DESCRIPTION="LibDOM is an implementation of the W3C DOM" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" 
-SRC_URI="git://git.netsurf-browser.org/libdom.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-lib/hubbub >= 0.1.2-HEAD"
-
-BUILD()
-{
-	cd libdom-0
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libdom-0
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT
-	GNU GPL v2"
-COPYRIGHT="2003 - 2012 The NetSurf Developers"
--- a/net-libs/libdom/patches/libdom-0.1.0.patchset
+++ b/net-libs/libdom/patches/libdom-0.1.0.patchset
@@ -0,0 +1,84 @@
+From ff1657dd341291967f59059f5b8dbcd1c95335e9 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 9 Jun 2014 20:13:18 +0200
+Subject: Fix include paths for Haiku.
+
+
+diff --git a/Makefile b/Makefile
+index c6bc2bd..64bc3a8 100644
+--- a/Makefile
+++ b/Makefile
+@@ -47,11 +47,11 @@ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+ Is := include/dom
+-I := /include/dom
+I := /$(INCLUDEDIR)/dom
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/dom.h;$(Is)/functypes.h
+ 
+ Is := include/dom/core
+-I := /include/dom/core
+I := /$(INCLUDEDIR)/dom/core
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/attr.h;$(Is)/characterdata.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/cdatasection.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/comment.h
+@@ -66,7 +66,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/pi.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/text.h;$(Is)/typeinfo.h
+ 
+ Is := include/dom/events
+-I := /include/dom/events
+I := /$(INCLUDEDIR)/dom/events
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/event.h;$(Is)/ui_event.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/custom_event.h;$(Is)/mouse_event.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/keyboard_event.h;$(Is)/text_event.h
+@@ -78,7 +78,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/event_listener.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/document_event.h
+ 
+ Is := include/dom/html
+-I := /include/dom/html
+I := /$(INCLUDEDIR)/dom/html
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_document.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_collection.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_element.h
+diff --git a/bindings/hubbub/Makefile b/bindings/hubbub/Makefile
+index 946219d..984ea3f 100644
+--- a/bindings/hubbub/Makefile
+++ b/bindings/hubbub/Makefile
+@@ -1,7 +1,7 @@
+ ifeq ($(WITH_HUBBUB_BINDING),yes)
+   DIR_SOURCES := parser.c
+ 
+-  DIR_INSTALL_ITEMS := /include/dom/bindings/hubbub:errors.h;parser.h
+  DIR_INSTALL_ITEMS := /$(INCLUDEDIR)/dom/bindings/hubbub:errors.h;parser.h
+ 
+   # Hubbub
+   ifneq ($(PKGCONFIG),)
+diff --git a/bindings/xml/Makefile b/bindings/xml/Makefile
+index ea7653c..1211c5e 100644
+--- a/bindings/xml/Makefile
+++ b/bindings/xml/Makefile
+@@ -26,7 +26,7 @@ ifeq ($(WITH_EXPAT_BINDING),yes)
+ endif
+ 
+ ifeq ($(DO_XML_INSTALL),yes)
+-  DIR_INSTALL_ITEMS := /include/dom/bindings/xml:xmlerror.h;xmlparser.h
+  DIR_INSTALL_ITEMS := /$(INCLUDEDIR)/dom/bindings/xml:xmlerror.h;xmlparser.h
+ endif
+ 
+ include $(NSBUILD)/Makefile.subdir
+diff --git a/libdom.pc.in b/libdom.pc.in
+index b6e82cf..406ed9e 100644
+--- a/libdom.pc.in
+++ b/libdom.pc.in
+@@ -1,7 +1,7 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/LIBDIR
+-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
+ 
+ Name: libdom
+ Description: W3C DOM implementation
+-- 
+1.8.3.4
+