diff --git a/common/shlibs b/common/shlibs index bf3f9b26575..51c9ba0635a 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 - } -}