diff options
Diffstat (limited to 'user')
26 files changed, 149 insertions, 252 deletions
diff --git a/user/gcompat/APKBUILD b/user/gcompat/APKBUILD index f5cde0815..e6b142f84 100644 --- a/user/gcompat/APKBUILD +++ b/user/gcompat/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gcompat -pkgver=0.3.0 +pkgver=0.4.0 pkgrel=0 pkgdesc="The GNU C Library compatibility layer for musl" url="https://code.foxkit.us/adelie/gcompat" @@ -8,11 +8,9 @@ arch="all" options="!check" # No test suite. license="UoI-NCSA" depends="" -makedepends="libucontext-dev" +makedepends="libucontext-dev utmps-dev" replaces="libc6-compat" -source="https://distfiles.adelielinux.org/source/gcompat/$pkgname-$pkgver.tar.xz - no-utmp.patch - " +source="https://distfiles.adelielinux.org/source/gcompat/$pkgname-$pkgver.tar.xz" _link_arch=$CARCH case "$CARCH" in @@ -23,8 +21,7 @@ x86) _ld="ld-linux.so.2" ;; pmmx) _ld="ld-linux.so.2" _link_arch=i386;; x86_64) _ld="ld-linux-x86-64.so.2" ;; mips* | ppc | s390*) _ld="ld.so.1" ;; -ppc64le) _ld="ld64.so.2" ;; -ppc64) _ld="ld64.so.1" ;; +ppc64*) _ld="ld64.so.2" ;; esac build() { @@ -37,5 +34,4 @@ package() { make LINKER_PATH="/lib/ld-musl-${_link_arch}.so.1" LOADER_NAME="$_ld" WITH_LIBUCONTEXT=YesPlease DESTDIR="$pkgdir" install } -sha512sums="1f7dd73efd556b7e0f7f1c80751185583de24daf4ab235b488ea1ab98cea2d3a94abed341b922be0bd43c8d539a00176b892c78acf09f2adacb279c09648b3be gcompat-0.3.0.tar.xz -34fbf97cfbad2bae219e238f5edcb55425c6d7c9be7dde02aa0e8223dbf163ff20f535539de2232a1ef3c6f47a92eac6e00484af99dc8beb192c761b15389b82 no-utmp.patch" +sha512sums="32b4038a031b9af2d5febb547fe9268eb829f40bb2437c94afe5b939e06e7337448ad7f2dce34362829d19672ede54eec8fc34dc755736dbc76f347906ba5ead gcompat-0.4.0.tar.xz" diff --git a/user/grub/2.02_beta3-mkconfig-alpine.patch b/user/grub/2.02_beta3-mkconfig-alpine.patch deleted file mode 100644 index 606540fff..000000000 --- a/user/grub/2.02_beta3-mkconfig-alpine.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/util/grub.d/10_linux.in -+++ b/util/grub.d/10_linux.in -@@ -21,8 +21,11 @@ - exec_prefix="@exec_prefix@" - datarootdir="@datarootdir@" - -+. /etc/update-extlinux.conf - . "$pkgdatadir/grub-mkconfig_lib" - -+GRUB_CMDLINE_LINUX_DEFAULT="modules=${modules} ${default_kernel_opts} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ - export TEXTDOMAIN=@PACKAGE@ - export TEXTDOMAINDIR="@localedir@" - -@@ -75,6 +78,7 @@ - version="$2" - type="$3" - args="$4" -+ tag="$(basename ${rel_dirname}/${basename} | cut -b9-)" - - if [ -z "$boot_device_id" ]; then - boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" -@@ -133,6 +137,7 @@ - echo '$(echo "$message" | grub_quote)' - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} - EOF -+ [ -f "/boot/initramfs-${tag}" ] && initrd="initramfs-${tag}" - if test -n "${initrd}" ; then - # TRANSLATORS: ramdisk isn't identifier. Should be translated. - message="$(gettext_printf "Loading initial ramdisk ...")" diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD index efcfda2af..532b0aa48 100644 --- a/user/grub/APKBUILD +++ b/user/grub/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=grub pkgver=2.02 -pkgrel=4 +pkgrel=5 pkgdesc="Bootloader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" arch="all !s390x" @@ -31,7 +31,8 @@ source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz fix-gcc-no-pie-specs.patch grub2-accept-empty-module.patch grub-xen-host_grub.cfg - 2.02_beta3-mkconfig-alpine.patch + the-arch-everyone-uses-and-nobody-loves.patch + default-grub " prepare() { @@ -113,6 +114,7 @@ package() { done rm -f "$pkgdir"/usr/lib/charset.alias + install -D -m644 "$srcdir"/default-grub "$pkgdir"/etc/default/grub # remove grub-install warning of missing directory mkdir -p "$pkgdir"/usr/share/locale } @@ -155,4 +157,5 @@ sha512sums="cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2 f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857f8f42601eba82c855607513eb6ce5b2af6bd6c71f046e288 fix-gcc-no-pie-specs.patch 098a1742aef131c85d63b934a9815879b991f2e73030cb90ac4b5dcd07d249fa0dd0a281e52ada0e10f05d59223493bd416eb47543242bf0ba336a0ebc9b2a1a grub2-accept-empty-module.patch 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg -5de7c1cc11640a3892447f0daa1e3fd1f67b0c474c8aec555e4e6315b5e6c00491ba02c88b420cec221da0640c6961d639f148746df14a0b2c15bda7989cd25c 2.02_beta3-mkconfig-alpine.patch" +088455205f2f397d60e43eab19ed73994880ea1f442661f7975846cceaf2b112d92fd1341119d7dbfad3af2174dfd4d4721f31dead1ac35f4a3cb7c0d92f8a04 the-arch-everyone-uses-and-nobody-loves.patch +048d061ac0aab0106f59a3d257739ff5de6c7dc08a4dc9b8b12e9bd2b1ec11f9bc6214013f3d1083b11c3ce41185fcbb5615beb2f290380abf392bb4c3f0d509 default-grub" diff --git a/user/grub/default-grub b/user/grub/default-grub new file mode 100644 index 000000000..18fc2317d --- /dev/null +++ b/user/grub/default-grub @@ -0,0 +1,8 @@ +# Welcome to Adélie Linux. +# This file contains configuration for the GRUB boot manager. +# Changes to this file won't take effect unless you run `update-grub` as root. + +GRUB_DEFAULT="Adélie" +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR="Adélie" +GRUB_CMDLINE_LINUX_DEFAULT="ro" diff --git a/user/grub/the-arch-everyone-uses-and-nobody-loves.patch b/user/grub/the-arch-everyone-uses-and-nobody-loves.patch new file mode 100644 index 000000000..2d09149f7 --- /dev/null +++ b/user/grub/the-arch-everyone-uses-and-nobody-loves.patch @@ -0,0 +1,72 @@ +From 563b1da6e6ae7af46cc8354cadb5dab416989f0a Mon Sep 17 00:00:00 2001 +From: Michael Chang <mchang@suse.com> +Date: Mon, 26 Mar 2018 16:52:34 +0800 +Subject: Fix packed-not-aligned error on GCC 8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When building with GCC 8, there are several errors regarding packed-not-aligned. + +./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned] + +This patch fixes the build error by cleaning up the ambiguity of placing +aligned structure in a packed one. In "struct grub_btrfs_time" and "struct +grub_gpt_part_type", the aligned attribute seems to be superfluous, and also +has to be packed, to ensure the structure is bit-to-bit mapped to the format +laid on disk. I think we could blame to copy and paste error here for the +mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as +the name suggests. :) + +Signed-off-by: Michael Chang <mchang@suse.com> +Tested-by: Michael Chang <mchang@suse.com> +Tested-by: Paul Menzel <paulepanter@users.sourceforge.net> +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> +--- + grub-core/fs/btrfs.c | 2 +- + include/grub/efiemu/runtime.h | 2 +- + include/grub/gpt_partition.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c +index 4849c1ceb..be195448d 100644 +--- a/grub-core/fs/btrfs.c ++++ b/grub-core/fs/btrfs.c +@@ -175,7 +175,7 @@ struct grub_btrfs_time + { + grub_int64_t sec; + grub_uint32_t nanosec; +-} __attribute__ ((aligned (4))); ++} GRUB_PACKED; + + struct grub_btrfs_inode + { +diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h +index 9b6b729f4..36d2dedf4 100644 +--- a/include/grub/efiemu/runtime.h ++++ b/include/grub/efiemu/runtime.h +@@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel + + struct efi_variable + { +- grub_efi_guid_t guid; ++ grub_efi_packed_guid_t guid; + grub_uint32_t namelen; + grub_uint32_t size; + grub_efi_uint32_t attributes; +diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h +index 1b32f6725..9668a68c3 100644 +--- a/include/grub/gpt_partition.h ++++ b/include/grub/gpt_partition.h +@@ -28,7 +28,7 @@ struct grub_gpt_part_type + grub_uint16_t data2; + grub_uint16_t data3; + grub_uint8_t data4[8]; +-} __attribute__ ((aligned(8))); ++} GRUB_PACKED; + typedef struct grub_gpt_part_type grub_gpt_part_type_t; + + #define GRUB_GPT_PARTITION_TYPE_EMPTY \ +-- +cgit v1.1-33-g03f6 + diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD index 10b71dca4..2682bc026 100644 --- a/user/gst-plugins-base/APKBUILD +++ b/user/gst-plugins-base/APKBUILD @@ -13,7 +13,7 @@ replaces="gst-plugins-base1" makedepends="alsa-lib-dev cdparanoia-dev expat-dev glib-dev gobject-introspection-dev gstreamer-dev libice-dev libogg-dev libsm-dev libtheora-dev libvorbis-dev libx11-dev libxt-dev libxv-dev mesa-dev - opus-dev orc-dev pango-dev perl" + opus-dev orc-dev pango-dev perl cmd:which !gst-plugins-base" checkdepends="orc-compiler" source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz endian.patch diff --git a/user/icon-naming-utils/APKBUILD b/user/icon-naming-utils/APKBUILD index e878b858c..1d41aef6b 100644 --- a/user/icon-naming-utils/APKBUILD +++ b/user/icon-naming-utils/APKBUILD @@ -4,7 +4,7 @@ pkgname=icon-naming-utils pkgver=0.8.90 pkgrel=0 pkgdesc="Script for migrating to the Icon Naming Specification" -url="http://tango.freedesktop.org/Tango_Icon_Library" +url="http://tango-project.org/" arch="noarch" license="GPL-2.0-only" depends="perl perl-xml-simple" diff --git a/user/kaffeine/APKBUILD b/user/kaffeine/APKBUILD index 039bd9dd8..ee7dcffe2 100644 --- a/user/kaffeine/APKBUILD +++ b/user/kaffeine/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kaffeine -pkgver=2.0.16-2 +pkgver=2.0.17 pkgrel=0 pkgdesc="Media player with a focus on Digital TV (DVB)" url="https://www.kde.org/applications/multimedia/kaffeine/" @@ -13,8 +13,6 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev kxmlgui-dev solid-dev kdbusaddons-dev vlc-dev libxscrnsaver-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kaffeine/kaffeine-$pkgver.tar.xz" -builddir="$srcdir/kaffeine-$pkgver" -pkgver=2.0.16.2 build() { cd "$builddir" @@ -42,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1b39bf59127c777b34f3076a237c53973af827191d2a279d40e7f14891dcd3d7bba1444b0b456d0e614807bf6bff494568aed958632dfba54515de8de5b06f21 kaffeine-2.0.16-2.tar.xz" +sha512sums="96b4f676452102802f0226037a21572f851b2ebe2338f758d4d14f15af63adc93fc1ff15d78753284793ca01ebe9fa5f7b367545cfa491e08f563c19d63130dc kaffeine-2.0.17.tar.xz" diff --git a/user/kphotoalbum/APKBUILD b/user/kphotoalbum/APKBUILD index 86590bce3..c8c83d7f4 100644 --- a/user/kphotoalbum/APKBUILD +++ b/user/kphotoalbum/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kphotoalbum -pkgver=5.4 -pkgrel=1 +pkgver=5.5 +pkgrel=0 pkgdesc="Versatile photo album software by KDE" url="https://www.kphotoalbum.org/" arch="all" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba kphotoalbum-5.4.tar.xz" +sha512sums="fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0 kphotoalbum-5.5.tar.xz" diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD index c85aaf521..ac809584d 100644 --- a/user/krita/APKBUILD +++ b/user/krita/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krita -pkgver=4.1.5 -pkgrel=1 +pkgver=4.1.8 +pkgrel=0 pkgdesc="Digital painting program by KDE" url="https://krita.org/" arch="all" @@ -53,4 +53,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499 krita-4.1.5.tar.gz" +sha512sums="d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9 krita-4.1.8.tar.gz" diff --git a/user/kstars/0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch b/user/kstars/0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch deleted file mode 100644 index 052b849d9..000000000 --- a/user/kstars/0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b2b36b864813e512829ab8a3613f8a91f2bff20e Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Wed, 29 Aug 2018 11:27:38 -0500 -Subject: [PATCH] htmesh: Fix compile error on modern Linux systems - ---- - kstars/htmesh/SkipListElement.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kstars/htmesh/SkipListElement.h b/kstars/htmesh/SkipListElement.h -index f8187e42a..52dfff38a 100644 ---- a/kstars/htmesh/SkipListElement.h -+++ b/kstars/htmesh/SkipListElement.h -@@ -20,7 +20,7 @@ - #define KEY_MAX _I64_MAX - #else - #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || \ -- (defined(__SUNPRO_CC) && defined(__sun)) || defined(__APPLE__) -+ (defined(__SUNPRO_CC) && defined(__sun)) || defined(__APPLE__) || defined(__linux__) - #define KEY_MAX LLONG_MAX - #else - #define KEY_MAX LONG_LONG_MAX --- -2.17.1 - diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD index b98404eda..7966eb088 100644 --- a/user/kstars/APKBUILD +++ b/user/kstars/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kstars -pkgver=3.0.0 +pkgver=3.2.1 pkgrel=0 pkgdesc="Desktop planetarium" url="https://www.kde.org/applications/education/kstars/" @@ -14,14 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kxmlgui-dev kplotting-dev knotifications-dev eigen-dev mesa-dev qt5-qtwebsockets-dev libraw-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/kstars/kstars-$pkgver.tar.xz - 0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch - " +source="https://download.kde.org/stable/kstars/kstars-$pkgver.tar.xz" build() { - cd "$builddir" - mkdir build - cd build if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -34,19 +29,16 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ ${CMAKE_CROSSOPTS} \ - .. - make + -Bbuild + make -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="e574c2529898d66bc79e1cf88ce778dddeedfdfed4ea23921219226121b60be042a94e6865e9076efff038a0a529587901f9a4ab2cd5b658440a8bf39c0c4d08 kstars-3.0.0.tar.xz -8c81a6db810a99b7d8bf7adca15767fdbfb79269ab2de1e4136de3c75266dde2fd572b961f63dc9b4f619abf7292e02eed5d29ca9ba53586f30871aba6015fdb 0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch" +sha512sums="d62d2211db66941c402e19dee28ace235933fe33e077f7de3350c1a80eb02c18b23549c9cc8403fe9d34bc06332501b5ed931f992eb92c605fe7661572c3ed46 kstars-3.2.1.tar.xz" diff --git a/user/libopenraw/APKBUILD b/user/libopenraw/APKBUILD index e06f1637d..b29becc3f 100644 --- a/user/libopenraw/APKBUILD +++ b/user/libopenraw/APKBUILD @@ -4,22 +4,19 @@ pkgname=libopenraw pkgver=0.1.3 pkgrel=0 pkgdesc="Library for decoding RAW camera image formats" -url="https://libopenraw.freedesktop.org/wiki/" +url="https://libopenraw.freedesktop.org/" arch="all" license="LGPL-2.1+ AND LGPL-3.0+ AND GPL-2.0+" makedepends="boost-dev libjpeg-turbo-dev libxml2-dev glib-dev gdk-pixbuf-dev" subpackages="$pkgname-dev" source="https://libopenraw.freedesktop.org/download/libopenraw-$pkgver.tar.bz2" -sha512sums="c56d84610f0cf5da970c4c0c791fccf2f7e9f7c7dacf2aeac0b2702ce9a0cd3aaa2f6db0794b0466e1dd8316771973db1e64d013f635c1166b7ff2eebdcbf029 libopenraw-0.1.3.tar.bz2" prepare() { - cd "$builddir" default_prepare update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,12 +28,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } +sha512sums="c56d84610f0cf5da970c4c0c791fccf2f7e9f7c7dacf2aeac0b2702ce9a0cd3aaa2f6db0794b0466e1dd8316771973db1e64d013f635c1166b7ff2eebdcbf029 libopenraw-0.1.3.tar.bz2" diff --git a/user/libutempter/APKBUILD b/user/libutempter/APKBUILD index 058530412..3e8a0601e 100644 --- a/user/libutempter/APKBUILD +++ b/user/libutempter/APKBUILD @@ -3,7 +3,7 @@ pkgname=libutempter pkgver=1.1.6 pkgrel=1 pkgdesc="Library to record virtual terminal sessions in login files" -url="No URL" +url=" " arch="all" options="!check suid" # No test suite. license="LGPL-2.1+" diff --git a/user/libwnck/APKBUILD b/user/libwnck/APKBUILD index d722a9c53..a6e8bb5e1 100644 --- a/user/libwnck/APKBUILD +++ b/user/libwnck/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libwnck -pkgver=3.30.0 +pkgver=3.32.0 _pkgmaj=${pkgver%.*} pkgrel=0 pkgdesc="Window navigator construction kit library from Gnome" @@ -9,30 +9,31 @@ url="https://gnome.org" arch="all" license="LGPL-2.0+" makedepends="glib-dev gtk+3.0-dev gobject-introspection-dev vala-dev - startup-notification-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" + startup-notification-dev meson ninja" +subpackages="$pkgname-dev $pkgname-lang" source="https://download.gnome.org/sources/libwnck/$_pkgmaj/libwnck-$pkgver.tar.xz" +prepare() { + default_prepare + mkdir -p "$builddir"/build +} + build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var - make + cd "$builddir"/build + meson \ + -Dprefix=/usr \ + .. + ninja } check() { - cd "$builddir" - make check + cd "$builddir"/build + ninja test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + cd "$builddir"/build + DESTDIR="$pkgdir" ninja install } -sha512sums="79842e4645de828941ac030eeff9d232b18a51fe0d18baf5ceb2beaf897d328ee5bf3b297501e2b27e66c63d42f6546a7605a37c6d7d52ff76e9b2bc5c328128 libwnck-3.30.0.tar.xz" +sha512sums="a939b96feda20b0eba2b87556b97a9ba4b9aaea4c82c0e274a23796a3a9b49cb93be582d79e32a52a87b5ca6e35182a9d617cb802802b3c2ba2bff2b028aa3de libwnck-3.32.0.tar.xz" diff --git a/user/luarocks/APKBUILD b/user/luarocks/APKBUILD index 3a536a7bd..f890e8403 100644 --- a/user/luarocks/APKBUILD +++ b/user/luarocks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=luarocks -pkgver=3.0.4 +pkgver=3.1.0 pkgrel=0 pkgdesc="Package manager for Lua software" url="https://luarocks.org/" @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="65a28f0dca4fc45a0ee413493d0e4287de9c495b27c0366d955a16d03adf94b36cb9dbeda00fb74045809eb5048b78ea5158257b5ddafa924dc8ff0f017e95f8 luarocks-3.0.4.tar.gz" +sha512sums="fd8b63671641b0872d91af6e3f129a3b1264c23ba71b51d523ff4382ffb005799a341c4ffc6483818ed56a9d6945115018078eea7c9228ed8cb5df69207ee846 luarocks-3.1.0.tar.gz" diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD index 99289220b..2f7daa034 100644 --- a/user/marco/APKBUILD +++ b/user/marco/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=marco -pkgver=1.22.0 +pkgver=1.22.1 pkgrel=0 pkgdesc="Window manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -36,5 +36,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0935ca1532fde882e21ebbc67b41afe80e15e8519b413b9b8bde351196be347a8dcac2e092da818ec0bc700216e38211f192a891eafec8ac7d9bf63d3a42328d marco-1.22.0.tar.xz +sha512sums="18093f4d419fbc90f957a04ec3e36a153b3c51a6bcdc1ac5884adcc0292f157bc5e4af51e171451a4b54b5bccffdee2e8a07ed13dafb6106773abfb06b6a8a4f marco-1.22.1.tar.xz b377b2a7d2af094a8b4bd6d1827c85f9675656cd8bdc6892b334c8479d188459ec8585fed3c746fdaef5820f768ce93605586693a3308f0db2d6f58e08f4df49 correctly-posix.patch" diff --git a/user/mate-session-manager/APKBUILD b/user/mate-session-manager/APKBUILD index 09ee4cc78..82ff187a5 100644 --- a/user/mate-session-manager/APKBUILD +++ b/user/mate-session-manager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=mate-session-manager -pkgver=1.22.0 +pkgver=1.22.1 pkgrel=0 pkgdesc="Session manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -10,8 +10,7 @@ license="GPL-2.0+ AND LGPL-2.0+" depends="" makedepends="dbus-glib-dev gtk+3.0-dev intltool libsm-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-session-manager-$pkgver.tar.xz - no-systemd.patch" +source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-session-manager-$pkgver.tar.xz" build() { cd "$builddir" @@ -35,5 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7e5e21e37c7ac55ca7d71302edef9aabeccf39233aec9edfe93a2fdcd4150d039e8121adecebb3d0a4a707eccef0c7afa1b54c5b52b57853242964c7506eeb9a mate-session-manager-1.22.0.tar.xz -ea84e562b3a5d08b373f270d8d5fa9eeae9b803e3eb4ef925c31bad0e4e185eecfcff5465864a4a449fc5cade000b3ee18dea515744fcb59ac2efaf9df420a43 no-systemd.patch" +sha512sums="1c47134813d24abef7b2f5df098120a2cd138f822ea3d687a1a2566224bbde21482bf40ac47ba08a39ed0899ff35eeac3c3690c83c006774c47f22189688990b mate-session-manager-1.22.1.tar.xz" diff --git a/user/mate-session-manager/no-systemd.patch b/user/mate-session-manager/no-systemd.patch deleted file mode 100644 index 79c19f34a..000000000 --- a/user/mate-session-manager/no-systemd.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 254a091b31517a25bc037b31daff27fbb74ac90d Mon Sep 17 00:00:00 2001 -From: Victor Kareh <vkareh@redhat.com> -Date: Wed, 6 Mar 2019 09:20:36 -0500 -Subject: [PATCH] Guard against missing systemd - ---- - mate-session/gsm-systemd.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/mate-session/gsm-systemd.c b/mate-session/gsm-systemd.c -index da3f23b..d03cafd 100644 ---- a/mate-session/gsm-systemd.c -+++ b/mate-session/gsm-systemd.c -@@ -429,16 +429,31 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager) - gboolean is_last_session; - int ret, i; - -+#ifdef HAVE_SYSTEMD - ret = sd_pid_get_session (getpid (), &session); -+#endif -+ -+ if (session == NULL) { -+ return FALSE; -+ } - - if (ret != 0) { -+ free (session); - return FALSE; - } - -+#ifdef HAVE_SYSTEMD - ret = sd_uid_get_sessions (getuid (), FALSE, &sessions); -+#endif -+ -+ if (sessions == NULL) { -+ free (session); -+ return FALSE; -+ } - - if (ret <= 0) { - free (session); -+ free (sessions); - return FALSE; - } - -@@ -450,7 +465,9 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager) - if (g_strcmp0 (sessions[i], session) == 0) - continue; - -+#ifdef HAVE_SYSTEMD - ret = sd_session_get_state (sessions[i], &state); -+#endif - - if (ret != 0) - continue; -@@ -461,7 +478,9 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager) - } - free (state); - -+#ifdef HAVE_SYSTEMD - ret = sd_session_get_type (sessions[i], &type); -+#endif - - if (ret != 0) - continue; diff --git a/user/muparser/APKBUILD b/user/muparser/APKBUILD index 479ca0d67..f088af0fa 100644 --- a/user/muparser/APKBUILD +++ b/user/muparser/APKBUILD @@ -4,7 +4,7 @@ pkgname=muparser pkgver=2.2.6.1 pkgrel=0 pkgdesc="Fast math parser library" -url="http://beltoforion.de/article.php?a=muparser" +url="https://beltoforion.de/article.php?a=muparser" arch="all" options="!check" # No test suite. license="MIT" @@ -14,8 +14,6 @@ subpackages="$pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/beltoforion/$pkgname/archive/v$pkgver.tar.gz" build() { - cd "$builddir/build" - cmake \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ @@ -23,13 +21,12 @@ build() { -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_VERBOSE_MAKEFILE=ON \ $cmake_opts \ - ../ - make + -Bbuild + make -C build } package() { - cd "$builddir/build" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496 muparser-2.2.6.1.tar.gz" diff --git a/user/otf-culmus/APKBUILD b/user/otf-culmus/APKBUILD index d70ab7169..b67bd4347 100644 --- a/user/otf-culmus/APKBUILD +++ b/user/otf-culmus/APKBUILD @@ -4,7 +4,7 @@ pkgname=otf-culmus pkgver=0.133 pkgrel=0 pkgdesc="Culmus collections of Hebrew font families" -url="https://culmus.sourceforge.net" +url="http://culmus.sourceforge.net/" arch="noarch" options="!check" # No tests license="MIT AND GPL-2.0-only WITH font-exception" @@ -13,7 +13,6 @@ source="https://downloads.sourceforge.net/culmus/culmus-$pkgver.tar.gz" builddir="$srcdir"/${pkgname#*-}-$pkgver package() { - cd "$builddir" mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} for i in *.otf; do install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-} diff --git a/user/rc/APKBUILD b/user/rc/APKBUILD index fb05794e6..aef05b35a 100644 --- a/user/rc/APKBUILD +++ b/user/rc/APKBUILD @@ -4,7 +4,7 @@ pkgname=rc pkgver=1.7.4 pkgrel=0 pkgdesc="Reimplementation of the Plan 9 shell" -url="http://tobold.org/article/rc" +url="http://static.tobold.org/rc" arch="all" license="Zlib" depends="" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="http://static.tobold.org/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install mkdir ${pkgdir}/usr/share/man mv ${pkgdir}/usr/share/man1 ${pkgdir}/usr/share/man diff --git a/user/ttc-iosevka/APKBUILD b/user/ttc-iosevka/APKBUILD index 8791fc8aa..4d0ea71b1 100644 --- a/user/ttc-iosevka/APKBUILD +++ b/user/ttc-iosevka/APKBUILD @@ -4,7 +4,7 @@ pkgname=ttc-iosevka pkgver=2.2.1 pkgrel=0 pkgdesc="Monospace sans-serif typeface" -url="http://typeof.net/Iosevka/" +url="https://typeof.net/Iosevka/" arch="noarch" options="!check" # No test suite. license="OFL-1.1" diff --git a/user/wpa_supplicant/APKBUILD b/user/wpa_supplicant/APKBUILD index abbcbaff0..549bc4181 100644 --- a/user/wpa_supplicant/APKBUILD +++ b/user/wpa_supplicant/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=wpa_supplicant -pkgver=2.7 +pkgver=2.8 pkgrel=0 pkgdesc="Utility providing key negotiation for WPA wireless networks" url="https://w1.fi/wpa_supplicant/" @@ -11,12 +11,11 @@ options="!check" # No test suite subpackages="$pkgname-dbus::noarch $pkgname-doc $pkgname-openrc wpa_gui" depends="" makedepends="linux-headers openssl-dev dbus-dev libnl3-dev qt5-qtbase-dev" -source="http://w1.fi/releases/$pkgname-$pkgver.tar.gz +source="https://w1.fi/releases/$pkgname-$pkgver.tar.gz wpa_supplicant.initd wpa_supplicant.confd dbus.patch eloop.patch - undefined-ref.patch config wpa_cli.sh" @@ -84,7 +83,7 @@ dbus() { install -m644 dbus-wpa_supplicant.conf \ "$subpkgdir"/etc/dbus-1/system.d/wpa_supplicant.conf install -d "$subpkgdir"/usr/share/dbus-1/system-services - install fi.epitest.hostap.WPASupplicant.service \ + install fi.w1.wpa_supplicant1.service \ "$subpkgdir"/usr/share/dbus-1/system-services } @@ -96,11 +95,10 @@ wpa_gui() { install -Dm755 wpa_gui-qt4/wpa_gui "$subpkgdir"/usr/bin/wpa_gui } -sha512sums="8b6eb5b5f30d351c73db63d73c09f24028a18166246539b4a4f89f0d226fb42751afa2ff72296df33317f615150325d285e8e7bda30e0d88abcdc9637ab731d3 wpa_supplicant-2.7.tar.gz +sha512sums="b37d254d32a4b7a1f95fcb18ec1be0ffb9d025e0b21c42c53acc4cd839be355df1b125b32cc073f9fe09b746807321e23dbe25dc2fc8a7cafa1e71add69f245b wpa_supplicant-2.8.tar.gz 11eed22f6e793f40c788d586c715deecae03c421d11761b7b4a376660bce812c54cc6f353c7d4d5da9c455aeffd778baefb9e76d380027a729574a756e54ddcc wpa_supplicant.initd 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 wpa_supplicant.confd dac56bc505a51167042ebe548f0e81a20a5578f753af9bb7ec3335a542d799c6e8739681ef7c8f7747a9bc954f8aa6f1a147250eacba17fd7fff80c4e53638ed dbus.patch 2be055dd1f7da5a3d8e79c2f2c0220ddd31df309452da18f290144d2112d6dbde0fc633bb2ad02c386a39d7785323acaf5f70e5969995a1e8303a094eb5fe232 eloop.patch -5e790b3ae50f3d29cb38f73cff30f8994798e7bdbecc9f852def910a8150c1724c051bbb52603fa9c6818c950a5fe347bccd21848427f31f54d641ae40621c3f undefined-ref.patch 221660fa0350442a7d8371686b2118861052a4613fb352b7f80079e3750b82f4e48efc378b9d617455007d1106552b695fdca506a3c338283986641f3848b202 config 45d3e70c47d0f7d6dc6730853af8cbcb40ed0713ee7b1069698f5a635939f273f66e72d4221e064c3c71a92154cf07841c8c0d4fc14d796dbb6fe0d92776ee2b wpa_cli.sh" diff --git a/user/wpa_supplicant/undefined-ref.patch b/user/wpa_supplicant/undefined-ref.patch deleted file mode 100644 index 97a8cc7f3..000000000 --- a/user/wpa_supplicant/undefined-ref.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f2973fa39d6109f0f34969e91551a98dc340d537 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Mon, 3 Dec 2018 12:00:26 +0200 -Subject: FT: Fix CONFIG_IEEE80211X=y build without CONFIG_FILS=y - -remove_ie() was defined within an ifdef CONFIG_FILS block while it is -now needed even without CONFIG_FILS=y. Remove the CONFIG_FILS condition -there. - -Fixes 8c41734e5de1 ("FT: Fix Reassociation Request IEs during FT protocol") -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - wpa_supplicant/sme.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c -index 39c8069..f77f751 100644 ---- a/wpa_supplicant/sme.c -+++ b/wpa_supplicant/sme.c -@@ -1386,7 +1386,6 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data) - } - - --#ifdef CONFIG_FILS - #ifdef CONFIG_IEEE80211R - static void remove_ie(u8 *buf, size_t *len, u8 eid) - { -@@ -1401,7 +1400,6 @@ static void remove_ie(u8 *buf, size_t *len, u8 eid) - } - } - #endif /* CONFIG_IEEE80211R */ --#endif /* CONFIG_FILS */ - - - void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode, --- -cgit v0.12 - diff --git a/user/zstd/APKBUILD b/user/zstd/APKBUILD index dc23629a8..e47eceb12 100644 --- a/user/zstd/APKBUILD +++ b/user/zstd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=zstd -pkgver=1.3.8 +pkgver=1.4.0 pkgrel=0 pkgdesc="Fast real-time compression algorithm" url="https://facebook.github.io/zstd/" @@ -24,4 +24,4 @@ package() { make PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="5c1c0a7a998b814a9edc1466f6d321b0d8ffcf927295fd5499137c9075a8823be03d98f61ea5212d1969f8d52b32e940b1cc10d1507d7702424ea2eea0e79a1b zstd-1.3.8.tar.gz" +sha512sums="ef6d95639593fed3cfb9ff4f1527c4ba38658e42f16eb3369b2a4bbe150905751bb71c6e3fe9c8bbdfceee26a540ae3e41bd0f0bc692d36db444b7da65a6e304 zstd-1.4.0.tar.gz" |