mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
expat: bump version
This commit is contained in:
Jerome Duval
@@ -1,86 +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-2017 Expat maintainers."
|
||||
LICENSE="MIT"
|
||||
REVISION="2"
|
||||
SOURCE_URI="http://downloads.sf.net/expat/expat-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885"
|
||||
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.2
|
||||
lib:libexpat$secondaryArchSuffix = 1.6.3 compat >= 1
|
||||
"
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
PROVIDES="$PROVIDES
|
||||
cmd:xmlwf = $portVersion compat >= 2.2
|
||||
"
|
||||
fi
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
expat${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libexpat$secondaryArchSuffix = 1.6.3 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
|
||||
|
||||
rm $libDir/libexpat.la
|
||||
|
||||
# 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
|
||||
}
|
||||
@@ -1,92 +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-2018 Expat maintainers."
|
||||
LICENSE="MIT"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://downloads.sourceforge.net/expat/expat-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18"
|
||||
PATCHES="expat-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm sparc m68k"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
|
||||
libVersion=1.6.9
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
portVersionCompat="$portVersion compat >= 2.2"
|
||||
|
||||
PROVIDES="
|
||||
expat$secondaryArchSuffix = $portVersionCompat
|
||||
lib:libexpat$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
PROVIDES="$PROVIDES
|
||||
cmd:xmlwf = $portVersionCompat
|
||||
"
|
||||
fi
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
expat${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libexpat$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
expat$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:automake
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
debugList=(
|
||||
"$libDir"/libexpat.so.$libVersion
|
||||
)
|
||||
if [ -z "$secondaryArchSuffix" ]; then
|
||||
debugList+=("$binDir"/xmlwf)
|
||||
fi
|
||||
defineDebugInfoPackage expat$secondaryArchSuffix "${debugList[@]}"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm $libDir/libexpat.la
|
||||
|
||||
# remove command and manual for secondary architecture
|
||||
if [ -n "$secondaryArchSuffix" ]; then
|
||||
rm -rf $binDir $documentationDir
|
||||
fi
|
||||
|
||||
# prepare develop/lib
|
||||
prepareInstalledDevelLib libexpat
|
||||
fixPkgconfig
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
@@ -8,12 +8,12 @@ COPYRIGHT="1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
|
||||
LICENSE="MIT"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://downloads.sourceforge.net/expat/expat-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="b2c160f1b60e92da69de8e12333096aeb0c3bf692d41c60794de278af72135a5"
|
||||
CHECKSUM_SHA256="f122a20eada303f904d5e0513326c5b821248f2d4d2afbf5c6f1339e511c0586"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm sparc m68k"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
|
||||
libVersion=1.6.12
|
||||
libVersion=1.7.0
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
portVersionCompat="$portVersion compat >= 2.2"
|
||||
|
||||
@@ -82,7 +82,8 @@ INSTALL()
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
$developDir \
|
||||
$libDir/cmake
|
||||
}
|
||||
|
||||
TEST()
|
||||
@@ -1,4 +0,0 @@
|
||||
--- /dev/null
|
||||
+++ b/Makefile.am
|
||||
@@ -0,0 +1 @@
|
||||
+ACLOCAL_AMFLAGS = -I m4
|
||||
@@ -1,74 +0,0 @@
|
||||
From 048260a4de37118400e49774d8e9f4ff3ee39a83 Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Thu, 22 Jun 2017 18:14:08 +0200
|
||||
Subject: add patch from hartwork
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e48c32e..5c0e666 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -41,7 +41,7 @@ dnl If the API has changed, increment LIBCURRENT and set LIBREVISION to 0
|
||||
dnl
|
||||
dnl If the API changes compatibly (i.e. simply adding a new function
|
||||
dnl without changing or removing earlier interfaces), then increment LIBAGE.
|
||||
-dnl
|
||||
+dnl
|
||||
dnl If the API changes incompatibly set LIBAGE back to 0
|
||||
dnl
|
||||
|
||||
@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
|
||||
|
||||
|
||||
AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)])
|
||||
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
|
||||
+AC_LINK_IFELSE([AC_LANG_SOURCE([
|
||||
#include <stdlib.h> /* for NULL */
|
||||
#include <sys/random.h>
|
||||
int main() {
|
||||
@@ -180,25 +180,25 @@ dnl http://lists.gnu.org/archive/html/bug-autoconf/2002-07/msg00028.html
|
||||
# AC_CPP_FUNC
|
||||
# ------------------ #
|
||||
# Checks to see if ANSI C99 CPP variable __func__ works.
|
||||
-# If not, perhaps __FUNCTION__ works instead.
|
||||
-# If not, we'll just define __func__ to "".
|
||||
+# If not, perhaps __FUNCTION__ works instead.
|
||||
+# If not, we'll just define __func__ to "".
|
||||
AC_DEFUN([AC_CPP_FUNC],
|
||||
[AC_REQUIRE([AC_PROG_CC_STDC])dnl
|
||||
AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func,
|
||||
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
|
||||
[[const char *foo = __func__;]])],
|
||||
- [ac_cv_cpp_func=yes],
|
||||
+ [ac_cv_cpp_func=yes],
|
||||
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
|
||||
[[const char *foo = __FUNCTION__;]])],
|
||||
- [ac_cv_cpp_func=__FUNCTION__],
|
||||
+ [ac_cv_cpp_func=__FUNCTION__],
|
||||
[ac_cv_cpp_func=no])])])
|
||||
if test $ac_cv_cpp_func = __FUNCTION__; then
|
||||
AC_DEFINE(__func__,__FUNCTION__,
|
||||
- [Define to __FUNCTION__ or "" if `__func__' does not conform to
|
||||
+ [Define to __FUNCTION__ or "" if `__func__' does not conform to
|
||||
ANSI C.])
|
||||
elif test $ac_cv_cpp_func = no; then
|
||||
AC_DEFINE(__func__,"",
|
||||
- [Define to __FUNCTION__ or "" if `__func__' does not conform to
|
||||
+ [Define to __FUNCTION__ or "" if `__func__' does not conform to
|
||||
ANSI C.])
|
||||
fi
|
||||
])# AC_CPP_FUNC
|
||||
@@ -220,8 +220,8 @@ AS_HELP_STRING([--disable-xml-context],
|
||||
[Do not retain context around the current parse point]),
|
||||
[enable_xml_context=${enableval}])
|
||||
AS_IF([test "x${enable_xml_context}" != "xno"], [
|
||||
- AS_IF([test "x${enable_xml_context}" == "xyes" \
|
||||
- -o "x${enable_xml_context}" == "x"], [
|
||||
+ AS_IF([test "x${enable_xml_context}" = "xyes" \
|
||||
+ -o "x${enable_xml_context}" = "x"], [
|
||||
enable_xml_context=1024
|
||||
])
|
||||
AC_DEFINE_UNQUOTED([XML_CONTEXT_BYTES], [${enable_xml_context}],
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
From da46f5dd038f637854a72276e90b081d1456189b Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
Date: Wed, 15 Aug 2018 14:31:29 +0000
|
||||
Subject: Do not use __attribute__((__unused__)) with gcc2.
|
||||
|
||||
|
||||
diff --git a/lib/internal.h b/lib/internal.h
|
||||
index e33fdcb..b52dbea 100644
|
||||
--- a/lib/internal.h
|
||||
+++ b/lib/internal.h
|
||||
@@ -102,7 +102,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef UNUSED_P
|
||||
-# ifdef __GNUC__
|
||||
+# if defined(__GNUC__) && __GNUC__ >= 3
|
||||
# define UNUSED_P(p) UNUSED_ ## p __attribute__((__unused__))
|
||||
# else
|
||||
# define UNUSED_P(p) UNUSED_ ## p
|
||||
--
|
||||
2.18.0
|
||||
|
||||
Reference in New Issue
Block a user