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

io.elementary.photos: fix ftbfs

Browse source
This commit is contained in:
Đoàn Trần Công Danh 2021-01-15 22:23:14 +07:00
parent 905358ffa3
commit 2a3d8f1e45
1 changed files with 95 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
srcpkgs/io.elementary.photos/patches/fix-meson.patch Normal file
View file

@ -0,0 +1,95 @@
From 27e529fc96da828982563e2e19a6f0cef883a29e Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 22 Jul 2020 19:35:53 +0200
Subject: [PATCH] meson: Properly include config.vapi and config.h (#578)
---
meson.build | 21 +++++++++++++++++++--
src/meson.build | 13 -------------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git meson.build meson.build
index 5edb5314..9bebaca0 100644
--- meson.build
+++ meson.build
@@ -11,14 +11,33 @@ add_project_arguments([
'-Wno-unused',
'-Wl,--enable-new-dtags',
+ '-include', 'config.h',
'-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name())
],
language: 'c',
)
+add_project_arguments([
+ '--vapidir', join_paths(meson.current_source_dir(), 'vapi'),
+ '--pkg', 'config',
+ ],
+ language: 'vala',
+)
libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), meson.project_name())
pluginsdir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
+conf_data = configuration_data()
+conf_data.set_quoted('PROJECT_NAME', meson.project_name())
+conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+conf_data.set_quoted('_VERSION', meson.project_version())
+conf_data.set_quoted('_PREFIX', get_option('prefix'))
+conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir')))
+conf_data.set_quoted('_LIBEXECDIR', libexecdir)
+config_header = configure_file(
+ output : 'config.h',
+ configuration : conf_data
+)
+
gnome = import('gnome')
i18n = import('i18n')
@@ -52,7 +71,6 @@ gstreamer_plugins_base_vapi = meson.get_compiler('vala').find_library('gstreamer
gstreamer_plugins_base_dep = declare_dependency(dependencies: [gstreamer_plugins_base_vapi])
lconv_dep = meson.get_compiler('vala').find_library('LConv', dirs: join_paths(meson.current_source_dir(), 'vapi'))
linux_dep = meson.get_compiler('vala').find_library('linux')
-config_dep = meson.get_compiler('vala').find_library('config', dirs: join_paths(meson.current_source_dir(), 'vapi'))
vapi_include = include_directories('./vapi')
@@ -82,7 +100,6 @@ dependencies = [
webkit2gtk_dep,
lconv_dep,
linux_dep,
- config_dep
]
add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'vapi')], language: 'vala')
diff --git src/meson.build src/meson.build
index 45bf4c1b..1215d778 100644
--- src/meson.build
+++ src/meson.build
@@ -4,18 +4,6 @@ library_files = files(
'plugins/TransitionsInterfaces.vala'
)
-conf_data = configuration_data()
-conf_data.set_quoted('PROJECT_NAME', meson.project_name())
-conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-conf_data.set_quoted('_VERSION', meson.project_version())
-conf_data.set_quoted('_PREFIX', get_option('prefix'))
-conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir')))
-conf_data.set_quoted('_LIBEXECDIR', libexecdir)
-config_header = configure_file(
- output : 'config.h',
- configuration : conf_data
-)
-
photos_files = files(
'AppDirs.vala',
'Application.vala',
@@ -233,7 +221,6 @@ photos_exe = executable(
meson.project_name(),
photos_files,
library_files,
- config_header,
icons_gresource,
global_gresource,
dependencies: dependencies,