|
From a6a46107644eafc99abda0ca32fce4493370bbd8 Mon Sep 17 00:00:00 2001 |
|
From: Gris Ge <[email protected]> |
|
Date: Tue, 19 May 2020 15:27:20 +0800 |
|
Subject: [PATCH] Fix compiling failure regarding ctags |
|
|
|
Using patch from https://github.com/varlink/libvarlink/pull/23 |
|
|
|
Signed-off-by: Gris Ge <[email protected]> |
|
--- |
|
PKGBUILD | 7 +++++-- |
|
drop_tags_and_ctags_targets.patch | 29 +++++++++++++++++++++++++++++ |
|
2 files changed, 34 insertions(+), 2 deletions(-) |
|
create mode 100644 drop_tags_and_ctags_targets.patch |
|
|
|
diff --git a/PKGBUILD b/PKGBUILD |
|
index 5b19248..e975e37 100644 |
|
--- a/PKGBUILD |
|
+++ b/PKGBUILD |
|
@@ -7,11 +7,14 @@ pkgdesc='Varlink C library and command line tool' |
|
makedepends=("meson" "python") |
|
arch=('x86_64') |
|
url='https://github.com/varlink/libvarlink' |
|
-source=("https://github.com/varlink/libvarlink/archive/${pkgver}.tar.gz") |
|
-sha256sums=('0e316138ef6abc34363b05d0caf6df2e389a93b832e8d971e3ae64b48ba96133') |
|
+source=("https://github.com/varlink/libvarlink/archive/${pkgver}.tar.gz" |
|
+ "drop_tags_and_ctags_targets.patch") |
|
+sha256sums=('0e316138ef6abc34363b05d0caf6df2e389a93b832e8d971e3ae64b48ba96133' |
|
+ '92fc9ef736b25e11f51a64b30a37b59ec9fb141e8487fe3338682a8746d1f579') |
|
|
|
build() { |
|
cd "$pkgname-$pkgver" |
|
+ patch -p1 -i $srcdir/drop_tags_and_ctags_targets.patch |
|
|
|
meson --prefix=/usr build/ |
|
ninja -C build/ |
|
diff --git a/drop_tags_and_ctags_targets.patch b/drop_tags_and_ctags_targets.patch |
|
new file mode 100644 |
|
index 0000000..c5dfead |
|
--- /dev/null |
|
+++ b/drop_tags_and_ctags_targets.patch |
|
@@ -0,0 +1,29 @@ |
|
+diff -Nur libvarlink-19.old/meson.build libvarlink-19/meson.build |
|
+--- libvarlink-19.old/meson.build 2020-03-06 18:42:33.000000000 +0800 |
|
++++ libvarlink-19/meson.build 2020-05-19 15:20:45.906719047 +0800 |
|
+@@ -79,25 +79,3 @@ |
|
+ subdir('tool') |
|
+ subdir('vim') |
|
+ subdir('bash-completion') |
|
+- |
|
+-############################################################ |
|
+- |
|
+-git = find_program('git', required : false) |
|
+- |
|
+-if git.found() |
|
+- all_files = run_command( |
|
+- git, |
|
+- ['--git-dir=@0@/.git'.format(meson.current_source_dir()), |
|
+- 'ls-files', |
|
+- ':/*.[ch]']) |
|
+- all_files = files(all_files.stdout().split()) |
|
+- |
|
+- custom_target( |
|
+- 'tags', |
|
+- output : 'tags', |
|
+- command : ['env', 'etags', '-o', '@0@/TAGS'.format(meson.current_source_dir())] + all_files) |
|
+- custom_target( |
|
+- 'ctags', |
|
+- output : 'ctags', |
|
+- command : ['env', 'ctags', '-o', '@0@/tags'.format(meson.current_source_dir())] + all_files) |
|
+-endif |
|
-- |
|
2.26.2 |
|
|
