From 72b9dff466459202b58e30b7b7a9fa934e2d03ba Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Tue, 6 Oct 2020 09:06:34 -0400 Subject: [PATCH 1/7] New package: libnma-1.8.30 --- common/shlibs | 2 +- srcpkgs/libnma-devel | 1 + srcpkgs/libnma/template | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/libnma-devel create mode 100644 srcpkgs/libnma/template diff --git a/common/shlibs b/common/shlibs index 36efd174d6b..91635660be4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2981,7 +2981,7 @@ libstilview.so.0 libsidplayfp-1.8.7_1 libczmq.so.4 czmq-4.0.1_1 liblz.so.1 lzlib-1.8_1 libelogind.so.0 libelogind-238.1_2 -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 libimagequant.so.0 libimagequant-2.8.2_1 diff --git a/srcpkgs/libnma-devel b/srcpkgs/libnma-devel new file mode 120000 index 00000000000..21c1b5b0b03 --- /dev/null +++ b/srcpkgs/libnma-devel @@ -0,0 +1 @@ +libnma \ No newline at end of file diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template new file mode 100644 index 00000000000..c6c0aba1901 --- /dev/null +++ b/srcpkgs/libnma/template @@ -0,0 +1,41 @@ +# Template file for 'libnma' +pkgname=libnma +version=1.8.30 +revision=1 +build_style=meson +build_helper="gir" +hostmakedepends="gettext glib-devel gtk-doc pkg-config vala" +makedepends="gcr-devel gtk+3-devel iso-codes + mobile-broadband-provider-info NetworkManager-devel" +depends="NetworkManager iso-codes" +short_desc="NetworkManager panel applet for GNOME - runtime library" +maintainer="cinerea0 " +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 + +if [ "$CROSS_BUILD" ]; then + configure_args+="-Dgtk_doc=false" + hostmakedepends+=" libnma-devel" +fi + +post_install() { + if [ "$CROSS_BUILD" ]; then + vmkdir usr/share/gtk-doc/html 0755 + vcopy /usr/share/gtk-doc/html/libnma usr/share/gtk-doc/html + fi +} + +libnma-devel_package() { + short_desc+=" - library development files" + depends="${sourcepkg}>=${version}_${revision} NetworkManager-devel" + pkg_install() { + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + vmove usr/include + vmove usr/share/gir-1.0 + vmove usr/share/vala + vmove usr/share/gtk-doc + } +} From 2ca17ec4f553b00c82bb3b32c37867d71bd70417 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Tue, 6 Oct 2020 09:09:38 -0400 Subject: [PATCH 2/7] network-manager-applet: update to 1.18.0 --- common/shlibs | 1 - srcpkgs/libnm-gtk | 1 - srcpkgs/network-manager-applet-devel | 1 - srcpkgs/network-manager-applet/template | 47 ++++--------------------- 4 files changed, 7 insertions(+), 43 deletions(-) delete mode 120000 srcpkgs/libnm-gtk delete mode 120000 srcpkgs/network-manager-applet-devel diff --git a/common/shlibs b/common/shlibs index 91635660be4..00839f3c723 100644 --- a/common/shlibs +++ b/common/shlibs @@ -905,7 +905,6 @@ liblcms2.so.2 lcms2-2.2_1 libcolord.so.2 libcolord-1.1.7_1 libcolordprivate.so.2 libcolord-1.1.7_1 libcolorhug.so.2 libcolord-1.1.7_1 -libnm-gtk.so.0 libnm-gtk-0.9.1.95_1 libcaribou.so.0 caribou-0.4.0_1 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1 libgrilo-0.3.so.0 grilo-0.3.2_1 diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk deleted file mode 120000 index f95007eeb04..00000000000 --- a/srcpkgs/libnm-gtk +++ /dev/null @@ -1 +0,0 @@ -network-manager-applet \ No newline at end of file diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel deleted file mode 120000 index f95007eeb04..00000000000 --- a/srcpkgs/network-manager-applet-devel +++ /dev/null @@ -1 +0,0 @@ -network-manager-applet \ No newline at end of file diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template index 0656107b1af..2d9861a94ba 100644 --- a/srcpkgs/network-manager-applet/template +++ b/srcpkgs/network-manager-applet/template @@ -1,14 +1,14 @@ # Template file for 'network-manager-applet' pkgname=network-manager-applet -version=1.8.24 +version=1.18.0 revision=1 -build_style=gnu-configure -build_helper="gir" -configure_args="--disable-static --without-selinux $(vopt_enable gir introspection)" +build_style=meson +configure_args="-Dselinux=false" hostmakedepends="dbus-glib-devel glib-devel intltool pkg-config" makedepends="ModemManager-devel NetworkManager-devel iso-codes jansson-devel - libgnome-keyring-devel libgudev-devel libnotify-devel libsecret-devel - polkit-devel mobile-broadband-provider-info" + libappindicator-devel libapparmor-devel libdbusmenu-gtk3-devel + libgnome-keyring-devel libgudev-devel libnotify-devel libnma-devel + libsecret-devel polkit-devel mobile-broadband-provider-info" depends="NetworkManager hicolor-icon-theme iso-codes" short_desc="NetworkManager panel applet for GNOME" maintainer="Enno Boland " @@ -16,38 +16,5 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/NetworkManager" changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=118bbb8a5027634b62e8b45b16ceafce74441529c99bf230654e3bec38f9fbbf +checksum=ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b lib32disabled=yes - -# Package build options -build_options="gir" -build_options_default="gir" - -pre_build() { - export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/libnma/.libs:${wrksrc}/src/libnm-gtk/.libs" -} - -libnm-gtk_package() { - short_desc+=" - runtime library" - pkg_install() { - vmove "usr/lib/*.so.*" - if [ "$build_option_gir" ]; then - vmove usr/lib/girepository-1.0 - fi - } -} - -network-manager-applet-devel_package() { - depends="gtk+3-devel NetworkManager-devel>=1.0 - libnm-gtk>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi - vmove usr/share/gtk-doc - } -} From 92ec1bdd5dc9227331993288404b2ef8f35d2bfb Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Tue, 6 Oct 2020 09:34:07 -0400 Subject: [PATCH 3/7] NetworkManager-strongswan: update to 1.5.2 --- srcpkgs/NetworkManager-strongswan/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/NetworkManager-strongswan/template b/srcpkgs/NetworkManager-strongswan/template index 4d8d2b14306..46c02d092e5 100644 --- a/srcpkgs/NetworkManager-strongswan/template +++ b/srcpkgs/NetworkManager-strongswan/template @@ -1,16 +1,16 @@ # Template file for 'NetworkManager-strongswan' pkgname=NetworkManager-strongswan -version=1.4.5 -revision=2 +version=1.5.2 +revision=1 build_style=gnu-configure configure_args="--disable-static --disable-more-warnings --without-libnm-glib --disable-more-warnings" hostmakedepends="intltool pkg-config" -makedepends="NetworkManager-devel libsecret-devel network-manager-applet-devel" +makedepends="gtk+3-devel NetworkManager-devel libnma-devel libsecret-devel" depends="strongswan" short_desc="Strongswan NetworkManager plugin" maintainer="Louis Dupré Bertoni " license="GPL-2.0-or-later" homepage="https://www.strongswan.org/" distfiles="https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-${version}.tar.bz2" -checksum=343b68cbe32f65e2baa01b37716415e4360addc8c90209d45504b52b8864bd04 +checksum=c8452b952653881dcc2745f0ab460c061086215b297129212a743bd9e9f78169 From b53e6adb7d7db896b6603a22475de8eb28607b8f Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Tue, 6 Oct 2020 10:05:40 -0400 Subject: [PATCH 4/7] NetworkManager-l2tp: change dependency to libnma-devel --- srcpkgs/NetworkManager-l2tp/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template index d60f5878792..1dea408c423 100644 --- a/srcpkgs/NetworkManager-l2tp/template +++ b/srcpkgs/NetworkManager-l2tp/template @@ -1,12 +1,12 @@ # Template file for 'NetworkManager-l2tp' pkgname=NetworkManager-l2tp version=1.8.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--runstatedir=/run" hostmakedepends="pkg-config intltool glib-devel" -makedepends="gtk+3-devel glib-devel libglib-devel libsecret-devel - network-manager-applet-devel libressl-devel nss-devel ppp-devel" +makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel + libsecret-devel nss-devel ppp-devel" depends="strongswan xl2tpd ppp" short_desc="NetworkManager VPN plugin for L2TP/IPsec" maintainer="Douglas Kosovic " From 9be7a3a1f2d437d5ffb3aa26d42dc34596a1c780 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Tue, 6 Oct 2020 11:20:26 -0400 Subject: [PATCH 5/7] NetworkManager-openconnect: change dependency to libnma-devel --- srcpkgs/NetworkManager-openconnect/template | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template index 327f2bd84cb..f32a075180f 100644 --- a/srcpkgs/NetworkManager-openconnect/template +++ b/srcpkgs/NetworkManager-openconnect/template @@ -1,18 +1,17 @@ -# Template build file for 'NetworkManager-openconnect'. +# Template file for 'NetworkManager-openconnect' pkgname=NetworkManager-openconnect version=1.2.6 -revision=2 -lib32disabled=yes +revision=3 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool" -makedepends="gtk+3-devel network-manager-applet-devel libsecret-devel - libxml2-devel openconnect-devel libressl-devel liblz4-devel - gcr-devel" +makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel + libressl-devel libsecret-devel libxml2-devel openconnect-devel" depends="openconnect" short_desc="NetworkManager VPN plugin for OpenConnect" +maintainer="Enno Boland " +license="GPL-2.0-only, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/NetworkManager" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -license="GPL-2" -maintainer="Enno Boland " checksum=95109803596a9782680a5dca3b51c4ad8ff7e126169d5431278cab694112975a +lib32disabled=yes From 67d062296686207ed7b1bf697c75bfc50437056e Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Tue, 6 Oct 2020 12:33:51 -0400 Subject: [PATCH 6/7] NetworkManager-openvpn: update to 1.8.12 --- ...isable-libnm-glib-support-by-default.patch | 52 ------------------- srcpkgs/NetworkManager-openvpn/template | 8 +-- 2 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch diff --git a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch b/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch deleted file mode 100644 index 7eb72e1dbb6..00000000000 --- a/srcpkgs/NetworkManager-openvpn/patches/0001-build-disable-libnm-glib-support-by-default.patch +++ /dev/null @@ -1,52 +0,0 @@ -source: https://git.archlinux.org/svntogit/packages.git/tree/trunk/0001-build-disable-libnm-glib-support-by-default.patch?h=packages/networkmanager-openvpn - -From 52aad4911ffad04cf8274b5574124a4d5470c7fa Mon Sep 17 00:00:00 2001 -Message-Id: <52aad4911ffad04cf8274b5574124a4d5470c7fa.1549642989.git.jan.steffens@gmail.com> -From: Lubomir Rintel -Date: Wed, 17 Oct 2018 15:21:30 +0200 -Subject: [PATCH] build: disable libnm-glib support by default - -By now nobody should be using this. Keep the code around for a little -longer just in case anybody still uses this. - -The libnm-glib support also serves as an example how do we build two -different versions of the properties plugin. We'll soon be in a similar -situation with Gtk 4.0. (sigh.) Just don't drop it yet. - -Conflicts: - NEWS ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 11ff5d0..eaf015b 100644 ---- configure.ac -+++ configure.ac -@@ -75,20 +75,20 @@ dnl - dnl GNOME support - dnl - AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-openvpn without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no]) --AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-openvpn without libnm-glib comatibility]), [], [with_libnm_glib_specified=no]) -+AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-openvpn with libnm-glib comatibility (depreacted)]), [], [with_libnm_glib_specified=no]) - if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then - if test "$with_gnome_specified" != no -a "$with_gnome" == no; then - AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome) - fi - fi - if test "$with_gnome" != no; then - with_gnome=yes - fi - if test "$with_libnm_glib_specified" == no; then -- with_libnm_glib="$with_gnome" -+ with_libnm_glib=no - fi --if test "$with_libnm_glib" != no; then -- with_libnm_glib=yes -+if test "$with_libnm_glib" != yes; then -+ with_libnm_glib=no - fi - AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no) - AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no) --- -2.20.1 diff --git a/srcpkgs/NetworkManager-openvpn/template b/srcpkgs/NetworkManager-openvpn/template index 170d992326e..7f2c40e6de3 100644 --- a/srcpkgs/NetworkManager-openvpn/template +++ b/srcpkgs/NetworkManager-openvpn/template @@ -1,18 +1,18 @@ # Template file for 'NetworkManager-openvpn' pkgname=NetworkManager-openvpn -version=1.8.10 -revision=2 +version=1.8.12 +revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config" -makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel" +makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel" depends="openvpn" short_desc="NetworkManager VPN plugin for OpenVPN" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/NetworkManager" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=af3cc86ba848d21b4ac807a09d575de11335ba4df8ce6fdb089212e77c2231ef +checksum=0efda8878aaf0e6eb5071a053aea5d7f9d42aac097b3ff89e7cbc9233f815318 system_accounts="_nm_openvpn" lib32disabled=yes _nm_openvpn_homedir="/var/empty" From 0fcb2577b3074df7d0da5067d8f50eb81a40f111 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Tue, 6 Oct 2020 18:18:52 -0400 Subject: [PATCH 7/7] NetworkManager-pptp: change dependency to libnma-devel --- srcpkgs/NetworkManager-pptp/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/NetworkManager-pptp/template b/srcpkgs/NetworkManager-pptp/template index 7889bb47800..9c541cf246f 100644 --- a/srcpkgs/NetworkManager-pptp/template +++ b/srcpkgs/NetworkManager-pptp/template @@ -1,12 +1,12 @@ # Template file for 'NetworkManager-pptp' pkgname=NetworkManager-pptp version=1.2.8 -revision=3 +revision=4 build_style=gnu-configure configure_args="--without-libnm-glib" hostmakedepends="pkg-config intltool glib-devel" -makedepends="libglib-devel gtk+3-devel libsecret-devel ppp-devel - network-manager-applet-devel NetworkManager-devel" +makedepends="gtk+3-devel libglib-devel libnma-devel libsecret-devel + NetworkManager-devel ppp-devel" depends="pptpclient" short_desc="NetworkManager VPN plugin for pptp" maintainer="Enno Boland "