[med-svn] [libundead] 01/03: Use Meson build patch from upstream PR

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to branch master
in repository libundead.

commit 66e3e1ebf8cd2b4d09c2d14fd8e62ef7447a2aa3
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Fri Mar 3 00:41:38 2017 +0100

    Use Meson build patch from upstream PR
---
 debian/patches/01_meson-build.patch.patch | 74 +++++++++++++++++++++++++++++++
 debian/patches/meson.build.patch          | 54 ----------------------
 debian/patches/series                     |  2 +-
 3 files changed, 75 insertions(+), 55 deletions(-)

diff --git a/debian/patches/01_meson-build.patch.patch b/debian/patches/01_meson-build.patch.patch
new file mode 100644
index 0000000..67641f7
--- /dev/null
+++ b/debian/patches/01_meson-build.patch.patch
@@ -0,0 +1,74 @@
+From 8636fb47ee27ea11676239200eb0568bc087ef1b Mon Sep 17 00:00:00 2001
+From: Matthias Klumpp <matthias at tenstral.net>
+Date: Tue, 28 Feb 2017 14:47:37 +0100
+Subject: [PATCH] Add Meson build definition
+
+---
+ meson.build | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 58 insertions(+)
+ create mode 100644 meson.build
+
+diff --git a/meson.build b/meson.build
+new file mode 100644
+index 0000000..15da282
+--- /dev/null
++++ b/meson.build
+@@ -0,0 +1,58 @@
++project('undeaD', 'd')
++
++project_version   = '1.0.6'
++project_soversion = '0'
++
++src_dir = include_directories('src/')
++pkgc = import('pkgconfig')
++
++undead_src = [
++    'src/undead/stream.d',
++    'src/undead/dateparse.d',
++    'src/undead/regexp.d',
++    'src/undead/doformat.d',
++    'src/undead/cstream.d',
++    'src/undead/date.d',
++    'src/undead/socketstream.d',
++    'src/undead/datebase.d',
++    'src/undead/metastrings.d',
++    'src/undead/bitarray.d'
++]
++
++undead_internal_src = [
++    'src/undead/internal/file.d',
++]
++
++install_headers(undead_src, subdir: 'd/undead')
++install_headers(undead_internal_src, subdir: 'd/undead/internal')
++
++# we only build a static library here
++undead_lib = static_library('undead',
++        [undead_src,
++         undead_internal_src],
++        include_directories: [src_dir],
++        install: true,
++        version: project_version,
++        soversion: project_soversion
++)
++pkgc.generate(name: 'undead',
++              libraries: undead_lib,
++              subdirs: 'd/',
++              version: project_version,
++              description: 'Obsolete Phobos modules, back from the dead.'
++)
++
++# Tests
++# We need to manually create a main () routine, since LDC will break with split compilation and -main flag
++fake_main_src = meson.build_root() + '/umain.d'
++r = run_command('sh', '-c', 'echo "void main () {}" > ' + fake_main_src)
++if r.returncode() != 0
++  error('Unable to write dummy main.d file: ' + r.stderr().strip())
++endif
++
++undead_test_exe = executable('undead_test',
++    [undead_src, undead_internal_src, fake_main_src],
++    include_directories: [src_dir],
++    d_args: meson.get_compiler('d').unittest_args()
++)
++test('undead_tests', undead_test_exe)
diff --git a/debian/patches/meson.build.patch b/debian/patches/meson.build.patch
deleted file mode 100644
index b86f2b1..0000000
--- a/debian/patches/meson.build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Sat, 25 Feb 2017 20:34:50 +0100
-Description: Meson control file
-
---- /dev/null
-+++ b/meson.build
-@@ -0,0 +1,47 @@
-+project('undeaD', 'd')
-+
-+project_version   = '1.0.6'
-+project_soversion = '0'
-+
-+src_dir = include_directories('.')
-+pkgc = import('pkgconfig')
-+
-+#
-+# Sources
-+#
-+undead_src = [
-+    'src/undead/doformat.d',
-+    'src/undead/socketstream.d',
-+    'src/undead/stream.d',
-+    'src/undead/date.d',
-+    'src/undead/internal/file.d',
-+    'src/undead/datebase.d',
-+    'src/undead/bitarray.d',
-+    'src/undead/regexp.d',
-+    'src/undead/metastrings.d',
-+    'src/undead/dateparse.d',
-+    'src/undead/cstream.d'
-+]
-+
-+#
-+# Includes
-+#
-+install_subdir('src/', install_dir: 'include/d/')
-+
-+#
-+# Library and pkg-config
-+#
-+undead_lib = library('undead',
-+        [undead_src],
-+        include_directories: [src_dir],
-+        install: true,
-+        version: project_version,
-+        soversion: project_soversion
-+)
-+pkgc.generate(name: 'undead',
-+              libraries: undead_lib,
-+              subdirs: 'd/',
-+              version: project_version,
-+              description: 'obsolete Phobos modules upgraded to work with the latest D'
-+)
-+
diff --git a/debian/patches/series b/debian/patches/series
index 4bf31d4..87f5ce5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-meson.build.patch
+01_meson-build.patch.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libundead.git