[gnome-software/wip/hughsie/libxmlb: 1/2] trivial: Allow using libxmlb as a subproject



commit 3b369aa7310af85e5933a1eb13eb7715f09422cd
Author: Richard Hughes <richard hughsie com>
Date:   Thu Oct 18 16:56:20 2018 +0100

    trivial: Allow using libxmlb as a subproject
    
    This might make it easier for people trying out gnome-software.

 .gitlab-ci.yml           | 3 +--
 meson.build              | 2 +-
 subprojects/libxmlb.wrap | 4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3d95554..82581436 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,9 +5,8 @@ stages:
 
 before_script:
   # Update and use base build deps
-  - dnf update -y && dnf -y install dnf-plugins-core @buildsys-build
+  - dnf update -y && dnf -y install git gobject-introspection-devel dnf-plugins-core @buildsys-build
   - dnf install -y 
https://people.freedesktop.org/~hughsient/temp/libappstream-glib-0.7.14-0.641.20181015git.fc29.x86_64.rpm 
https://people.freedesktop.org/~hughsient/temp/libappstream-glib-devel-0.7.14-0.641.20181015git.fc29.x86_64.rpm
-  - dnf install -y 
https://people.freedesktop.org/~hughsient/temp/libxmlb-0.1.2-0.49.20181016git.fc29.x86_64.rpm 
https://people.freedesktop.org/~hughsient/temp/libxmlb-devel-0.1.2-0.49.20181016git.fc29.x86_64.rpm
   - dnf --enablerepo updates-testing -y builddep gnome-software
   # Some deps may not be sync'd
   - dnf -y install rpm-ostree-devel
diff --git a/meson.build b/meson.build
index 567d4a70..dd6f1a33 100644
--- a/meson.build
+++ b/meson.build
@@ -98,7 +98,7 @@ conf.set('HAVE_LINUX_UNISTD_H', cc.has_header('linux/unistd.h'))
 
 appstream_glib = dependency('appstream-glib', version : '>= 0.7.14')
 gdk_pixbuf = dependency('gdk-pixbuf-2.0', version : '>= 2.32.0')
-libxmlb = dependency('xmlb', version : '>= 0.1.2')
+libxmlb = dependency('xmlb', version : '>= 0.1.2', fallback : ['libxmlb', 'libxmlb_dep'])
 gio_unix = dependency('gio-unix-2.0', version : '>= 2.56.0')
 gmodule = dependency('gmodule-2.0')
 gtk = dependency('gtk+-3.0', version : '>= 3.22.4')
diff --git a/subprojects/libxmlb.wrap b/subprojects/libxmlb.wrap
new file mode 100644
index 00000000..ea04cf53
--- /dev/null
+++ b/subprojects/libxmlb.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory = libxmlb
+url = https://github.com/hughsie/libxmlb.git
+revision = master


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]