diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index edeb8278579..e482bba98de 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,4 +1,6 @@ # Template file for 'NetworkManager' +# when updating to 1.24 or newer, drop the compat +# patch in gnome-control-center and rebuild it pkgname=NetworkManager version=1.22.10 revision=2 diff --git a/srcpkgs/gnome-control-center/patches/nm122.patch b/srcpkgs/gnome-control-center/patches/nm122.patch new file mode 100644 index 00000000000..833fed3968e --- /dev/null +++ b/srcpkgs/gnome-control-center/patches/nm122.patch @@ -0,0 +1,38 @@ +From 4159f984bd351caf6f0e1adbd90feeb85ab252f4 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Wed, 16 Sep 2020 22:02:04 +0200 +Subject: [PATCH] restore compatibility with networkmanager 1.22 + +drop this patch and rebuild gnome-control-center when updating nm +--- + panels/network/net-device-wifi.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git panels/network/net-device-wifi.c panels/network/net-device-wifi.c +index cb86e5b..d63c57c 100644 +--- panels/network/net-device-wifi.c ++++ panels/network/net-device-wifi.c +@@ -1180,11 +1180,6 @@ nm_client_on_permission_change (NetDeviceWifi *self) { + NMClientPermissionResult perm; + NMDeviceWifiCapabilities caps; + +- if (nm_client_get_permissions_state (self->client) != NM_TERNARY_TRUE) { +- /* permissions aren't ready yet */ +- return; +- } +- + /* only enable the button if the user can create a hotspot */ + perm = nm_client_get_permission_result (self->client, NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN); + caps = nm_device_wifi_get_capabilities (NM_DEVICE_WIFI (self->device)); +@@ -1227,8 +1222,6 @@ net_device_wifi_new (CcPanel *panel, NMClient *client, NMDevice *device) + G_CALLBACK (ap_activated), self, G_CONNECT_SWAPPED); + g_signal_connect_object (list, "configure", + G_CALLBACK (show_details_for_row), self, G_CONNECT_SWAPPED); +- g_signal_connect_object (client, "notify", +- G_CALLBACK(nm_client_on_permission_change), self, G_CONNECT_SWAPPED); + + nm_client_on_permission_change(self); + +-- +2.28.0 + diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 9fdb853afbf..191101afaad 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,22 +1,22 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=3.34.1 -revision=2 +version=3.38.0 +revision=1 build_style=meson build_helper="gir" configure_args="-Dcheese=$(vopt_if cheese true false)" -hostmakedepends="glib-devel gsettings-desktop-schemas-devel intltool pkg-config polkit - python3" +hostmakedepends="glib-devel gsettings-desktop-schemas-devel intltool pkg-config + polkit python3" makedepends="ModemManager-devel accountsservice-devel alsa-plugins colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel gnome-menus-devel gnome-online-accounts-devel gnome-settings-daemon-devel grilo-devel ibus-devel - libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel + libSM-devel libXxf86misc-devel libgnomekbd-devel libgtop-devel libhandy1-devel libpwquality-devel mit-krb5-devel network-manager-applet-devel polkit-devel pulseaudio-devel samba-devel tzdata upower-devel vala-devel clutter-gtk-devel libxml2-devel libX11-devel gtk+3-devel cups-devel libgudev-devel libwacom-devel clutter-devel libsecret-devel libcanberra-devel udisks2-devel gsound-devel $(vopt_if cheese cheese-devel)" -depends="alsa-plugins-pulseaudio desktop-file-utils +depends="alsa-plugins-pulseaudio desktop-file-utils upower colord cups-pk-helper gsettings-desktop-schemas hicolor-icon-theme iso-codes sound-theme-freedesktop cracklib" short_desc="GNOME control center" @@ -24,13 +24,17 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5f82ecd5554136c462248ec5363b82d95358b39dfd6787006d8307b4504e515e +checksum=f6b6b5b8ef9c38d895ba5af87f31adae02194ad86c9aa6cff2d2b9755c2db1da build_options="cheese" +build_options_default="cheese" + desc_option_cheese="Add support for adding user account images with your webcam" -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" cheese" -fi + +# needs X11 and requires altered filesystem +do_check() { + : +} CFLAGS="-fcommon"