summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--user/cairo/APKBUILD58
-rw-r--r--user/fontconfig/APKBUILD6
-rw-r--r--user/gst-plugins-base/APKBUILD6
-rw-r--r--user/gst-plugins-good/APKBUILD23
-rw-r--r--user/gstreamer/APKBUILD20
-rw-r--r--user/harfbuzz/APKBUILD29
-rw-r--r--user/pango/APKBUILD22
-rw-r--r--user/xfce-desktop/APKBUILD2
8 files changed, 61 insertions, 105 deletions
diff --git a/user/cairo/APKBUILD b/user/cairo/APKBUILD
index d9be3529f..99b45658c 100644
--- a/user/cairo/APKBUILD
+++ b/user/cairo/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Zach van Rijn <me@zv.io>
pkgname=cairo
-pkgver=1.16.0
-pkgrel=3
+pkgver=1.18.4
+pkgrel=0
pkgdesc="A vector graphics library"
url="https://cairographics.org/"
arch="all"
@@ -10,16 +10,11 @@ license="LGPL-2.0+ AND MPL-1.1"
depends=""
depends_dev="fontconfig-dev freetype-dev libxrender-dev pixman-dev
xcb-util-dev libxext-dev $pkgname-tools"
-makedepends="$depends_dev zlib-dev expat-dev glib-dev libpng-dev cmd:which"
+makedepends="$depends_dev gtk-doc meson zlib-dev expat-dev glib-dev libpng-dev
+ cmd:which"
subpackages="$pkgname-dev $pkgname-doc $pkgname-gobject $pkgname-tools"
-# fontconfig-ultimate https://github.com/bohoomil/fontconfig-ultimate
-_ultver="2016-04-23"
source="https://cairographics.org/releases/$pkgname-$pkgver.tar.xz
- fontconfig-ultimate-$_ultver.tar.gz::https://github.com/bohoomil/fontconfig-ultimate/archive/$_ultver.tar.gz
musl-stacksize.patch
- CVE-2018-19876.patch
- CVE-2019-6462.patch
- CVE-2020-35492.patch
"
# secfixes:
@@ -29,42 +24,21 @@ source="https://cairographics.org/releases/$pkgname-$pkgver.tar.xz
# 1.16.0-r1:
# - CVE-2018-19876
-prepare() {
- default_prepare
-
- # infinality
- for j in "$srcdir"/fontconfig-ultimate-$_ultver/$pkgname/*.patch; do
- msg "Applying ${j}"
- patch -p1 -i $j
- done
-}
-
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
+ meson setup \
--prefix=/usr \
--sysconfdir=/etc \
+ --mandir=/usr/share/man \
--localstatedir=/var \
- --enable-ft \
- --enable-gobject \
- --enable-pdf \
- --enable-png \
- --enable-ps \
- --enable-svg \
- --enable-tee \
- --enable-x \
- --enable-xcb \
- --enable-xcb-shm \
- --enable-xlib \
- --enable-xlib-xrender \
- --disable-xlib-xcb \
- --disable-static
- make
+ --buildtype=release \
+ --wrap-mode=nofallback \
+ -Dgtk_doc=true \
+ build
+ meson compile -C build
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install -C build
}
gobject() {
@@ -81,9 +55,5 @@ tools() {
"$subpkgdir"/usr/lib/cairo/
}
-sha512sums="9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f cairo-1.16.0.tar.xz
-d8185f4ec74f44c4746acf7e79bba7ff7ffd9d35bdabeb25e10b4e12825942d910931aa857f1645e5c8185bcb40a1f1ffe1e7e647428e9ea66618b2aec52fac3 fontconfig-ultimate-2016-04-23.tar.gz
-86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch
-9020c596caa54a2ac435d5dae0f121d36d3c3f34d487b9c1032665b1bd15813506adf31984e34b5dd328ee0e068de0627e1d061230758328cae4fa993c3a9209 CVE-2018-19876.patch
-ebe5d71b18aa9eefe1e0a6c150761bb7abef41f144f37eb0bfa8a01947aacb1292ac131cf815dcaaaa6478c0aac07ca5428fba28ad346a00c5aaa5fa64f6ff5b CVE-2019-6462.patch
-8dcb95b6a8e023ad5675f81f9a87a087868dc74113cd0ab96568d525582266c366064cc7cc168738dc75968385ab0444911f54754d31962dfe1235526afbd72c CVE-2020-35492.patch"
+sha512sums="863679f817ed67dc2c916c035d740916e27e7e69c04fca63936e37d274e7f4c79848d16c8f7c481798864602e8847c489f698df89b785cbc576c925dbd513316 cairo-1.18.4.tar.xz
+86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch"
diff --git a/user/fontconfig/APKBUILD b/user/fontconfig/APKBUILD
index aeae4256d..227d555c1 100644
--- a/user/fontconfig/APKBUILD
+++ b/user/fontconfig/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
# Maintainer:
pkgname=fontconfig
-pkgver=2.13.1
+pkgver=2.16.0
pkgrel=0
pkgdesc="Library for configuring and customizing font access"
url="https://www.freedesktop.org/wiki/Software/fontconfig/"
@@ -12,7 +12,7 @@ depends=""
makedepends="freetype-dev expat-dev python3-dev gperf util-linux-dev"
triggers="$pkgname.trigger=/usr/share/fonts/*"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://www.freedesktop.org/software/fontconfig/release/${pkgname}-${pkgver}.tar.gz"
+source="https://www.freedesktop.org/software/fontconfig/release/${pkgname}-${pkgver}.tar.xz"
build() {
# regenerate hash functions
@@ -37,4 +37,4 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="830df32e944ee21ad02a9df04787b9902af36ffc13913524acef6e38799a38c5df7a6e407cc0ff9c24455520549d53b3d85d22642a229ac654dc9269926f130b fontconfig-2.13.1.tar.gz"
+sha512sums="90b5c39e5eadc56a9fbddd69b2a6eaa6bf9ee5cda003091b0896e66f87f3c1be8ab4442f54d20fca7232d72f60d9578f5e5ba3f376e39b64b8a2aa7b8f13b062 fontconfig-2.16.0.tar.xz"
diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD
index 6a89cb469..07d8d21c3 100644
--- a/user/gst-plugins-base/APKBUILD
+++ b/user/gst-plugins-base/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gst-plugins-base
-pkgver=1.20.1
-pkgrel=1
+pkgver=1.26.0
+pkgrel=0
pkgdesc="GStreamer multimedia framework - Base plugins"
url="https://gstreamer.freedesktop.org/"
arch="all"
@@ -38,4 +38,4 @@ package() {
DESTDIR="$pkgdir" ninja -C _build install
}
-sha512sums="679a0eee1973fa9612e2e24978e2c2d9d8fdc5732e1699b4a87712881f1549d0811719a13ff4fe77b91322ca4425c39623b371703f6b3a36fb7238b977d3e541 gst-plugins-base-1.20.1.tar.xz"
+sha512sums="bc332690cecaed6ade28ba4a8cc76eb897f3cc447e04d00fb92af0f3a5b838764660a46b0ebff0e994d69ffa7e332048c627b3f3e613528ebac3cdd3e8c6f0fc gst-plugins-base-1.26.0.tar.xz"
diff --git a/user/gst-plugins-good/APKBUILD b/user/gst-plugins-good/APKBUILD
index bc8624aa0..d0b3095ac 100644
--- a/user/gst-plugins-good/APKBUILD
+++ b/user/gst-plugins-good/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gst-plugins-good
-pkgver=1.20.2
-pkgrel=2
+pkgver=1.26.0
+pkgrel=0
pkgdesc="GStreamer multimedia framework - Free, well-written plugins"
url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html"
arch="all"
@@ -17,28 +17,25 @@ makedepends="gst-plugins-base-dev gstreamer-dev gobject-introspection-dev
wayland-protocols"
subpackages="$pkgname-gtk $pkgname-lang"
ldpath="/usr/lib/gstreamer-1.0"
-source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz
- drop-messages-interval-type.patch
- fix-arm-test-alignment.patch
- "
+source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz"
build() {
- meson \
+ meson setup \
-Dprefix=/usr \
-Dnls=enabled \
-Dorc=disabled \
-Dpackage-name="GStreamer Good Plugins (${DISTRO_NAME:-Adélie Linux})" \
-Dpackage-origin="${DISTRO_URL:-https://www.adelielinux.org/}" \
- _build
- ninja -C _build
+ build
+ meson compile -C build
}
check() {
- ninja -C _build test
+ meson test -C build
}
package() {
- DESTDIR="$pkgdir" ninja -C _build install
+ DESTDIR="$pkgdir" meson install -C build
}
gtk() {
@@ -51,6 +48,4 @@ gtk() {
"$subpkgdir"/usr/lib/gstreamer-1.0/
}
-sha512sums="a10ea48fdfbe741e9bc63036b011748558f89968aaa525380ac99884c27463d190c0b49e2d98b4f554eee6ead8a5c5da3ba62e5b0b1fe54877598beccc68a933 gst-plugins-good-1.20.2.tar.xz
-0f08a08d6f0e8303a9c899c5260f6ca2c0e0a41e1ca2a9c795c1cb1267a9003354cd0e5538022049a09784ba9000a4a60b7a0b07b38a18483ec30d9a86356e46 drop-messages-interval-type.patch
-b08c5013100dff428125dca9075641a8c528ccdcdf005b66b286cfe3b8b6f80c4b04f41d768883e98112107b857e17af68e2864a331f379bd7ea5027adc641d8 fix-arm-test-alignment.patch"
+sha512sums="b354812ef201343557b3e58a7756b46eba56e150cb724dd2cd0cc84d6cde6a6621a02fe56f07e87bd1028da312cb074a693311920de24fb11e51d0c5d147f6d6 gst-plugins-good-1.26.0.tar.xz"
diff --git a/user/gstreamer/APKBUILD b/user/gstreamer/APKBUILD
index 94c5af1c9..82b3cd86d 100644
--- a/user/gstreamer/APKBUILD
+++ b/user/gstreamer/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gstreamer
-pkgver=1.20.1
+pkgver=1.26.0
pkgrel=0
pkgdesc="GStreamer multimedia framework"
url="https://gstreamer.freedesktop.org/"
@@ -12,13 +12,10 @@ makedepends="$depends_dev bison flex gobject-introspection-dev glib-dev
meson ninja"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-lang"
source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz
- disable-tests.patch
- test-deadlock.patch
- time64.patch
"
build() {
- meson \
+ meson setup \
-Dprefix=/usr \
-Dintrospection=enabled \
-Dpackage-name="GStreamer (${DISTRO_NAME:-Adélie Linux})" \
@@ -26,16 +23,16 @@ build() {
-Dglib-asserts=disabled \
-Dnls=enabled \
-Dptp-helper-permissions=none \
- _build
- ninja -C _build
+ build
+ meson compile -C build
}
check() {
- ninja -C _build test
+ meson test -C build
}
package() {
- DESTDIR="$pkgdir" ninja -C _build install
+ DESTDIR="$pkgdir" meson install -C build
}
dev() {
@@ -55,7 +52,4 @@ tools() {
mv "$pkgdir"/usr/lib/libgstcheck-1.0.so.* "$subpkgdir"/usr/lib/
}
-sha512sums="d6f67cce81ba15fba3fcf70850e3c84b25e8da3e53fd56e6f2c87c7ee1701071ea44deb754a0ea371b3cb17877f26aab94d9eccb6729cbb370d6d6d5c324aa1a gstreamer-1.20.1.tar.xz
-39e6bfb52ebe85beefa2550eb404f83c5bbb3546cc1733b99e757401d2d182f95d829b90df99d5f43506d7c85d4f44ac797f35653cd42a935f1dc56d0b844c02 disable-tests.patch
-d7e574e8715607d3103d46eb05388b781702a9e937d78f8cfab6d8d48d04baa7fbfe547bdeb816bbfddb5a333dd1862e460b057b12ea24704351ef5653f78491 test-deadlock.patch
-977a9e689cce68b151a742ef67dbb60a10a55fcfae67f086909e1f0fc4a5998026acd03aeed32068fdb0485dd884c4313f39a63e3bab5baaafa878c439531bc3 time64.patch"
+sha512sums="9faf15d9a01fb5a89b8338ce56d00f69cd7bf64d48a301a71d29a18f830a9dcc0d233939ab21f675cd984428c7799f830c3cb84edc324bcc89f43a7af0789f74 gstreamer-1.26.0.tar.xz"
diff --git a/user/harfbuzz/APKBUILD b/user/harfbuzz/APKBUILD
index f858e0b00..588c64469 100644
--- a/user/harfbuzz/APKBUILD
+++ b/user/harfbuzz/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer:
pkgname=harfbuzz
-pkgver=2.6.8
-pkgrel=1
+pkgver=10.4.0
+pkgrel=0
pkgdesc="Text shaping library"
url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
arch="all"
@@ -10,35 +10,32 @@ options="!check" # tests depend on certain freetype behaviours
license="MIT"
depends=""
makedepends="cairo-dev freetype-dev glib-dev gobject-introspection-dev icu-dev
- graphite2-dev"
+ graphite2-dev meson"
checkdepends="python3"
subpackages="$pkgname-dev $pkgname-icu"
source="https://github.com/$pkgname/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"
build() {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
+ meson setup \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--localstatedir=/var \
- --disable-static \
- --with-glib \
- --with-gobject \
- --with-graphite2 \
- --with-icu \
- --with-truetype
- make
+ -Dgobject=enabled \
+ -Dcairo=enabled \
+ -Dgraphite2=enabled \
+ -Dfreetype=enabled \
+ build
+ meson compile -C build
}
check() {
- make check
+ meson test -C build
}
package() {
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install -C build
}
dev() {
@@ -53,4 +50,4 @@ icu() {
mv "$pkgdir"/usr/lib/lib*icu.so.* "$subpkgdir"/usr/lib/
}
-sha512sums="651b23d7d4fab6fef472ee57db39bbaebc31c2f40ea3a482c1499ad1a7b549b86a2bccbe9da191c8e9ecdf464191dd3c9a7485546b51695ad8ab3c0329732d9d harfbuzz-2.6.8.tar.xz"
+sha512sums="73e202225aeef6174ebd3b8b226ad9d5afb48c40ecdc1bc26d1bc5f0cf1d832a8ffc2fe5b7ae3b7c8f848552dd57116d407f44120c6813b59dbe9faed0c346dc harfbuzz-10.4.0.tar.xz"
diff --git a/user/pango/APKBUILD b/user/pango/APKBUILD
index 43b8630fb..5228d3404 100644
--- a/user/pango/APKBUILD
+++ b/user/pango/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Zach van Rijn <me@zv.io>
pkgname=pango
-pkgver=1.50.7
+pkgver=1.56.3
pkgrel=0
pkgdesc="Library for laying out and rendering text"
url="https://www.pango.org/"
@@ -21,19 +21,19 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve
# - CVE-2019-1010238
build () {
- meson \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --localstatedir=/var \
- --buildtype=release \
- . output
- ninja -C output
+ meson setup \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --buildtype=release \
+ build
+ meson compile -C build
}
package() {
mkdir -p "$pkgdir"/etc/pango
- DESTDIR="$pkgdir" ninja -C output install
+ DESTDIR="$pkgdir" meson install -C build
}
-sha512sums="4d754ed753fc34074c2a8751459406af7eb1eccb227c6158287f7e2921614d918cae47d078d4a2b4c098b641e40274e81bf1ec6b6a1b147efd550626665767d3 pango-1.50.7.tar.xz"
+sha512sums="adb5aa66ea0c45f7bb112867a77f25d31d39bbb18fd8d41df0c1fd329714def874aa3cb8a49847561a75b0824c2abf8ce09a610d088e88d7de015c36a1536ac0 pango-1.56.3.tar.xz"
diff --git a/user/xfce-desktop/APKBUILD b/user/xfce-desktop/APKBUILD
index 3c74251c8..2a6b532ad 100644
--- a/user/xfce-desktop/APKBUILD
+++ b/user/xfce-desktop/APKBUILD
@@ -13,7 +13,7 @@ depends="catfish gigolo exo mousepad orage parole ristretto thunar
xfce4-power-manager xfce4-settings xfce4-volumed-pulse xfdesktop
xfce4-appfinder xfce4-panel xfce4-screenshooter xfce4-taskmanager
xfconf xfce4-dict xfce4-panel-profiles xfce4-session xfdashboard xfmpc
- xfwm4 xfce4-terminal xfce4-notifyd adelie-fonts"
+ xfwm4 xfce4-terminal xfce4-notifyd adelie-xfce-theme"
makedepends=""
source="org.adelie-linux.about-xfce.desktop"