mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
Merge pull request #514 from fbrosson/expat
expat: drop 2.0.1, fix 2.1.0, add 2.1.1.
This commit is contained in:
Jérôme Duval
@@ -1,85 +0,0 @@
|
||||
SUMMARY="XML parser toolkit"
|
||||
DESCRIPTION="
|
||||
Expat is an XML parser library written in C. It is a stream-oriented parser in \
|
||||
which an application registers handlers for things the parser might find in \
|
||||
the XML document (like start tags).
|
||||
"
|
||||
HOMEPAGE="http://expat.sourceforge.net/"
|
||||
COPYRIGHT="
|
||||
1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
|
||||
2001-2006 Expat maintainers.
|
||||
"
|
||||
LICENSE="MIT"
|
||||
SOURCE_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz"
|
||||
CHECKSUM_SHA256="847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93"
|
||||
REVISION="7"
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
|
||||
PROVIDES="
|
||||
expat$secondaryArchSuffix = $portVersion compat >= 2.0
|
||||
lib:libexpat$secondaryArchSuffix = 1.5.2 compat >= 1
|
||||
"
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
PROVIDES="$PROVIDES
|
||||
cmd:xmlwf = $portVersion compat >= 2.0
|
||||
"
|
||||
fi
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
"
|
||||
|
||||
PATCH()
|
||||
{
|
||||
echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
|
||||
echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
|
||||
}
|
||||
|
||||
BUILD()
|
||||
{
|
||||
rm -f conftools/libtool.m4
|
||||
libtoolize --force --copy --install
|
||||
aclocal -I conftools -I m4
|
||||
autoconf
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
# remove command for secondary architecture
|
||||
if [ -n "$secondaryArchSuffix" ]; then
|
||||
rm -rf $binDir
|
||||
fi
|
||||
|
||||
# prepare develop/lib
|
||||
prepareInstalledDevelLibs libexpat
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
|
||||
# ----- devel package -------------------------------------------------------
|
||||
|
||||
PROVIDES_devel="
|
||||
expat${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libexpat${secondaryArchSuffix} = 1.5.2 compat >= 1
|
||||
"
|
||||
REQUIRES_devel="
|
||||
expat${secondaryArchSuffix} == $portVersion base
|
||||
"
|
||||
@@ -1,18 +1,16 @@
|
||||
SUMMARY="XML parser toolkit"
|
||||
DESCRIPTION="
|
||||
Expat is an XML parser library written in C. It is a stream-oriented parser in \
|
||||
which an application registers handlers for things the parser might find in \
|
||||
the XML document (like start tags).
|
||||
"
|
||||
DESCRIPTION="Expat is an XML parser library written in C. It is a \
|
||||
stream-oriented parser in which an application registers handlers for things \
|
||||
the parser might find in the XML document (like start tags)."
|
||||
HOMEPAGE="http://expat.sourceforge.net/"
|
||||
COPYRIGHT="
|
||||
1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
|
||||
2001-2006 Expat maintainers.
|
||||
"
|
||||
COPYRIGHT="1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
|
||||
2001-2012 Expat maintainers."
|
||||
LICENSE="MIT"
|
||||
SOURCE_URI="http://sourceforge.net/projects/expat/files/expat/$portVersion/expat-$portVersion.tar.gz"
|
||||
REVISION="2"
|
||||
SOURCE_URI="http://downloads.sf.net/expat/expat-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86"
|
||||
REVISION="1"
|
||||
PATCHES="Makefile.am.patch"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
|
||||
@@ -29,27 +27,29 @@ fi
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
expat${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libexpat$secondaryArchSuffix = 1.6.0 compat >= 1
|
||||
"
|
||||
REQUIRES_devel="
|
||||
expat$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
PATCH()
|
||||
{
|
||||
echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
|
||||
echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
|
||||
}
|
||||
|
||||
BUILD()
|
||||
{
|
||||
rm -f conftools/libtool.m4
|
||||
libtoolize --force --copy --install
|
||||
aclocal -I conftools -I m4
|
||||
autoconf
|
||||
@@ -61,9 +61,9 @@ INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
# remove command for secondary architecture
|
||||
# remove command and manual for secondary architecture
|
||||
if [ -n "$secondaryArchSuffix" ]; then
|
||||
rm -rf $binDir
|
||||
rm -rf $binDir $documentationDir
|
||||
fi
|
||||
|
||||
# prepare develop/lib
|
||||
@@ -79,13 +79,3 @@ TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
|
||||
# ----- devel package -------------------------------------------------------
|
||||
|
||||
PROVIDES_devel="
|
||||
expat${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libexpat${secondaryArchSuffix} = 1.6.0 compat >= 1
|
||||
"
|
||||
REQUIRES_devel="
|
||||
expat${secondaryArchSuffix} == $portVersion base
|
||||
"
|
||||
|
||||
84
dev-libs/expat/expat-2.1.1.recipe
Normal file
84
dev-libs/expat/expat-2.1.1.recipe
Normal file
@@ -0,0 +1,84 @@
|
||||
SUMMARY="XML parser toolkit"
|
||||
DESCRIPTION="Expat is an XML parser library written in C. It is a \
|
||||
stream-oriented parser in which an application registers handlers for things \
|
||||
the parser might find in the XML document (like start tags)."
|
||||
HOMEPAGE="http://expat.sourceforge.net/"
|
||||
COPYRIGHT="1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
|
||||
2001-2016 Expat maintainers."
|
||||
LICENSE="MIT"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://downloads.sf.net/expat/expat-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67"
|
||||
PATCHES="
|
||||
Makefile.am.patch
|
||||
expat-$portVersion.patchset
|
||||
"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
|
||||
PROVIDES="
|
||||
expat$secondaryArchSuffix = $portVersion compat >= 2.1
|
||||
lib:libexpat$secondaryArchSuffix = 1.6.0 compat >= 1
|
||||
"
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
PROVIDES="$PROVIDES
|
||||
cmd:xmlwf = $portVersion compat >= 2.1
|
||||
"
|
||||
fi
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
expat${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libexpat$secondaryArchSuffix = 1.6.0 compat >= 1
|
||||
"
|
||||
REQUIRES_devel="
|
||||
expat$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
libtoolize --force --copy --install
|
||||
aclocal -I conftools -I m4
|
||||
autoconf
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
# remove command and manual for secondary architecture
|
||||
if [ -n "$secondaryArchSuffix" ]; then
|
||||
rm -rf $binDir $documentationDir
|
||||
fi
|
||||
|
||||
# prepare develop/lib
|
||||
prepareInstalledDevelLibs libexpat
|
||||
fixPkgconfig
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
4
dev-libs/expat/patches/Makefile.am.patch
Normal file
4
dev-libs/expat/patches/Makefile.am.patch
Normal file
@@ -0,0 +1,4 @@
|
||||
--- /dev/null
|
||||
+++ b/Makefile.am
|
||||
@@ -0,0 +1 @@
|
||||
+ACLOCAL_AMFLAGS = -I m4
|
||||
31
dev-libs/expat/patches/expat-2.1.1.patchset
Normal file
31
dev-libs/expat/patches/expat-2.1.1.patchset
Normal file
@@ -0,0 +1,31 @@
|
||||
From f255408fca0143fd70a68934ea02e2290b6c0908 Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
Date: Sat, 19 Mar 2016 10:11:53 +0000
|
||||
Subject: gcc2
|
||||
|
||||
|
||||
diff --git a/lib/xmlparse.c b/lib/xmlparse.c
|
||||
index e308c79..6a61508 100644
|
||||
--- a/lib/xmlparse.c
|
||||
+++ b/lib/xmlparse.c
|
||||
@@ -1693,13 +1693,16 @@ XML_GetBuffer(XML_Parser parser, int len)
|
||||
}
|
||||
|
||||
if (len > bufferLim - bufferEnd) {
|
||||
+#ifdef XML_CONTEXT_BYTES
|
||||
+ int keep;
|
||||
+#endif
|
||||
int neededSize = len + (int)(bufferEnd - bufferPtr);
|
||||
if (neededSize < 0) {
|
||||
errorCode = XML_ERROR_NO_MEMORY;
|
||||
return NULL;
|
||||
}
|
||||
#ifdef XML_CONTEXT_BYTES
|
||||
- int keep = (int)(bufferPtr - buffer);
|
||||
+ keep = (int)(bufferPtr - buffer);
|
||||
|
||||
if (keep > XML_CONTEXT_BYTES)
|
||||
keep = XML_CONTEXT_BYTES;
|
||||
--
|
||||
2.7.0
|
||||
|
||||
Reference in New Issue
Block a user