upg gettext libunistring

This commit is contained in:
joborun linux 2024-12-28 21:27:20 +02:00
parent 3c1c282a3d
commit 342e2373da
7 changed files with 70 additions and 47 deletions

View file

@ -6,8 +6,8 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=gettext
pkgver=0.22.5
pkgrel=02
pkgver=0.23
pkgrel=01
pkgdesc="GNU internationalization library"
url="https://www.gnu.org/software/gettext/"
#depends=(gcc-libs acl sh glib2 libunistring libcroco)
@ -15,17 +15,13 @@ makedepends=(gettext emacs-git git dbus)
optdepends=('git: for autopoint infrastructure updates')
#options=(!docs)
source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig}
gettext-0.22.2-disable-libtextstyle.patch)
gettext-0.23-libxml2.patch)
# gettext-0.22.2-disable-libtextstyle.patch)
prepare() {
cd $pkgname-$pkgver
# Do not build libtextstyle, as it depends on libcroco
# which is now unmaintained and has known security bugs.
# patch from Fedora
patch -p1 -i $srcdir/gettext-0.22.2-disable-libtextstyle.patch
autoreconf -f
automake
patch -Np1 -i ../gettext-0.23-libxml2.patch
}
@ -39,7 +35,8 @@ build() {
--enable-csharp \
--enable-nls \
--with-xz \
--without-included-gettext
--without-included-gettext \
--without-included-libunistring
sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' \
-i gettext-{tools,runtime,runtime/libasprintf}/libtool
@ -68,9 +65,13 @@ validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno
'68D94D8AAEEAD48AE7DC5B904F494A942E4616C2'
'9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development)
sha256sums=(ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0 # gettext-0.22.5.tar.gz
5829b36cdf582df81ca2ec0919b9a671f5cab7bb09adb23c96ada32e9b20168f # gettext-0.22.5.tar.gz.sig
a28a27192f336f0b0908bdbf840d3b19d7b587c4ac52cad635cb43e95eb3c78d) # gettext-0.22.2-disable-libtextstyle.patch
b2sums=('32828852ff105c66d4034f8a689f3e2a007b8770daa72f7f99fec3fb5ee2be7a930fb534389edf59436c8f41b98122efab24931d0e8bea3a903d24b4d9a34bfb'
'SKIP'
'c93e039ac8fd150a2d210343886cdaa13308af091ed9f97b93d4137c52d51e84ec32f78961b1ee5a100f2e7f4c61ef47c7ad9282e28a406a89d11ef18c57510b')
## 9801ed90b860f0e3dc2f9936408383c94a3957fff2569a63ad36b1170512d5d2 gettext-0.22.5-02-x86_64.pkg.tar.lz
sha256sums=(945dd7002a02dd7108ad0510602e13416b41d327898cf8522201bc6af10907a6 # gettext-0.23.tar.gz
0d61b372993e17b68cb40e1dc58e1830350ce796611b6c1dcec06fbfc448c1bb # gettext-0.23.tar.gz.sig
d552ffc8aba79872e8fb01370b495201f3cb4798194f7e61b0b206d243d9fcfa) # gettext-0.23-libxml2.patch
## 8c9026258c7aa2e06a19abeefef60cf20891c477c839cad5d498ad8f91b2f616 gettext-0.23-01-x86_64.pkg.tar.lz

View file

@ -1,8 +1,8 @@
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=gettext
pkgver=0.22.5
pkgrel=2
pkgver=0.23
pkgrel=1
pkgdesc="GNU internationalization library"
url="https://www.gnu.org/software/gettext/"
arch=(x86_64)
@ -24,23 +24,20 @@ makedepends=(
)
optdepends=('git: for autopoint infrastructure updates')
options=(!docs)
source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig}
gettext-0.22-disable-libtextstyle.patch)
b2sums=('39bc18de7b8836c63dec0b006555eec0bb82e7bbf210ea774f47d9933c98dad9a719c9cd2eff46ec3bacc8be633167a4fa8d84bb0132cdadbb86d182235b63b7'
source=(
https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig}
gettext-0.23-libxml2.patch
)
b2sums=('32828852ff105c66d4034f8a689f3e2a007b8770daa72f7f99fec3fb5ee2be7a930fb534389edf59436c8f41b98122efab24931d0e8bea3a903d24b4d9a34bfb'
'SKIP'
'8512f87c7c8fc6bedf2992a5da8b34ee847dd61af4f55407ff9e02b965afcbea508b1dd87cd2e31c689166ee8ded824f54a95089978274753a6730a8a1d39164')
'c93e039ac8fd150a2d210343886cdaa13308af091ed9f97b93d4137c52d51e84ec32f78961b1ee5a100f2e7f4c61ef47c7ad9282e28a406a89d11ef18c57510b')
validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno
'68D94D8AAEEAD48AE7DC5B904F494A942E4616C2'
'9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development)
prepare() {
cd ${pkgname}-${pkgver}
# Do not build libtextstyle, as it depends on libcroco
# which is now unmaintained and has known security bugs.
# patch from Fedora
patch -p1 -i $srcdir/gettext-0.22-disable-libtextstyle.patch
autoreconf -f
automake
patch -Np1 -i ../gettext-0.23-libxml2.patch
}
build() {
@ -50,7 +47,8 @@ build() {
--enable-csharp \
--enable-nls \
--with-xz \
--without-included-gettext
--without-included-gettext \
--without-included-libunistring
sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' \
-i gettext-{tools,runtime,runtime/libasprintf}/libtool
make

View file

@ -1,8 +1,6 @@
gettext
emacs-git
git
autoconf
automake
dbus

View file

@ -0,0 +1,25 @@
diff -ur gettext-0.23.orig/gettext-tools/src/its.c gettext-0.23/gettext-tools/src/its.c
--- gettext-0.23.orig/gettext-tools/src/its.c 2024-10-13 16:14:36.000000000 +0530
+++ gettext-0.23/gettext-tools/src/its.c 2024-12-05 23:24:03.100545103 +0530
@@ -28,6 +28,7 @@
#include <stdint.h>
#include <stdlib.h>
+#include <libxml/xmlversion.h>
#include <libxml/xmlerror.h>
#include <libxml/tree.h>
#include <libxml/parser.h>
@@ -82,7 +83,13 @@
/* ----------------------------- Error handling ----------------------------- */
static void
+/* Adapt to API change in libxml 2.12.0.
++ See <https://gitlab.gnome.org/GNOME/libxml2/-/issues/622>. */
+#if LIBXML_VERSION >= 21200
+structured_error (void *data, const xmlError *err)
+#else
structured_error (void *data, xmlError *err)
+#endif
{
error (0, err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0,
_("%s error: %s"), "libxml2", err->message);

View file

@ -1,6 +1,6 @@
real 8m56.854s
user 7m37.687s
sys 1m27.822s
real 9m47.415s
user 8m50.088s
sys 1m56.209s

View file

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=libunistring
pkgver=1.2
pkgver=1.3
pkgrel=01
pkgdesc='Library for manipulating Unicode strings and C strings'
url='https://www.gnu.org/software/libunistring/'
@ -39,14 +39,16 @@ package() {
arch=(x86_64)
license=(GPL)
license=(GPL-2.0-or-later LGPL-3.0-or-later)
validpgpkeys=(462225C3B46F34879FC8496CD605848ED7E69871 # Daiki Ueno <ueno@unixuser.org>
9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D) # Bruno Haible (Open Source Development) <bruno@clisp.org>
sha256sums=(632bd65ed74a881ca8a0309a1001c428bd1cbd5cd7ddbf8cedcd2e65f4dcdc44 # libunistring-1.2.tar.xz
91da3f033231a635dae9e0161c834b74e890e1eba19d4e5972b26c5c312ac2cb) # libunistring-1.2.tar.xz.sig
b2sums=('213d24ea4ba5e960a030bd83fc1b6c9d9a5e33d63ade8874e2a15d1b7a0acbe4b2d03df18065f6c17f01bfed94f7e70ef474e713f5c5ad2375cf2438457b0379'
'SKIP')
## 501ca8f454adf7b4da856367d8f18ca2caf1f881730f052fa899ce54b3530c7e libunistring-1.2-01-x86_64.pkg.tar.lz
sha256sums=(f245786c831d25150f3dfb4317cda1acc5e3f79a5da4ad073ddca58886569527 # libunistring-1.3.tar.xz
62201b5b7ce9c0b033c50cefa5d7769dff4b7cee8205572e0cf917653cae9e33) # libunistring-1.3.tar.xz.sig
## 91c948a8a75413b817b163159c0b9e74ad8c246415f5ac47b9ebd3620d817e14 libunistring-1.3-01-x86_64.pkg.tar.lz

View file

@ -6,34 +6,33 @@
# Contributor: Patrick McCarty <pnorcks at gmail dot com>
pkgname=libunistring
pkgver=1.2
pkgver=1.3
pkgrel=1
pkgdesc='Library for manipulating Unicode strings and C strings'
url='https://www.gnu.org/software/libunistring/'
arch=(x86_64)
license=(GPL)
license=(
GPL-2.0-or-later
LGPL-3.0-or-later
)
depends=(glibc)
provides=('libunistring.so')
source=(https://ftp.gnu.org/gnu/$pkgname/${pkgname}-${pkgver}.tar.xz{,.sig})
validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno <ueno@unixuser.org>
'9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development) <bruno@clisp.org>
sha256sums=('632bd65ed74a881ca8a0309a1001c428bd1cbd5cd7ddbf8cedcd2e65f4dcdc44'
'SKIP')
b2sums=('606c6fdd93f05b01e9b08b3bd30283afcbf9a3425abf900e7672f1d6eb91b51009913d4f5e45a4c1c1b82a84b4870d3eaced9ca76fd570936ad5c39c94038fc7'
b2sums=('213d24ea4ba5e960a030bd83fc1b6c9d9a5e33d63ade8874e2a15d1b7a0acbe4b2d03df18065f6c17f01bfed94f7e70ef474e713f5c5ad2375cf2438457b0379'
'SKIP')
build() {
cd $pkgname-$pkgver
cd ${pkgname}-${pkgver}
./configure --prefix=/usr
make
}
check() {
make -C $pkgname-$pkgver check
make -C ${pkgname}-${pkgver} check
}
package() {
make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
make -C ${pkgname}-${pkgver} DESTDIR="${pkgdir}" install
}
# vim: ts=2 sw=2 et: