[arch-commits] Commit in network-manager-applet/trunk (2 files)

[Jan Steffens]

    Date: Tuesday, November 7, 2017 @ 21:48:44
  Author: heftig
Revision: 309023

1.8.6-3: Fix wireless security settings

Added:
  network-manager-applet/trunk/0001-meson-Make-sure-the-entire-wireless-security-static-.patch
Modified:
  network-manager-applet/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-meson-Make-sure-the-entire-wireless-security-static-.patch |  178 ++++++++++
 PKGBUILD                                                        |    9 
 2 files changed, 184 insertions(+), 3 deletions(-)

Added: 0001-meson-Make-sure-the-entire-wireless-security-static-.patch
===================================================================
--- 0001-meson-Make-sure-the-entire-wireless-security-static-.patch	                        (rev 0)
+++ 0001-meson-Make-sure-the-entire-wireless-security-static-.patch	2017-11-07 21:48:44 UTC (rev 309023)
@@ -0,0 +1,178 @@
+From d096192f401cbbb75f6f6ffd7dcda3766a5505b9 Mon Sep 17 00:00:00 2001
+Message-Id: <d096192f401cbbb75f6f6ffd7dcda3766a5505b9.1510090607.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 7 Nov 2017 22:11:47 +0100
+Subject: [PATCH] meson: Make sure the entire wireless-security static lib is
+ used
+
+Otherwise ld will not link in the gresources, which contain no "needed"
+(as far as ld can determine) symbols.
+---
+ src/connection-editor/meson.build |  5 +++--
+ src/libnm-gtk/meson.build         |  5 +++--
+ src/libnma/meson.build            |  5 +++--
+ src/meson.build                   | 10 +++++++++-
+ src/wireless-security/meson.build | 10 ----------
+ 5 files changed, 18 insertions(+), 17 deletions(-)
+
+diff --git a/src/connection-editor/meson.build b/src/connection-editor/meson.build
+index 990f1b4739ff6e4f..004303e48d21acf1 100644
+--- a/src/connection-editor/meson.build
++++ b/src/connection-editor/meson.build
+@@ -76,14 +76,14 @@ incs = [
+   top_inc,
+   utils_inc,
+   src_inc,
+-  shared_inc
++  shared_inc,
++  wireless_security_inc
+ ]
+ 
+ deps = [
+   gtk_dep,
+   libnm_dep,
+   libnma_dep,
+-  libwireless_security_libnm_dep,
+   m_dep
+ ]
+ 
+@@ -117,6 +117,7 @@ executable(
+   c_args: cflags,
+   link_args: ldflags,
+   link_depends: linker_script_ver,
++  link_whole: libwireless_security_libnm,
+   install: true,
+   install_dir: nma_bindir
+ )
+diff --git a/src/libnm-gtk/meson.build b/src/libnm-gtk/meson.build
+index 9aaf21942cae8fe6..cc6785dadd04a85c 100644
+--- a/src/libnm-gtk/meson.build
++++ b/src/libnm-gtk/meson.build
+@@ -39,15 +39,15 @@ incs = [
+   top_inc,
+   shared_inc,
+   src_inc,
+-  libnma_inc
++  libnma_inc,
++  wireless_security_inc
+ ]
+ 
+ deps = [
+   gtk_dep,
+   gudev_dep,
+   libnm_glib_dep,
+   libutils_libnm_glib_dep,
+-  libwireless_security_libnm_glib_dep
+ ]
+ 
+ cflags = [
+@@ -77,6 +77,7 @@ libnm_gtk = shared_library(
+   c_args: cflags,
+   link_args: ldflags,
+   link_depends: symbol_map,
++  link_whole: libwireless_security_libnm_glib,
+   install: true,
+   install_dir: nma_libdir
+ )
+diff --git a/src/libnma/meson.build b/src/libnma/meson.build
+index 0659268a375c45cc..98a72aa733c84c50 100644
+--- a/src/libnma/meson.build
++++ b/src/libnma/meson.build
+@@ -47,15 +47,15 @@ incs = [
+   top_inc,
+   shared_inc,
+   src_inc,
+-  libnma_inc
++  libnma_inc,
++  wireless_security_inc
+ ]
+ 
+ deps = [
+   gtk_dep,
+   gudev_dep,
+   libnm_dep,
+   libutils_libnm_dep,
+-  libwireless_security_libnm_dep
+ ]
+ 
+ cflags = [
+@@ -102,6 +102,7 @@ libnma = shared_library(
+   c_args: cflags,
+   link_args: ldflags,
+   link_depends: symbol_map,
++  link_whole: libwireless_security_libnm,
+   install: true,
+   install_dir: nma_libdir
+ )
+diff --git a/src/meson.build b/src/meson.build
+index c8e287237fd128f0..45ff246352ba53d3 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -61,13 +61,20 @@ sources += gnome.compile_resources(
+   dependencies: resource_data
+ )
+ 
++incs = [
++  top_inc,
++  utils_inc,
++  src_inc,
++  shared_inc,
++  wireless_security_inc
++]
++
+ deps = [
+   gtk_dep,
+   libnm_dep,
+   libnma_dep,
+   libnotify_dep,
+   libsecret_dep,
+-  libwireless_security_libnm_dep,
+   m_dep
+ ]
+ 
+@@ -109,6 +116,7 @@ executable(
+   c_args: cflags,
+   link_args: ldflags,
+   link_depends: linker_script_ver,
++  link_whole: libwireless_security_libnm,
+   install: true,
+   install_dir: nma_bindir
+ )
+diff --git a/src/wireless-security/meson.build b/src/wireless-security/meson.build
+index e3efcdb4ca0a39d8..a4fbe97d36ae9af7 100644
+--- a/src/wireless-security/meson.build
++++ b/src/wireless-security/meson.build
+@@ -57,30 +57,20 @@ libwireless_security_libnm = static_library(
+   dependencies: deps
+ )
+ 
+-libwireless_security_libnm_dep = declare_dependency(
+-  link_with: libwireless_security_libnm,
+-  include_directories: wireless_security_inc
+-)
+-
+ if enable_libnm_gtk
+   deps = [
+     gtk_dep,
+     libnm_glib_dep,
+     libutils_libnm_glib_dep
+   ]
+ 
+   cflags = '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY'
+ 
+   libwireless_security_libnm_glib = static_library(
+     'wireless-security-libnm-glib',
+     sources: sources,
+     include_directories: incs,
+     dependencies: deps,
+     c_args: cflags
+   )
+-
+-  libwireless_security_libnm_glib_dep = declare_dependency(
+-    link_with: libwireless_security_libnm_glib,
+-    include_directories: wireless_security_inc
+-  )
+ endif
+-- 
+2.15.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-07 21:00:08 UTC (rev 309022)
+++ PKGBUILD	2017-11-07 21:48:44 UTC (rev 309023)
@@ -11,7 +11,7 @@
 pkgdesc="Applet for managing network connections"
 url="https://wiki.gnome.org/Projects/NetworkManager/"
 pkgver=1.8.6
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 license=(GPL2 LGPL2.1)
 depends=(libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes gcr)
@@ -18,8 +18,10 @@
 makedepends=(libsecret libnotify libmm-glib intltool gobject-introspection git gtk-doc meson)
 options=(!emptydirs)
 _commit=a2377d7534780b96a32405cce2e5548e81bbd081  # tags/1.8.6^0
-source=("git+https://git.gnome.org/browse/network-manager-applet#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://git.gnome.org/browse/network-manager-applet#commit=$_commit"
+        0001-meson-Make-sure-the-entire-wireless-security-static-.patch)
+sha256sums=('SKIP'
+            'f8b25e87b54e79f1b55ca962358eaba031d7789f5ce38e4e30b53d990b0fd312')
 
 pkgver() {
   cd $pkgbase
@@ -30,6 +32,7 @@
   mkdir -p build nma/etc/xdg nma/usr/bin \
     nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet}
   cd $pkgbase
+  patch -Np1 -i ../0001-meson-Make-sure-the-entire-wireless-security-static-.patch
   sed -i "s/version: '1\.8\.5'/version: '1.8.6'/" meson.build
 }