jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gnome-builder: update to 3.32.0.

Browse source
This commit is contained in:
Rasmus Thomsen 2019-03-27 22:28:27 +01:00 committed by maxice8
parent 314d5e61bb
commit 1ce47df58e
4 changed files with 958 additions and 618 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

951
srcpkgs/gnome-builder/patches/57c566fae9aa1e74a48f7272b14590bae9f7a00a.patch Normal file
View file

@ -0,0 +1,951 @@
From 57c566fae9aa1e74a48f7272b14590bae9f7a00a Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Mon, 25 Mar 2019 17:04:27 -0700
Subject: [PATCH] build: fix gresource usage with meson 0.50
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This will probably be fixed upstream¹, but we can easily work
around it for now. Fixes build with Meson 0.50.0
¹ https://github.com/mesonbuild/meson/issues/5049
---
src/gstyle/meson.build | 3 +--
src/libide/code/meson.build | 2 +-
src/libide/editor/meson.build | 2 +-
src/libide/greeter/meson.build | 2 +-
src/libide/gui/meson.build | 2 +-
src/libide/sourceview/meson.build | 2 +-
src/libide/terminal/meson.build | 2 +-
src/libide/webkit/meson.build | 2 +-
src/plugins/auto-save/meson.build | 2 +-
src/plugins/autotools/meson.build | 2 +-
src/plugins/beautifier/meson.build | 2 +-
src/plugins/buffer-monitor/meson.build | 2 +-
src/plugins/buildconfig/meson.build | 2 +-
src/plugins/buildsystem/meson.build | 2 +-
src/plugins/buildui/meson.build | 2 +-
src/plugins/c-pack/meson.build | 2 +-
src/plugins/clang/meson.build | 2 +-
src/plugins/cmake/meson.build | 2 +-
src/plugins/code-index/meson.build | 2 +-
src/plugins/codeui/meson.build | 2 +-
src/plugins/color-picker/meson.build | 2 +-
src/plugins/command-bar/meson.build | 2 +-
src/plugins/comment-code/meson.build | 2 +-
src/plugins/create-project/meson.build | 2 +-
src/plugins/ctags/meson.build | 2 +-
src/plugins/debuggerui/meson.build | 2 +-
src/plugins/devhelp/meson.build | 2 +-
src/plugins/deviced/meson.build | 2 +-
src/plugins/deviceui/meson.build | 2 +-
src/plugins/doap/meson.build | 2 +-
src/plugins/editor/meson.build | 2 +-
src/plugins/editorconfig/meson.build | 2 +-
src/plugins/emacs/meson.build | 2 +-
src/plugins/file-search/meson.build | 2 +-
src/plugins/flatpak/meson.build | 2 +-
src/plugins/gcc/meson.build | 2 +-
src/plugins/gdb/meson.build | 2 +-
src/plugins/gettext/meson.build | 2 +-
src/plugins/git/meson.build | 2 +-
src/plugins/glade/meson.build | 2 +-
src/plugins/gnome-code-assistance/meson.build | 2 +-
src/plugins/greeter/meson.build | 2 +-
src/plugins/grep/meson.build | 2 +-
src/plugins/history/meson.build | 2 +-
src/plugins/html-completion/meson.build | 2 +-
src/plugins/line-spacing/meson.build | 2 +-
src/plugins/ls/meson.build | 2 +-
src/plugins/meson/meson.build | 2 +-
src/plugins/messages/meson.build | 2 +-
src/plugins/modelines/meson.build | 2 +-
src/plugins/newcomers/meson.build | 2 +-
src/plugins/notification/meson.build | 2 +-
src/plugins/omni-gutter/meson.build | 2 +-
src/plugins/podman/meson.build | 2 +-
src/plugins/project-tree/meson.build | 2 +-
src/plugins/python-pack/meson.build | 2 +-
src/plugins/qemu/meson.build | 2 +-
src/plugins/quick-highlight/meson.build | 2 +-
src/plugins/recent/meson.build | 2 +-
src/plugins/restore-cursor/meson.build | 2 +-
src/plugins/retab/meson.build | 2 +-
src/plugins/snippets/meson.build | 2 +-
src/plugins/spellcheck/meson.build | 2 +-
src/plugins/sublime/meson.build | 2 +-
src/plugins/support/meson.build | 2 +-
src/plugins/symbol-tree/meson.build | 2 +-
src/plugins/sysprof/meson.build | 2 +-
src/plugins/sysroot/meson.build | 2 +-
src/plugins/terminal/meson.build | 2 +-
src/plugins/testui/meson.build | 2 +-
src/plugins/todo/meson.build | 2 +-
src/plugins/trim-spaces/meson.build | 2 +-
src/plugins/vcsui/meson.build | 2 +-
src/plugins/vim/meson.build | 2 +-
src/plugins/words/meson.build | 2 +-
src/plugins/xml-pack/meson.build | 2 +-
76 files changed, 76 insertions(+), 77 deletions(-)
diff --git a/src/gstyle/meson.build b/src/gstyle/meson.build
index 4d8c310fb..fb3247996 100644
--- a/src/gstyle/meson.build
+++ b/src/gstyle/meson.build
@@ -65,8 +65,7 @@ libgstyle_sources = [
'gstyle-slidein.c',
'gstyle-utils.c',
'gstyle-xyz.c',
- libgstyle_resources[0],
- libgstyle_resources[1],
+ libgstyle_resources,
]
libgstyle_deps = [
diff --git a/src/libide/code/meson.build b/src/libide/code/meson.build
index 14e7979b2..ddacdc162 100644
--- a/src/libide/code/meson.build
+++ b/src/libide/code/meson.build
@@ -138,7 +138,7 @@ libide_code_resources = gnome.compile_resources(
c_name: 'ide_code',
)
libide_code_generated_headers += [libide_code_resources[1]]
-libide_code_generated_sources += libide_code_resources[0]
+libide_code_generated_sources += libide_code_resources
#
diff --git a/src/libide/editor/meson.build b/src/libide/editor/meson.build
index ceaf83d3a..2838425b7 100644
--- a/src/libide/editor/meson.build
+++ b/src/libide/editor/meson.build
@@ -71,7 +71,7 @@ libide_editor_resources = gnome.compile_resources(
c_name: 'ide_editor',
)
libide_editor_generated_headers += [libide_editor_resources[1]]
-libide_editor_sources += libide_editor_resources[0]
+libide_editor_sources += libide_editor_resources
#
# Dependencies
diff --git a/src/libide/greeter/meson.build b/src/libide/greeter/meson.build
index 2baa43503..3968ca41e 100644
--- a/src/libide/greeter/meson.build
+++ b/src/libide/greeter/meson.build
@@ -51,7 +51,7 @@ libide_greeter_resources = gnome.compile_resources(
c_name: 'ide_greeter',
)
libide_greeter_generated_headers += [libide_greeter_resources[1]]
-libide_greeter_private_sources += libide_greeter_resources[0]
+libide_greeter_private_sources += libide_greeter_resources
#
diff --git a/src/libide/gui/meson.build b/src/libide/gui/meson.build
index 3c494df9a..364d9cb12 100644
--- a/src/libide/gui/meson.build
+++ b/src/libide/gui/meson.build
@@ -163,7 +163,7 @@ libide_gui_resources = gnome.compile_resources(
c_name: 'ide_gui',
)
libide_gui_generated_headers += [libide_gui_resources[1]]
-libide_gui_sources += libide_gui_resources[0]
+libide_gui_sources += libide_gui_resources
#
diff --git a/src/libide/sourceview/meson.build b/src/libide/sourceview/meson.build
index 7d07a0b0c..c4ba12d1f 100644
--- a/src/libide/sourceview/meson.build
+++ b/src/libide/sourceview/meson.build
@@ -106,7 +106,7 @@ libide_sourceview_resources = gnome.compile_resources(
c_name: 'ide_sourceview',
)
libide_sourceview_generated_headers += [libide_sourceview_resources[1]]
-libide_sourceview_generated_sources += libide_sourceview_resources[0]
+libide_sourceview_generated_sources += libide_sourceview_resources
#
# Enum generation
diff --git a/src/libide/terminal/meson.build b/src/libide/terminal/meson.build
index 4ab3a67cd..c316afac9 100644
--- a/src/libide/terminal/meson.build
+++ b/src/libide/terminal/meson.build
@@ -76,7 +76,7 @@ libide_terminal_deps = [
#
libide_terminal = static_library('ide-terminal-' + libide_api_version,
- libide_terminal_public_sources + libide_terminal_private_sources + [libide_terminal_resources[0]],
+ libide_terminal_public_sources + libide_terminal_private_sources + libide_terminal_resources,
dependencies: libide_terminal_deps,
c_args: libide_args + release_args + ['-DIDE_TERMINAL_COMPILATION'],
)
diff --git a/src/libide/webkit/meson.build b/src/libide/webkit/meson.build
index d92786c26..e1767ae46 100644
--- a/src/libide/webkit/meson.build
+++ b/src/libide/webkit/meson.build
@@ -17,7 +17,7 @@ libide_webkit_resources = gnome.compile_resources(
c_name: 'ide_webkit',
)
libide_webkit_generated_headers = [libide_webkit_resources[1]]
-libide_webkit_sources += libide_webkit_resources[0]
+libide_webkit_sources += libide_webkit_resources
#
# Dependencies
diff --git a/src/plugins/auto-save/meson.build b/src/plugins/auto-save/meson.build
index 8beb1b0ac..4c12716f0 100644
--- a/src/plugins/auto-save/meson.build
+++ b/src/plugins/auto-save/meson.build
@@ -9,4 +9,4 @@ plugin_auto_save_resources = gnome.compile_resources(
c_name: 'gbp_auto_save',
)
-plugins_sources += plugin_auto_save_resources[0]
+plugins_sources += plugin_auto_save_resources
diff --git a/src/plugins/autotools/meson.build b/src/plugins/autotools/meson.build
index 93c592742..b9ab596af 100644
--- a/src/plugins/autotools/meson.build
+++ b/src/plugins/autotools/meson.build
@@ -20,6 +20,6 @@ plugin_autotools_resources = gnome.compile_resources(
c_name: 'gbp_autotools',
)
-plugins_sources += plugin_autotools_resources[0]
+plugins_sources += plugin_autotools_resources
endif
diff --git a/src/plugins/beautifier/meson.build b/src/plugins/beautifier/meson.build
index 268957d2d..af37614f2 100644
--- a/src/plugins/beautifier/meson.build
+++ b/src/plugins/beautifier/meson.build
@@ -14,6 +14,6 @@ plugin_beautifier_resources = gnome.compile_resources(
c_name: 'gbp_beautifier',
)
-plugins_sources += plugin_beautifier_resources[0]
+plugins_sources += plugin_beautifier_resources
endif
diff --git a/src/plugins/buffer-monitor/meson.build b/src/plugins/buffer-monitor/meson.build
index e4669de4c..5df90d1e6 100644
--- a/src/plugins/buffer-monitor/meson.build
+++ b/src/plugins/buffer-monitor/meson.build
@@ -9,4 +9,4 @@ plugin_buffer_monitor_resources = gnome.compile_resources(
c_name: 'gbp_buffer_monitor',
)
-plugins_sources += plugin_buffer_monitor_resources[0]
+plugins_sources += plugin_buffer_monitor_resources
diff --git a/src/plugins/buildconfig/meson.build b/src/plugins/buildconfig/meson.build
index 528ba7656..ca9d20d75 100644
--- a/src/plugins/buildconfig/meson.build
+++ b/src/plugins/buildconfig/meson.build
@@ -11,4 +11,4 @@ plugin_buildconfig_resources = gnome.compile_resources(
c_name: 'gbp_buildconfig',
)
-plugins_sources += plugin_buildconfig_resources[0]
+plugins_sources += plugin_buildconfig_resources
diff --git a/src/plugins/buildsystem/meson.build b/src/plugins/buildsystem/meson.build
index 2de1e508c..acbca0606 100644
--- a/src/plugins/buildsystem/meson.build
+++ b/src/plugins/buildsystem/meson.build
@@ -9,4 +9,4 @@ plugin_buildsystem_resources = gnome.compile_resources(
c_name: 'gbp_buildsystem',
)
-plugins_sources += plugin_buildsystem_resources[0]
+plugins_sources += plugin_buildsystem_resources
diff --git a/src/plugins/buildui/meson.build b/src/plugins/buildui/meson.build
index eb2e71947..6524ce012 100644
--- a/src/plugins/buildui/meson.build
+++ b/src/plugins/buildui/meson.build
@@ -19,4 +19,4 @@ plugin_buildui_resources = gnome.compile_resources(
c_name: 'gbp_buildui',
)
-plugins_sources += plugin_buildui_resources[0]
+plugins_sources += plugin_buildui_resources
diff --git a/src/plugins/c-pack/meson.build b/src/plugins/c-pack/meson.build
index a1f60fc9f..0fffd5f9f 100644
--- a/src/plugins/c-pack/meson.build
+++ b/src/plugins/c-pack/meson.build
@@ -17,7 +17,7 @@ plugin_c_pack_resources = gnome.compile_resources(
c_name: 'ide_c',
)
-plugins_sources += plugin_c_pack_resources[0]
+plugins_sources += plugin_c_pack_resources
test_cpack = executable('test-cpack',
'test-cpack.c', 'c-parse-helper.c',
diff --git a/src/plugins/clang/meson.build b/src/plugins/clang/meson.build
index 01381b74f..3a7b87f0b 100644
--- a/src/plugins/clang/meson.build
+++ b/src/plugins/clang/meson.build
@@ -41,7 +41,7 @@ plugin_clang_resources = gnome.compile_resources(
c_name: 'gbp_clang',
)
-plugins_sources += plugin_clang_resources[0]
+plugins_sources += plugin_clang_resources
add_languages('cpp') # Needed for llvm dep
llvm_dep = dependency('llvm', version: '>= 3.5')
diff --git a/src/plugins/cmake/meson.build b/src/plugins/cmake/meson.build
index 37abefb9b..f97154023 100644
--- a/src/plugins/cmake/meson.build
+++ b/src/plugins/cmake/meson.build
@@ -17,6 +17,6 @@ plugin_cmake_resources = gnome.compile_resources(
c_name: 'gbp_cmake',
)
-plugins_sources += plugin_cmake_resources[0]
+plugins_sources += plugin_cmake_resources
endif
diff --git a/src/plugins/code-index/meson.build b/src/plugins/code-index/meson.build
index c6f175d81..2b9fd4819 100644
--- a/src/plugins/code-index/meson.build
+++ b/src/plugins/code-index/meson.build
@@ -21,6 +21,6 @@ plugin_code_index_resources = gnome.compile_resources(
c_name: 'gbp_code_index',
)
-plugins_sources += plugin_code_index_resources[0]
+plugins_sources += plugin_code_index_resources
endif
diff --git a/src/plugins/codeui/meson.build b/src/plugins/codeui/meson.build
index 751517423..928a34315 100644
--- a/src/plugins/codeui/meson.build
+++ b/src/plugins/codeui/meson.build
@@ -10,4 +10,4 @@ plugin_codeui_resources = gnome.compile_resources(
c_name: 'gbp_codeui',
)
-plugins_sources += plugin_codeui_resources[0]
+plugins_sources += plugin_codeui_resources
diff --git a/src/plugins/color-picker/meson.build b/src/plugins/color-picker/meson.build
index cbfca15eb..cdd68d28b 100644
--- a/src/plugins/color-picker/meson.build
+++ b/src/plugins/color-picker/meson.build
@@ -22,6 +22,6 @@ plugin_color_picker_resources = gnome.compile_resources(
c_name: 'gbp_color_picker',
)
-plugins_sources += plugin_color_picker_resources[0]
+plugins_sources += plugin_color_picker_resources
endif
diff --git a/src/plugins/command-bar/meson.build b/src/plugins/command-bar/meson.build
index 76bde4928..aebde636f 100644
--- a/src/plugins/command-bar/meson.build
+++ b/src/plugins/command-bar/meson.build
@@ -15,4 +15,4 @@ plugin_command_bar_resources = gnome.compile_resources(
c_name: 'gbp_command_bar',
)
-plugins_sources += plugin_command_bar_resources[0]
+plugins_sources += plugin_command_bar_resources
diff --git a/src/plugins/comment-code/meson.build b/src/plugins/comment-code/meson.build
index 703df526c..e0eef1e0d 100644
--- a/src/plugins/comment-code/meson.build
+++ b/src/plugins/comment-code/meson.build
@@ -9,4 +9,4 @@ plugin_comment_code_resources = gnome.compile_resources(
c_name: 'gbp_comment_code',
)
-plugins_sources += plugin_comment_code_resources[0]
+plugins_sources += plugin_comment_code_resources
diff --git a/src/plugins/create-project/meson.build b/src/plugins/create-project/meson.build
index e99c1fc80..94f1f09b4 100644
--- a/src/plugins/create-project/meson.build
+++ b/src/plugins/create-project/meson.build
@@ -12,4 +12,4 @@ plugin_create_project_resources = gnome.compile_resources(
c_name: 'gbp_create_project',
)
-plugins_sources += plugin_create_project_resources[0]
+plugins_sources += plugin_create_project_resources
diff --git a/src/plugins/ctags/meson.build b/src/plugins/ctags/meson.build
index acd7fa79a..36c8da888 100644
--- a/src/plugins/ctags/meson.build
+++ b/src/plugins/ctags/meson.build
@@ -24,7 +24,7 @@ plugin_ctags_resources = gnome.compile_resources(
c_name: 'gbp_ctags',
)
-plugins_sources += plugin_ctags_resources[0]
+plugins_sources += plugin_ctags_resources
test_ctags = executable('test-ctags',
'test-ctags.c', 'ide-ctags-index.c',
diff --git a/src/plugins/debuggerui/meson.build b/src/plugins/debuggerui/meson.build
index cd77cec81..87d981288 100644
--- a/src/plugins/debuggerui/meson.build
+++ b/src/plugins/debuggerui/meson.build
@@ -18,4 +18,4 @@ plugin_debuggerui_resources = gnome.compile_resources(
c_name: 'gbp_debuggerui',
)
-plugins_sources += plugin_debuggerui_resources[0]
+plugins_sources += plugin_debuggerui_resources
diff --git a/src/plugins/devhelp/meson.build b/src/plugins/devhelp/meson.build
index 685f73f51..e4cbc0223 100644
--- a/src/plugins/devhelp/meson.build
+++ b/src/plugins/devhelp/meson.build
@@ -20,6 +20,6 @@ plugin_devhelp_resources = gnome.compile_resources(
c_name: 'gbp_devhelp',
)
-plugins_sources += plugin_devhelp_resources[0]
+plugins_sources += plugin_devhelp_resources
endif
diff --git a/src/plugins/deviced/meson.build b/src/plugins/deviced/meson.build
index c728cb5d2..3c2453331 100644
--- a/src/plugins/deviced/meson.build
+++ b/src/plugins/deviced/meson.build
@@ -21,6 +21,6 @@ plugins_deps += [
dependency('libdeviced', version: '>=3.27.4'),
]
-plugins_sources += plugin_deviced_resources[0]
+plugins_sources += plugin_deviced_resources
endif
diff --git a/src/plugins/deviceui/meson.build b/src/plugins/deviceui/meson.build
index d1d00235c..b9b125ef5 100644
--- a/src/plugins/deviceui/meson.build
+++ b/src/plugins/deviceui/meson.build
@@ -9,4 +9,4 @@ plugin_deviceui_resources = gnome.compile_resources(
c_name: 'gbp_deviceui',
)
-plugins_sources += plugin_deviceui_resources[0]
+plugins_sources += plugin_deviceui_resources
diff --git a/src/plugins/doap/meson.build b/src/plugins/doap/meson.build
index ebd2ffb74..f302c2520 100644
--- a/src/plugins/doap/meson.build
+++ b/src/plugins/doap/meson.build
@@ -9,4 +9,4 @@ plugin_doap_resources = gnome.compile_resources(
c_name: 'gbp_doap',
)
-plugins_sources += plugin_doap_resources[0]
+plugins_sources += plugin_doap_resources
diff --git a/src/plugins/editor/meson.build b/src/plugins/editor/meson.build
index 7c0101be7..08655c113 100644
--- a/src/plugins/editor/meson.build
+++ b/src/plugins/editor/meson.build
@@ -15,4 +15,4 @@ plugin_editor_resources = gnome.compile_resources(
c_name: 'gbp_editor',
)
-plugins_sources += plugin_editor_resources[0]
+plugins_sources += plugin_editor_resources
diff --git a/src/plugins/editorconfig/meson.build b/src/plugins/editorconfig/meson.build
index 8cbf269d1..2637ff5de 100644
--- a/src/plugins/editorconfig/meson.build
+++ b/src/plugins/editorconfig/meson.build
@@ -14,7 +14,7 @@ plugin_editorconfig_resources = gnome.compile_resources(
c_name: 'gbp_editorconfig',
)
-plugins_sources += plugin_editorconfig_resources[0]
+plugins_sources += plugin_editorconfig_resources
plugins_deps += libeditorconfig_dep
endif
diff --git a/src/plugins/emacs/meson.build b/src/plugins/emacs/meson.build
index a568a5666..bd5375286 100644
--- a/src/plugins/emacs/meson.build
+++ b/src/plugins/emacs/meson.build
@@ -9,4 +9,4 @@ plugin_emacs_resources = gnome.compile_resources(
c_name: 'gbp_emacs',
)
-plugins_sources += plugin_emacs_resources[0]
+plugins_sources += plugin_emacs_resources
diff --git a/src/plugins/file-search/meson.build b/src/plugins/file-search/meson.build
index 8ae908f90..eeb9406e5 100644
--- a/src/plugins/file-search/meson.build
+++ b/src/plugins/file-search/meson.build
@@ -13,6 +13,6 @@ plugin_file_search_resources = gnome.compile_resources(
c_name: 'gbp_file_search',
)
-plugins_sources += plugin_file_search_resources[0]
+plugins_sources += plugin_file_search_resources
endif
diff --git a/src/plugins/flatpak/meson.build b/src/plugins/flatpak/meson.build
index 438dd08f2..6fab01c1e 100644
--- a/src/plugins/flatpak/meson.build
+++ b/src/plugins/flatpak/meson.build
@@ -40,6 +40,6 @@ plugins_deps += [
dependency('libsoup-2.4', version: '>= 2.52.0'),
]
-plugins_sources += plugin_flatpak_resources[0]
+plugins_sources += plugin_flatpak_resources
endif
diff --git a/src/plugins/gcc/meson.build b/src/plugins/gcc/meson.build
index 932bcdc92..cbd7520e3 100644
--- a/src/plugins/gcc/meson.build
+++ b/src/plugins/gcc/meson.build
@@ -12,4 +12,4 @@ plugin_gcc_resources = gnome.compile_resources(
c_name: 'gbp_gcc',
)
-plugins_sources += plugin_gcc_resources[0]
+plugins_sources += plugin_gcc_resources
diff --git a/src/plugins/gdb/meson.build b/src/plugins/gdb/meson.build
index 804213497..b24f2af68 100644
--- a/src/plugins/gdb/meson.build
+++ b/src/plugins/gdb/meson.build
@@ -11,7 +11,7 @@ plugin_gdb_resources = gnome.compile_resources(
c_name: 'gbp_gdb',
)
-plugins_sources += plugin_gdb_resources[0]
+plugins_sources += plugin_gdb_resources
gdbwire = static_library('gdbwire', ['gdbwire.c'],
c_args: [ '-Wno-redundant-decls',
diff --git a/src/plugins/gettext/meson.build b/src/plugins/gettext/meson.build
index 24ccf09b4..d3bbddb71 100644
--- a/src/plugins/gettext/meson.build
+++ b/src/plugins/gettext/meson.build
@@ -11,6 +11,6 @@ plugin_gettext_resources = gnome.compile_resources(
c_name: 'gbp_gettext',
)
-plugins_sources += plugin_gettext_resources[0]
+plugins_sources += plugin_gettext_resources
endif
diff --git a/src/plugins/git/meson.build b/src/plugins/git/meson.build
index 79dc08181..894da68ac 100644
--- a/src/plugins/git/meson.build
+++ b/src/plugins/git/meson.build
@@ -25,6 +25,6 @@ plugin_git_resources = gnome.compile_resources(
c_name: 'gbp_git',
)
-plugins_sources += plugin_git_resources[0]
+plugins_sources += plugin_git_resources
endif
diff --git a/src/plugins/glade/meson.build b/src/plugins/glade/meson.build
index c57630612..f365f9f54 100644
--- a/src/plugins/glade/meson.build
+++ b/src/plugins/glade/meson.build
@@ -21,6 +21,6 @@ plugins_deps += [
dependency('gladeui-2.0', version: '>=3.22.0'),
]
-plugins_sources += plugin_glade_resources[0]
+plugins_sources += plugin_glade_resources
endif
diff --git a/src/plugins/gnome-code-assistance/meson.build b/src/plugins/gnome-code-assistance/meson.build
index a7d86fa14..452dad6fd 100644
--- a/src/plugins/gnome-code-assistance/meson.build
+++ b/src/plugins/gnome-code-assistance/meson.build
@@ -18,6 +18,6 @@ plugin_gnome_code_assistance_resources = gnome.compile_resources(
c_name: 'gbp_gnome_code_assistance',
)
-plugins_sources += plugin_gnome_code_assistance_resources[0]
+plugins_sources += plugin_gnome_code_assistance_resources
endif
diff --git a/src/plugins/greeter/meson.build b/src/plugins/greeter/meson.build
index 736f31520..a31c3ed9b 100644
--- a/src/plugins/greeter/meson.build
+++ b/src/plugins/greeter/meson.build
@@ -9,4 +9,4 @@ plugin_greeter_resources = gnome.compile_resources(
c_name: 'gbp_greeter',
)
-plugins_sources += plugin_greeter_resources[0]
+plugins_sources += plugin_greeter_resources
diff --git a/src/plugins/grep/meson.build b/src/plugins/grep/meson.build
index d6e586c7b..0803c6e91 100644
--- a/src/plugins/grep/meson.build
+++ b/src/plugins/grep/meson.build
@@ -14,6 +14,6 @@ plugin_grep_resources = gnome.compile_resources(
c_name: 'gbp_grep',
)
-plugins_sources += plugin_grep_resources[0]
+plugins_sources += plugin_grep_resources
endif
diff --git a/src/plugins/history/meson.build b/src/plugins/history/meson.build
index 78d5e5cc1..7a327f5d2 100644
--- a/src/plugins/history/meson.build
+++ b/src/plugins/history/meson.build
@@ -11,4 +11,4 @@ plugin_history_resources = gnome.compile_resources(
c_name: 'gbp_history',
)
-plugins_sources += plugin_history_resources[0]
+plugins_sources += plugin_history_resources
diff --git a/src/plugins/html-completion/meson.build b/src/plugins/html-completion/meson.build
index a44ec62f4..556a9e48d 100644
--- a/src/plugins/html-completion/meson.build
+++ b/src/plugins/html-completion/meson.build
@@ -13,6 +13,6 @@ plugin_html_completion_resources = gnome.compile_resources(
c_name: 'gbp_html_completion',
)
-plugins_sources += plugin_html_completion_resources[0]
+plugins_sources += plugin_html_completion_resources
endif
diff --git a/src/plugins/line-spacing/meson.build b/src/plugins/line-spacing/meson.build
index 3a6dc5b35..a7582797d 100644
--- a/src/plugins/line-spacing/meson.build
+++ b/src/plugins/line-spacing/meson.build
@@ -9,4 +9,4 @@ plugin_line_spacing_resources = gnome.compile_resources(
c_name: 'gbp_line_spacing',
)
-plugins_sources += plugin_line_spacing_resources[0]
+plugins_sources += plugin_line_spacing_resources
diff --git a/src/plugins/ls/meson.build b/src/plugins/ls/meson.build
index 99633be7f..27f4bb85e 100644
--- a/src/plugins/ls/meson.build
+++ b/src/plugins/ls/meson.build
@@ -11,4 +11,4 @@ plugin_ls_resources = gnome.compile_resources(
c_name: 'gbp_ls',
)
-plugins_sources += plugin_ls_resources[0]
+plugins_sources += plugin_ls_resources
diff --git a/src/plugins/meson/meson.build b/src/plugins/meson/meson.build
index f161fb0c8..4e16a7da5 100644
--- a/src/plugins/meson/meson.build
+++ b/src/plugins/meson/meson.build
@@ -25,6 +25,6 @@ plugin_meson_resources = gnome.compile_resources(
c_name: 'gbp_meson',
)
-plugins_sources += plugin_meson_resources[0]
+plugins_sources += plugin_meson_resources
endif
diff --git a/src/plugins/messages/meson.build b/src/plugins/messages/meson.build
index af8a212fa..78b97b43f 100644
--- a/src/plugins/messages/meson.build
+++ b/src/plugins/messages/meson.build
@@ -10,4 +10,4 @@ plugin_messages_resources = gnome.compile_resources(
c_name: 'gbp_messages',
)
-plugins_sources += plugin_messages_resources[0]
+plugins_sources += plugin_messages_resources
diff --git a/src/plugins/modelines/meson.build b/src/plugins/modelines/meson.build
index 7916fc4ae..2306675af 100644
--- a/src/plugins/modelines/meson.build
+++ b/src/plugins/modelines/meson.build
@@ -12,6 +12,6 @@ plugin_modelines_resources = gnome.compile_resources(
c_name: 'gbp_modelines',
)
-plugins_sources += plugin_modelines_resources[0]
+plugins_sources += plugin_modelines_resources
endif
diff --git a/src/plugins/newcomers/meson.build b/src/plugins/newcomers/meson.build
index be45e6b45..256d7a10c 100644
--- a/src/plugins/newcomers/meson.build
+++ b/src/plugins/newcomers/meson.build
@@ -12,6 +12,6 @@ plugin_newcomers_resources = gnome.compile_resources(
c_name: 'gbp_newcomers',
)
-plugins_sources += plugin_newcomers_resources[0]
+plugins_sources += plugin_newcomers_resources
endif
diff --git a/src/plugins/notification/meson.build b/src/plugins/notification/meson.build
index e7d23dcd1..afe1260e2 100644
--- a/src/plugins/notification/meson.build
+++ b/src/plugins/notification/meson.build
@@ -11,6 +11,6 @@ plugin_notification_resources = gnome.compile_resources(
c_name: 'gbp_notification',
)
-plugins_sources += plugin_notification_resources[0]
+plugins_sources += plugin_notification_resources
endif
diff --git a/src/plugins/omni-gutter/meson.build b/src/plugins/omni-gutter/meson.build
index 80f4168b8..36e8331e8 100644
--- a/src/plugins/omni-gutter/meson.build
+++ b/src/plugins/omni-gutter/meson.build
@@ -11,4 +11,4 @@ omni_gutter_resources = gnome.compile_resources(
c_name: 'gbp_omni_gutter',
)
-plugins_sources += omni_gutter_resources[0]
+plugins_sources += omni_gutter_resources
diff --git a/src/plugins/podman/meson.build b/src/plugins/podman/meson.build
index b1a589444..9fc50fdc4 100644
--- a/src/plugins/podman/meson.build
+++ b/src/plugins/podman/meson.build
@@ -13,6 +13,6 @@ plugin_podman_resources = gnome.compile_resources(
c_name: 'gbp_podman'
)
-plugins_sources += plugin_podman_resources[0]
+plugins_sources += plugin_podman_resources
endif
diff --git a/src/plugins/project-tree/meson.build b/src/plugins/project-tree/meson.build
index c95aa92be..99f0e1f8c 100644
--- a/src/plugins/project-tree/meson.build
+++ b/src/plugins/project-tree/meson.build
@@ -15,4 +15,4 @@ plugin_project_tree_resources = gnome.compile_resources(
c_name: 'gbp_project_tree',
)
-plugins_sources += plugin_project_tree_resources[0]
+plugins_sources += plugin_project_tree_resources
diff --git a/src/plugins/python-pack/meson.build b/src/plugins/python-pack/meson.build
index a369bfa9f..96bd89d90 100644
--- a/src/plugins/python-pack/meson.build
+++ b/src/plugins/python-pack/meson.build
@@ -11,6 +11,6 @@ plugin_python_pack_resources = gnome.compile_resources(
c_name: 'gbp_python_pack',
)
-plugins_sources += plugin_python_pack_resources[0]
+plugins_sources += plugin_python_pack_resources
endif
diff --git a/src/plugins/qemu/meson.build b/src/plugins/qemu/meson.build
index ca36d1bb7..32bcee7d8 100644
--- a/src/plugins/qemu/meson.build
+++ b/src/plugins/qemu/meson.build
@@ -11,6 +11,6 @@ plugin_qemu_resources = gnome.compile_resources(
c_name: 'gbp_qemu',
)
-plugins_sources += plugin_qemu_resources[0]
+plugins_sources += plugin_qemu_resources
endif
diff --git a/src/plugins/quick-highlight/meson.build b/src/plugins/quick-highlight/meson.build
index 5bb496fb7..da0b06e7e 100644
--- a/src/plugins/quick-highlight/meson.build
+++ b/src/plugins/quick-highlight/meson.build
@@ -12,6 +12,6 @@ plugin_quick_highlight_resources = gnome.compile_resources(
c_name: 'gbp_quick_highlight',
)
-plugins_sources += plugin_quick_highlight_resources[0]
+plugins_sources += plugin_quick_highlight_resources
endif
diff --git a/src/plugins/recent/meson.build b/src/plugins/recent/meson.build
index 9a3417060..6094decb0 100644
--- a/src/plugins/recent/meson.build
+++ b/src/plugins/recent/meson.build
@@ -10,4 +10,4 @@ plugin_recent_resources = gnome.compile_resources(
c_name: 'gbp_recent',
)
-plugins_sources += plugin_recent_resources[0]
+plugins_sources += plugin_recent_resources
diff --git a/src/plugins/restore-cursor/meson.build b/src/plugins/restore-cursor/meson.build
index 5ebbe8810..43d8f340f 100644
--- a/src/plugins/restore-cursor/meson.build
+++ b/src/plugins/restore-cursor/meson.build
@@ -9,4 +9,4 @@ plugin_restore_cursor_resources = gnome.compile_resources(
c_name: 'gbp_restore_cursor',
)
-plugins_sources += plugin_restore_cursor_resources[0]
+plugins_sources += plugin_restore_cursor_resources
diff --git a/src/plugins/retab/meson.build b/src/plugins/retab/meson.build
index ecb8e9476..c2c901d56 100644
--- a/src/plugins/retab/meson.build
+++ b/src/plugins/retab/meson.build
@@ -11,6 +11,6 @@ plugin_retab_resources = gnome.compile_resources(
c_name: 'gbp_retab',
)
-plugins_sources += plugin_retab_resources[0]
+plugins_sources += plugin_retab_resources
endif
diff --git a/src/plugins/snippets/meson.build b/src/plugins/snippets/meson.build
index ab2e3fec2..007b4ecd7 100644
--- a/src/plugins/snippets/meson.build
+++ b/src/plugins/snippets/meson.build
@@ -12,4 +12,4 @@ snippets_resources = gnome.compile_resources(
c_name: 'gbp_snippets',
)
-plugins_sources += snippets_resources[0]
+plugins_sources += snippets_resources
diff --git a/src/plugins/spellcheck/meson.build b/src/plugins/spellcheck/meson.build
index 659d12621..c29516d0f 100644
--- a/src/plugins/spellcheck/meson.build
+++ b/src/plugins/spellcheck/meson.build
@@ -24,6 +24,6 @@ plugins_deps += [
dependency('enchant-2'),
]
-plugins_sources += plugin_spellcheck_resources[0]
+plugins_sources += plugin_spellcheck_resources
endif
diff --git a/src/plugins/sublime/meson.build b/src/plugins/sublime/meson.build
index 3272cfc5f..4ca6dfbbc 100644
--- a/src/plugins/sublime/meson.build
+++ b/src/plugins/sublime/meson.build
@@ -9,4 +9,4 @@ plugin_sublime_resources = gnome.compile_resources(
c_name: 'gbp_sublime',
)
-plugins_sources += plugin_sublime_resources[0]
+plugins_sources += plugin_sublime_resources
diff --git a/src/plugins/support/meson.build b/src/plugins/support/meson.build
index 23db282d9..9906f7eef 100644
--- a/src/plugins/support/meson.build
+++ b/src/plugins/support/meson.build
@@ -10,4 +10,4 @@ plugin_support_resources = gnome.compile_resources(
c_name: 'gbp_support',
)
-plugins_sources += plugin_support_resources[0]
+plugins_sources += plugin_support_resources
diff --git a/src/plugins/symbol-tree/meson.build b/src/plugins/symbol-tree/meson.build
index b40d3d4e6..1eeb61f54 100644
--- a/src/plugins/symbol-tree/meson.build
+++ b/src/plugins/symbol-tree/meson.build
@@ -12,4 +12,4 @@ plugin_symbol_tree_resources = gnome.compile_resources(
c_name: 'gbp_symbol_tree',
)
-plugins_sources += plugin_symbol_tree_resources[0]
+plugins_sources += plugin_symbol_tree_resources
diff --git a/src/plugins/sysprof/meson.build b/src/plugins/sysprof/meson.build
index 780e9ca9f..2e9eca880 100644
--- a/src/plugins/sysprof/meson.build
+++ b/src/plugins/sysprof/meson.build
@@ -19,6 +19,6 @@ plugin_sysprof_resources = gnome.compile_resources(
c_name: 'gbp_sysprof',
)
-plugins_sources += plugin_sysprof_resources[0]
+plugins_sources += plugin_sysprof_resources
endif
diff --git a/src/plugins/sysroot/meson.build b/src/plugins/sysroot/meson.build
index aad3d6229..cb640d5cf 100644
--- a/src/plugins/sysroot/meson.build
+++ b/src/plugins/sysroot/meson.build
@@ -17,6 +17,6 @@ plugin_sysroot_resources = gnome.compile_resources(
c_name: 'gbp_sysroot',
)
-plugins_sources += plugin_sysroot_resources[0]
+plugins_sources += plugin_sysroot_resources
endif
diff --git a/src/plugins/terminal/meson.build b/src/plugins/terminal/meson.build
index f13204f81..1c9dbc7e2 100644
--- a/src/plugins/terminal/meson.build
+++ b/src/plugins/terminal/meson.build
@@ -10,4 +10,4 @@ plugin_terminal_resources = gnome.compile_resources(
c_name: 'gbp_terminal',
)
-plugins_sources += plugin_terminal_resources[0]
+plugins_sources += plugin_terminal_resources
diff --git a/src/plugins/testui/meson.build b/src/plugins/testui/meson.build
index 019c44e67..3778eb403 100644
--- a/src/plugins/testui/meson.build
+++ b/src/plugins/testui/meson.build
@@ -11,4 +11,4 @@ plugin_testui_resources = gnome.compile_resources(
c_name: 'gbp_testui',
)
-plugins_sources += plugin_testui_resources[0]
+plugins_sources += plugin_testui_resources
diff --git a/src/plugins/todo/meson.build b/src/plugins/todo/meson.build
index 0e8b6f67a..91e789e0c 100644
--- a/src/plugins/todo/meson.build
+++ b/src/plugins/todo/meson.build
@@ -14,6 +14,6 @@ plugin_todo_resources = gnome.compile_resources(
c_name: 'gbp_todo',
)
-plugins_sources += plugin_todo_resources[0]
+plugins_sources += plugin_todo_resources
endif
diff --git a/src/plugins/trim-spaces/meson.build b/src/plugins/trim-spaces/meson.build
index e366b0e69..a88635391 100644
--- a/src/plugins/trim-spaces/meson.build
+++ b/src/plugins/trim-spaces/meson.build
@@ -9,4 +9,4 @@ plugin_trim_spaces_resources = gnome.compile_resources(
c_name: 'gbp_trim_spaces',
)
-plugins_sources += plugin_trim_spaces_resources[0]
+plugins_sources += plugin_trim_spaces_resources
diff --git a/src/plugins/vcsui/meson.build b/src/plugins/vcsui/meson.build
index f85a51df3..35d44e02c 100644
--- a/src/plugins/vcsui/meson.build
+++ b/src/plugins/vcsui/meson.build
@@ -11,4 +11,4 @@ plugin_vcsui_resources = gnome.compile_resources(
c_name: 'gbp_vcsui',
)
-plugins_sources += plugin_vcsui_resources[0]
+plugins_sources += plugin_vcsui_resources
diff --git a/src/plugins/vim/meson.build b/src/plugins/vim/meson.build
index 8c20ea085..fcdcde818 100644
--- a/src/plugins/vim/meson.build
+++ b/src/plugins/vim/meson.build
@@ -12,4 +12,4 @@ plugin_vim_resources = gnome.compile_resources(
c_name: 'gbp_vim',
)
-plugins_sources += plugin_vim_resources[0]
+plugins_sources += plugin_vim_resources
diff --git a/src/plugins/words/meson.build b/src/plugins/words/meson.build
index 0d8cfdb15..9f81be059 100644
--- a/src/plugins/words/meson.build
+++ b/src/plugins/words/meson.build
@@ -13,6 +13,6 @@ plugin_words_resources = gnome.compile_resources(
c_name: 'gbp_words',
)
-plugins_sources += plugin_words_resources[0]
+plugins_sources += plugin_words_resources
endif
diff --git a/src/plugins/xml-pack/meson.build b/src/plugins/xml-pack/meson.build
index 9338eae07..1137fdcaa 100644
--- a/src/plugins/xml-pack/meson.build
+++ b/src/plugins/xml-pack/meson.build
@@ -40,6 +40,6 @@ plugin_xml_pack_resources = gnome.compile_resources(
c_name: 'gbp_xml_pack',
)
-plugins_sources += plugin_xml_pack_resources[0]
+plugins_sources += plugin_xml_pack_resources
endif

571
srcpkgs/gnome-builder/patches/fix-build-with-newer-meson.patch
View file

@ -1,571 +0,0 @@
We have to fix a few things here:
Newer meson versions don't want us to only take the first of the resources arrays,
that leads to undefined references. We also have to build everything as shared lib,
since building internal static libs is pretty broken right meson right now,
see https://github.com/mesonbuild/meson/pull/3939
diff --git src/gstyle/meson.build src/gstyle/meson.build
index 4fe3287..fe4c90c 100644
--- src/gstyle/meson.build
+++ src/gstyle/meson.build
@@ -65,7 +65,7 @@ libgstyle_sources = [
'gstyle-slidein.c',
'gstyle-utils.c',
'gstyle-xyz.c',
- libgstyle_resources[0],
+ libgstyle_resources,
]
libgstyle_deps = [
diff --git src/libeditorconfig/meson.build src/libeditorconfig/meson.build
index 6c59ace..bf07f9d 100644
--- src/libeditorconfig/meson.build
+++ src/libeditorconfig/meson.build
@@ -34,11 +34,14 @@ libeditorconfig_args = [
'-Deditorconfig_VERSION_SUFFIX=0',
]
-libeditorconfig = static_library('editorconfig',
+libeditorconfig = shared_library('editorconfig',
libeditorconfig_sources,
dependencies: libeditorconfig_deps,
c_args: libeditorconfig_args,
pic: true,
+ install: true,
+ install_dir: pkglibdir_abs,
+ install_rpath: pkglibdir_abs,
)
libeditorconfig_dep = declare_dependency(
diff --git src/plugins/autotools/meson.build src/plugins/autotools/meson.build
index 94506d3..57f84a6 100644
--- src/plugins/autotools/meson.build
+++ src/plugins/autotools/meson.build
@@ -28,7 +28,6 @@ autotools_sources = [
'ide-makecache-target.h',
]
-gnome_builder_plugins_sources += files(autotools_sources)
-gnome_builder_plugins_sources += autotools_resources[0]
-
+gnome_builder_plugins_sources += files(autotools_sources)
+gnome_builder_plugins_sources += autotools_resources
endif
diff --git src/plugins/beautifier/meson.build src/plugins/beautifier/meson.build
index 8e67241..1f8006b 100644
--- src/plugins/beautifier/meson.build
+++ src/plugins/beautifier/meson.build
@@ -20,6 +20,6 @@ beautifier_sources = [
]
gnome_builder_plugins_sources += files(beautifier_sources)
-gnome_builder_plugins_sources += beautifier_resources[0]
+gnome_builder_plugins_sources += beautifier_resources
endif
diff --git src/plugins/c-pack/meson.build src/plugins/c-pack/meson.build
index a975601..8534bf3 100644
--- src/plugins/c-pack/meson.build
+++ src/plugins/c-pack/meson.build
@@ -18,6 +18,6 @@ c_pack_sources = [
]
gnome_builder_plugins_sources += files(c_pack_sources)
-gnome_builder_plugins_sources += c_pack_resources[0]
+gnome_builder_plugins_sources += c_pack_resources
endif
diff --git src/plugins/clang/meson.build src/plugins/clang/meson.build
index ba5c46a..d498e96 100644
--- src/plugins/clang/meson.build
+++ src/plugins/clang/meson.build
@@ -61,7 +61,7 @@ clang_includes_dep = declare_dependency(
gnome_builder_plugins_deps += [clang_includes_dep]
gnome_builder_plugins_sources += files(clang_sources)
-gnome_builder_plugins_sources += clang_resources[0]
+gnome_builder_plugins_sources += clang_resources
gnome_builder_clang_deps = [ clang_dep, libide_deps, libide_dep ]
diff --git src/plugins/cmake/meson.build src/plugins/cmake/meson.build
index b13e998..be42d50 100644
--- src/plugins/cmake/meson.build
+++ src/plugins/cmake/meson.build
@@ -23,6 +23,6 @@ cmake_sources = [
]
gnome_builder_plugins_sources += files(cmake_sources)
-gnome_builder_plugins_sources += cmake_resources[0]
+gnome_builder_plugins_sources += cmake_resources
endif
diff --git src/plugins/code-index/meson.build src/plugins/code-index/meson.build
index 290d8cf..96ee7c1 100644
--- src/plugins/code-index/meson.build
+++ src/plugins/code-index/meson.build
@@ -23,6 +23,6 @@ code_index_sources = [
]
gnome_builder_plugins_sources += files(code_index_sources)
-gnome_builder_plugins_sources += code_index_resources[0]
+gnome_builder_plugins_sources += code_index_resources
endif
diff --git src/plugins/color-picker/meson.build src/plugins/color-picker/meson.build
index 198b4b5..31a1b53 100644
--- src/plugins/color-picker/meson.build
+++ src/plugins/color-picker/meson.build
@@ -29,7 +29,7 @@ color_picker_sources = [
gnome_builder_plugins_deps += [libgstyle_dep]
gnome_builder_plugins_sources += files(color_picker_sources)
-gnome_builder_plugins_sources += color_picker_resources[0]
+gnome_builder_plugins_sources += color_picker_resources
install_data('gsettings/org.gnome.builder.plugins.color_picker_plugin.gschema.xml',
install_dir: schema_dir,
diff --git src/plugins/command-bar/meson.build src/plugins/command-bar/meson.build
index 139844f..9f37ba5 100644
--- src/plugins/command-bar/meson.build
+++ src/plugins/command-bar/meson.build
@@ -30,6 +30,6 @@ command_bar_sources = [
]
gnome_builder_plugins_sources += files(command_bar_sources)
-gnome_builder_plugins_sources += command_bar_resources[0]
+gnome_builder_plugins_sources += command_bar_resources
endif
diff --git src/plugins/comment-code/meson.build src/plugins/comment-code/meson.build
index 3c27211..b74c262 100644
--- src/plugins/comment-code/meson.build
+++ src/plugins/comment-code/meson.build
@@ -13,6 +13,6 @@ comment_code_sources = [
]
gnome_builder_plugins_sources += files(comment_code_sources)
-gnome_builder_plugins_sources += comment_code_resources[0]
+gnome_builder_plugins_sources += comment_code_resources
endif
diff --git src/plugins/create-project/meson.build src/plugins/create-project/meson.build
index bfd6371..c1b0977 100644
--- src/plugins/create-project/meson.build
+++ src/plugins/create-project/meson.build
@@ -19,6 +19,6 @@ create_project_sources = [
]
gnome_builder_plugins_sources += files(create_project_sources)
-gnome_builder_plugins_sources += create_project_resources[0]
+gnome_builder_plugins_sources += create_project_resources
endif
diff --git src/plugins/ctags/meson.build src/plugins/ctags/meson.build
index 91c5db3..f75f80e 100644
--- src/plugins/ctags/meson.build
+++ src/plugins/ctags/meson.build
@@ -23,6 +23,6 @@ ctags_sources = [
]
gnome_builder_plugins_sources += files(ctags_sources)
-gnome_builder_plugins_sources += ctags_resources[0]
+gnome_builder_plugins_sources += ctags_resources
endif
diff --git src/plugins/devhelp/meson.build src/plugins/devhelp/meson.build
index b07e9f9..837b4b1 100644
--- src/plugins/devhelp/meson.build
+++ src/plugins/devhelp/meson.build
@@ -21,6 +21,6 @@ gnome_builder_plugins_deps += [
]
gnome_builder_plugins_sources += files(devhelp_sources)
-gnome_builder_plugins_sources += devhelp_resources[0]
+gnome_builder_plugins_sources += devhelp_resources
endif
diff --git src/plugins/deviced/meson.build src/plugins/deviced/meson.build
index e2393d5..5f9cba7 100644
--- src/plugins/deviced/meson.build
+++ src/plugins/deviced/meson.build
@@ -18,6 +18,6 @@ gnome_builder_plugins_deps += [
]
gnome_builder_plugins_sources += files(deviced_sources)
-gnome_builder_plugins_sources += deviced_resources[0]
+gnome_builder_plugins_sources += deviced_resources
endif
diff --git src/plugins/file-search/meson.build src/plugins/file-search/meson.build
index aa32604..42281e8 100644
--- src/plugins/file-search/meson.build
+++ src/plugins/file-search/meson.build
@@ -16,6 +16,6 @@ file_search_sources = [
]
gnome_builder_plugins_sources += files(file_search_sources)
-gnome_builder_plugins_sources += file_search_resources[0]
+gnome_builder_plugins_sources += file_search_resources
endif
diff --git src/plugins/flatpak/meson.build src/plugins/flatpak/meson.build
index 28982bb..2ad3239 100644
--- src/plugins/flatpak/meson.build
+++ src/plugins/flatpak/meson.build
@@ -58,6 +58,6 @@ gnome_builder_plugins_deps += [
]
gnome_builder_plugins_sources += files(flatpak_sources)
-gnome_builder_plugins_sources += flatpak_resources[0]
+gnome_builder_plugins_sources += flatpak_resources
endif
diff --git src/plugins/gcc/meson.build src/plugins/gcc/meson.build
index 4127bde..0404810 100644
--- src/plugins/gcc/meson.build
+++ src/plugins/gcc/meson.build
@@ -15,6 +15,6 @@ gcc_sources = [
]
gnome_builder_plugins_sources += files(gcc_sources)
-gnome_builder_plugins_sources += gcc_resources[0]
+gnome_builder_plugins_sources += gcc_resources
endif
diff --git src/plugins/gdb/meson.build src/plugins/gdb/meson.build
index 0627359..75a1b26 100644
--- src/plugins/gdb/meson.build
+++ src/plugins/gdb/meson.build
@@ -12,16 +12,19 @@ gdb_sources = [
'gbp-gdb-plugin.c',
]
-gdbwire = static_library('gdbwire', ['gdbwire.c'],
+gdbwire = shared_library('gdbwire', ['gdbwire.c'],
c_args: [ '-Wno-redundant-decls',
'-Wno-switch-default',
'-Wno-missing-declarations',
'-Wno-uninitialized',
'-Wno-declaration-after-statement' ],
+ install: true,
+ install_dir: pkglibdir_abs,
+ install_rpath: pkglibdir_abs,
)
gnome_builder_plugins_sources += files(gdb_sources)
-gnome_builder_plugins_sources += gdb_resources[0]
+gnome_builder_plugins_sources += gdb_resources
gnome_builder_plugins_link_with += gdbwire
endif
diff --git src/plugins/gettext/meson.build src/plugins/gettext/meson.build
index 6bcf45e..2c5219a 100644
--- src/plugins/gettext/meson.build
+++ src/plugins/gettext/meson.build
@@ -13,6 +13,6 @@ gettext_sources = [
]
gnome_builder_plugins_sources += files(gettext_sources)
-gnome_builder_plugins_sources += gettext_resources[0]
+gnome_builder_plugins_sources += gettext_resources
endif
diff --git src/plugins/git/meson.build src/plugins/git/meson.build
index fdd9499..d5c3cdb 100644
--- src/plugins/git/meson.build
+++ src/plugins/git/meson.build
@@ -29,6 +29,6 @@ gnome_builder_plugins_deps += [
]
gnome_builder_plugins_sources += files(git_sources)
-gnome_builder_plugins_sources += git_resources[0]
+gnome_builder_plugins_sources += git_resources
endif
diff --git src/plugins/gnome-code-assistance/meson.build src/plugins/gnome-code-assistance/meson.build
index fee9b7a..4dc9890 100644
--- src/plugins/gnome-code-assistance/meson.build
+++ src/plugins/gnome-code-assistance/meson.build
@@ -23,7 +23,7 @@ gca_sources = [
]
gnome_builder_plugins_sources += files(gca_sources)
-gnome_builder_plugins_sources += gca_resources[0]
+gnome_builder_plugins_sources += gca_resources
install_data('org.gnome.builder.gnome-code-assistance.gschema.xml',
install_dir: schema_dir)
diff --git src/plugins/history/meson.build src/plugins/history/meson.build
index 6c58e54..8c451bf 100644
--- src/plugins/history/meson.build
+++ src/plugins/history/meson.build
@@ -17,6 +17,6 @@ history_sources = [
]
gnome_builder_plugins_sources += files(history_sources)
-gnome_builder_plugins_sources += history_resources[0]
+gnome_builder_plugins_sources += history_resources
endif
diff --git src/plugins/html-completion/meson.build src/plugins/html-completion/meson.build
index 1b5b78f..393ef26 100644
--- src/plugins/html-completion/meson.build
+++ src/plugins/html-completion/meson.build
@@ -14,6 +14,6 @@ html_completion_sources = [
]
gnome_builder_plugins_sources += files(html_completion_sources)
-gnome_builder_plugins_sources += html_completion_resources[0]
+gnome_builder_plugins_sources += html_completion_resources
endif
diff --git src/plugins/meson/meson.build src/plugins/meson/meson.build
index 90319af..6dd6c2e 100644
--- src/plugins/meson/meson.build
+++ src/plugins/meson/meson.build
@@ -36,7 +36,7 @@ meson_sources = [
'gbp-meson-utils.h',
]
-gnome_builder_plugins_sources += files(meson_sources)
-gnome_builder_plugins_sources += meson_resources[0]
+gnome_builder_plugins_sources += files(meson_sources)
+gnome_builder_plugins_sources += meson_resources
endif
diff --git src/plugins/messages/meson.build src/plugins/messages/meson.build
index 96afadb..7c4c62f 100644
--- src/plugins/messages/meson.build
+++ src/plugins/messages/meson.build
@@ -13,4 +13,4 @@ messages_sources = [
]
gnome_builder_plugins_sources += files(messages_sources)
-gnome_builder_plugins_sources += messages_resources[0]
+gnome_builder_plugins_sources += messages_resources
diff --git src/plugins/newcomers/meson.build src/plugins/newcomers/meson.build
index f461394..abb16ee 100644
--- src/plugins/newcomers/meson.build
+++ src/plugins/newcomers/meson.build
@@ -15,6 +15,6 @@ newcomers_sources = [
]
gnome_builder_plugins_sources += files(newcomers_sources)
-gnome_builder_plugins_sources += newcomers_resources[0]
+gnome_builder_plugins_sources += newcomers_resources
endif
diff --git src/plugins/notification/meson.build src/plugins/notification/meson.build
index a306847..0314c2d 100644
--- src/plugins/notification/meson.build
+++ src/plugins/notification/meson.build
@@ -13,6 +13,6 @@ notification_sources = [
]
gnome_builder_plugins_sources += files(notification_sources)
-gnome_builder_plugins_sources += notification_resources[0]
+gnome_builder_plugins_sources += notification_resources
endif
diff --git src/plugins/project-tree/meson.build src/plugins/project-tree/meson.build
index 4ca0242..e8be5c4 100644
--- src/plugins/project-tree/meson.build
+++ src/plugins/project-tree/meson.build
@@ -34,6 +34,6 @@ gnome_builder_plugins_deps += dependency('vte-2.91', version: '>=0.40.2')
gnome_builder_plugins_args += '-DHAVE_VTE'
gnome_builder_plugins_sources += files(project_tree_sources)
-gnome_builder_plugins_sources += project_tree_resources[0]
+gnome_builder_plugins_sources += project_tree_resources
endif
diff --git src/plugins/python-pack/meson.build src/plugins/python-pack/meson.build
index bdddd88..3e105ea 100644
--- src/plugins/python-pack/meson.build
+++ src/plugins/python-pack/meson.build
@@ -13,6 +13,6 @@ python_pack_sources = [
]
gnome_builder_plugins_sources += files(python_pack_sources)
-gnome_builder_plugins_sources += python_pack_resources[0]
+gnome_builder_plugins_sources += python_pack_resources
endif
diff --git src/plugins/qemu/meson.build src/plugins/qemu/meson.build
index 0b50c10..259180c 100644
--- src/plugins/qemu/meson.build
+++ src/plugins/qemu/meson.build
@@ -12,6 +12,6 @@ qemu_sources = [
]
gnome_builder_plugins_sources += files(qemu_sources)
-gnome_builder_plugins_sources += qemu_resources[0]
+gnome_builder_plugins_sources += qemu_resources
endif
diff --git src/plugins/quick-highlight/meson.build src/plugins/quick-highlight/meson.build
index a22cdb4..57d744d 100644
--- src/plugins/quick-highlight/meson.build
+++ src/plugins/quick-highlight/meson.build
@@ -15,6 +15,6 @@ quick_highlight_sources = [
]
gnome_builder_plugins_sources += files(quick_highlight_sources)
-gnome_builder_plugins_sources += quick_highlight_resources[0]
+gnome_builder_plugins_sources += quick_highlight_resources
endif
diff --git src/plugins/recent/meson.build src/plugins/recent/meson.build
index e8501df..63e82cd 100644
--- src/plugins/recent/meson.build
+++ src/plugins/recent/meson.build
@@ -13,4 +13,4 @@ recent_sources = [
]
gnome_builder_plugins_sources += files(recent_sources)
-gnome_builder_plugins_sources += recent_resources[0]
+gnome_builder_plugins_sources += recent_resources
diff --git src/plugins/retab/meson.build src/plugins/retab/meson.build
index c0b61aa..0a9dee0 100644
--- src/plugins/retab/meson.build
+++ src/plugins/retab/meson.build
@@ -13,6 +13,6 @@ retab_sources = [
]
gnome_builder_plugins_sources += files(retab_sources)
-gnome_builder_plugins_sources += retab_resources[0]
+gnome_builder_plugins_sources += retab_resources
endif
diff --git src/plugins/snippets/meson.build src/plugins/snippets/meson.build
index e6652d7..29ab296 100644
--- src/plugins/snippets/meson.build
+++ src/plugins/snippets/meson.build
@@ -15,6 +15,6 @@ snippets_sources = [
]
gnome_builder_plugins_sources += files(snippets_sources)
-gnome_builder_plugins_sources += snippets_resources[0]
+gnome_builder_plugins_sources += snippets_resources
endif
diff --git src/plugins/spellcheck/meson.build src/plugins/spellcheck/meson.build
index 4cf50e1..fce30cd 100644
--- src/plugins/spellcheck/meson.build
+++ src/plugins/spellcheck/meson.build
@@ -33,6 +33,6 @@ gnome_builder_plugins_deps += [
]
gnome_builder_plugins_sources += files(spellcheck_sources)
-gnome_builder_plugins_sources += spellcheck_resources[0]
+gnome_builder_plugins_sources += spellcheck_resources
endif
diff --git src/plugins/support/meson.build src/plugins/support/meson.build
index 1e1d9fb..8d28015 100644
--- src/plugins/support/meson.build
+++ src/plugins/support/meson.build
@@ -15,6 +15,6 @@ support_sources = [
]
gnome_builder_plugins_sources += files(support_sources)
-gnome_builder_plugins_sources += support_resources[0]
+gnome_builder_plugins_sources += support_resources
endif
diff --git src/plugins/symbol-tree/meson.build src/plugins/symbol-tree/meson.build
index a085ab7..a2d641c 100644
--- src/plugins/symbol-tree/meson.build
+++ src/plugins/symbol-tree/meson.build
@@ -18,6 +18,6 @@ symbol_tree_sources = [
]
gnome_builder_plugins_sources += files(symbol_tree_sources)
-gnome_builder_plugins_sources += symbol_tree_resources[0]
+gnome_builder_plugins_sources += symbol_tree_resources
endif
diff --git src/plugins/sysmon/meson.build src/plugins/sysmon/meson.build
index 7b5dce7..3bc857b 100644
--- src/plugins/sysmon/meson.build
+++ src/plugins/sysmon/meson.build
@@ -14,6 +14,6 @@ sysmon_sources = [
]
gnome_builder_plugins_sources += files(sysmon_sources)
-gnome_builder_plugins_sources += sysmon_resources[0]
+gnome_builder_plugins_sources += sysmon_resources
endif
diff --git src/plugins/sysprof/meson.build src/plugins/sysprof/meson.build
index 09c47e7..815d1c9 100644
--- src/plugins/sysprof/meson.build
+++ src/plugins/sysprof/meson.build
@@ -20,6 +20,6 @@ gnome_builder_plugins_deps += [
]
gnome_builder_plugins_sources += files(sysprof_sources)
-gnome_builder_plugins_sources += sysprof_resources[0]
+gnome_builder_plugins_sources += sysprof_resources
endif
diff --git src/plugins/sysroot/meson.build src/plugins/sysroot/meson.build
index 01c2b4d..9cd2ce6 100644
--- src/plugins/sysroot/meson.build
+++ src/plugins/sysroot/meson.build
@@ -25,6 +25,6 @@ sysroot_sources = [
]
gnome_builder_plugins_sources += files(sysroot_sources)
-gnome_builder_plugins_sources += sysroot_resources[0]
+gnome_builder_plugins_sources += sysroot_resources
endif
diff --git src/plugins/terminal/meson.build src/plugins/terminal/meson.build
index e697221..ca3d0bc 100644
--- src/plugins/terminal/meson.build
+++ src/plugins/terminal/meson.build
@@ -19,4 +19,4 @@ terminal_sources = [
gnome_builder_plugins_deps += [libvte_dep]
gnome_builder_plugins_sources += files(terminal_sources)
-gnome_builder_plugins_sources += terminal_resources[0]
+gnome_builder_plugins_sources += terminal_resources
diff --git src/plugins/todo/meson.build src/plugins/todo/meson.build
index cc76a72..44b0afc 100644
--- src/plugins/todo/meson.build
+++ src/plugins/todo/meson.build
@@ -19,6 +19,6 @@ todo_sources = [
]
gnome_builder_plugins_sources += files(todo_sources)
-gnome_builder_plugins_sources += todo_resources[0]
+gnome_builder_plugins_sources += todo_resources
endif
diff --git src/plugins/words/meson.build src/plugins/words/meson.build
index 25c5f16..eeb12d1 100644
--- src/plugins/words/meson.build
+++ src/plugins/words/meson.build
@@ -14,6 +14,6 @@ words_sources = [
]
gnome_builder_plugins_sources += files(words_sources)
-gnome_builder_plugins_sources += words_resources[0]
+gnome_builder_plugins_sources += words_resources
endif
diff --git src/plugins/xml-pack/meson.build src/plugins/xml-pack/meson.build
index 5ae9289..212c923 100644
--- src/plugins/xml-pack/meson.build
+++ src/plugins/xml-pack/meson.build
@@ -41,6 +41,6 @@ xml_pack_sources = [
]
gnome_builder_plugins_sources += files(xml_pack_sources)
-gnome_builder_plugins_sources += xml_pack_resources[0]
+gnome_builder_plugins_sources += xml_pack_resources
endif

41
srcpkgs/gnome-builder/patches/musl-wordsize.patch
View file

@ -1,41 +0,0 @@
--- src/plugins/sysprof/gbp-sysprof-plugin.c 2018-03-14 03:10:22.000000000 +0100
+++ src/plugins/sysprof/gbp-sysprof-plugin.c 2018-04-10 15:20:46.416250960 +0200
@@ -16,6 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <stdlib.h>
+#if !defined(__GLIBC__)
+#include <bits/reg.h> /* for __WORDSIZE */
+#endif
+
#include <libpeas/peas.h>
#include <ide.h>
#include <sysprof.h>
--- src/plugins/sysprof/gbp-sysprof-perspective.c 2018-03-14 03:10:22.000000000 +0100
+++ src/plugins/sysprof/gbp-sysprof-perspective.c 2018-04-10 15:12:49.793279369 +0200
@@ -17,6 +17,10 @@
*/
#define G_LOG_DOMAIN "gbp-sysprof-perspective"
+#include <stdlib.h>
+#if !defined(__GLIBC__)
+#include <bits/reg.h> /* for __WORDSIZE */
+#endif
#include <glib/gi18n.h>
#include <sysprof.h>
--- src/plugins/sysprof/gbp-sysprof-workbench-addin.c 2018-03-14 03:10:22.000000000 +0100
+++ src/plugins/sysprof/gbp-sysprof-workbench-addin.c 2018-04-10 15:19:28.473255605 +0200
@@ -16,6 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <stdlib.h>
+#if !defined(__GLIBC__)
+#include <bits/reg.h> /* for __WORDSIZE */
+#endif
+
#include <glib/gi18n.h>
#include <sysprof.h>

13
srcpkgs/gnome-builder/template
View file

@ -1,24 +1,25 @@
# Template file for 'gnome-builder'
pkgname=gnome-builder
version=3.30.3
revision=4
version=3.32.0
revision=1
build_style=meson
configure_args="-Dwith_webkit=true -Dwith_sysprof=true -Dhelp=true"
hostmakedepends="appdata-tools desktop-file-utils flex gobject-introspection
gspell-devel llvm mm-common vala python3-Sphinx"
gspell-devel llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme"
makedepends="cairo-devel clang devhelp-devel enchant2-devel flatpak-devel
gspell-devel gtksourceview4-devel gtk+3-devel json-glib-devel jsonrpc-glib-devel
libdazzle-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel
libxml2-devel template-glib-devel vala-devel vte3-devel webkit2gtk-devel
python3-gobject-devel sysprof-devel"
python3-gobject-devel sysprof-devel glade3-devel"
depends="desktop-file-utils flatpak-builder python3-lxml devhelp python3-gobject"
short_desc="IDE for GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Builder"
changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-30/NEWS"
changelog="https://gitlab.gnome.org/GNOME/gnome-builder/raw/gnome-builder-3-32/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=9998f3d41d9526fdbf274cae712fafe7b79d0b9d1dd5739c6c2141e5e5550686
checksum=e46270d86a52721e4329349e4badff1df63a98aeb2a2c4554969367ba1d68702
patch_args="-Np1"
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" libexecinfo-devel"