diff --git a/common/shlibs b/common/shlibs index 069d5ddb6c..442695af08 100644 --- a/common/shlibs +++ b/common/shlibs @@ -523,8 +523,8 @@ libmenu-cache.so.1 menu-cache-0.2.6_1 libupower-glib.so.1 libupower-glib1-0.9.23_4 libupower-glib.so.2 libupower-glib2-0.99.0_2 libcanberra.so.0 libcanberra-0.23_1 -libcanberra-gtk.so.0 libcanberra-0.23_1 -libcanberra-gtk3.so.0 libcanberra-0.23_1 +libcanberra-gtk.so.0 libcanberra-gtk-0.30_6 +libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6 libgtop-2.0.so.7 libgtop-2.28.1_1 librarian.so.0 rarian-0.8.1_1 libmetacity-private.so.0 metacity-2.30.1_1 diff --git a/srcpkgs/libcanberra-gtk b/srcpkgs/libcanberra-gtk new file mode 120000 index 0000000000..2c1c8bc0aa --- /dev/null +++ b/srcpkgs/libcanberra-gtk @@ -0,0 +1 @@ +libcanberra \ No newline at end of file diff --git a/srcpkgs/libcanberra-gtk3 b/srcpkgs/libcanberra-gtk3 new file mode 120000 index 0000000000..2c1c8bc0aa --- /dev/null +++ b/srcpkgs/libcanberra-gtk3 @@ -0,0 +1 @@ +libcanberra \ No newline at end of file diff --git a/srcpkgs/libcanberra-utils b/srcpkgs/libcanberra-utils new file mode 120000 index 0000000000..2c1c8bc0aa --- /dev/null +++ b/srcpkgs/libcanberra-utils @@ -0,0 +1 @@ +libcanberra \ No newline at end of file diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template index 60c23745a0..b54066a18b 100644 --- a/srcpkgs/libcanberra/template +++ b/srcpkgs/libcanberra/template @@ -1,10 +1,10 @@ # Template build file for 'libcanberra'. pkgname=libcanberra version=0.30 -revision=5 +revision=6 build_style=gnu-configure -configure_args="--enable-alsa --enable-null - --enable-gstreamer --disable-oss --with-builtin=dso --disable-lynx" +configure_args="--enable-alsa --enable-null --disable-lynx + --enable-gstreamer --disable-oss --with-builtin=dso" hostmakedepends="libtool pkg-config intltool" makedepends=" gtk+-devel gtk+3-devel libvorbis-devel libltdl-devel @@ -26,6 +26,29 @@ pre_configure() { libtoolize -f } +libcanberra-utils_package() { + replaces="${sourcepkg}<0.30_6" + short_desc+=" - utilities" + pkg_install() { + vmove usr/bin + } +} +libcanberra-gtk_package() { + replaces="${sourcepkg}<0.30_6" + short_desc+=" - GTK+ (2.x) support" + pkg_install() { + vmove usr/lib/libcanberra-gtk.so.* + vmove usr/lib/gtk-2.0 + } +} +libcanberra-gtk3_package() { + replaces="${sourcepkg}<0.30_6" + short_desc+=" - GTK+ (3.x) support" + pkg_install() { + vmove usr/lib/libcanberra-gtk3.so.* + vmove usr/lib/gtk-3.0 + } +} libcanberra-devel_package() { depends="gtk+-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files"