[gimp/gtk3-port-meson: 235/235] Disable some non-ported themes. Reorganize warnings, add some -Werror=.
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port-meson: 235/235] Disable some non-ported themes. Reorganize warnings, add some -Werror=.
- Date: Mon, 12 Feb 2018 16:17:18 +0000 (UTC)
commit c1d7291364bd7bacc2feae6a1d85f4fb82cccb94
Author: Félix Piédallu <felix piedallu me>
Date: Mon Feb 12 17:15:02 2018 +0100
Disable some non-ported themes.
Reorganize warnings, add some -Werror=.
meson.build | 25 +++++++++++++++----------
themes/meson.build | 13 +++++++------
2 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/meson.build b/meson.build
index 3529e5a..045b8dd 100644
--- a/meson.build
+++ b/meson.build
@@ -742,26 +742,31 @@ add_project_arguments(
'-fdiagnostics-show-option',
'-fno-common',
- '-Wmissing-prototypes',
- '-Werror=missing-prototypes',
-
'-Wdeclaration-after-statement',
'-Wformat-security',
- '-Winit-self',
- # '-Wlogical-op',
'-Wmissing-declarations',
'-Wmissing-format-attribute',
+ '-Wmissing-prototypes',
'-Wold-style-definition',
'-Wpointer-arith',
- '-Wreturn-type',
- # '-Wstrict-prototypes',
- '-Wtype-limits',
- # '--omg-optimized',
- # '--disable-instructions',
+ # Error on some very disturbing warnings
+ '-Werror=implicit-function-declaration',
+ '-Werror=missing-prototypes',
+
+ # Just for debug
+ '-Wno-deprecated-declarations',
language: [ 'c', 'cpp', ],
)
+if cc.get_id() == 'gcc'
+ add_project_arguments(
+ '-Wlogical-op',
+ '-Werror=strict-prototypes',
+ language: [ 'c', 'cpp', ],
+ )
+endif
+
# Ensure MSVC-compatible struct packing convention is used when
# compiling for Win32 with gcc.
diff --git a/themes/meson.build b/themes/meson.build
index a161d96..44f72e1 100644
--- a/themes/meson.build
+++ b/themes/meson.build
@@ -1,10 +1,11 @@
theme_names = [
- [ 'Lighter', '00-Lighter' ],
- [ 'Light', '01-Light' ],
- [ 'Gray', '02-Gray' ],
- [ 'Dark', '03-Dark' ],
- [ 'Darker', '04-Darker' ],
+ # [ 'Lighter', '00-Lighter' ],
+ # [ 'Light', '01-Light' ],
+ # [ 'Gray', '02-Gray' ],
+ # [ 'Dark', '03-Dark' ],
+ # [ 'Darker', '04-Darker' ],
+ [ 'Small', 'Small' ],
[ 'System', 'System' ],
]
@@ -12,7 +13,7 @@ foreach theme : theme_names
theme_srcdir = theme[0]
theme_bindir = theme[1]
install_data(
- join_paths(theme_srcdir, 'gtkrc'),
+ join_paths(theme_srcdir, 'gimp.css'),
install_dir: join_paths(gimpdatadir, 'themes', theme_bindir)
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]