[gnome-control-center] network: Drop broken patches to import code from network-manager-applet



commit 4afbeff6edca11ea1e77c385b2b1d6e76a462a44
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue Oct 1 10:02:13 2019 +1300

    network: Drop broken patches to import code from network-manager-applet
    
    They are disabled, and aren't going to work due to other changes we have landed.

 build-aux/meson.build                              |   4 -
 build-aux/meson/update-from-gsd.in                 |  10 -
 build-aux/meson/update-from-gsd.sh                 |  26 -
 build-aux/meson/update-from-nma.in                 |  19 -
 panels/network/wireless-security/meson.build       |  30 -
 .../nm-connection-editor-to-network-panel.patch    |  69 ---
 .../nm-connection-editor-ui-to-network-panel.patch | 638 ---------------------
 7 files changed, 796 deletions(-)
---
diff --git a/build-aux/meson.build b/build-aux/meson.build
index f3fdb40a8..1b429060d 100644
--- a/build-aux/meson.build
+++ b/build-aux/meson.build
@@ -1,5 +1 @@
-update_from_gsd = find_program('meson/update-from-gsd.sh')
-update_from_gsd_in = files('meson/update-from-gsd.in')
-update_from_nma_in = files('meson/update-from-nma.in')
-
 meson.add_install_script('meson/meson_post_install.py', control_center_datadir)
diff --git a/panels/network/wireless-security/meson.build b/panels/network/wireless-security/meson.build
index 182ac1e14..5e6e0157b 100644
--- a/panels/network/wireless-security/meson.build
+++ b/panels/network/wireless-security/meson.build
@@ -66,33 +66,3 @@ libwireless_security = static_library(
   include_directories: top_inc,
   dependencies: deps
 )
-
-'''
-# DISABLED
-# FIXME: workaround for updating different sources code
-input_dir = join_paths(meson.source_root(), '..', 'network-manager-applet', 'src', 'wireless-security')
-
-script_conf = configuration_data()
-script_conf.set('program', update_from_gsd.path())
-script_conf.set('input_dir', input_dir)
-script_conf.set('working_dir', meson.current_source_dir())
-script_conf.set('source_files', ' '.join(nm_applet_sources + nm_applet_headers))
-script_conf.set('source_patch', 'nm-connection-editor-to-network-panel.patch')
-script_conf.set('source_message', 'network: Update wireless-security from network-manager-applet')
-script_conf.set('resource_data', ' '.join(nm_resource_data))
-script_conf.set('resource_patch', 'nm-connection-editor-ui-to-network-panel.patch')
-script_conf.set('resource_message', 'network: Update wireless-security UI from network-manager-applet')
-
-script_name = 'update-from-nma'
-
-script = configure_file(
-  input: update_from_nma_in,
-  output: script_name + '.sh',
-  configuration: script_conf
-)
-
-run_target(
-  script_name,
-  command: script
-)
-'''


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]