From aa4c2d0ec9e004d87c8cba2d0f8acc1f2e1d81fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 9 Jun 2024 13:51:41 +0700 Subject: [PATCH 1/2] gnubg: build with gtk+3 --- srcpkgs/gnubg/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnubg/template b/srcpkgs/gnubg/template index 949220dcfe86db..cdd2b7dac47c93 100644 --- a/srcpkgs/gnubg/template +++ b/srcpkgs/gnubg/template @@ -1,12 +1,13 @@ # Template file for 'gnubg' pkgname=gnubg version=1.08.003 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--disable-cputest ax_cv_gcc_x86_cpuid_0x00000001=6000000" +configure_args="--disable-cputest ax_cv_gcc_x86_cpuid_0x00000001=6000000 + --with-gtk3" hostmakedepends="flex gdk-pixbuf-devel pkg-config python3-devel" -makedepends="libcurl-devel libglib-devel gtk+-devel gtkglext-devel python3-devel - libcanberra-devel readline-devel readline sqlite-devel" +makedepends="libcurl-devel libglib-devel gtk+3-devel libepoxy-devel python3-devel + glu-devel libcanberra-devel readline-devel readline sqlite-devel" depends="python3" short_desc="GNU Backgammon game" maintainer="Leah Neukirchen " From 8782e5796c2f4b2c5e092327b6c10a97264c43d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 9 Jun 2024 13:51:41 +0700 Subject: [PATCH 2/2] libcanberra: drop gtk 2 --- common/shlibs | 1 - srcpkgs/libcanberra-gtk | 1 - srcpkgs/libcanberra/template | 15 +++------------ 3 files changed, 3 insertions(+), 14 deletions(-) delete mode 120000 srcpkgs/libcanberra-gtk diff --git a/common/shlibs b/common/shlibs index 6289c6b8576cfb..cf91d780286b52 100644 --- a/common/shlibs +++ b/common/shlibs @@ -587,7 +587,6 @@ libverto-k5ev.so.0 mit-krb5-libs-1.8_1 libmenu-cache.so.3 menu-cache-1.0.0_1 libupower-glib.so.3 libupower-glib3-0.99.3_1 libcanberra.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.11 libgtop-2.38.0_1 librarian.so.0 rarian-0.8.1_1 diff --git a/srcpkgs/libcanberra-gtk b/srcpkgs/libcanberra-gtk deleted file mode 120000 index 2c1c8bc0aaa9f3..00000000000000 --- a/srcpkgs/libcanberra-gtk +++ /dev/null @@ -1 +0,0 @@ -libcanberra \ No newline at end of file diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template index 46e4ecc18bb8e5..267c91908ec211 100644 --- a/srcpkgs/libcanberra/template +++ b/srcpkgs/libcanberra/template @@ -1,12 +1,12 @@ # Template file for 'libcanberra' pkgname=libcanberra version=0.30 -revision=12 +revision=13 build_style=gnu-configure configure_args="--enable-alsa --enable-null --disable-lynx --enable-gstreamer --disable-oss --with-builtin=dso" hostmakedepends="gettext pkg-config gtk-doc" -makedepends="gtk+-devel gtk+3-devel libvorbis-devel libltdl-devel +makedepends="gtk+3-devel libvorbis-devel libltdl-devel gstreamer1-devel alsa-lib-devel tdb-devel pulseaudio-devel eudev-libudev-devel vala-devel" short_desc="XDG Sound Theme and Name Specification library implementation" @@ -23,14 +23,6 @@ libcanberra-utils_package() { 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" @@ -40,8 +32,7 @@ libcanberra-gtk3_package() { } } libcanberra-devel_package() { - depends="gtk+-devel gtk+3-devel - ${sourcepkg}-gtk>=${version}_${revision} + depends="gtk+3-devel ${sourcepkg}-gtk3>=${version}_${revision} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files"