mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
libunistring: bump to 0.9.9, add debuginfo. (#2285)
* Fix compat. * Move $infoDir and html doc to the devel package. * Drop documentation on second arch. * Fix LICENSE. * Switch HOMEPAGE & SOURCE_URI to https.
This commit is contained in:
fbrosson
waddlesplash
@@ -1,63 +0,0 @@
|
||||
SUMMARY="A library for manipulating Unicode strings"
|
||||
DESCRIPTION="libunistring provides functions for manipulating Unicode strings and for \
|
||||
manipulating C strings according to the Unicode standard."
|
||||
HOMEPAGE="http://www.gnu.org/software/libunistring/"
|
||||
COPYRIGHT="1998-2014 Free Software Fundation, Inc."
|
||||
LICENSE="GNU LGPL v2.1"
|
||||
REVISION="2"
|
||||
SOURCE_URI="http://ftpmirror.gnu.org/libunistring/libunistring-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="9ce081cbee1951b55597b30e7030bda9d7b2f034ef901a135ff3a020be5a41e5"
|
||||
PATCHES="libunistring-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
|
||||
PROVIDES="
|
||||
libunistring$secondaryArchSuffix = $portVersion compat >= 0
|
||||
lib:libunistring$secondaryArchSuffix = 2.0.0 compat >= 2
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
libunistring${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libunistring$secondaryArchSuffix = 2.0.0 compat >= 0
|
||||
"
|
||||
REQUIRES_devel="
|
||||
libunistring$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:autoconf
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:gperf
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf -fi
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
rm $libDir/libunistring.la
|
||||
prepareInstalledDevelLib libunistring
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
86
dev-libs/libunistring/libunistring-0.9.9.recipe
Normal file
86
dev-libs/libunistring/libunistring-0.9.9.recipe
Normal file
@@ -0,0 +1,86 @@
|
||||
SUMMARY="A library for manipulating Unicode strings"
|
||||
DESCRIPTION="libunistring provides functions for manipulating Unicode strings \
|
||||
and for manipulating C strings according to the Unicode standard."
|
||||
HOMEPAGE="https://www.gnu.org/software/libunistring/"
|
||||
COPYRIGHT="1998-2018 Free Software Fundation, Inc."
|
||||
LICENSE="GNU GPL v2
|
||||
GNU LGPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://ftpmirror.gnu.org/libunistring/libunistring-$portVersion.tar.gz
|
||||
https://ftp.gnu.org/gnu/libunistring/libunistring-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="f5e90c08f9e5427ca3a2c0c53f19aa38b25c500913510ad25afef86448bea84a"
|
||||
PATCHES="libunistring-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
|
||||
|
||||
libVersion="2.1.0"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
portVersionCompat="$portVersion compat >= ${portVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
libunistring$secondaryArchSuffix = $portVersionCompat
|
||||
lib:libunistring$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
libunistring${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libunistring$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
libunistring$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:autoconf
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:gperf
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
defineDebugInfoPackage libunistring$secondaryArchSuffix \
|
||||
"$libDir"/libunistring.so.$libVersion
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf -fi
|
||||
if [ -n "$secondaryArchSuffix" ]; then
|
||||
runConfigure ./configure
|
||||
else
|
||||
runConfigure --omit-dirs docDir ./configure --docdir="$developDocDir"
|
||||
fi
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
rm -f "$libDir"/libunistring.la "$libDir"/charset.alias
|
||||
|
||||
if [ -n "$secondaryArchSuffix" ]; then
|
||||
rm -rf "$documentationDir"
|
||||
maybe_infoDir=
|
||||
else
|
||||
install -t "$developDocDir" README
|
||||
maybe_infoDir="$infoDir"
|
||||
fi
|
||||
|
||||
prepareInstalledDevelLib libunistring
|
||||
packageEntries devel \
|
||||
"$developDir" \
|
||||
${maybe_infoDir:+"$maybe_infoDir"}
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
From 9688eae82d1c9cf4e3c7d7460f7fcba935438029 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 5 Mar 2015 19:33:40 +0000
|
||||
Subject: Haiku patch
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 38fe5dd..5a822de 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([build-aux])
|
||||
. $srcdir/version.sh
|
||||
gl_INIT_PACKAGE([libunistring], [$VERSION_NUMBER])
|
||||
AM_INIT_AUTOMAKE([silent-rules dist-xz])
|
||||
-AM_CONFIG_HEADER([config.h])
|
||||
+AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
dnl Override automake's tar command used for creating distributions.
|
||||
am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"'
|
||||
diff --git a/lib/uniname/uniname.c b/lib/uniname/uniname.c
|
||||
index 2191f09..fc2727c 100644
|
||||
--- a/lib/uniname/uniname.c
|
||||
+++ b/lib/uniname/uniname.c
|
||||
@@ -375,6 +375,8 @@ unicode_name_character (const char *name)
|
||||
if (false)
|
||||
filled_buf:
|
||||
{
|
||||
+ uint16_t words[UNICODE_CHARNAME_MAX_WORDS];
|
||||
+ uint16_t *wordptr = words;
|
||||
{
|
||||
/* Special case for variation selector aliases. Keeps the
|
||||
tables small. */
|
||||
@@ -407,8 +409,6 @@ unicode_name_character (const char *name)
|
||||
}
|
||||
}
|
||||
/* Convert the constituents to uint16_t words. */
|
||||
- uint16_t words[UNICODE_CHARNAME_MAX_WORDS];
|
||||
- uint16_t *wordptr = words;
|
||||
{
|
||||
const char *p1 = buf;
|
||||
for (;;)
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
22
dev-libs/libunistring/patches/libunistring-0.9.9.patchset
Normal file
22
dev-libs/libunistring/patches/libunistring-0.9.9.patchset
Normal file
@@ -0,0 +1,22 @@
|
||||
From 9688eae82d1c9cf4e3c7d7460f7fcba935438029 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 5 Mar 2015 19:33:40 +0000
|
||||
Subject: Haiku patch
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 38fe5dd..5a822de 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([build-aux])
|
||||
. $srcdir/version.sh
|
||||
gl_INIT_PACKAGE([libunistring], [$VERSION_NUMBER])
|
||||
AM_INIT_AUTOMAKE([silent-rules dist-xz])
|
||||
-AM_CONFIG_HEADER([config.h])
|
||||
+AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
dnl Override automake's tar command used for creating distributions.
|
||||
am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"'
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
Reference in New Issue
Block a user