[arch-commits] Commit in network-manager-applet/repos (6 files)
Jan Steffens
heftig at archlinux.org
Tue Nov 7 21:49:28 UTC 2017
Date: Tuesday, November 7, 2017 @ 21:49:27
Author: heftig
Revision: 309024
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
network-manager-applet/repos/extra-i686/0001-meson-Make-sure-the-entire-wireless-security-static-.patch
(from rev 309023, network-manager-applet/trunk/0001-meson-Make-sure-the-entire-wireless-security-static-.patch)
network-manager-applet/repos/extra-i686/PKGBUILD
(from rev 309023, network-manager-applet/trunk/PKGBUILD)
network-manager-applet/repos/extra-x86_64/0001-meson-Make-sure-the-entire-wireless-security-static-.patch
(from rev 309023, network-manager-applet/trunk/0001-meson-Make-sure-the-entire-wireless-security-static-.patch)
network-manager-applet/repos/extra-x86_64/PKGBUILD
(from rev 309023, network-manager-applet/trunk/PKGBUILD)
Deleted:
network-manager-applet/repos/extra-i686/PKGBUILD
network-manager-applet/repos/extra-x86_64/PKGBUILD
------------------------------------------------------------------------------+
/PKGBUILD | 158 ++++++++
extra-i686/0001-meson-Make-sure-the-entire-wireless-security-static-.patch | 178 ++++++++++
extra-i686/PKGBUILD | 76 ----
extra-x86_64/0001-meson-Make-sure-the-entire-wireless-security-static-.patch | 178 ++++++++++
extra-x86_64/PKGBUILD | 76 ----
5 files changed, 514 insertions(+), 152 deletions(-)
Copied: network-manager-applet/repos/extra-i686/0001-meson-Make-sure-the-entire-wireless-security-static-.patch (from rev 309023, network-manager-applet/trunk/0001-meson-Make-sure-the-entire-wireless-security-static-.patch)
===================================================================
--- extra-i686/0001-meson-Make-sure-the-entire-wireless-security-static-.patch (rev 0)
+++ extra-i686/0001-meson-Make-sure-the-entire-wireless-security-static-.patch 2017-11-07 21:49:27 UTC (rev 309024)
@@ -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
+
Property changes on: network-manager-applet/repos/extra-i686/0001-meson-Make-sure-the-entire-wireless-security-static-.patch
___________________________________________________________________
Added: svn:mergeinfo
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-11-07 21:48:44 UTC (rev 309023)
+++ extra-i686/PKGBUILD 2017-11-07 21:49:27 UTC (rev 309024)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Arjan Timmerman <arjan at archlinux.org>
-# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
-# Contributor: Tor Krill <tor at krill.nu>
-# Contributor: Will Rea <sillywilly at gmail.com>
-
-pkgbase=network-manager-applet
-pkgname=(nm-connection-editor network-manager-applet)
-pkgdesc="Applet for managing network connections"
-url="https://wiki.gnome.org/Projects/NetworkManager/"
-pkgver=1.8.6
-pkgrel=2
-arch=(i686 x86_64)
-license=(GPL2 LGPL2.1)
-depends=(libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes gcr)
-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')
-
-pkgver() {
- cd $pkgbase
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- mkdir -p build nma/etc/xdg nma/usr/bin \
- nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet}
- cd $pkgbase
- sed -i "s/version: '1\.8\.5'/version: '1.8.6'/" meson.build
-}
-
-build() {
- cd build
- arch-meson ../$pkgbase -Denable-selinux=false
- ninja
-}
-
-check() {
- cd build
- meson test
-}
-
-package_nm-connection-editor() {
- pkgdesc="NetworkManager GUI connection editor and widgets"
- provides=("libnm-gtk=$pkgver-$pkgrel" "libnma=$pkgver-$pkgrel")
- conflicts=(libnm-gtk)
- replaces=(libnm-gtk)
-
- cd build
- DESTDIR="$pkgdir" ninja install
-
-### Split network-manager-applet
- cd ../nma
- mv "$pkgdir"/etc/xdg/autostart etc/xdg/
- mv "$pkgdir"/usr/bin/nm-applet usr/bin/
- mv "$pkgdir"/usr/share/GConf usr/share/
-
- cd usr/share
- mv "$pkgdir"/usr/share/applications/nm-applet.desktop applications/
- mv "$pkgdir"/usr/share/man/man1/nm-applet.1 man/man1/
-
- cd icons/hicolor/22x22
- mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{adhoc,mb-roam,wwan-tower}.png apps/
- mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{secure,vpn-active}-lock.png apps/
- mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{signal,tech}-*.png apps/
- mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-*connecting*.png apps/
-}
-
-package_network-manager-applet() {
- depends=(nm-connection-editor libmm-glib libnotify libsecret networkmanager)
- mv nma/* "$pkgdir"
-}
Copied: network-manager-applet/repos/extra-i686/PKGBUILD (from rev 309023, network-manager-applet/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-11-07 21:49:27 UTC (rev 309024)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Arjan Timmerman <arjan at archlinux.org>
+# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
+# Contributor: Tor Krill <tor at krill.nu>
+# Contributor: Will Rea <sillywilly at gmail.com>
+
+pkgbase=network-manager-applet
+pkgname=(nm-connection-editor network-manager-applet)
+pkgdesc="Applet for managing network connections"
+url="https://wiki.gnome.org/Projects/NetworkManager/"
+pkgver=1.8.6
+pkgrel=3
+arch=(i686 x86_64)
+license=(GPL2 LGPL2.1)
+depends=(libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes gcr)
+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"
+ 0001-meson-Make-sure-the-entire-wireless-security-static-.patch)
+sha256sums=('SKIP'
+ 'f8b25e87b54e79f1b55ca962358eaba031d7789f5ce38e4e30b53d990b0fd312')
+
+pkgver() {
+ cd $pkgbase
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ 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
+}
+
+build() {
+ cd build
+ arch-meson ../$pkgbase -Denable-selinux=false
+ ninja
+}
+
+check() {
+ cd build
+ meson test
+}
+
+package_nm-connection-editor() {
+ pkgdesc="NetworkManager GUI connection editor and widgets"
+ provides=("libnm-gtk=$pkgver-$pkgrel" "libnma=$pkgver-$pkgrel")
+ conflicts=(libnm-gtk)
+ replaces=(libnm-gtk)
+
+ cd build
+ DESTDIR="$pkgdir" ninja install
+
+### Split network-manager-applet
+ cd ../nma
+ mv "$pkgdir"/etc/xdg/autostart etc/xdg/
+ mv "$pkgdir"/usr/bin/nm-applet usr/bin/
+ mv "$pkgdir"/usr/share/GConf usr/share/
+
+ cd usr/share
+ mv "$pkgdir"/usr/share/applications/nm-applet.desktop applications/
+ mv "$pkgdir"/usr/share/man/man1/nm-applet.1 man/man1/
+
+ cd icons/hicolor/22x22
+ mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{adhoc,mb-roam,wwan-tower}.png apps/
+ mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{secure,vpn-active}-lock.png apps/
+ mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{signal,tech}-*.png apps/
+ mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-*connecting*.png apps/
+}
+
+package_network-manager-applet() {
+ depends=(nm-connection-editor libmm-glib libnotify libsecret networkmanager)
+ mv nma/* "$pkgdir"
+}
Property changes on: network-manager-applet/repos/extra-i686/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:mergeinfo
Copied: network-manager-applet/repos/extra-x86_64/0001-meson-Make-sure-the-entire-wireless-security-static-.patch (from rev 309023, network-manager-applet/trunk/0001-meson-Make-sure-the-entire-wireless-security-static-.patch)
===================================================================
--- extra-x86_64/0001-meson-Make-sure-the-entire-wireless-security-static-.patch (rev 0)
+++ extra-x86_64/0001-meson-Make-sure-the-entire-wireless-security-static-.patch 2017-11-07 21:49:27 UTC (rev 309024)
@@ -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
+
Property changes on: network-manager-applet/repos/extra-x86_64/0001-meson-Make-sure-the-entire-wireless-security-static-.patch
___________________________________________________________________
Added: svn:mergeinfo
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-11-07 21:48:44 UTC (rev 309023)
+++ extra-x86_64/PKGBUILD 2017-11-07 21:49:27 UTC (rev 309024)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Arjan Timmerman <arjan at archlinux.org>
-# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
-# Contributor: Tor Krill <tor at krill.nu>
-# Contributor: Will Rea <sillywilly at gmail.com>
-
-pkgbase=network-manager-applet
-pkgname=(nm-connection-editor network-manager-applet)
-pkgdesc="Applet for managing network connections"
-url="https://wiki.gnome.org/Projects/NetworkManager/"
-pkgver=1.8.6
-pkgrel=2
-arch=(i686 x86_64)
-license=(GPL2 LGPL2.1)
-depends=(libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes gcr)
-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')
-
-pkgver() {
- cd $pkgbase
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- mkdir -p build nma/etc/xdg nma/usr/bin \
- nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet}
- cd $pkgbase
- sed -i "s/version: '1\.8\.5'/version: '1.8.6'/" meson.build
-}
-
-build() {
- cd build
- arch-meson ../$pkgbase -Denable-selinux=false
- ninja
-}
-
-check() {
- cd build
- meson test
-}
-
-package_nm-connection-editor() {
- pkgdesc="NetworkManager GUI connection editor and widgets"
- provides=("libnm-gtk=$pkgver-$pkgrel" "libnma=$pkgver-$pkgrel")
- conflicts=(libnm-gtk)
- replaces=(libnm-gtk)
-
- cd build
- DESTDIR="$pkgdir" ninja install
-
-### Split network-manager-applet
- cd ../nma
- mv "$pkgdir"/etc/xdg/autostart etc/xdg/
- mv "$pkgdir"/usr/bin/nm-applet usr/bin/
- mv "$pkgdir"/usr/share/GConf usr/share/
-
- cd usr/share
- mv "$pkgdir"/usr/share/applications/nm-applet.desktop applications/
- mv "$pkgdir"/usr/share/man/man1/nm-applet.1 man/man1/
-
- cd icons/hicolor/22x22
- mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{adhoc,mb-roam,wwan-tower}.png apps/
- mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{secure,vpn-active}-lock.png apps/
- mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{signal,tech}-*.png apps/
- mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-*connecting*.png apps/
-}
-
-package_network-manager-applet() {
- depends=(nm-connection-editor libmm-glib libnotify libsecret networkmanager)
- mv nma/* "$pkgdir"
-}
Copied: network-manager-applet/repos/extra-x86_64/PKGBUILD (from rev 309023, network-manager-applet/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-11-07 21:49:27 UTC (rev 309024)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Arjan Timmerman <arjan at archlinux.org>
+# Contributor: Wael Nasreddine <gandalf at siemens-mobiles.org>
+# Contributor: Tor Krill <tor at krill.nu>
+# Contributor: Will Rea <sillywilly at gmail.com>
+
+pkgbase=network-manager-applet
+pkgname=(nm-connection-editor network-manager-applet)
+pkgdesc="Applet for managing network connections"
+url="https://wiki.gnome.org/Projects/NetworkManager/"
+pkgver=1.8.6
+pkgrel=3
+arch=(i686 x86_64)
+license=(GPL2 LGPL2.1)
+depends=(libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes gcr)
+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"
+ 0001-meson-Make-sure-the-entire-wireless-security-static-.patch)
+sha256sums=('SKIP'
+ 'f8b25e87b54e79f1b55ca962358eaba031d7789f5ce38e4e30b53d990b0fd312')
+
+pkgver() {
+ cd $pkgbase
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ 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
+}
+
+build() {
+ cd build
+ arch-meson ../$pkgbase -Denable-selinux=false
+ ninja
+}
+
+check() {
+ cd build
+ meson test
+}
+
+package_nm-connection-editor() {
+ pkgdesc="NetworkManager GUI connection editor and widgets"
+ provides=("libnm-gtk=$pkgver-$pkgrel" "libnma=$pkgver-$pkgrel")
+ conflicts=(libnm-gtk)
+ replaces=(libnm-gtk)
+
+ cd build
+ DESTDIR="$pkgdir" ninja install
+
+### Split network-manager-applet
+ cd ../nma
+ mv "$pkgdir"/etc/xdg/autostart etc/xdg/
+ mv "$pkgdir"/usr/bin/nm-applet usr/bin/
+ mv "$pkgdir"/usr/share/GConf usr/share/
+
+ cd usr/share
+ mv "$pkgdir"/usr/share/applications/nm-applet.desktop applications/
+ mv "$pkgdir"/usr/share/man/man1/nm-applet.1 man/man1/
+
+ cd icons/hicolor/22x22
+ mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{adhoc,mb-roam,wwan-tower}.png apps/
+ mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{secure,vpn-active}-lock.png apps/
+ mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{signal,tech}-*.png apps/
+ mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-*connecting*.png apps/
+}
+
+package_network-manager-applet() {
+ depends=(nm-connection-editor libmm-glib libnotify libsecret networkmanager)
+ mv nma/* "$pkgdir"
+}
Property changes on: network-manager-applet/repos/extra-x86_64/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:mergeinfo
More information about the arch-commits
mailing list