forked from pool/baobab
Dominique Leuenberger
e756bfe369
No pretty whitespace lines, nor nice new macros - Drop gnome-utils Conflicts, not needed for a long time. - Drop update-desktop-files BuildRequires and no longer pass suse_update_desktop_file macro. - Add baobab-fix-linguas-build-issues.patch: build: Fix setting GNOMELOCALEDIR (bgo#794381), and build: Use LINGUAS file for help (bgo#794449). - Update URL to new home in GNOME wiki. OBS-URL: https://build.opensuse.org/request/show/590378 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/baobab?expand=0&rev=90
111 lines
2.2 KiB
Diff
111 lines
2.2 KiB
Diff
From 884fb555173c46fcb4a80a5cc9cbd32bad8186ba Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
|
|
Date: Fri, 16 Mar 2018 19:57:53 +0100
|
|
Subject: build: Fix setting GNOMELOCALEDIR
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=794381
|
|
---
|
|
meson.build | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 30d996d..ad1b1d3 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -23,7 +23,7 @@ conf.set_quoted('PACKAGE_NAME', meson.project_name())
|
|
conf.set_quoted('PACKAGE_VERSION', meson.project_version())
|
|
conf.set_quoted('VERSION', meson.project_version())
|
|
conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
|
|
-conf.set_quoted('GNOMELOCALEDIR', join_paths(get_option('prefix'), get_option('datadir'), '/locale'))
|
|
+conf.set_quoted('GNOMELOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
|
|
configure_file(output: 'config.h', configuration: conf)
|
|
config_h_dir = include_directories('.')
|
|
|
|
--
|
|
cgit v0.12
|
|
|
|
|
|
From aee08d643c880f649923c18a1a4bac1045820fd4 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Piotr=20Dr=C4=85g?= <piotrdrag@gmail.com>
|
|
Date: Sun, 18 Mar 2018 18:01:45 +0100
|
|
Subject: build: Use LINGUAS file for help
|
|
|
|
The old method is deprecated.
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=794449
|
|
---
|
|
help/LINGUAS | 21 +++++++++++++++++++++
|
|
help/meson.build | 27 +--------------------------
|
|
2 files changed, 22 insertions(+), 26 deletions(-)
|
|
create mode 100644 help/LINGUAS
|
|
|
|
diff --git a/help/LINGUAS b/help/LINGUAS
|
|
new file mode 100644
|
|
index 0000000..9f7af5e
|
|
--- /dev/null
|
|
+++ b/help/LINGUAS
|
|
@@ -0,0 +1,21 @@
|
|
+ca
|
|
+cs
|
|
+da
|
|
+de
|
|
+el
|
|
+es
|
|
+fi
|
|
+fr
|
|
+gl
|
|
+hr
|
|
+hu
|
|
+id
|
|
+it
|
|
+ko
|
|
+pl
|
|
+pt
|
|
+pt_BR
|
|
+ru
|
|
+sl
|
|
+sv
|
|
+zh_CN
|
|
diff --git a/help/meson.build b/help/meson.build
|
|
index 34e7691..549b3d9 100644
|
|
--- a/help/meson.build
|
|
+++ b/help/meson.build
|
|
@@ -17,33 +17,8 @@ help_media = [
|
|
'media/hicolor_apps_48x48_baobab.png'
|
|
]
|
|
|
|
-help_linguas = [
|
|
- 'ca',
|
|
- 'cs',
|
|
- 'da',
|
|
- 'de',
|
|
- 'el',
|
|
- 'es',
|
|
- 'fi',
|
|
- 'fr',
|
|
- 'gl',
|
|
- 'hr',
|
|
- 'hu',
|
|
- 'id',
|
|
- 'it',
|
|
- 'ko',
|
|
- 'pl',
|
|
- 'pt',
|
|
- 'pt_BR',
|
|
- 'ru',
|
|
- 'sl',
|
|
- 'sv',
|
|
- 'zh_CN'
|
|
-]
|
|
-
|
|
gnome.yelp(
|
|
meson.project_name(),
|
|
sources: help_files,
|
|
- media: help_media,
|
|
- languages: help_linguas,
|
|
+ media: help_media
|
|
)
|
|
--
|
|
cgit v0.12
|
|
|