From 4fb35d1b69c96a4bd6393049c44e7675e970a841 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:46:28 -0700 Subject: [PATCH] gnome-bluetooth: update to 42.1 --- common/shlibs | 1 + .../gnome-bluetooth/patches/meson-0.61.patch | 25 ------------------- srcpkgs/gnome-bluetooth/template | 12 ++++----- 3 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch diff --git a/common/shlibs b/common/shlibs index fa1bbe96c3f..d6a318a8125 100644 --- a/common/shlibs +++ b/common/shlibs @@ -687,6 +687,7 @@ libgtkmm-3.0.so.1 gtkmm-2.99.5_1 libgdkmm-3.0.so.1 gtkmm-2.99.5_1 libgtkmm-4.0.so.0 gtkmm4-4.0.0_1 libgnome-bluetooth.so.13 gnome-bluetooth1-3.12.0_1 +libgnome-bluetooth-3.0.so.13 gnome-bluetooth-42.1_1 libsasl2.so.3 libsasl-2.1.26_1 liblber-2.4.so.2 libldap-2.4.21_1 libldap-2.4.so.2 libldap-2.4.21_1 diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch deleted file mode 100644 index c6962edd4f0..00000000000 --- a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 7 Jan 2022 12:51:22 +0100 -Subject: [PATCH] build: Fix build for newer versions of meson - -sendto/meson.build:24:5: ERROR: Function does not take positional arguments. ---- - sendto/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/sendto/meson.build b/sendto/meson.build -index 24a4e394..3e233a03 100644 ---- a/sendto/meson.build -+++ b/sendto/meson.build -@@ -22,7 +22,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file ( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, --- -GitLab - diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template index e6861631b08..c764e5b760f 100644 --- a/srcpkgs/gnome-bluetooth/template +++ b/srcpkgs/gnome-bluetooth/template @@ -1,13 +1,13 @@ # Template file for 'gnome-bluetooth' pkgname=gnome-bluetooth -version=3.34.5 +version=42.1 revision=1 build_helper="gir" build_style=meson configure_args="-Dgtk_doc=false -Dintrospection=$(vopt_if gir true false)" -hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection) glib-devel" -makedepends="libXi-devel gtk+3-devel libnotify-devel dconf-devel - gvfs-devel bluez eudev-libudev-devel libcanberra-devel" +hostmakedepends="pkg-config gettext itstool $(vopt_if gir gobject-introspection) glib-devel" +makedepends="libXi-devel gtk4-devel libadwaita-devel libnotify-devel dconf-devel + gvfs-devel bluez eudev-libudev-devel libcanberra-devel gsound-devel upower-devel" depends="bluez>=5 dconf>=0.20 gvfs>=1.20 hicolor-icon-theme desktop-file-utils" checkdepends="python3-dbus" short_desc="GNOME Bluetooth Subsystem" @@ -15,13 +15,13 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GnomeBluetooth" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9 +checksum=d9fe5d673f27a40a86a9e23d93cb99367e7b06df51872e8ac5ecc9938e55b5eb build_options="gir" build_options_default="gir" gnome-bluetooth-devel_package() { - depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}" + depends="glib-devel gtk4-devel ${sourcepkg}>=${version}" short_desc+=" - development files" pkg_install() { vmove usr/include