Date: Wednesday, June 23, 2021 @ 19:49:16 Author: heftig Revision: 418667
archrelease: copy trunk to extra-x86_64 Added: libcanberra/repos/extra-x86_64/40-libcanberra-gtk-module.sh (from rev 418666, libcanberra/trunk/40-libcanberra-gtk-module.sh) libcanberra/repos/extra-x86_64/PKGBUILD (from rev 418666, libcanberra/trunk/PKGBUILD) libcanberra/repos/extra-x86_64/libcanberra-multi-backend.patch (from rev 418666, libcanberra/trunk/libcanberra-multi-backend.patch) Deleted: libcanberra/repos/extra-x86_64/40-libcanberra-gtk-module.sh libcanberra/repos/extra-x86_64/PKGBUILD ---------------------------------+ 40-libcanberra-gtk-module.sh | 26 ++++---- PKGBUILD | 119 ++++++++++++++++++++------------------ libcanberra-multi-backend.patch | 26 ++++++++ 3 files changed, 102 insertions(+), 69 deletions(-) Deleted: 40-libcanberra-gtk-module.sh =================================================================== --- 40-libcanberra-gtk-module.sh 2021-06-23 19:48:39 UTC (rev 418666) +++ 40-libcanberra-gtk-module.sh 2021-06-23 19:49:16 UTC (rev 418667) @@ -1,13 +0,0 @@ -#!/bin/sh - -case "${DESKTOP_SESSION-}" in - gnome*) # Done by gnome-settings-daemon - ;; - *) - # Extra check in case DESKTOP_SESSION is not set correctly - if [ -z "${GNOME_DESKTOP_SESSION_ID-}" ]; then - GTK_MODULES="${GTK_MODULES:+$GTK_MODULES:}canberra-gtk-module" - export GTK_MODULES - fi - ;; -esac Copied: libcanberra/repos/extra-x86_64/40-libcanberra-gtk-module.sh (from rev 418666, libcanberra/trunk/40-libcanberra-gtk-module.sh) =================================================================== --- 40-libcanberra-gtk-module.sh (rev 0) +++ 40-libcanberra-gtk-module.sh 2021-06-23 19:49:16 UTC (rev 418667) @@ -0,0 +1,13 @@ +#!/bin/sh + +case "${DESKTOP_SESSION-}" in + gnome*) # Done by gnome-settings-daemon + ;; + *) + # Extra check in case DESKTOP_SESSION is not set correctly + if [ -z "${GNOME_DESKTOP_SESSION_ID-}" ]; then + GTK_MODULES="${GTK_MODULES:+$GTK_MODULES:}canberra-gtk-module" + export GTK_MODULES + fi + ;; +esac Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-06-23 19:48:39 UTC (rev 418666) +++ PKGBUILD 2021-06-23 19:49:16 UTC (rev 418667) @@ -1,56 +0,0 @@ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=libcanberra -pkgver=0.30+2+gc0620e4 -pkgrel=4 -pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" -url="http://0pointer.de/lennart/projects/libcanberra" -arch=(x86_64) -license=(LGPL) -depends=(libvorbis libltdl alsa-lib libpulse tdb sound-theme-freedesktop) -makedepends=(gtk-doc gtk2 gtk3 git) -provides=("libcanberra-pulse=$pkgver-$pkgrel" libcanberra{,-gtk,-gtk3}.so) -replaces=("libcanberra-pulse<0.30+2+gc0620e4-4") -options=(libtool) -_commit=c0620e432650e81062c1967cc669829dbd29b310 # master -source=("git+http://git.0pointer.net/clone/libcanberra.git#commit=$_commit" - 40-libcanberra-gtk-module.sh) -sha256sums=('SKIP' - 'a0d0b135d3fea5c703a5f84208b79d66f671b082ae85f67b629ee2568a7ddc30') - -pkgver() { - cd libcanberra - git describe --tags | sed 's/^v//;s/-/+/g' -} - -prepare() { - cd libcanberra - ./autogen.sh -} - -build() { - cd libcanberra - ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ - --disable-static --with-builtin=dso --enable-null --disable-oss \ - --enable-alsa --enable-pulse \ - --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-gtk-doc - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -package_libcanberra() { - cd libcanberra - - make -j1 DESTDIR="$pkgdir" install - - rm "$pkgdir"/usr/lib/*.la - rm "$pkgdir"/usr/lib/gtk-{2,3}.0/modules/*.la - - # FS#52370: Remove login, logout and system-ready sounds. - # We have no sound themes that include these so do not play them. - rm -r "$pkgdir"/usr/share/{gnome,gdm} - - install -Dt "$pkgdir/etc/X11/xinit/xinitrc.d" ../40-libcanberra-gtk-module.sh -} - -# vim:set sw=2 et: Copied: libcanberra/repos/extra-x86_64/PKGBUILD (from rev 418666, libcanberra/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-06-23 19:49:16 UTC (rev 418667) @@ -0,0 +1,63 @@ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=libcanberra +pkgver=0.30+2+gc0620e4 +pkgrel=5 +pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" +url="http://0pointer.de/lennart/projects/libcanberra" +arch=(x86_64) +license=(LGPL) +depends=(libvorbis libltdl alsa-lib libpulse tdb sound-theme-freedesktop) +makedepends=(gtk-doc gtk2 gtk3 git) +provides=("libcanberra-pulse=$pkgver-$pkgrel" libcanberra{,-gtk,-gtk3}.so) +replaces=("libcanberra-pulse<0.30+2+gc0620e4-4") +options=(libtool) +_commit=c0620e432650e81062c1967cc669829dbd29b310 # master +source=("git+http://git.0pointer.net/clone/libcanberra.git#commit=$_commit" + 40-libcanberra-gtk-module.sh + libcanberra-multi-backend.patch) +sha256sums=('SKIP' + 'a0d0b135d3fea5c703a5f84208b79d66f671b082ae85f67b629ee2568a7ddc30' + 'de146cae3e40a16b38c8edb4f1a3a423c64eb9c5000e36c316b677e9909c9b06') + +pkgver() { + cd libcanberra + git describe --tags | sed 's/^v//;s/-/+/g' +} + +prepare() { + cd libcanberra + + # https://bugs.archlinux.org/task/71341 + # https://bugs.freedesktop.org/show_bug.cgi?id=51662 + patch -Np1 -i ../libcanberra-multi-backend.patch + + ./autogen.sh +} + +build() { + cd libcanberra + ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ + --disable-static --with-builtin=dso --enable-null --disable-oss \ + --enable-alsa --enable-pulse \ + --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-gtk-doc + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package_libcanberra() { + cd libcanberra + + make -j1 DESTDIR="$pkgdir" install + + rm "$pkgdir"/usr/lib/*.la + rm "$pkgdir"/usr/lib/gtk-{2,3}.0/modules/*.la + + # FS#52370: Remove login, logout and system-ready sounds. + # We have no sound themes that include these so do not play them. + rm -r "$pkgdir"/usr/share/{gnome,gdm} + + install -Dt "$pkgdir/etc/X11/xinit/xinitrc.d" ../40-libcanberra-gtk-module.sh +} + +# vim:set sw=2 et: Copied: libcanberra/repos/extra-x86_64/libcanberra-multi-backend.patch (from rev 418666, libcanberra/trunk/libcanberra-multi-backend.patch) =================================================================== --- libcanberra-multi-backend.patch (rev 0) +++ libcanberra-multi-backend.patch 2021-06-23 19:49:16 UTC (rev 418667) @@ -0,0 +1,26 @@ +Index: libcanberra-0.29/src/driver-order.c +=================================================================== +--- libcanberra-0.29.orig/src/driver-order.c ++++ libcanberra-0.29/src/driver-order.c +@@ -30,6 +30,7 @@ + #include "driver-order.h" + + const char* const ca_driver_order[] = { ++ "multi", + #ifdef HAVE_PULSE + "pulse", + #endif +Index: libcanberra-0.29/src/multi.c +=================================================================== +--- libcanberra-0.29.orig/src/multi.c ++++ libcanberra-0.29/src/multi.c +@@ -107,8 +107,7 @@ int driver_open(ca_context *c) { + int ret = CA_SUCCESS; + + ca_return_val_if_fail(c, CA_ERROR_INVALID); +- ca_return_val_if_fail(c->driver, CA_ERROR_NODRIVER); +- ca_return_val_if_fail(!strncmp(c->driver, "multi", 5), CA_ERROR_NODRIVER); ++ ca_return_val_if_fail(!c->driver || strncmp(c->driver, "multi", 5) == 0, CA_ERROR_NODRIVER); + ca_return_val_if_fail(!PRIVATE(c), CA_ERROR_STATE); + + if (!(c->private = p = ca_new0(struct private, 1)))