From 16bd6be4495fe440bec2ee04a08751775d8d2035 Mon Sep 17 00:00:00 2001 From: Rafael Bento Date: Jan 07 2024 15:51:26 +0000 Subject: [libosinfo]: update to 1.11.0 --- diff --git a/libre/libosinfo/0001-media-Fix-usage-of-application-id.patch b/libre/libosinfo/0001-media-Fix-usage-of-application-id.patch deleted file mode 100644 index 003d9a8..0000000 --- a/libre/libosinfo/0001-media-Fix-usage-of-application-id.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2626058a7921749387f8d3107241af7507f48c65 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= -Date: Mon, 1 Apr 2019 22:40:48 +0200 -Subject: [PATCH] media: Fix usage of application id -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Christophe Fergeau pointed this issue out during the review of 6d789033e -and, even though, the bogus code ended up merged (sorry, mea culpa -here!). - -Signed-off-by: Fabiano Fidêncio -Reviewed-by: Cole Robinson ---- - osinfo/osinfo_media.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c -index b16fcf6..4f86c2b 100644 ---- a/osinfo/osinfo_media.c -+++ b/osinfo/osinfo_media.c -@@ -830,10 +830,10 @@ create_from_location_async_data(CreateFromLocationAsyncData *data) - osinfo_entity_set_param(OSINFO_ENTITY(media), - OSINFO_MEDIA_PROP_PUBLISHER_ID, - data->publisher); -- if (!is_str_empty(data->pvd.application)) -+ if (!is_str_empty(data->application)) - osinfo_entity_set_param(OSINFO_ENTITY(media), - OSINFO_MEDIA_PROP_APPLICATION_ID, -- data->pvd.application); -+ data->application); - - index = (G_BYTE_ORDER == G_LITTLE_ENDIAN) ? 0 : 1; - vol_size = ((gint64) data->pvd.volume_space_size[index]) * --- -2.20.1 - diff --git a/libre/libosinfo/0002-loader-Properly-load-the-arch-value-for-images.patch b/libre/libosinfo/0002-loader-Properly-load-the-arch-value-for-images.patch deleted file mode 100644 index 50611e8..0000000 --- a/libre/libosinfo/0002-loader-Properly-load-the-arch-value-for-images.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1940739805409af9e39c61dbfe238e6c9b1519b6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= -Date: Wed, 10 Apr 2019 13:45:14 +0200 -Subject: [PATCH] loader: Properly load the arch value for images -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -osinfo_loader_image() has been considering the XML tag for the -images' architecture was "architecture", while it actually is "arch". - -By trying to read the wrong tag, no arch was loaded, causing then any -image load to fail with: -CRITICAL **: 13:30:06.539: osinfo_entity_set_param: assertion 'value != NULL' failed - -Signed-off-by: Fabiano Fidêncio ---- - osinfo/osinfo_loader.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c -index e30148b..84c25e5 100644 ---- a/osinfo/osinfo_loader.c -+++ b/osinfo/osinfo_loader.c -@@ -1312,8 +1312,7 @@ static OsinfoImage *osinfo_loader_image(OsinfoLoader *loader, - { NULL, G_TYPE_INVALID } - }; - -- gchar *arch = (gchar *)xmlGetProp(root, -- BAD_CAST OSINFO_IMAGE_PROP_ARCHITECTURE); -+ gchar *arch = (gchar *)xmlGetProp(root, BAD_CAST "arch"); - gchar *format = (gchar *)xmlGetProp(root, - BAD_CAST OSINFO_IMAGE_PROP_FORMAT); - gchar *cloud_init = (gchar *)xmlGetProp(root, --- -2.20.1 - diff --git a/libre/libosinfo/PKGBUILD b/libre/libosinfo/PKGBUILD index 39b66a9..9d50068 100644 --- a/libre/libosinfo/PKGBUILD +++ b/libre/libosinfo/PKGBUILD @@ -3,50 +3,41 @@ # Contributor: André Silva # Maintainer: Omar Vega Ramos # Contributor: Daniel Milewski +# Contributor: Rafael Bento _pkgname=libosinfo-libre pkgname=libosinfo -pkgver=1.4.0 -pkgrel=2 -pkgrel+=.par1 +pkgver=1.11.0 +pkgrel=1 +pkgrel+=.parabola1 pkgdesc="GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support" pkgdesc+=", without non-FSDG compliant distros and operating systems support" arch=('x86_64') arch+=('i686' 'armv7h') url="https://libosinfo.org/" license=('GPL' 'LGPL') -depends=('glib2' 'libxslt' 'osinfo-db') -makedepends=('check' 'gobject-introspection' 'intltool' 'libsoup' 'vala' 'gtk-doc') +depends=('gcc-libs' 'glib2' 'glibc' 'hwdata' 'libsoup3' 'libxml2' 'libxslt' 'osinfo-db') +makedepends=('gobject-introspection' 'intltool' 'meson' 'vala') conflicts=(${pkgname}-libre) replaces=(${pkgname}-libre) -mksource=(https://releases.pagure.org/libosinfo/$pkgname-$pkgver.tar.gz{,.asc}) -source=(https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-$pkgver.tar.gz - 0001-media-Fix-usage-of-application-id.patch - 0002-loader-Properly-load-the-arch-value-for-images.patch +mksource=(https://releases.pagure.org/libosinfo/$pkgname-$pkgver.tar.xz{,.asc}) +source=(https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-$pkgver.tar.xz libre.patch) validpgpkeys=('DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF' # Daniel P. Berrange - '09B9C8FF223EF113AFA06A39EE926C2BDACC177B') # Fabiano Fidêncio -mksha256sums=('a29e61a82b1a5727b145403914812273dfa033a0c07a15500078726bb3b84165' - 'SKIP') -sha256sums=('27efec42a2a2e3ae8b1f6ffcc541aded8b90c06cfbe778b8948f7c0896409eda' - '439e2cf620560cb116d0c08201282c0e152b46b2ab1fa4abcd7e717a2d45dec7' - '80c7583882a935658b9f9409cf5beeb36f46c873bb9041bcc858aca4e2fa7741' - '896216d2f132ff772b3c0cd9e18aa6c45aca2365767fc0c3aa98e8d3a21ca063') + '09B9C8FF223EF113AFA06A39EE926C2BDACC177B' # Fabiano Fidêncio + '206D3B352F566F3B0E6572E997D9123DE37A484F') # Victor Toso de Carvalho +mksha256sums=('1bf96eec9e1460f3d1a713163cca1ff0d480a3490b50899292f14548b3a96b60' + '06d1e30d6be7dd945b71cb50d72a014392d2246663b34ff852f107a4382b7dd3') +sha256sums=('SKIP' + 'c6187d6d74542d58c3faea99d7f39f76fc2d33988b3b7789ea55f342b8b49f91') mksource() { cd $pkgname-$pkgver - rm -rv {docs,tests/isodata/*} + rm -rv docs } prepare() { - cd $pkgname-$pkgver - sed -i '/export LC_ALL = C/d' maint.mk - - # Upsteam fixes - patch -Np1 -i ../0001-media-Fix-usage-of-application-id.patch - patch -Np1 -i ../0002-loader-Properly-load-the-arch-value-for-images.patch - -# rm -rv {docs,tests/isodata/*} + cd "${srcdir}"/${pkgname}-${pkgver} patch -Np1 -i ../libre.patch @@ -58,20 +49,19 @@ prepare() { } build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-usb-ids-path=/usr/share/hwdata/usb.ids \ - --with-pci-ids-path=/usr/share/hwdata/pci.ids \ - --enable-gtk-doc - make + local meson_options=( + -D with-usb-ids-path=/usr/share/hwdata/usb.ids + -D with-pci-ids-path=/usr/share/hwdata/pci.ids + ) + + arch-meson $pkgname-$pkgver build "${meson_options[@]}" + meson compile -C build } check() { - cd $pkgname-$pkgver - make check || : + meson test -C build --print-errorlogs } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + meson install -C build --destdir "$pkgdir" } diff --git a/libre/libosinfo/libre.patch b/libre/libosinfo/libre.patch index 10d9cf6..dd26d01 100644 --- a/libre/libosinfo/libre.patch +++ b/libre/libosinfo/libre.patch @@ -1,156 +1,17 @@ ---- libosinfo-1.2.0.orig/Makefile.am 2018-07-09 09:11:01.000000000 -0500 -+++ libosinfo-1.2.0/Makefile.am 2018-07-09 09:33:13.160987738 -0500 -@@ -1,5 +1,5 @@ - --SUBDIRS = osinfo tools docs po examples -+SUBDIRS = osinfo tools po examples - - if ENABLE_TESTS - SUBDIRS += tests ---- libosinfo-1.2.0.orig/Makefile.in 2018-07-09 09:11:01.000000000 -0500 -+++ libosinfo-1.2.0/Makefile.in 2018-07-09 09:33:39.303117264 -0500 -@@ -197,7 +197,7 @@ - ETAGS = etags - CTAGS = ctags - CSCOPE = cscope --DIST_SUBDIRS = osinfo tools docs po examples tests -+DIST_SUBDIRS = osinfo tools po examples tests - am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/libosinfo.spec.in $(srcdir)/mingw-libosinfo.spec.in \ - $(top_srcdir)/build-aux/compile \ ---- libosinfo-1.2.0.orig/configure 2018-07-09 09:11:01.000000000 -0500 -+++ libosinfo-1.2.0/configure 2018-07-09 09:42:21.595733119 -0500 -@@ -15499,7 +15499,7 @@ - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - - --ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h tools/Makefile tests/Makefile docs/Makefile docs/reference/Makefile examples/Makefile po/Makefile.in" -+ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h tools/Makefile tests/Makefile examples/Makefile po/Makefile.in" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -16596,8 +16596,6 @@ - "osinfo/osinfo_version.h") CONFIG_FILES="$CONFIG_FILES osinfo/osinfo_version.h" ;; - "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; - "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; -- "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; -- "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; - "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; - "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; ---- libosinfo-1.2.0.orig/configure.ac 2018-07-09 09:11:01.000000000 -0500 -+++ libosinfo-1.2.0/configure.ac 2018-07-09 09:42:41.148166092 -0500 -@@ -287,8 +287,6 @@ - osinfo/osinfo_version.h - tools/Makefile - tests/Makefile -- docs/Makefile -- docs/reference/Makefile - examples/Makefile - po/Makefile.in - ]) ---- libosinfo-1.2.0.orig/examples/demo.js 2018-07-09 09:11:01.000000000 -0500 -+++ libosinfo-1.2.0/examples/demo.js 2018-07-09 09:43:13.993320287 -0500 -@@ -32,7 +32,7 @@ - print (" OS short id " + name) - } - --var osid = "http://fedoraproject.org/fedora-11" -+var osid = "https://wiki.parabola.nu/Get_Parabola" - var hvid = "http://qemu.org/qemu-kvm-0.11.0" - var drvclass = "net" - //var drvclass = "audio" ---- libosinfo-1.2.0.orig/examples/libosinfo-dummy-data.xml 2018-07-09 09:11:01.000000000 -0500 -+++ libosinfo-1.2.0/examples/libosinfo-dummy-data.xml 2018-07-09 09:59:11.689219791 -0500 -@@ -64,87 +64,11 @@ - - - -- -- -- fedora11 -- Fedora 11 -- 11 -- Fedora Project -- apples -- marmot -- aardvark -- -- -- -- -- es1391 -- -- -- ac97+ -- -- -- -- -- -- fedora10 -- Fedora 10 -- 10 -- Fedora Project -- -- -- -- -- ac97 -- -- -- es1391 -- -- -- -- -- -- opensuse11.2 -- OpenSuse 11.2 -- 11.2 -- OpenSuse Project -+ -+ parabola -+ Parabola GNU/Linux-libre -+ Parabola Project - - -- -- -- -- -- -- -- ac97 -- -- -- ES1370 -- -- -- 3com -- -- -- -- -- -- -- -- -- -- -- es1370 -- -- -- ac97 -- -- -- es1371 -- -- -- 3com -- -- -- -- - - +diff --unified --recursive --text package.orig/meson.build package.new/meson.build +--- package.orig/meson.build 2023-12-28 09:48:55.000000000 -0300 ++++ package.new/meson.build 2023-12-29 04:41:19.637662099 -0300 +@@ -360,13 +360,6 @@ + subdir('osinfo') + subdir('tools') + subdir('po') +-if get_option('enable-gtk-doc') and not meson.is_cross_build() +- if find_program('gtkdoc-scan', required: true).found() +- subdir('docs/reference') +- else +- message('Not building documentation as gtk-doc was not found') +- endif +-endif + if get_option('enable-tests') + subdir('tests') + endif