summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-07 22:25:38 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-07 22:38:29 +0200
commit399ca0979f1ed58e9d163d254a8fddee45e3218b (patch)
tree15259e2393014433873939c682a43be78f12e29a
parent8e4c2e450ab4f6780ea57c2313ab0dc0d8b4cb3d (diff)
downloaddesktop-399ca0979f1ed58e9d163d254a8fddee45e3218b.tar.gz
desktop-399ca0979f1ed58e9d163d254a8fddee45e3218b.tar.xz
appstream: Version bump to 0.11.5
-rw-r--r--packages/dev-libs/appstream/appstream-0.11.4.exheres-013
-rw-r--r--packages/dev-libs/appstream/appstream-0.11.5.exheres-07
-rw-r--r--packages/dev-libs/appstream/files/appstream-Allow-disabling-API-documentation-build.patch31
-rw-r--r--packages/dev-libs/appstream/files/appstream-Restructure-build-feature-flags.patch158
4 files changed, 7 insertions, 202 deletions
diff --git a/packages/dev-libs/appstream/appstream-0.11.4.exheres-0 b/packages/dev-libs/appstream/appstream-0.11.4.exheres-0
deleted file mode 100644
index eee922f..0000000
--- a/packages/dev-libs/appstream/appstream-0.11.4.exheres-0
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2016 Heiko Becker <heirecka@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require appstream
-
-PLATFORMS="~amd64"
-
-DEFAULT_SRC_PREPARE_PATCHES+=(
- "${FILES}"/${PN}-Restructure-build-feature-flags.patch
- "${FILES}"/${PN}-Allow-disabling-API-documentation-build.patch
-
-)
-
diff --git a/packages/dev-libs/appstream/appstream-0.11.5.exheres-0 b/packages/dev-libs/appstream/appstream-0.11.5.exheres-0
new file mode 100644
index 0000000..61411f4
--- /dev/null
+++ b/packages/dev-libs/appstream/appstream-0.11.5.exheres-0
@@ -0,0 +1,7 @@
+# Copyright 2016 Heiko Becker <heirecka@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+require appstream
+
+PLATFORMS="~amd64"
+
diff --git a/packages/dev-libs/appstream/files/appstream-Allow-disabling-API-documentation-build.patch b/packages/dev-libs/appstream/files/appstream-Allow-disabling-API-documentation-build.patch
deleted file mode 100644
index 857f658..0000000
--- a/packages/dev-libs/appstream/files/appstream-Allow-disabling-API-documentation-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream: yes
-
-From 8e0abb18d334a271418c9e5cdd59b6e35bd94705 Mon Sep 17 00:00:00 2001
-From: Matthias Klumpp <matthias@tenstral.net>
-Date: Sun, 3 Sep 2017 14:26:02 +0200
-Subject: [PATCH] Allow disabling API documentation build
-
-This allows people to disable API documentation build, while still
-keeping it enabled by default. Resolves: #133
----
- docs/meson.build | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/docs/meson.build b/docs/meson.build
-index 022fd39..3aff74f 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -27,7 +27,9 @@ custom_target('man-appstreamcli',
- ]
- )
-
--subdir('api/')
-+if get_option('enable-docs') or get_option('enable-apidocs')
-+ subdir('api/')
-+endif
-
- #
- # Documentation
---
-2.14.1
-
diff --git a/packages/dev-libs/appstream/files/appstream-Restructure-build-feature-flags.patch b/packages/dev-libs/appstream/files/appstream-Restructure-build-feature-flags.patch
deleted file mode 100644
index 79b50df..0000000
--- a/packages/dev-libs/appstream/files/appstream-Restructure-build-feature-flags.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-Upstream: yes
-Reason: appstream-Allow-disabling-API-documentation-build.patch depends on
- this one
-
-From 26b2c4194940278c3f64054417b5427159fbdec1 Mon Sep 17 00:00:00 2001
-From: Matthias Klumpp <matthias@tenstral.net>
-Date: Sun, 3 Sep 2017 14:23:02 +0200
-Subject: [PATCH] Restructure build feature flags
-
----
- contrib/meson.build | 4 ++--
- docs/meson.build | 2 +-
- meson.build | 10 +++++-----
- meson_options.txt | 24 ++++++++++++------------
- src/meson.build | 2 +-
- 5 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/contrib/meson.build b/contrib/meson.build
-index 3d0acc1..1fd5537 100644
---- a/contrib/meson.build
-+++ b/contrib/meson.build
-@@ -1,8 +1,8 @@
- # Meson definition for AppStream contrib
-
--if get_option('vapi')
-+if get_option('enable-vapi')
- subdir('vapi/')
- endif
--if get_option('apt-support')
-+if get_option('enable-apt-support')
- subdir('apt-conf/')
- endif
-diff --git a/docs/meson.build b/docs/meson.build
-index bcd7123..022fd39 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -70,7 +70,7 @@ as_doc_src = [
- 'sources/services/urlhandler.xml'
- ]
-
--if get_option('documentation')
-+if get_option('enable-docs')
- publican_exe = find_program('publican')
- python_exe = find_program('python3')
-
-diff --git a/meson.build b/meson.build
-index 39eebd8..2ea0ada 100644
---- a/meson.build
-+++ b/meson.build
-@@ -19,10 +19,10 @@ conf.set_quoted('GETTEXT_PACKAGE', 'appstream')
- conf.set_quoted('LOCALEDIR', get_option('localedir'))
- conf.set_quoted('LOCALSTATEDIR', get_option('localstatedir'))
-
--if get_option('apt-support')
-+if get_option('enable-apt-support')
- conf.set('HAVE_APT_SUPPORT', 1)
- endif
--if get_option('stemming')
-+if get_option('enable-stemming')
- conf.set('HAVE_STEMMING', 1)
- endif
-
-@@ -32,7 +32,7 @@ configure_file(output: 'config.h', configuration: conf)
- # Custom C flags
- #
- sanitizer_libs = []
--if get_option('maintainer')
-+if get_option('enable-maintainer')
- add_global_arguments(['-Werror',
- '-Wall',
- '-Wextra',
-@@ -64,7 +64,7 @@ xml2_dep = dependency('libxml-2.0')
- yaml_dep = dependency('yaml-0.1')
-
- stemmer_inc_dirs = include_directories(['/usr/include'])
--if get_option('stemming')
-+if get_option('enable-stemming')
- stemmer_lib = ccompiler.find_library('stemmer', required: true)
- if not ccompiler.has_header('libstemmer.h')
- if ccompiler.has_header('libstemmer/libstemmer.h')
-@@ -92,6 +92,6 @@ subdir('contrib/')
- subdir('po/')
- subdir('docs/')
- subdir('tests/')
--if get_option('qt')
-+if get_option('enable-qt')
- subdir('qt/')
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index 0935629..bb76989 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,29 +1,29 @@
--option('l18n',
-- type : 'boolean',
-- value : true,
-- description : 'Enable localization'
--)
--option('stemming',
-+option('enable-stemming',
- type : 'boolean',
- value : true,
- description : 'Use stemming while searching. Requires Snowball (libstemmer)'
- )
--option('vapi',
-+option('enable-vapi',
- type : 'boolean',
- value : false,
- description : 'Create and install a Vala API file'
- )
--option('qt',
-+option('enable-qt',
- type : 'boolean',
- value : false,
- description : 'Build libappstream-qt'
- )
--option('documentation',
-+option('enable-docs',
- type : 'boolean',
- value : false,
-- description : 'Enable target to build documentation'
-+ description : 'Build documentation for API and specification'
-+)
-+option('enable-apidocs',
-+ type : 'boolean',
-+ value : true,
-+ description : 'Build API documentation (automatically enabled when --enable-docs is passed)'
- )
--option('apt-support',
-+option('enable-apt-support',
- type : 'boolean',
- value : false,
- description : 'Enable integration with APT on Debian'
-@@ -32,7 +32,7 @@ option('apt-support',
- #
- # For development
- #
--option('maintainer',
-+option('enable-maintainer',
- type : 'boolean',
- value : false,
- description : 'Enable maintainer mode (use strict compiler flags, e.g. -Werror)'
-diff --git a/src/meson.build b/src/meson.build
-index 5d06042..23129bb 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -88,7 +88,7 @@ aslib_res = glib.compile_resources (
- )
-
- aslib_deps = [glib_dep, xml2_dep, yaml_dep, gobject_dep, gio_unix_dep]
--if get_option ('stemming')
-+if get_option ('enable-stemming')
- aslib_deps += [stemmer_lib]
- endif
-
---
-2.14.1
-