- Update to version 1.11.0 (jsc#PED-2104)

Changes in this release include:
  * Several minor memory leak fixes
  * Several CI improvements
  * Several translations improvements
- Drop 3a0fef72.patch as it is now part of the tarball

OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=109
This commit is contained in:
Charles Arnold 2023-11-13 21:37:42 +00:00 committed by Git OBS Bridge
parent c6b7db02ce
commit 6bedadac07
5 changed files with 15 additions and 66 deletions

View File

@ -1,58 +0,0 @@
From 3a0fef72b11e2a22cac61a93a5b5b796885ac7e7 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Tue, 15 Feb 2022 12:22:00 -0800
Subject: [PATCH] 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@gmail.com>
---
meson.build | 11 ++++++++---
meson_options.txt | 7 +++++++
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index a6644025..037e4f33 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 13fc3583..15a361fd 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: '',
--
GitLab

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a252e00fc580deb21da0da8c0aa03b8c31e8440b8448c8b98143fab477d32305
size 293804

BIN
libosinfo-1.11.0.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Nov 13 13:47:19 MST 2023 - carnold@suse.com
- Update to version 1.11.0 (jsc#PED-2104)
Changes in this release include:
* Several minor memory leak fixes
* Several CI improvements
* Several translations improvements
- Drop 3a0fef72.patch as it is now part of the tarball
-------------------------------------------------------------------
Tue Oct 4 14:00:46 MDT 2022 - carnold@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package libosinfo
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2011 Dominique Leuenberger, Amsterdam, The Netherlands.
#
# All modifications and additions to the file contributed by third parties
@ -20,16 +20,13 @@
%define with_lang 1
Name: libosinfo
Version: 1.10.0
Version: 1.11.0
Release: 0
Summary: Operating system and hypervisor information management library
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Development/Libraries/C and C++
URL: https://releases.pagure.org/libosinfo
Source0: %{url}/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM 3a0fef72.patch -- build: Add option to select libsoup ABI
Patch0: https://gitlab.com/libosinfo/libosinfo/-/commit/3a0fef72.patch
BuildRequires: gtk-doc
BuildRequires: hwdata
BuildRequires: libcurl-devel