Andreas Wacknitz
2023-12-17 779d08ec663794a9f635e6316d742253af313e72
libcanberra: update to 0.30

Note: This has only GNOME-3.0 session support; dropped support for 2.0
2 files deleted
5 files modified
151 ■■■■ changed files
components/library/libcanberra/Makefile 16 ●●●●● patch | view | raw | blame | history
components/library/libcanberra/libcanberra.p5m 38 ●●●●● patch | view | raw | blame | history
components/library/libcanberra/manifests/sample-manifest.p5m 32 ●●●●● patch | view | raw | blame | history
components/library/libcanberra/patches/01-solaris.patch 27 ●●●●● patch | view | raw | blame | history
components/library/libcanberra/patches/02-device.patch 16 ●●●● patch | view | raw | blame | history
components/library/libcanberra/patches/03-gtk3.patch 20 ●●●●● patch | view | raw | blame | history
components/library/libcanberra/pkg5 2 ●●● patch | view | raw | blame | history
components/library/libcanberra/Makefile
@@ -18,15 +18,13 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME=         libcanberra
# Note that version 0.26 is the last version with support for GNOME-2.0 sessions. Later versions only support GNOME-3.0 session.
COMPONENT_VERSION=      0.26
COMPONENT_REVISION=     5
COMPONENT_VERSION=      0.30
COMPONENT_SUMMARY=      Event Sound API Using XDG Sound Theming Specification
COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= sha256:4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982
COMPONENT_ARCHIVE_URL=  https://0pointer.de/lennart/projects/libcanberra/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL=  https://0pointer.de/lennart/projects/libcanberra/
COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= sha256:c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72
COMPONENT_ARCHIVE_URL=  http://0pointer.de/lennart/projects/libcanberra/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL=  http://0pointer.de/lennart/projects/libcanberra/
COMPONENT_FMRI=         library/desktop/xdg/libcanberra
COMPONENT_CLASSIFICATION=System/Multimedia Libraries
COMPONENT_LICENSE=      LGPLv2.1
@@ -50,11 +48,9 @@
CONFIGURE_OPTIONS += --enable-gtk
CONFIGURE_OPTIONS += --disable-static
COMPONENT_INSTALL_ENV += GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
# Auto-generated dependencies
REQUIRED_PACKAGES += gnome/config/gconf
REQUIRED_PACKAGES += library/audio/gstreamer
REQUIRED_PACKAGES += library/audio/gstreamer1
REQUIRED_PACKAGES += library/audio/pulseaudio
REQUIRED_PACKAGES += library/desktop/gtk2
REQUIRED_PACKAGES += library/desktop/gtk3
components/library/libcanberra/libcanberra.p5m
@@ -23,15 +23,13 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
<transform file path=usr/share/gtk-doc/.* ->  default facet.doc true>
<transform file path=usr/share/gtk-doc/html/.* ->  default facet.doc.html true>
<transform file path=usr/share/locale/([^/]+)(\..+){0,1}(/.+){0,1} -> default facet.locale.%<\1> true>
<transform file path=etc/gconf/.* ->  default restart_fmri svc:/application/desktop-cache/gconf-cache:default>
file path=etc/gconf/schemas/libcanberra.schemas
<transform file path=usr/share/locale/([^/]+)(\..+){0,1}(/.+){0,1} -> default facet.locale.%<\1> true>
file path=usr/bin/canberra-gtk-play
file path=usr/include/canberra-gtk.h
file path=usr/include/canberra.h
file path=usr/lib/$(MACH64)/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
file path=usr/lib/$(MACH64)/gtk-2.0/modules/libcanberra-gtk-module.so
link path=usr/lib/$(MACH64)/gtk-3.0/modules/libcanberra-gtk-module.so \
    target=libcanberra-gtk3-module.so
@@ -41,16 +39,16 @@
file path=usr/lib/$(MACH64)/libcanberra-$(HUMAN_VERSION)/libcanberra-null.so
file path=usr/lib/$(MACH64)/libcanberra-$(HUMAN_VERSION)/libcanberra-oss.so
file path=usr/lib/$(MACH64)/libcanberra-$(HUMAN_VERSION)/libcanberra-pulse.so
link path=usr/lib/$(MACH64)/libcanberra-gtk.so target=libcanberra-gtk.so.0.1.7
link path=usr/lib/$(MACH64)/libcanberra-gtk.so.0 target=libcanberra-gtk.so.0.1.7
file path=usr/lib/$(MACH64)/libcanberra-gtk.so.0.1.7
link path=usr/lib/$(MACH64)/libcanberra-gtk3.so target=libcanberra-gtk3.so.0.1.7
link path=usr/lib/$(MACH64)/libcanberra-gtk.so target=libcanberra-gtk.so.0.1.9
link path=usr/lib/$(MACH64)/libcanberra-gtk.so.0 target=libcanberra-gtk.so.0.1.9
file path=usr/lib/$(MACH64)/libcanberra-gtk.so.0.1.9
link path=usr/lib/$(MACH64)/libcanberra-gtk3.so target=libcanberra-gtk3.so.0.1.9
link path=usr/lib/$(MACH64)/libcanberra-gtk3.so.0 \
    target=libcanberra-gtk3.so.0.1.7
file path=usr/lib/$(MACH64)/libcanberra-gtk3.so.0.1.7
link path=usr/lib/$(MACH64)/libcanberra.so target=libcanberra.so.0.2.4
link path=usr/lib/$(MACH64)/libcanberra.so.0 target=libcanberra.so.0.2.4
file path=usr/lib/$(MACH64)/libcanberra.so.0.2.4
    target=libcanberra-gtk3.so.0.1.9
file path=usr/lib/$(MACH64)/libcanberra-gtk3.so.0.1.9
link path=usr/lib/$(MACH64)/libcanberra.so target=libcanberra.so.0.2.5
link path=usr/lib/$(MACH64)/libcanberra.so.0 target=libcanberra.so.0.2.5
file path=usr/lib/$(MACH64)/libcanberra.so.0.2.5
file path=usr/lib/$(MACH64)/pkgconfig/libcanberra-gtk.pc
file path=usr/lib/$(MACH64)/pkgconfig/libcanberra-gtk3.pc
file path=usr/lib/$(MACH64)/pkgconfig/libcanberra.pc
@@ -58,17 +56,5 @@
file path=usr/share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
file path=usr/share/gnome/autostart/libcanberra-login-sound.desktop
file path=usr/share/gnome/shutdown/libcanberra-logout-sound.sh
file path=usr/share/gtk-doc/html/libcanberra/ch01.html
file path=usr/share/gtk-doc/html/libcanberra/home.png
file path=usr/share/gtk-doc/html/libcanberra/index.html
file path=usr/share/gtk-doc/html/libcanberra/index.sgml
file path=usr/share/gtk-doc/html/libcanberra/left.png
file path=usr/share/gtk-doc/html/libcanberra/libcanberra-canberra-gtk.html
file path=usr/share/gtk-doc/html/libcanberra/libcanberra-canberra.html
file path=usr/share/gtk-doc/html/libcanberra/libcanberra.devhelp
file path=usr/share/gtk-doc/html/libcanberra/libcanberra.devhelp2
file path=usr/share/gtk-doc/html/libcanberra/right.png
file path=usr/share/gtk-doc/html/libcanberra/style.css
file path=usr/share/gtk-doc/html/libcanberra/up.png
file path=usr/share/vala/vapi/libcanberra-gtk.vapi
file path=usr/share/vala/vapi/libcanberra.vapi
components/library/libcanberra/manifests/sample-manifest.p5m
@@ -23,10 +23,10 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=etc/gconf/schemas/libcanberra.schemas
file path=usr/bin/canberra-gtk-play
file path=usr/include/canberra-gtk.h
file path=usr/include/canberra.h
file path=usr/lib/$(MACH64)/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
file path=usr/lib/$(MACH64)/gtk-2.0/modules/libcanberra-gtk-module.so
link path=usr/lib/$(MACH64)/gtk-3.0/modules/libcanberra-gtk-module.so \
    target=libcanberra-gtk3-module.so
@@ -36,16 +36,16 @@
file path=usr/lib/$(MACH64)/libcanberra-$(HUMAN_VERSION)/libcanberra-null.so
file path=usr/lib/$(MACH64)/libcanberra-$(HUMAN_VERSION)/libcanberra-oss.so
file path=usr/lib/$(MACH64)/libcanberra-$(HUMAN_VERSION)/libcanberra-pulse.so
link path=usr/lib/$(MACH64)/libcanberra-gtk.so target=libcanberra-gtk.so.0.1.7
link path=usr/lib/$(MACH64)/libcanberra-gtk.so.0 target=libcanberra-gtk.so.0.1.7
file path=usr/lib/$(MACH64)/libcanberra-gtk.so.0.1.7
link path=usr/lib/$(MACH64)/libcanberra-gtk3.so target=libcanberra-gtk3.so.0.1.7
link path=usr/lib/$(MACH64)/libcanberra-gtk.so target=libcanberra-gtk.so.0.1.9
link path=usr/lib/$(MACH64)/libcanberra-gtk.so.0 target=libcanberra-gtk.so.0.1.9
file path=usr/lib/$(MACH64)/libcanberra-gtk.so.0.1.9
link path=usr/lib/$(MACH64)/libcanberra-gtk3.so target=libcanberra-gtk3.so.0.1.9
link path=usr/lib/$(MACH64)/libcanberra-gtk3.so.0 \
    target=libcanberra-gtk3.so.0.1.7
file path=usr/lib/$(MACH64)/libcanberra-gtk3.so.0.1.7
link path=usr/lib/$(MACH64)/libcanberra.so target=libcanberra.so.0.2.4
link path=usr/lib/$(MACH64)/libcanberra.so.0 target=libcanberra.so.0.2.4
file path=usr/lib/$(MACH64)/libcanberra.so.0.2.4
    target=libcanberra-gtk3.so.0.1.9
file path=usr/lib/$(MACH64)/libcanberra-gtk3.so.0.1.9
link path=usr/lib/$(MACH64)/libcanberra.so target=libcanberra.so.0.2.5
link path=usr/lib/$(MACH64)/libcanberra.so.0 target=libcanberra.so.0.2.5
file path=usr/lib/$(MACH64)/libcanberra.so.0.2.5
file path=usr/lib/$(MACH64)/pkgconfig/libcanberra-gtk.pc
file path=usr/lib/$(MACH64)/pkgconfig/libcanberra-gtk3.pc
file path=usr/lib/$(MACH64)/pkgconfig/libcanberra.pc
@@ -53,17 +53,5 @@
file path=usr/share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
file path=usr/share/gnome/autostart/libcanberra-login-sound.desktop
file path=usr/share/gnome/shutdown/libcanberra-logout-sound.sh
file path=usr/share/gtk-doc/html/libcanberra/ch01.html
file path=usr/share/gtk-doc/html/libcanberra/home.png
file path=usr/share/gtk-doc/html/libcanberra/index.html
file path=usr/share/gtk-doc/html/libcanberra/index.sgml
file path=usr/share/gtk-doc/html/libcanberra/left.png
file path=usr/share/gtk-doc/html/libcanberra/libcanberra-canberra-gtk.html
file path=usr/share/gtk-doc/html/libcanberra/libcanberra-canberra.html
file path=usr/share/gtk-doc/html/libcanberra/libcanberra.devhelp
file path=usr/share/gtk-doc/html/libcanberra/libcanberra.devhelp2
file path=usr/share/gtk-doc/html/libcanberra/right.png
file path=usr/share/gtk-doc/html/libcanberra/style.css
file path=usr/share/gtk-doc/html/libcanberra/up.png
file path=usr/share/vala/vapi/libcanberra-gtk.vapi
file path=usr/share/vala/vapi/libcanberra.vapi
components/library/libcanberra/patches/01-solaris.patch
File was deleted
components/library/libcanberra/patches/02-device.patch
@@ -121,9 +121,19 @@
         *_c = c;
         return CA_SUCCESS;
 }
--- libcanberra-0.25/configure.ac-orig    2010-09-13 23:43:25.620576446 -0500
+++ libcanberra-0.25/configure.ac    2010-09-13 23:46:13.839034621 -0500
@@ -490,6 +490,10 @@ AM_CONDITIONAL([USE_LYNX], [test "x$have
--- libcanberra-0.30/configure.ac.orig    2012-09-25 02:21:07.000000000 +0200
+++ libcanberra-0.30/configure.ac    2023-12-17 10:33:04.145775951 +0100
@@ -114,9 +114,6 @@
         -fdata-sections])
 AC_SUBST([WARNINGFLAGS], $with_cflags)
-CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\
-        -Wl,--as-needed \
-        -Wl,--gc-sections])
 AC_SUBST([GCLDFLAGS], $with_ldflags)
 #### libtool stuff ####
@@ -585,6 +582,10 @@
 
 PKG_CHECK_MODULES(VORBIS, [ vorbisfile ])
 
components/library/libcanberra/patches/03-gtk3.patch
File was deleted
components/library/libcanberra/pkg5
@@ -1,7 +1,7 @@
{
    "dependencies": [
        "gnome/config/gconf",
        "library/audio/gstreamer",
        "library/audio/gstreamer1",
        "library/audio/pulseaudio",
        "library/desktop/gtk2",
        "library/desktop/gtk3",