summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2019-02-06 11:07:16 +0000
committerRichard Hughes <richard@hughsie.com>2019-02-06 12:32:36 +0000
commitef905c24f8a0944a8b77dfc64ba30c351ae55ebe (patch)
tree86cad2c5c3880e56405568506ed58a86b965c627
parent2d8182a2d3213e67be087d60002bb36826f38e4c (diff)
downloadappstream-glib-ef905c24f8a0944a8b77dfc64ba30c351ae55ebe.tar.gz
Do not install the libappstream-builder shared library
Nothing uses it, and it's not API or ABI stable.
-rw-r--r--contrib/libappstream-glib.spec.in10
-rw-r--r--libappstream-builder/meson.build63
-rw-r--r--libappstream-builder/plugins/meson.build7
3 files changed, 2 insertions, 78 deletions
diff --git a/contrib/libappstream-glib.spec.in b/contrib/libappstream-glib.spec.in
index 7ba5ec3..a152064 100644
--- a/contrib/libappstream-glib.spec.in
+++ b/contrib/libappstream-glib.spec.in
@@ -60,6 +60,7 @@ representation.
%package devel
Summary: GLib Libraries and headers for appstream-glib
Requires: %{name}%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-builder-devel < 0.7.14-2
%description devel
GLib headers and libraries for appstream-glib.
@@ -136,17 +137,8 @@ GLib headers and libraries for appstream-builder.
%{_libdir}/asb-plugins-%{as_plugin_version}/libasb_plugin_hardcoded.so
%{_libdir}/asb-plugins-%{as_plugin_version}/libasb_plugin_icon.so
%{_libdir}/asb-plugins-%{as_plugin_version}/libasb_plugin_shell_extension.so
-%{_libdir}/libappstream-builder.so.8*
%{_mandir}/man1/appstream-builder.1.gz
-%files builder-devel
-%license COPYING
-%{_libdir}/libappstream-builder.so
-%{_libdir}/pkgconfig/appstream-builder.pc
-%dir %{_includedir}/libappstream-builder
-%{_includedir}/libappstream-builder/*.h
-%{_datadir}/gir-1.0/AppStreamBuilder-1.0.gir
-
%changelog
* #LONGDATE# Richard Hughes <richard@hughsie.com> #VERSION#-0.#BUILD##ALPHATAG#
- Update from git
diff --git a/libappstream-builder/meson.build b/libappstream-builder/meson.build
index fe74cf3..79e8a74 100644
--- a/libappstream-builder/meson.build
+++ b/libappstream-builder/meson.build
@@ -25,13 +25,6 @@ if get_option('alpm')
deps = deps + [alpm]
endif
-headers = [
- 'appstream-builder.h',
- 'asb-app.h',
-]
-
-install_headers(headers, subdir : 'libappstream-builder')
-
sources = [
'asb-app.c',
'asb-context.c',
@@ -54,41 +47,20 @@ endif
top_build_incdir = include_directories('..')
-mapfile = 'appstream-builder.map'
-vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)
-asbuilder = shared_library(
+asbuilder = static_library(
'appstream-builder', sources,
- soversion : lt_current,
- version : lt_version,
dependencies : deps,
c_args : asbuilder_cargs,
include_directories : [
top_build_incdir,
asglib_incdir,
],
- link_args : vflag,
- link_depends : mapfile,
link_with : asglib,
- install : true,
)
asbuilder_incdir = include_directories('.')
subdir('plugins')
-pkgg.generate(
- version : as_version,
- libraries : asbuilder,
- requires : [
- 'glib-2.0',
- 'gobject-2.0',
- 'gdk-pixbuf-2.0',
- ],
- name : 'appstream-builder',
- description : 'Objects and helper methods to help reading and writing AppStream metadata',
- filebase : 'appstream-builder',
- subdirs : 'libappstream-builder'
-)
-
asb_self_test = executable(
'asb-self-test',
'asb-self-test.c',
@@ -108,36 +80,3 @@ asb_self_test = executable(
],
)
test('asb-self-test', asb_self_test)
-
-asbuilder_introspection_srcs = [
- 'asb-app.c',
- 'asb-app.h',
- 'asb-context.c',
- 'asb-context.h',
- 'asb-context-private.h',
- 'asb-package.c',
- 'asb-package.h',
- 'asb-task.c',
- 'asb-task.h',
-]
-
-if get_option('introspection')
- asglib_gir_dep = declare_dependency(sources: asglib_gir)
-
- gnome.generate_gir(asbuilder,
- sources : asbuilder_introspection_srcs,
- nsversion : '1.0',
- namespace : 'AppStreamBuilder',
- symbol_prefix : 'asb_',
- identifier_prefix : 'Asb',
- export_packages : 'appstream-builder',
- dependencies: asglib_gir_dep,
- includes : [
- 'AppStreamGlib-1.0',
- 'GdkPixbuf-2.0',
- 'Gio-2.0',
- 'GObject-2.0',
- ],
- install : true
- )
-endif
diff --git a/libappstream-builder/plugins/meson.build b/libappstream-builder/plugins/meson.build
index e7d6b3c..3f9ad4e 100644
--- a/libappstream-builder/plugins/meson.build
+++ b/libappstream-builder/plugins/meson.build
@@ -11,7 +11,6 @@ shared_module(
dependencies : [
gdkpixbuf,
],
- link_with : [asbuilder, asglib],
c_args : asb_plugins_cargs,
install : true,
install_dir : plugindir,
@@ -28,7 +27,6 @@ shared_module(
dependencies : [
gdkpixbuf,
],
- link_with : [asbuilder, asglib],
c_args : asb_plugins_cargs,
install : true,
install_dir : plugindir,
@@ -45,7 +43,6 @@ shared_module(
dependencies : [
gdkpixbuf,
],
- link_with : [asbuilder, asglib],
c_args : asb_plugins_cargs,
install : true,
install_dir : plugindir,
@@ -62,7 +59,6 @@ shared_module(
dependencies : [
gdkpixbuf,
],
- link_with : [asbuilder, asglib],
c_args : asb_plugins_cargs,
install : true,
install_dir : plugindir,
@@ -79,7 +75,6 @@ shared_module(
dependencies : [
gdkpixbuf,
],
- link_with : [asbuilder, asglib],
c_args : asb_plugins_cargs,
install : true,
install_dir : plugindir,
@@ -97,7 +92,6 @@ shared_module(
gdkpixbuf,
json_glib,
],
- link_with : [asbuilder, asglib],
c_args : asb_plugins_cargs,
install : true,
install_dir : plugindir,
@@ -118,7 +112,6 @@ if get_option('fonts')
freetype,
fontconfig,
],
- link_with : [asbuilder, asglib],
c_args : asb_plugins_cargs,
install : true,
install_dir : plugindir,