Patch the build to avoid requiring git
Stephen Kitt
6 years ago
|
0 |
gcab (1.1-2) UNRELEASED; urgency=medium
|
|
1 |
|
|
2 |
* Patch the build to avoid requiring git. Closes: #890111.
|
|
3 |
|
|
4 |
-- Stephen Kitt <skitt@debian.org> Sun, 11 Feb 2018 18:47:27 +0100
|
|
5 |
|
| 0 | 6 |
gcab (1.1-1) unstable; urgency=medium
|
| 1 | 7 |
|
| 2 | 8 |
* New upstream release.
|
|
0 |
Description: Use main version instead of git version
|
|
1 |
Author: Stephen Kitt <skitt@debian.org>
|
|
2 |
|
|
3 |
This avoids needing git to build.
|
|
4 |
|
|
5 |
--- a/meson.build
|
|
6 |
+++ b/meson.build
|
|
7 |
@@ -5,8 +5,6 @@
|
|
8 |
default_options : ['warning_level=2', 'c_std=c99'],
|
|
9 |
)
|
|
10 |
|
|
11 |
-git_version = run_command(['git', 'describe', '--abbrev=4', 'HEAD']).stdout().strip().split('-')
|
|
12 |
-
|
|
13 |
# libtool versioning
|
|
14 |
lt_current = '0'
|
|
15 |
lt_revision = '0'
|
|
16 |
@@ -95,11 +93,7 @@
|
|
17 |
conf = configuration_data()
|
|
18 |
conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
|
|
19 |
conf.set_quoted('PACKAGE_NAME', meson.project_name())
|
|
20 |
-if git_version.length() == 3
|
|
21 |
- conf.set_quoted('PACKAGE_STRING', '@0@ @1@.@2@-@3@'.format(meson.project_name(), git_version[0], git_version[1], git_version[2]))
|
|
22 |
-else
|
|
23 |
- conf.set_quoted('PACKAGE_STRING', '@0@ v@1@'.format(meson.project_name(), meson.project_version()))
|
|
24 |
-endif
|
|
25 |
+conf.set_quoted('PACKAGE_STRING', '@0@ v@1@'.format(meson.project_name(), meson.project_version()))
|
|
26 |
|
|
27 |
conf.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
|
|
28 |
conf.set_quoted('PACKAGE_BUGREPORT', 'https://bugzilla.gnome.org/enter_bug.cgi?product=msitools&component=gcab')
|
| 0 | 0 |
manpage-hyphens.patch
|
| 1 | 1 |
zalloc_integer_overflow.patch
|
|
2 |
no-git-version.patch
|