From 0666ff06496782da3ac28bb3a47354028f372ed7 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Sun, 29 Nov 2020 00:25:30 -0500 Subject: [PATCH 1/9] libnma: replace libnm-gtk --- common/shlibs | 1 - srcpkgs/libnma/template | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index c2ee49430390..0b40f41e21b3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2982,7 +2982,6 @@ libczmq.so.4 czmq-4.0.1_1 liblz.so.1 lzlib-1.8_1 libelogind.so.0 libelogind-238.1_2 libseat.so.1 libseat-0.3.0_1 -libnma.so.0 libnm-gtk-1.4.0_1 libnma.so.0 libnma-1.8.30_1 libgspell-1.so.2 gspell-1.8.0_1 libotf.so.1 libotf-0.9.16_1 diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template index c6c0aba1901f..18b016b2b93b 100644 --- a/srcpkgs/libnma/template +++ b/srcpkgs/libnma/template @@ -1,7 +1,7 @@ # Template file for 'libnma' pkgname=libnma version=1.8.30 -revision=1 +revision=2 build_style=meson build_helper="gir" hostmakedepends="gettext glib-devel gtk-doc pkg-config vala" @@ -14,6 +14,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/libnma" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=da33e72a49e07d855d97a52aa9a8962a4c96f52b9168c4e0027117ad8ffdafb4 +replaces="libnm-gtk>=0" if [ "$CROSS_BUILD" ]; then configure_args+="-Dgtk_doc=false" From 2048f96e51e3cff107ee01de7eefa2b1023feb84 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 30 Nov 2020 12:35:50 -0500 Subject: [PATCH 2/9] network-manager-applet: revbump for libnma --- srcpkgs/network-manager-applet/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template index 2d9861a94ba2..303ded924567 100644 --- a/srcpkgs/network-manager-applet/template +++ b/srcpkgs/network-manager-applet/template @@ -1,7 +1,7 @@ # Template file for 'network-manager-applet' pkgname=network-manager-applet version=1.18.0 -revision=1 +revision=2 build_style=meson configure_args="-Dselinux=false" hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config" From 831bcb00a58c754195db12964cfa7f68296256c2 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 30 Nov 2020 14:19:38 -0500 Subject: [PATCH 3/9] NetworkManager-l2tp: update to 1.8.6 --- srcpkgs/NetworkManager-l2tp/template | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template index 1dea408c4235..1769dc9d2673 100644 --- a/srcpkgs/NetworkManager-l2tp/template +++ b/srcpkgs/NetworkManager-l2tp/template @@ -1,7 +1,7 @@ # Template file for 'NetworkManager-l2tp' pkgname=NetworkManager-l2tp -version=1.8.2 -revision=2 +version=1.8.6 +revision=1 build_style=gnu-configure configure_args="--runstatedir=/run" hostmakedepends="pkg-config intltool glib-devel" @@ -13,7 +13,7 @@ maintainer="Douglas Kosovic " license="GPL-2.0-or-later" homepage="https://github.com/nm-l2tp/NetworkManager-l2tp" distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=1d80986dc88951e298446833d314bab7af0a933e736960d6b3b025e6b7faca94 +checksum=e345263c440ef8f48bcd95661d7772ffdbdd65e37d0a3eca813a542a3357ac23 # Automatically determine the pppd plugin dir location, but will need to # revbump this package whenever version of ppp package is updated. @@ -22,7 +22,3 @@ do_configure() { ./configure ${configure_args} --with-pppd-plugin-dir=/usr/lib/pppd/${PPP_VERSION} } - -post_install() { - mv $DESTDIR/etc/dbus-1 $DESTDIR/usr/share -} From 68a932e44f70f315a6931fe9d56edc7e1d6189e1 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 30 Nov 2020 14:33:19 -0500 Subject: [PATCH 4/9] NetworkManager-openvpn: revbump for libnma --- srcpkgs/NetworkManager-openvpn/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template index 7f2c40e6de34..82429aed9169 100644 --- a/srcpkgs/NetworkManager-openvpn/template +++ b/srcpkgs/NetworkManager-openvpn/template @@ -1,7 +1,7 @@ # Template file for 'NetworkManager-openvpn' pkgname=NetworkManager-openvpn version=1.8.12 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config" From 37f39171c8c41a0b26fdd1e97382e38c9c9601d7 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 30 Nov 2020 15:17:38 -0500 Subject: [PATCH 5/9] NetworkManager-pptp: revbump for libnma --- srcpkgs/NetworkManager-pptp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template index 9c541cf246f6..09568b2cec06 100644 --- a/srcpkgs/NetworkManager-pptp/template +++ b/srcpkgs/NetworkManager-pptp/template @@ -1,7 +1,7 @@ # Template file for 'NetworkManager-pptp' pkgname=NetworkManager-pptp version=1.2.8 -revision=4 +revision=5 build_style=gnu-configure configure_args="--without-libnm-glib" hostmakedepends="pkg-config intltool glib-devel" From 5b3f912d9680700e31a127d34125c930924a9af3 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 30 Nov 2020 15:20:38 -0500 Subject: [PATCH 6/9] NetworkManager-strongswan: revbump for libnma --- srcpkgs/NetworkManager-strongswan/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template index 46c02d092e5e..5cf6472410f6 100644 --- a/srcpkgs/NetworkManager-strongswan/template +++ b/srcpkgs/NetworkManager-strongswan/template @@ -1,7 +1,7 @@ # Template file for 'NetworkManager-strongswan' pkgname=NetworkManager-strongswan version=1.5.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --disable-more-warnings --without-libnm-glib --disable-more-warnings" From 0c7aa555745d651d29459e6b61ae287bc386796f Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 30 Nov 2020 15:34:00 -0500 Subject: [PATCH 7/9] NetworkManager-vpnc: revbump for libnma --- srcpkgs/NetworkManager-vpnc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/NetworkManager-vpnc/template b/srcpkgs/NetworkManager-vpnc/template index b9d172261329..2ce5c6efd600 100644 --- a/srcpkgs/NetworkManager-vpnc/template +++ b/srcpkgs/NetworkManager-vpnc/template @@ -1,7 +1,7 @@ # Template file for 'NetworkManager-vpnc' pkgname=NetworkManager-vpnc version=1.2.6 -revision=4 +revision=5 build_style=gnu-configure configure_args="--localstatedir=/var --disable-static --without-libnm-glib" hostmakedepends="pkg-config intltool" From d9b57d2c8d007a366d0cf59d10007b73643761d7 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 30 Nov 2020 16:53:49 -0500 Subject: [PATCH 8/9] cinnamon-control-center: revbump for libnma --- srcpkgs/cinnamon-control-center/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template index b9ebe5f22d14..9da17ca74f32 100644 --- a/srcpkgs/cinnamon-control-center/template +++ b/srcpkgs/cinnamon-control-center/template @@ -1,7 +1,7 @@ # Template file for 'cinnamon-control-center' pkgname=cinnamon-control-center version=4.6.2 -revision=2 +revision=3 build_style=gnu-configure build_helper=gir configure_args="--disable-static --disable-update-mimedb --disable-systemd" @@ -28,6 +28,7 @@ do_check() { pre_configure() { NOCONFIGURE=1 ./autogen.sh } + post_install() { # Remove unused stuff make -C shell DESTDIR="$DESTDIR" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA @@ -41,6 +42,7 @@ libcinnamon-control-center_package() { vmove "usr/lib/*.so.*" } } + cinnamon-control-center-devel_package() { short_desc+=" - development files" depends="libglib-devel gtk+3-devel lib${sourcepkg}>=${version}_${revision}" From ae469a4da86d0d5f34ef3c54853005efedf7ef94 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Mon, 30 Nov 2020 17:26:48 -0500 Subject: [PATCH 9/9] gnome-control-center: update to 3.38.2 --- srcpkgs/gnome-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index b4be62deaa30..8bb8a374e991 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,6 +1,6 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=3.38.1 +version=3.38.2 revision=1 build_style=meson build_helper="gir" @@ -24,7 +24,7 @@ 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=8d90006c610f6fccb3cddbcf413b1bc4137fb4977b901a3989420fe160082026 +checksum=1500e0ec0dbbb3f0b9289d084d6987b9430fe444872adbea5ca7fe0cd5f8476c build_options="cheese" build_options_default="cheese"