diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/parted/APKBUILD | 11 | ||||
| -rw-r--r-- | system/parted/bsd-endian.patch | 13 | ||||
| -rw-r--r-- | system/parted/fix-libintl-header-s390x.patch | 58 | ||||
| -rw-r--r-- | system/pcre/APKBUILD | 17 |
4 files changed, 29 insertions, 70 deletions
diff --git a/system/parted/APKBUILD b/system/parted/APKBUILD index 6f0e135ea..d75fa2fe5 100644 --- a/system/parted/APKBUILD +++ b/system/parted/APKBUILD @@ -2,19 +2,19 @@ # Maintainer: pkgname=parted pkgver=3.2 -pkgrel=8 +pkgrel=9 pkgdesc="Utility to create, destroy, resize, check and copy partitions" url="https://www.gnu.org/software/parted/parted.html" arch="all" license="GPL-3.0+" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -depends= +depends="" makedepends="ncurses-dev lvm2-dev bash util-linux-dev autoconf automake" checkdepends="check-dev python3" -source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz +source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz + bsd-endian.patch disable-two-tests.patch fix-includes.patch - fix-libintl-header-s390x.patch sysmacros.patch tests-call-name-correctly.patch tests-python3.patch @@ -47,10 +47,11 @@ package() { rm -rf "$pkgdir"/usr/lib/charset.alias rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } + sha512sums="4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4 parted-3.2.tar.xz +d3c16548cac315dad100c992c0b8446d1f7978cb45e867c69e746b25781c06802d3b4aab7d9346e44e68f61bb07e41ff65ef75d0dc6613f6fa8472b2e67a76a7 bsd-endian.patch b49eb0211c405a4ef69e1bb0079621c22fec4adf0309f0a58b5d881540913de01d05ccd3eb521f35c3cf6f4eb8aa0f4c5270ce3dea47270a5c3fe8fae635c6f0 disable-two-tests.patch 55ee63c218d1867c0f2c596e7c3eec5c42af160181456cc551fe3d432eabed0ac2dd3a3955ff0c375f76aeec8071e7f55a32834b87a0d39b8ef30361f671bfdd fix-includes.patch -444a7e2fb3235dfd218f6b71fb25adde107d001f638d988ee1fa79686d8efee94a9499e27bdfdd75f9718760b448938b70a90a74285b93a39338d21f4ab4c9dc fix-libintl-header-s390x.patch 5d2e8f22b6cd5bdd3289996848279a945ca09acd2862e82283bb769c2e4d61a24a31e1793d81385e8f3f1f4d48417e2308c5ea39dac47e832666363dde044ba7 sysmacros.patch 8bd86d2b0401566e7757c43d849b7f913cc4ec1bf50d5641dc72d7e278ca38db2ac746cd8dcc756b245021ea1f9738875b6a831f05185b9217d3f1c287944748 tests-call-name-correctly.patch 7486f98d535380a9e6598b9ac6153564319d5effa25456dc393cf3540ea47ac5b462be79cbd7d8efbd1fc2d2ef240a00873a2e2b138d4b4b0bb1494893de1eac tests-python3.patch" diff --git a/system/parted/bsd-endian.patch b/system/parted/bsd-endian.patch new file mode 100644 index 000000000..6e5e13c0e --- /dev/null +++ b/system/parted/bsd-endian.patch @@ -0,0 +1,13 @@ +See-Also: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31923 + +--- parted-3.2/libparted/labels/bsd.c.old 2014-06-15 18:17:43.000000000 +0000 ++++ parted-3.2/libparted/labels/bsd.c 2019-08-05 05:48:52.914401379 +0000 +@@ -364,7 +364,7 @@ + max_part = i; + } + +- label->d_npartitions = PED_CPU_TO_LE16 (max_part) + 1; ++ label->d_npartitions = PED_CPU_TO_LE16 (max_part + 1); + label->d_checksum = xbsd_dkcksum (label); + + alpha_bootblock_checksum (bsd_specific->boot_code); diff --git a/system/parted/fix-libintl-header-s390x.patch b/system/parted/fix-libintl-header-s390x.patch deleted file mode 100644 index 68ae7d270..000000000 --- a/system/parted/fix-libintl-header-s390x.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 4b2a566a3e007184d3ee9ce5b399a63eebbdadc3 Mon Sep 17 00:00:00 2001 -From: "Tuan M. Hoang" <tmhoang@flatglobe.org> -Date: Thu, 23 Feb 2017 07:53:02 +0000 -Subject: [PATCH] main/parted: disable nls on s390x - -Because we build with --disable-nls by default, we need to remove libintl.h in -these files on s390x. This is specific for DASD devices only on s390x. ---- - libparted/labels/dasd.c | 2 +- - libparted/labels/fdasd.c | 2 +- - libparted/labels/vtoc.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libparted/labels/dasd.c b/libparted/labels/dasd.c -index fa9414f..5acf844 100644 ---- a/libparted/labels/dasd.c -+++ b/libparted/labels/dasd.c -@@ -40,8 +40,8 @@ - #include <parted/fdasd.h> - #include <arch/linux.h> - --#include <libintl.h> - #if ENABLE_NLS -+# include <libintl.h> - # define _(String) dgettext (PACKAGE, String) - #else - # define _(String) (String) -diff --git a/libparted/labels/fdasd.c b/libparted/labels/fdasd.c -index 1f87937..e6a9086 100644 ---- a/libparted/labels/fdasd.c -+++ b/libparted/labels/fdasd.c -@@ -24,8 +24,8 @@ - - #include <parted/parted.h> - --#include <libintl.h> - #if ENABLE_NLS -+# include <libintl.h> - # define _(String) dgettext (PACKAGE, String) - #else - # define _(String) (String) -diff --git a/libparted/labels/vtoc.c b/libparted/labels/vtoc.c -index fdfa94f..64ba149 100644 ---- a/libparted/labels/vtoc.c -+++ b/libparted/labels/vtoc.c -@@ -12,8 +12,8 @@ - - #include <parted/parted.h> - --#include <libintl.h> - #if ENABLE_NLS -+# include <libintl.h> - # define _(String) dgettext (PACKAGE, String) - #else - # define _(String) (String) --- -2.11.1 - diff --git a/system/pcre/APKBUILD b/system/pcre/APKBUILD index 96a6e6123..aa043954c 100644 --- a/system/pcre/APKBUILD +++ b/system/pcre/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pcre pkgver=8.43 -pkgrel=1 +pkgrel=2 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" arch="all" @@ -28,6 +28,7 @@ build() { --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ + --libdir=/lib \ $_enable_jit \ --enable-utf8 \ --enable-unicode-properties \ @@ -43,6 +44,8 @@ build() { package() { make DESTDIR="$pkgdir" install + mkdir -p "$pkgdir"/usr/lib + mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib/ } check() { @@ -54,20 +57,20 @@ check() { libpcrecpp() { pkgdesc="C++ bindings for PCRE" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libpcrecpp.so* "$subpkgdir"/usr/lib/ + mkdir -p "$subpkgdir"/lib + mv "$pkgdir"/lib/libpcrecpp.so* "$subpkgdir"/lib/ } libpcre16() { pkgdesc="PCRE with 16 bit character support" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libpcre16.so* "$subpkgdir"/usr/lib/ + mkdir -p "$subpkgdir"/lib + mv "$pkgdir"/lib/libpcre16.so* "$subpkgdir"/lib/ } libpcre32() { pkgdesc="PCRE with 32 bit character support" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libpcre32.so* "$subpkgdir"/usr/lib/ + mkdir -p "$subpkgdir"/lib + mv "$pkgdir"/lib/libpcre32.so* "$subpkgdir"/lib/ } tools() { |