From 2ee42a5529a33e0b5e68047dca1eb11727bd5285 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 23 Jun 2017 11:13:09 +0200 Subject: [PATCH] expat: bump version, remove obsolete files (#1465) --- dev-libs/expat/expat-2.1.0.recipe | 81 ------------------ dev-libs/expat/expat-2.1.1.recipe | 84 ------------------- ...{expat-2.2.0.recipe => expat-2.2.1.recipe} | 10 +-- dev-libs/expat/patches/expat-2.1.1.patchset | 31 ------- 4 files changed, 5 insertions(+), 201 deletions(-) delete mode 100644 dev-libs/expat/expat-2.1.0.recipe delete mode 100644 dev-libs/expat/expat-2.1.1.recipe rename dev-libs/expat/{expat-2.2.0.recipe => expat-2.2.1.recipe} (87%) delete mode 100644 dev-libs/expat/patches/expat-2.1.1.patchset diff --git a/dev-libs/expat/expat-2.1.0.recipe b/dev-libs/expat/expat-2.1.0.recipe deleted file mode 100644 index bf20cae00..000000000 --- a/dev-libs/expat/expat-2.1.0.recipe +++ /dev/null @@ -1,81 +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-2012 Expat maintainers." -LICENSE="MIT" -REVISION="2" -SOURCE_URI="http://downloads.sf.net/expat/expat-$portVersion.tar.gz" -CHECKSUM_SHA256="823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86" -PATCHES="Makefile.am.patch" - -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 -} diff --git a/dev-libs/expat/expat-2.1.1.recipe b/dev-libs/expat/expat-2.1.1.recipe deleted file mode 100644 index 3c01092c6..000000000 --- a/dev-libs/expat/expat-2.1.1.recipe +++ /dev/null @@ -1,84 +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-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 -} diff --git a/dev-libs/expat/expat-2.2.0.recipe b/dev-libs/expat/expat-2.2.1.recipe similarity index 87% rename from dev-libs/expat/expat-2.2.0.recipe rename to dev-libs/expat/expat-2.2.1.recipe index be13eccc5..26374f031 100644 --- a/dev-libs/expat/expat-2.2.0.recipe +++ b/dev-libs/expat/expat-2.2.1.recipe @@ -4,11 +4,11 @@ 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." + 2001-2017 Expat maintainers." LICENSE="MIT" -REVISION="3" +REVISION="1" SOURCE_URI="http://downloads.sf.net/expat/expat-$portVersion.tar.bz2" -CHECKSUM_SHA256="d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff" +CHECKSUM_SHA256="1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885" PATCHES=" Makefile.am.patch " @@ -18,7 +18,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" expat$secondaryArchSuffix = $portVersion compat >= 2.2 - lib:libexpat$secondaryArchSuffix = 1.6.2 compat >= 1 + lib:libexpat$secondaryArchSuffix = 1.6.3 compat >= 1 " if [ -z "$secondaryArchSuffix" ]; then PROVIDES="$PROVIDES @@ -32,7 +32,7 @@ REQUIRES=" PROVIDES_devel=" expat${secondaryArchSuffix}_devel = $portVersion - devel:libexpat$secondaryArchSuffix = 1.6.2 compat >= 1 + devel:libexpat$secondaryArchSuffix = 1.6.3 compat >= 1 " REQUIRES_devel=" expat$secondaryArchSuffix == $portVersion base diff --git a/dev-libs/expat/patches/expat-2.1.1.patchset b/dev-libs/expat/patches/expat-2.1.1.patchset deleted file mode 100644 index ffb8f3d91..000000000 --- a/dev-libs/expat/patches/expat-2.1.1.patchset +++ /dev/null @@ -1,31 +0,0 @@ -From f255408fca0143fd70a68934ea02e2290b6c0908 Mon Sep 17 00:00:00 2001 -From: fbrosson -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 -