[Pkg-libvirt-commits] [Git][libvirt-team/libosinfo][debian/sid] 4 commits: Cherry-pick patch to allow building against libsoup3

[Jeremy Bicha (@jbicha)]

Jeremy Bicha pushed to branch debian/sid at Libvirt Packaging Team / libosinfo


Commits:
cc1bda6f by Jeremy Bicha at 2022-07-01T13:45:29-04:00
Cherry-pick patch to allow building against libsoup3

- - - - -
ce57ef87 by Jeremy Bicha at 2022-07-01T13:47:02-04:00
Build against libsoup3

- - - - -
b3c378a3 by Jeremy Bicha at 2022-08-02T15:58:03-04:00
Add versioned Breaks against gnome-boxes

- - - - -
89428140 by Jeremy Bicha at 2022-08-02T15:58:17-04:00
releasing package libosinfo version 1.10.0-2

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/build-Add-option-to-select-libsoup-ABI.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libosinfo (1.10.0-2) unstable; urgency=medium
+
+  * [0d5f097] Mark autopkgtests as superficial
+  * [cc1bda6] Cherry-pick patch to allow building against libsoup3
+  * [ce57ef8] Build against libsoup3
+  * [0bcba33] Add versioned Breaks against gnome-boxes
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 02 Aug 2022 15:57:21 -0400
+
 libosinfo (1.10.0-1) unstable; urgency=medium
 
   * Team upload


=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Build-Depends:
  libglib2.0-bin,
  libglib2.0-dev,
  libgirepository1.0-dev,
- libsoup2.4-dev,
+ libsoup-3.0-dev,
  libxml2-dev,
  libxml2-utils,
  libxslt-dev,
@@ -32,6 +32,7 @@ Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, pci.ids, usb.ids,
  libosinfo-l10n (>= ${source:Version}),
  osinfo-db
+Breaks: gnome-boxes (<< 42.3)
 Description: Library for managing information about operating systems and hypervisors
  libosinfo is a GObject based library API for managing information about
  operating systems, hypervisors and the (virtual) hardware devices they


=====================================
debian/patches/build-Add-option-to-select-libsoup-ABI.patch
=====================================
@@ -0,0 +1,55 @@
+From: Matt Turner <mattst88 at gmail.com>
+Date: Tue, 15 Feb 2022 12:22:00 -0800
+Subject: build: Add option to select libsoup ABI
+
+This allows distributions that ship both versions of libsoup and choose
+which version of libsoup will be linked.
+
+Signed-off-by: Matt Turner <mattst88 at gmail.com>
+(cherry picked from commit 3a0fef72b11e2a22cac61a93a5b5b796885ac7e7)
+---
+ meson.build       | 11 ++++++++---
+ meson_options.txt |  7 +++++++
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 39b739e..b4e4587 100644
+--- a/meson.build
++++ b/meson.build
+@@ -71,10 +71,15 @@ gio_dep = dependency('gio-2.0', version: glib_version_info)
+ gobject_dep = dependency('gobject-2.0', version: glib_version_info)
+ 
+ #  everything else
+-libsoup_dep = dependency('libsoup-3.0', required: false)
+-#    fallback to libsoup2
++
++libsoup_abi = get_option('libsoup-abi')
++libsoup_dep = disabler()
++if ['auto', '3.0'].contains(libsoup_abi)
++  libsoup_dep = dependency('libsoup-3.0', required: libsoup_abi.contains('3.0'))
++endif
+ if not libsoup_dep.found()
+-  libsoup_dep = dependency('libsoup-2.4')
++#    fallback to libsoup2
++  libsoup_dep = dependency('libsoup-2.4', required: libsoup_abi.contains('2.4'))
+ endif
+ libxml_dep = dependency('libxml-2.0', version: '>= 2.6.0')
+ libxslt_dep = dependency('libxslt', version: '>= 1.0.0')
+diff --git a/meson_options.txt b/meson_options.txt
+index 13fc358..15a361f 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -24,6 +24,13 @@ option('enable-vala',
+     description: 'Enable Vala bindings'
+ )
+ 
++option('libsoup-abi',
++    type: 'combo',
++    value: 'auto',
++    choices: ['auto', '2.4', '3.0'],
++    description: 'Select libsoup ABI version'
++)
++
+ option('with-pci-ids-path',
+     type: 'string',
+     value: '',


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 Skip-syntax-check.patch
+build-Add-option-to-select-libsoup-ABI.patch


=====================================
debian/rules
=====================================
@@ -12,6 +12,7 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		-Dauto_features=enabled \
 		-Denable-gtk-doc=true \
+		-Dlibsoup-abi='3.0' \
 		-Dwith-usb-ids-path=/usr/share/misc/usb.ids \
 		-Dwith-pci-ids-path=/usr/share/misc/pci.ids \
 		$(NULL)



View it on GitLab: https://salsa.debian.org/libvirt-team/libosinfo/-/compare/0d5f097f7ec9da31ba6bf2b4949297897d71af81...89428140f3b63f76ca1f23f8396e8c3818dca1b6

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libosinfo/-/compare/0d5f097f7ec9da31ba6bf2b4949297897d71af81...89428140f3b63f76ca1f23f8396e8c3818dca1b6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20220802/bc3cfa5e/attachment-0001.htm>