From dab271b5a851e4de6efb1ef8f69a0f1eeb684e01 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 20 Jul 2019 20:52:55 -0400 Subject: [PATCH 1/2] Add option to specify path to pygobject override directory --- meson_options.txt | 5 +++++ pygobject/meson.build | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 62d6c59..5e7c07d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -8,3 +8,8 @@ option('deprecated_warnings', value : false, description: 'Show build warnings for deprecations' ) +option('py-overrides-dir', + type : 'string', + value : '', + description: 'Path to pygobject overrides directory' +) diff --git a/pygobject/meson.build b/pygobject/meson.build index 415816e..049b565 100644 --- a/pygobject/meson.build +++ b/pygobject/meson.build @@ -3,14 +3,19 @@ pygobject = dependency('pygobject-3.0', required: true, ) -foreach exec : ['python2', 'python3'] +override_dir = get_option('py-overrides-dir') +exec = find_program(['python3', 'python']) + +if override_dir == '' r = run_command(exec, '-c', 'import gi;print(gi._overridesdir)') - if r.returncode() == 0 - override_dir = r.stdout().strip() - install_data(['XApp.py'], - install_dir: override_dir - ) + if r.returncode() != 0 + error('Error getting the GObject Introspection override directory: ' + r.stderr()) endif -endforeach + override_dir = r.stdout().strip() +endif + +install_data(['XApp.py'], + install_dir: override_dir, +) From 2dfe82ec68981ea046345b2be349bd56293579f7 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 20 Jul 2019 20:51:20 -0400 Subject: [PATCH 2/2] Install icons and scripts using meson options With meson there's no point for a package to try to write to '/' when there's built in options like 'bindir' and 'datadir' which are the actual directories we want these files installed. --- files/meson.build | 7 ------- .../scalable/actions/add-files-to-archive-symbolic.svg | 0 .../hicolor/scalable/actions/category-search-symbolic.svg | 0 .../hicolor/scalable/actions/extract-archive-symbolic.svg | 0 .../hicolor/scalable/actions/media-mount-symbolic.svg | 0 .../hicolor/scalable/actions/view-bottom-pane-symbolic.svg | 0 .../scalable/actions/view-left-pane-symbolic-rtl.svg | 0 .../hicolor/scalable/actions/view-left-pane-symbolic.svg | 0 .../scalable/actions/view-right-pane-symbolic-rtl.svg | 0 .../hicolor/scalable/actions/view-right-pane-symbolic.svg | 0 .../hicolor/scalable/actions/view-top-pane-symbolic.svg | 0 .../scalable/actions/xapp-go-history-next-symbolic-rtl.svg | 0 .../scalable/actions/xapp-go-history-next-symbolic.svg | 0 .../actions/xapp-go-history-previous-symbolic-rtl.svg | 0 .../scalable/actions/xapp-go-history-previous-symbolic.svg | 0 .../scalable/actions/xapp-search-entire-word-symbolic.svg | 0 .../hicolor/scalable/actions/xapp-search-wrap-symbolic.svg | 0 .../hicolor/scalable/actions/xapp-text-case-symbolic.svg | 0 .../hicolor/scalable/actions/xapp-use-regex-symbolic.svg | 0 .../scalable/categories/xapp-prefs-behavior-symbolic.svg | 0 .../scalable/categories/xapp-prefs-display-symbolic.svg | 0 .../scalable/categories/xapp-prefs-plugins-symbolic.svg | 0 .../scalable/categories/xapp-prefs-preview-symbolic.svg | 0 .../scalable/categories/xapp-prefs-toolbar-symbolic.svg | 0 icons/meson.build | 3 +++ meson.build | 3 ++- scripts/meson.build | 5 +++++ {files/usr/bin => scripts}/pastebin | 0 {files/usr/bin => scripts}/upload-system-info | 0 {files/usr/bin => scripts}/xfce4-set-wallpaper | 0 30 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 files/meson.build rename {files/usr/share/icons => icons}/hicolor/scalable/actions/add-files-to-archive-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/category-search-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/extract-archive-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/media-mount-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/view-bottom-pane-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/view-left-pane-symbolic-rtl.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/view-left-pane-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/view-right-pane-symbolic-rtl.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/view-right-pane-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/view-top-pane-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/xapp-go-history-next-symbolic-rtl.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/xapp-go-history-next-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/xapp-go-history-previous-symbolic-rtl.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/xapp-go-history-previous-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/xapp-search-entire-word-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/xapp-search-wrap-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/xapp-text-case-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/actions/xapp-use-regex-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/categories/xapp-prefs-behavior-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/categories/xapp-prefs-display-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/categories/xapp-prefs-plugins-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/categories/xapp-prefs-preview-symbolic.svg (100%) rename {files/usr/share/icons => icons}/hicolor/scalable/categories/xapp-prefs-toolbar-symbolic.svg (100%) create mode 100644 icons/meson.build create mode 100644 scripts/meson.build rename {files/usr/bin => scripts}/pastebin (100%) rename {files/usr/bin => scripts}/upload-system-info (100%) rename {files/usr/bin => scripts}/xfce4-set-wallpaper (100%) diff --git a/files/meson.build b/files/meson.build deleted file mode 100644 index 5292001..0000000 --- a/files/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -message('Copying ./files structure') - -install_subdir('usr', - install_dir: '/', -) - - diff --git a/files/usr/share/icons/hicolor/scalable/actions/add-files-to-archive-symbolic.svg b/icons/hicolor/scalable/actions/add-files-to-archive-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/add-files-to-archive-symbolic.svg rename to icons/hicolor/scalable/actions/add-files-to-archive-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/category-search-symbolic.svg b/icons/hicolor/scalable/actions/category-search-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/category-search-symbolic.svg rename to icons/hicolor/scalable/actions/category-search-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/extract-archive-symbolic.svg b/icons/hicolor/scalable/actions/extract-archive-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/extract-archive-symbolic.svg rename to icons/hicolor/scalable/actions/extract-archive-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/media-mount-symbolic.svg b/icons/hicolor/scalable/actions/media-mount-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/media-mount-symbolic.svg rename to icons/hicolor/scalable/actions/media-mount-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/view-bottom-pane-symbolic.svg b/icons/hicolor/scalable/actions/view-bottom-pane-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/view-bottom-pane-symbolic.svg rename to icons/hicolor/scalable/actions/view-bottom-pane-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/view-left-pane-symbolic-rtl.svg b/icons/hicolor/scalable/actions/view-left-pane-symbolic-rtl.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/view-left-pane-symbolic-rtl.svg rename to icons/hicolor/scalable/actions/view-left-pane-symbolic-rtl.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/view-left-pane-symbolic.svg b/icons/hicolor/scalable/actions/view-left-pane-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/view-left-pane-symbolic.svg rename to icons/hicolor/scalable/actions/view-left-pane-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/view-right-pane-symbolic-rtl.svg b/icons/hicolor/scalable/actions/view-right-pane-symbolic-rtl.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/view-right-pane-symbolic-rtl.svg rename to icons/hicolor/scalable/actions/view-right-pane-symbolic-rtl.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/view-right-pane-symbolic.svg b/icons/hicolor/scalable/actions/view-right-pane-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/view-right-pane-symbolic.svg rename to icons/hicolor/scalable/actions/view-right-pane-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/view-top-pane-symbolic.svg b/icons/hicolor/scalable/actions/view-top-pane-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/view-top-pane-symbolic.svg rename to icons/hicolor/scalable/actions/view-top-pane-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/xapp-go-history-next-symbolic-rtl.svg b/icons/hicolor/scalable/actions/xapp-go-history-next-symbolic-rtl.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/xapp-go-history-next-symbolic-rtl.svg rename to icons/hicolor/scalable/actions/xapp-go-history-next-symbolic-rtl.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/xapp-go-history-next-symbolic.svg b/icons/hicolor/scalable/actions/xapp-go-history-next-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/xapp-go-history-next-symbolic.svg rename to icons/hicolor/scalable/actions/xapp-go-history-next-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/xapp-go-history-previous-symbolic-rtl.svg b/icons/hicolor/scalable/actions/xapp-go-history-previous-symbolic-rtl.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/xapp-go-history-previous-symbolic-rtl.svg rename to icons/hicolor/scalable/actions/xapp-go-history-previous-symbolic-rtl.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/xapp-go-history-previous-symbolic.svg b/icons/hicolor/scalable/actions/xapp-go-history-previous-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/xapp-go-history-previous-symbolic.svg rename to icons/hicolor/scalable/actions/xapp-go-history-previous-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/xapp-search-entire-word-symbolic.svg b/icons/hicolor/scalable/actions/xapp-search-entire-word-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/xapp-search-entire-word-symbolic.svg rename to icons/hicolor/scalable/actions/xapp-search-entire-word-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/xapp-search-wrap-symbolic.svg b/icons/hicolor/scalable/actions/xapp-search-wrap-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/xapp-search-wrap-symbolic.svg rename to icons/hicolor/scalable/actions/xapp-search-wrap-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/xapp-text-case-symbolic.svg b/icons/hicolor/scalable/actions/xapp-text-case-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/xapp-text-case-symbolic.svg rename to icons/hicolor/scalable/actions/xapp-text-case-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/actions/xapp-use-regex-symbolic.svg b/icons/hicolor/scalable/actions/xapp-use-regex-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/actions/xapp-use-regex-symbolic.svg rename to icons/hicolor/scalable/actions/xapp-use-regex-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/categories/xapp-prefs-behavior-symbolic.svg b/icons/hicolor/scalable/categories/xapp-prefs-behavior-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/categories/xapp-prefs-behavior-symbolic.svg rename to icons/hicolor/scalable/categories/xapp-prefs-behavior-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/categories/xapp-prefs-display-symbolic.svg b/icons/hicolor/scalable/categories/xapp-prefs-display-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/categories/xapp-prefs-display-symbolic.svg rename to icons/hicolor/scalable/categories/xapp-prefs-display-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/categories/xapp-prefs-plugins-symbolic.svg b/icons/hicolor/scalable/categories/xapp-prefs-plugins-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/categories/xapp-prefs-plugins-symbolic.svg rename to icons/hicolor/scalable/categories/xapp-prefs-plugins-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/categories/xapp-prefs-preview-symbolic.svg b/icons/hicolor/scalable/categories/xapp-prefs-preview-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/categories/xapp-prefs-preview-symbolic.svg rename to icons/hicolor/scalable/categories/xapp-prefs-preview-symbolic.svg diff --git a/files/usr/share/icons/hicolor/scalable/categories/xapp-prefs-toolbar-symbolic.svg b/icons/hicolor/scalable/categories/xapp-prefs-toolbar-symbolic.svg similarity index 100% rename from files/usr/share/icons/hicolor/scalable/categories/xapp-prefs-toolbar-symbolic.svg rename to icons/hicolor/scalable/categories/xapp-prefs-toolbar-symbolic.svg diff --git a/icons/meson.build b/icons/meson.build new file mode 100644 index 0000000..cd8f1be --- /dev/null +++ b/icons/meson.build @@ -0,0 +1,3 @@ +install_subdir('hicolor', + install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'icons'), +) diff --git a/meson.build b/meson.build index 6db3fc8..8aa78fa 100644 --- a/meson.build +++ b/meson.build @@ -33,12 +33,13 @@ c = configure_file(output : 'config.h', top_inc = include_directories('.') +subdir('icons') subdir('libxapp') subdir('po') subdir('pygobject') -subdir('files') subdir('schemas') subdir('status-applets') +subdir('scripts') if get_option('docs') subdir('docs') diff --git a/scripts/meson.build b/scripts/meson.build new file mode 100644 index 0000000..b92795f --- /dev/null +++ b/scripts/meson.build @@ -0,0 +1,5 @@ +scripts = files('pastebin', 'upload-system-info', 'xfce4-set-wallpaper') + +install_data(scripts, + install_dir: join_paths(get_option('prefix'), get_option('bindir')), +) diff --git a/files/usr/bin/pastebin b/scripts/pastebin similarity index 100% rename from files/usr/bin/pastebin rename to scripts/pastebin diff --git a/files/usr/bin/upload-system-info b/scripts/upload-system-info similarity index 100% rename from files/usr/bin/upload-system-info rename to scripts/upload-system-info diff --git a/files/usr/bin/xfce4-set-wallpaper b/scripts/xfce4-set-wallpaper similarity index 100% rename from files/usr/bin/xfce4-set-wallpaper rename to scripts/xfce4-set-wallpaper