summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--legacy/openjdk7/APKBUILD (renamed from user/openjdk7/APKBUILD)0
-rw-r--r--legacy/openjdk7/icedtea-cpio.patch (renamed from user/openjdk7/icedtea-cpio.patch)0
-rw-r--r--legacy/openjdk7/icedtea-hotspot-musl-ppc.patch (renamed from user/openjdk7/icedtea-hotspot-musl-ppc.patch)0
-rw-r--r--legacy/openjdk7/icedtea-hotspot-musl.patch (renamed from user/openjdk7/icedtea-hotspot-musl.patch)0
-rw-r--r--legacy/openjdk7/icedtea-hotspot-noagent-musl.patch (renamed from user/openjdk7/icedtea-hotspot-noagent-musl.patch)0
-rw-r--r--legacy/openjdk7/icedtea-hotspot-uclibc-fixes.patch (renamed from user/openjdk7/icedtea-hotspot-uclibc-fixes.patch)0
-rw-r--r--legacy/openjdk7/icedtea-jdk-execinfo.patch (renamed from user/openjdk7/icedtea-jdk-execinfo.patch)0
-rw-r--r--legacy/openjdk7/icedtea-jdk-fix-build.patch (renamed from user/openjdk7/icedtea-jdk-fix-build.patch)0
-rw-r--r--legacy/openjdk7/icedtea-jdk-fix-ipv6-init.patch (renamed from user/openjdk7/icedtea-jdk-fix-ipv6-init.patch)0
-rw-r--r--legacy/openjdk7/icedtea-jdk-musl.patch (renamed from user/openjdk7/icedtea-jdk-musl.patch)0
-rw-r--r--legacy/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch (renamed from user/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch)0
-rw-r--r--legacy/openjdk7/icedtea-jdk-no-soname.patch (renamed from user/openjdk7/icedtea-jdk-no-soname.patch)0
-rw-r--r--legacy/openjdk7/icedtea-remove-gawk.patch (renamed from user/openjdk7/icedtea-remove-gawk.patch)0
-rw-r--r--legacy/openjdk7/icedtea-tar.patch (renamed from user/openjdk7/icedtea-tar.patch)0
-rw-r--r--legacy/openjdk7/icedtea-xattr.patch (renamed from user/openjdk7/icedtea-xattr.patch)0
-rw-r--r--legacy/openjdk7/remove-gawk.patch (renamed from user/openjdk7/remove-gawk.patch)0
-rw-r--r--legacy/openjdk7/xattr.patch (renamed from user/openjdk7/xattr.patch)0
-rw-r--r--system/attr/APKBUILD5
-rw-r--r--system/coreutils/APKBUILD7
-rw-r--r--user/i3status/APKBUILD5
-rw-r--r--user/mplayer/APKBUILD2
-rw-r--r--user/openldap/openldap.pre-install2
-rw-r--r--user/pulseaudio/APKBUILD7
-rw-r--r--user/pulseaudio/alsa-include.patch45
-rw-r--r--user/vlc/APKBUILD2
25 files changed, 63 insertions, 12 deletions
diff --git a/user/openjdk7/APKBUILD b/legacy/openjdk7/APKBUILD
index e87060a19..e87060a19 100644
--- a/user/openjdk7/APKBUILD
+++ b/legacy/openjdk7/APKBUILD
diff --git a/user/openjdk7/icedtea-cpio.patch b/legacy/openjdk7/icedtea-cpio.patch
index c66c1ca60..c66c1ca60 100644
--- a/user/openjdk7/icedtea-cpio.patch
+++ b/legacy/openjdk7/icedtea-cpio.patch
diff --git a/user/openjdk7/icedtea-hotspot-musl-ppc.patch b/legacy/openjdk7/icedtea-hotspot-musl-ppc.patch
index eca684884..eca684884 100644
--- a/user/openjdk7/icedtea-hotspot-musl-ppc.patch
+++ b/legacy/openjdk7/icedtea-hotspot-musl-ppc.patch
diff --git a/user/openjdk7/icedtea-hotspot-musl.patch b/legacy/openjdk7/icedtea-hotspot-musl.patch
index 1da903148..1da903148 100644
--- a/user/openjdk7/icedtea-hotspot-musl.patch
+++ b/legacy/openjdk7/icedtea-hotspot-musl.patch
diff --git a/user/openjdk7/icedtea-hotspot-noagent-musl.patch b/legacy/openjdk7/icedtea-hotspot-noagent-musl.patch
index 37604acca..37604acca 100644
--- a/user/openjdk7/icedtea-hotspot-noagent-musl.patch
+++ b/legacy/openjdk7/icedtea-hotspot-noagent-musl.patch
diff --git a/user/openjdk7/icedtea-hotspot-uclibc-fixes.patch b/legacy/openjdk7/icedtea-hotspot-uclibc-fixes.patch
index 1c1d82276..1c1d82276 100644
--- a/user/openjdk7/icedtea-hotspot-uclibc-fixes.patch
+++ b/legacy/openjdk7/icedtea-hotspot-uclibc-fixes.patch
diff --git a/user/openjdk7/icedtea-jdk-execinfo.patch b/legacy/openjdk7/icedtea-jdk-execinfo.patch
index a6499dcb0..a6499dcb0 100644
--- a/user/openjdk7/icedtea-jdk-execinfo.patch
+++ b/legacy/openjdk7/icedtea-jdk-execinfo.patch
diff --git a/user/openjdk7/icedtea-jdk-fix-build.patch b/legacy/openjdk7/icedtea-jdk-fix-build.patch
index 9fae895b6..9fae895b6 100644
--- a/user/openjdk7/icedtea-jdk-fix-build.patch
+++ b/legacy/openjdk7/icedtea-jdk-fix-build.patch
diff --git a/user/openjdk7/icedtea-jdk-fix-ipv6-init.patch b/legacy/openjdk7/icedtea-jdk-fix-ipv6-init.patch
index 11f3bf6dd..11f3bf6dd 100644
--- a/user/openjdk7/icedtea-jdk-fix-ipv6-init.patch
+++ b/legacy/openjdk7/icedtea-jdk-fix-ipv6-init.patch
diff --git a/user/openjdk7/icedtea-jdk-musl.patch b/legacy/openjdk7/icedtea-jdk-musl.patch
index 49c16d73a..49c16d73a 100644
--- a/user/openjdk7/icedtea-jdk-musl.patch
+++ b/legacy/openjdk7/icedtea-jdk-musl.patch
diff --git a/user/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch b/legacy/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch
index 26f89bb54..26f89bb54 100644
--- a/user/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch
+++ b/legacy/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch
diff --git a/user/openjdk7/icedtea-jdk-no-soname.patch b/legacy/openjdk7/icedtea-jdk-no-soname.patch
index fe6bbb732..fe6bbb732 100644
--- a/user/openjdk7/icedtea-jdk-no-soname.patch
+++ b/legacy/openjdk7/icedtea-jdk-no-soname.patch
diff --git a/user/openjdk7/icedtea-remove-gawk.patch b/legacy/openjdk7/icedtea-remove-gawk.patch
index 98e9878b7..98e9878b7 100644
--- a/user/openjdk7/icedtea-remove-gawk.patch
+++ b/legacy/openjdk7/icedtea-remove-gawk.patch
diff --git a/user/openjdk7/icedtea-tar.patch b/legacy/openjdk7/icedtea-tar.patch
index 98c280184..98c280184 100644
--- a/user/openjdk7/icedtea-tar.patch
+++ b/legacy/openjdk7/icedtea-tar.patch
diff --git a/user/openjdk7/icedtea-xattr.patch b/legacy/openjdk7/icedtea-xattr.patch
index 51aee48c4..51aee48c4 100644
--- a/user/openjdk7/icedtea-xattr.patch
+++ b/legacy/openjdk7/icedtea-xattr.patch
diff --git a/user/openjdk7/remove-gawk.patch b/legacy/openjdk7/remove-gawk.patch
index dccddbab9..dccddbab9 100644
--- a/user/openjdk7/remove-gawk.patch
+++ b/legacy/openjdk7/remove-gawk.patch
diff --git a/user/openjdk7/xattr.patch b/legacy/openjdk7/xattr.patch
index 258f9f12d..258f9f12d 100644
--- a/user/openjdk7/xattr.patch
+++ b/legacy/openjdk7/xattr.patch
diff --git a/system/attr/APKBUILD b/system/attr/APKBUILD
index 9dccb1415..1d4997a5d 100644
--- a/system/attr/APKBUILD
+++ b/system/attr/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=attr
pkgver=2.4.48
-pkgrel=0
+pkgrel=1
pkgdesc="Utilities for managing filesystem extended attributes"
url="https://savannah.nongnu.org/projects/attr"
arch="all"
@@ -29,7 +29,8 @@ build() {
--libdir=/lib \
--includedir=/usr/include \
--mandir=/usr/share/man \
- --datadir=/usr/share
+ --datadir=/usr/share \
+ --sysconfdir=/etc
make
}
diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD
index 4a70574c3..ff7df9e00 100644
--- a/system/coreutils/APKBUILD
+++ b/system/coreutils/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=coreutils
pkgver=8.31
-pkgrel=3
+pkgrel=4
pkgdesc="Basic file, shell, and text manipulation utilities"
url="https://www.gnu.org/software/coreutils/"
arch="all"
@@ -60,8 +60,11 @@ package() {
# stdbuf(1) requires a /usr/libexec/ .so
# env(1) needs to be in /usr/bin/ for compatibility with the rest of the world
+ # install(1) " "
mkdir -p "$pkgdir"/usr/bin
- mv "$pkgdir"/bin/stdbuf "$pkgdir"/bin/env "$pkgdir"/usr/bin/
+ for USR_PROGRAM in env install stdbuf; do
+ mv "$pkgdir"/bin/$USR_PROGRAM "$pkgdir"/usr/bin/
+ done
}
sha512sums="ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af coreutils-8.31.tar.xz
diff --git a/user/i3status/APKBUILD b/user/i3status/APKBUILD
index b892fef2f..422c1dfd4 100644
--- a/user/i3status/APKBUILD
+++ b/user/i3status/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Luis Ressel <aranea@aixah.de>
pkgname=i3status
pkgver=2.13
-pkgrel=0
+pkgrel=1
pkgdesc="Status bar generator for dzen2, xmobar or similar"
url="https://i3wm.org/i3status/"
arch="all"
@@ -28,7 +28,8 @@ build() {
PATH_ASCIIDOC=/usr/bin/asciidoctor ../configure \
--build=$CBUILD \
--host=$CHOST \
- --prefix=/usr
+ --prefix=/usr \
+ --sysconfdir=/etc
make
}
diff --git a/user/mplayer/APKBUILD b/user/mplayer/APKBUILD
index 8fb03660a..6b6ce9a71 100644
--- a/user/mplayer/APKBUILD
+++ b/user/mplayer/APKBUILD
@@ -28,12 +28,14 @@ build() {
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
+ --confdir=/etc/mplayer \
--disable-ffmpeg_a
make
}
package() {
make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir/etc"
}
sha512sums="8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34 MPlayer-1.4.tar.xz"
diff --git a/user/openldap/openldap.pre-install b/user/openldap/openldap.pre-install
index a98a882ae..b6bc3c7b4 100644
--- a/user/openldap/openldap.pre-install
+++ b/user/openldap/openldap.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
groupadd -r ldap 2>/dev/null
-useradd -c "OpenLdap User" -s /sbin/nologin -g ldap \
+useradd -c "OpenLDAP User" -s /sbin/nologin -g ldap \
-m -d /usr/lib/openldap -r ldap 2>/dev/null
exit 0
diff --git a/user/pulseaudio/APKBUILD b/user/pulseaudio/APKBUILD
index 2829f044a..611a788a0 100644
--- a/user/pulseaudio/APKBUILD
+++ b/user/pulseaudio/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=pulseaudio
pkgver=12.2
-pkgrel=4
+pkgrel=5
pkgdesc="A featureful, general-purpose sound server"
url="https://www.freedesktop.org/wiki/Software/PulseAudio"
pkgusers="pulse"
@@ -23,11 +23,11 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bluez
source="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz
$pkgname.initd
$pkgname.confd
+ alsa-include.patch
disable-flat-volume.patch
"
build() {
- cd "$builddir"
LIBS="-lintl" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -50,12 +50,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
}
@@ -134,4 +132,5 @@ zshcomp() {
sha512sums="877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e pulseaudio-12.2.tar.xz
34fe54ece5df60ce63a7955cd828a2716670fef71f40960698ae5518fdaf9cd599f4d8f8852e2c88d715600a9ad06a38984415e5eb320071012e5eb6e5c1b8b1 pulseaudio.initd
75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd
+1549c495395ea0b9bf863f063be85c5847cdffc27b4e59e8d528aae5de29d1f2552dbae94f8c649fcab264e07ede330e584dcee46118b98ddf64c63cb1e8397e alsa-include.patch
dcb50f7c4fd86b0311ab050f7f0340dcf54379a685903951f22e24df6aee5486ee5e02f866c9e53dd55a54ba302658ad282114ce37f169d185855dc37dae0349 disable-flat-volume.patch"
diff --git a/user/pulseaudio/alsa-include.patch b/user/pulseaudio/alsa-include.patch
new file mode 100644
index 000000000..2654838e5
--- /dev/null
+++ b/user/pulseaudio/alsa-include.patch
@@ -0,0 +1,45 @@
+From b89d33bb182c42db5ad3987b0e91b7bf62f421e8 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Sun, 21 Apr 2019 11:59:30 +0200
+Subject: [PATCH] alsa: Fix inclusion of use-case.h
+
+The recent change in ALSA upstream stripped -I$include/alsa path from
+pkgconfig. We already fixed for this change in some places but still
+the code for UCM was overlooked, and this resulted in the unresolved
+symbols in alsa card module. Fix them as well.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ configure.ac | 2 +-
+ src/modules/alsa/alsa-ucm.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c004bd70d..b44ed1595 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
+ AS_IF([test "x$HAVE_ALSA" = "x1"],
+ [
+ save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS"
+- AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
++ AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
+ CPPFLAGS="$save_CPPFLAGS"
+ ],
+ HAVE_ALSA_UCM=0)
+diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
+index 53abf3f90..c926f3cc3 100644
+--- a/src/modules/alsa/alsa-ucm.h
++++ b/src/modules/alsa/alsa-ucm.h
+@@ -23,7 +23,7 @@
+ ***/
+
+ #ifdef HAVE_ALSA_UCM
+-#include <use-case.h>
++#include <alsa/use-case.h>
+ #else
+ typedef void snd_use_case_mgr_t;
+ #endif
+--
+2.21.0
+
diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD
index 6bd76fafe..1cd7f5981 100644
--- a/user/vlc/APKBUILD
+++ b/user/vlc/APKBUILD
@@ -201,4 +201,4 @@ e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd463
e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89 omxil-rpi-codecs.patch
a117ca4d7fd66a5f959fdeaddfdce2f8442fe9f2c13995bb7f4792a7745c00813813aa962f76e957e3b0735344a5dc000e0644ce09f23458802a2932231655c3 tar-compat.patch
c0107655249687655846a9547ca1a5670b9207443180600e7a149c69ffb96d7226787c19b018d4033db9b284c1a5faa8d7d42188ed40c3b8bb051256febf11c5 test-s390x.patch
-b67b6e21e9d4027aef1006e6057f9ba8e65ce3895b08f7b911b1675cff9bc423f64ee2c187c584860e9e5d4635a30408a7781add9694d9bba753eac37f357406 vlc-libs.trigger"
+34d899b8b88de2058a8d64ce316389bd3437c0bbcd64a925eec4975adf2bc306a3a8d2e322bad5e3a18b5a28cbb5bf6705d8849dee655daf7e5a4bb007fe07e0 vlc-libs.trigger"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-16 11:08:15 +0000