diff options
Diffstat (limited to 'community/xml2')
| -rw-r--r-- | community/xml2/01_use_libxml2_instead_of_libxml.patch | 70 | ||||
| -rw-r--r-- | community/xml2/PKGBUILD | 18 |
2 files changed, 9 insertions, 79 deletions
diff --git a/community/xml2/01_use_libxml2_instead_of_libxml.patch b/community/xml2/01_use_libxml2_instead_of_libxml.patch deleted file mode 100644 index 975060ed3..000000000 --- a/community/xml2/01_use_libxml2_instead_of_libxml.patch +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_use_libxml2_instead_of_libxml.dpatch by Daniel Leidert -## <daniel.leidert@wgdd.de> -## -## DP: Make use of libxml2 instead of libxml - -@DPATCH@ -diff -urNad xml2-0.4~/2xml.c xml2-0.4/2xml.c ---- xml2-0.4~/2xml.c 2003-12-24 21:28:48.000000000 +0100 -+++ xml2-0.4/2xml.c 2008-03-12 09:32:17.345380803 +0100 -@@ -24,7 +24,7 @@ - #include <assert.h> - #include <ctype.h> - --#include <HTMLparser.h> -+#include <libxml/HTMLparser.h> - - int do_html; - int in_tag = 0; -@@ -104,7 +104,7 @@ - fputs("/>",stdout); - else { - const htmlElemDesc *elem = NULL; -- if (do_html) elem = htmlTagLookup(name); -+ if (do_html) elem = htmlTagLookup((xmlChar *) name); - finish_tag(); - if (NULL == elem || (!elem->endTag && !elem->empty)) { - fputs("</",stdout); -diff -urNad xml2-0.4~/Makefile.am xml2-0.4/Makefile.am ---- xml2-0.4~/Makefile.am 2008-02-07 16:58:13.000000000 +0100 -+++ xml2-0.4/Makefile.am 2008-03-12 09:32:17.345380803 +0100 -@@ -1,9 +1,9 @@ --AM_CPPFLAGS = $(XML_CFLAGS) -+AM_CFLAGS = $(XML_CFLAGS) - bin_PROGRAMS = xml2 2xml csv2 2csv - xml2_SOURCES = xml2.c --xml2_LDADD = -lxml -+xml2_LDADD = $(XML_LIBS) - 2xml_SOURCES = 2xml.c --2xml_LDADD = -lxml -+2xml_LDADD = $(XML_LIBS) - csv2_SOURCES = csv2.c - 2csv_SOURCES = 2csv.c - -diff -urNad xml2-0.4~/configure.ac xml2-0.4/configure.ac ---- xml2-0.4~/configure.ac 2008-02-07 17:11:54.000000000 +0100 -+++ xml2-0.4/configure.ac 2008-03-12 09:32:17.345380803 +0100 -@@ -11,7 +11,7 @@ - AC_PROG_CC - - # Checks for libraries. --PKG_CHECK_MODULES(XML, libxml) -+PKG_CHECK_MODULES(XML, libxml-2.0) - AC_SUBST(XML_LIBS) - AC_SUBST(XML_CFLAGS) - -diff -urNad xml2-0.4~/xml2.c xml2-0.4/xml2.c ---- xml2-0.4~/xml2.c 2001-10-28 05:29:46.000000000 +0100 -+++ xml2-0.4/xml2.c 2008-03-12 09:32:17.345380803 +0100 -@@ -24,8 +24,8 @@ - #include <string.h> - #include <ctype.h> - --#include <parser.h> --#include <HTMLparser.h> -+#include <libxml/parser.h> -+#include <libxml/HTMLparser.h> - - struct node - { diff --git a/community/xml2/PKGBUILD b/community/xml2/PKGBUILD index ab1fdd7fc..75cc5d49d 100644 --- a/community/xml2/PKGBUILD +++ b/community/xml2/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 55027 2011-08-31 14:49:55Z spupykin $ +# $Id: PKGBUILD 89943 2013-05-05 21:39:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Orivej Desh <masecretaire@gmx.fr> # Maintainer: Orivej Desh <masecretaire@gmx.fr> pkgname=xml2 -pkgver=0.4 -pkgrel=2 +pkgver=0.5 +pkgrel=1 pkgdesc="XML/Unix Processing Tools to convert XML and HTML to and from a line-oriented format more amenable to processing by classic Unix pipeline processing tools" arch=("i686" "x86_64") url="http://www.ofb.net/~egnor/xml2/" license=("GPL") depends=("libxml2") -source=("http://download.ofb.net/gale/$pkgname-$pkgver.tar.gz" - "01_use_libxml2_instead_of_libxml.patch") -md5sums=('8a0ef16fe0b3e1495307318c590c1ec0' - '9e810be33d2abbc8aabd8203db1f9654') +source=("http://download.ofb.net/gale/$pkgname-$pkgver.tar.gz") +md5sums=('48eacf64b01ca3a4a5afb1a36f5906e6') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i ../01_use_libxml2_instead_of_libxml.patch - autoreconf ./configure --prefix=/usr make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install cd "$pkgdir/usr/bin" rm html2 2html |