[gnome-system-monitor/wip-charts: 139/139] Merge branch 'master' into wip-charts



commit 4bcf0a8f0457fe322559eab1d4b1a6664b77506f
Merge: 9683e6bb 52e0f838
Author: Robert Roth <robert roth off gmail com>
Date:   Tue Oct 1 20:35:31 2019 +0300

    Merge branch 'master' into wip-charts

 HACKING                                            |   39 +-
 MAINTAINERS                                        |    6 +-
 NEWS                                               |  136 ++
 data/icons/meson.build                             |    5 +
 .../scalable/apps/org.gnome.SystemMonitor.svg      |  290 ++++
 .../apps/org.gnome.SystemMonitor-symbolic.svg      |    6 +
 data/interface.ui                                  |   19 +-
 data/menus.ui                                      |   34 +-
 data/meson.build                                   |    1 +
 gnome-system-monitor-kde.desktop.in.in             |    2 +-
 gnome-system-monitor.desktop.in.in                 |    2 +-
 help/C/figures/monitorlogo.png                     |  Bin 29268 -> 989 bytes
 help/C/index.page                                  |    2 +-
 meson.build                                        |   27 +-
 meson_post_install.py                              |   17 +
 org.gnome.gnome-system-monitor.policy.in.in        |    2 +-
 po/LINGUAS                                         |    1 +
 po/ar.po                                           | 1320 +++++++++-------
 po/ca.po                                           |  809 +++++-----
 po/cs.po                                           |  544 +++----
 po/da.po                                           |  509 +++---
 po/de.po                                           |  558 +++----
 po/el.po                                           |  483 +++---
 po/eo.po                                           | 1264 ++++++++-------
 po/es.po                                           |  499 +++---
 po/eu.po                                           |  892 +++++------
 po/fa.po                                           | 1336 ++++++++--------
 po/fi.po                                           |  497 +++---
 po/fr.po                                           |  535 ++++---
 po/fur.po                                          |  589 ++++---
 po/gl.po                                           |  491 +++---
 po/hr.po                                           |  439 +++---
 po/hu.po                                           |  498 +++---
 po/id.po                                           |  596 ++++---
 po/is.po                                           |  508 +++---
 po/it.po                                           |  516 +++---
 po/ja.po                                           | 1298 ++++++++-------
 po/kk.po                                           |  485 +++---
 po/ko.po                                           |  816 +++++-----
 po/lt.po                                           |  463 +++---
 po/lv.po                                           |  485 +++---
 po/mjw.po                                          | 1358 ++++++++++++++++
 po/ml.po                                           | 1667 +++++++++++---------
 po/nl.po                                           |  487 +++---
 po/pl.po                                           |  482 +++---
 po/pt_BR.po                                        |  497 +++---
 po/ro.po                                           | 1262 ++++++++-------
 po/ru.po                                           |  468 +++---
 po/sk.po                                           |  502 +++---
 po/sl.po                                           |  457 +++---
 po/sr.po                                           |  496 +++---
 po/sv.po                                           |  500 +++---
 po/tr.po                                           |  523 +++---
 po/zh_CN.po                                        |  401 ++---
 po/zh_TW.po                                        |  486 +++---
 src/application.cpp                                |    4 +-
 src/application.h                                  |    1 +
 src/interface.cpp                                  |   20 +-
 src/legacy/treeview.c                              |    7 +-
 src/load-graph.cpp                                 |    2 +-
 src/org.gnome.gnome-system-monitor.gschema.xml.in  |   39 +-
 src/procdialogs.cpp                                |    2 +-
 src/proctable.cpp                                  |    8 +-
 63 files changed, 14499 insertions(+), 12189 deletions(-)
---
diff --cc meson.build
index 9e12ea4a,d60ced73..cc7ef8bb
--- a/meson.build
+++ b/meson.build
@@@ -84,13 -85,16 +86,17 @@@ extra_cflags = 
  extra_cxxflags = [
    # '-fvisibility=hidden',
    # '-fvisibility-inlines-hidden',
 + '-fpermissive',
  ]
  
- add_project_arguments(cc.get_supported_arguments(extra_flags + extra_cflags),
+ 
+ cflags   = extra_flags + extra_cflags
+ cxxflags = extra_flags + extra_cxxflags
+ 
+ add_project_arguments(cc.get_supported_arguments(cflags),
    language: 'c'
  )
- add_project_arguments(cx.get_supported_arguments(extra_flags + extra_cxxflags),
+ add_project_arguments(cx.get_supported_arguments(cxxflags),
    language: 'cpp'
  )
  


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