From 37c400fab5b12102c3be2462a72d95a75cae17b00a23ddb8efafe5c75c9c339b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 21 Mar 2022 08:35:58 +0000 Subject: [PATCH] Accepting request 962960 from GNOME:Next New stable rel OBS-URL: https://build.opensuse.org/request/show/962960 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=196 --- ...d758f866d3a3f7ca482942beee749f13a91e.patch | 25 ------ gnome-bluetooth-3.34.5.tar.xz | 3 - gnome-bluetooth-42.0.tar.xz | 3 + gnome-bluetooth.changes | 77 +++++++++++++++++++ gnome-bluetooth.spec | 67 ++++++++++------ 5 files changed, 122 insertions(+), 53 deletions(-) delete mode 100644 755fd758f866d3a3f7ca482942beee749f13a91e.patch delete mode 100644 gnome-bluetooth-3.34.5.tar.xz create mode 100644 gnome-bluetooth-42.0.tar.xz diff --git a/755fd758f866d3a3f7ca482942beee749f13a91e.patch b/755fd758f866d3a3f7ca482942beee749f13a91e.patch deleted file mode 100644 index 6e86fd5..0000000 --- a/755fd758f866d3a3f7ca482942beee749f13a91e.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/gnome-bluetooth-3.34.5.tar.xz b/gnome-bluetooth-3.34.5.tar.xz deleted file mode 100644 index 8902191..0000000 --- a/gnome-bluetooth-3.34.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9 -size 353936 diff --git a/gnome-bluetooth-42.0.tar.xz b/gnome-bluetooth-42.0.tar.xz new file mode 100644 index 0000000..9133423 --- /dev/null +++ b/gnome-bluetooth-42.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170 +size 302440 diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 690ffdf..eca5f93 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,9 +1,86 @@ +------------------------------------------------------------------- +Fri Mar 18 22:14:09 UTC 2022 - Bjørn Lie + +- Update to version 42.0: + + Updated translations. + +------------------------------------------------------------------- +Thu Mar 10 17:10:09 UTC 2022 - Bjørn Lie + +- Update to version 42.rc: + + This version of gnome-bluetooth fixes a problem that could lead + to gnome-shell's Bluetooth menu not appearing when it should + have. This version also makes the Connect switch available for + Bluetooth LE MIDI devices. + +------------------------------------------------------------------- +Wed Feb 23 16:54:25 UTC 2022 - Bjørn Lie + +- Update to version 42.beta.2: + + This version of gnome-bluetooth contains a number of bug fixes + related to the GTK4 port, including spinners not spinning, + device removal confirmation dialog not appearing, pairing + dialog not disappearing, and a work-around to a UPower + reference leak that could lead to a crash in the main + libraries, as well as fixes for basic functionality in + bluetooth-sendto. + +------------------------------------------------------------------- +Tue Feb 8 18:10:09 UTC 2022 - Bjørn Lie + +- Update to version 42.beta: + + This version of gnome-bluetooth adds a number of APIs to + eventually be used in Settings and gnome-shell: + - Export battery information for Bluetooth devices which + support it. + - Check whether any input devices are connected, so as to be + able to show a confirmation dialogue when switching off + Bluetooth. + - Check whether a device can be connected to. +- Add pkgconfig(upower-glib) BuildRequires: New dependency. + +------------------------------------------------------------------- +Thu Feb 3 06:01:59 UTC 2022 - Bjørn Lie + +- Update to version 42.alpha.2: + + This version of gnome-bluetooth splits the libraries into UI + and non-UI versions. The UI library is only exposed as a native + library for the benefit of gnome-control-center, and the non-UI + library is only exposed as an introspected library for the + benefit of gnome-shell. +- Package new libgnome-bluetooth-ui-3_0-13 sub-package. +- Drop 755fd758f866d3a3f7ca482942beee749f13a91e.patch: Fixed + upstream. + ------------------------------------------------------------------- Thu Feb 3 06:00:59 UTC 2022 - Bjørn Lie - Add 755fd758f866d3a3f7ca482942beee749f13a91e.patch Fix build with meson 0.61 and newer. +------------------------------------------------------------------- +Fri Jan 7 21:42:57 UTC 2022 - Bjørn Lie + +- Update to version 42.alpha: + + Port library to GTK4 + + Remove chooser widgets from library + + Remove chooser UI from bluetooth-sendto + + Make bluetooth-sendto optional + + Replace canberra-gtk dependency with gsound + + GtkTreeModel-based API was replaced by a GListModel-based API + + Loads of bug fixes, many new tests + + Make changes to the way the default adapter is selected, see + README.md for details. +- Following upstreams port: + + Drop: pkgconfig(gtk+-3.0) and pkgconfig(libcanberra-gtk3) + BuildRequires. + + Add: pkgconfig(gtk4), pkgconfig(gsound) and + pkgconfig(libadwaita-1) BuildRequires. +- Rename libgnome-bluetooth13 to libgnome-bluetooth-3_0-13, + typelib-1_0-GnomeBluetooth-1_0 to typelib-1_0-GnomeBluetooth-3_0 + and gnome-bluetooth2-lang to gnome-bluetooth-3.0-lang following + upstreams changes. + ------------------------------------------------------------------- Sat Nov 6 11:15:24 UTC 2021 - Bjørn Lie diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index f34404e..19ce327 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -18,15 +18,13 @@ %define _udevdir %(pkg-config --variable udevdir udev) Name: gnome-bluetooth -Version: 3.34.5 +Version: 42.0 Release: 0 Summary: GNOME Bluetooth graphical utilities License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/GNOME URL: https://wiki.gnome.org/Projects/GnomeBluetooth -Source0: https://download.gnome.org/sources/gnome-bluetooth/3.34/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM 755fd758f866d3a3f7ca482942beee749f13a91e.patch -- Fix build with meson 0.61 and newer -Patch0: https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/commit/755fd758f866d3a3f7ca482942beee749f13a91e.patch +Source0: https://download.gnome.org/sources/gnome-bluetooth/42/%{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gobject-introspection-devel @@ -36,10 +34,12 @@ BuildRequires: pkgconfig BuildRequires: yelp-tools BuildRequires: pkgconfig(gio-unix-2.0) >= 2.44 BuildRequires: pkgconfig(gmodule-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0 -BuildRequires: pkgconfig(libcanberra-gtk3) +BuildRequires: pkgconfig(gsound) +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(libadwaita-1) >= 1.1 BuildRequires: pkgconfig(libnotify) >= 0.7.0 BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(upower-glib) >= 0.99.14 # Require bluez (mandatory, as per readme, bnc#622946) Requires: bluez >= 5 @@ -48,22 +48,32 @@ A set of graphical utilities to setup, monitor and use Bluetooth devices. This package provides the utilities, data files and manuals for GNOME Bluetooth. -%package -n libgnome-bluetooth13 +%package -n libgnome-bluetooth-3_0-13 Summary: GNOME Bluetooth's Shared Libraries License: LGPL-2.1-or-later Group: System/Libraries -%description -n libgnome-bluetooth13 +%description -n libgnome-bluetooth-3_0-13 A set of graphical utilities to setup, monitor and use Bluetooth devices. This package provides the GNOME Bluetooth's shared library. -%package -n typelib-1_0-GnomeBluetooth-1_0 +%package -n libgnome-bluetooth-ui-3_0-13 +Summary: GNOME Bluetooth's Shared Libraries +License: LGPL-2.1-or-later +Group: System/Libraries + +%description -n libgnome-bluetooth-ui-3_0-13 +A set of graphical utilities to setup, monitor and use Bluetooth devices. + +This package provides the GNOME Bluetooth's shared library. + +%package -n typelib-1_0-GnomeBluetooth-3_0 Summary: Introspection bindings for the GNOME Bluetooth libraries License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries -%description -n typelib-1_0-GnomeBluetooth-1_0 +%description -n typelib-1_0-GnomeBluetooth-3_0 A set of graphical utilities to setup, monitor and use Bluetooth devices. This package provides the GObject Introspection bindings for the GNOME Bluetooth's @@ -74,8 +84,9 @@ Summary: Development files for the GNOME Bluetooth libraries License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Libraries/GNOME Requires: %{name} = %{version} -Requires: libgnome-bluetooth13 = %{version} -Requires: typelib-1_0-GnomeBluetooth-1_0 = %{version} +Requires: libgnome-bluetooth-3_0-13 = %{version} +Requires: libgnome-bluetooth-ui-3_0-13 = %{version} +Requires: typelib-1_0-GnomeBluetooth-3_0 = %{version} %description devel A set of graphical utilities to setup, monitor and use Bluetooth devices. @@ -95,35 +106,41 @@ This package provides the necessary files for development with GNOME Bluetooth. %install %meson_install -%find_lang %{name}2 %{?no_lang_C} +%find_lang %{name}-3.0 %{?no_lang_C} %fdupes %{buildroot}/%{_prefix} -%ldconfig_scriptlets -n libgnome-bluetooth13 +%ldconfig_scriptlets -n libgnome-bluetooth-3_0-13 %files %license COPYING %doc NEWS README.md %{_bindir}/bluetooth-* %{_datadir}/applications/bluetooth-sendto.desktop -%{_datadir}/gnome-bluetooth/ -%{_datadir}/icons/hicolor/*/*/*bluetooth* +%dir %{_datadir}/gnome-bluetooth-3.0 +%{_datadir}/gnome-bluetooth-3.0/pin-code-database.xml %{_mandir}/man1/bluetooth-* -%files -n libgnome-bluetooth13 +%files -n libgnome-bluetooth-3_0-13 %license COPYING.LIB -%{_libdir}/libgnome-bluetooth.so.* +%{_libdir}/libgnome-bluetooth-3.0.so.* -%files -n typelib-1_0-GnomeBluetooth-1_0 -%{_libdir}/girepository-1.0/GnomeBluetooth-1.0.typelib +%files -n libgnome-bluetooth-ui-3_0-13 +%license COPYING.LIB +%{_libdir}/libgnome-bluetooth-ui-3.0.so.* + +%files -n typelib-1_0-GnomeBluetooth-3_0 +%{_libdir}/girepository-1.0/GnomeBluetooth-3.0.typelib %files devel %doc AUTHORS ChangeLog.README MAINTAINERS -%doc %{_datadir}/gtk-doc/html/gnome-bluetooth -%{_includedir}/gnome-bluetooth -%{_libdir}/libgnome-bluetooth.so -%{_libdir}/pkgconfig/gnome-bluetooth-1.0.pc +%doc %{_datadir}/gtk-doc/html/gnome-bluetooth-3.0 +%{_includedir}/gnome-bluetooth-3.0 +%{_libdir}/libgnome-bluetooth-3.0.so +%{_libdir}/libgnome-bluetooth-ui-3.0.so +%{_libdir}/pkgconfig/gnome-bluetooth-3.0.pc +%{_libdir}/pkgconfig/gnome-bluetooth-ui-3.0.pc %{_datadir}/gir-1.0/*.gir -%files lang -f %{name}2.lang +%files lang -f %{name}-3.0.lang %changelog