pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libosinfo: Update wip/libosinfo to 1.9.0

Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Tue Dec 7 17:43:55 2021 +0100
Changeset:	fef0508cb4e1c21019a53af178fd9ba6d2a6b4c4

Modified Files:
	libosinfo/Makefile
	libosinfo/PLIST
	libosinfo/distinfo
Added Files:
	libosinfo/patches/patch-osinfo_meson.build
Removed Files:
	libosinfo/patches/patch-configure

Log Message:
libosinfo: Update wip/libosinfo to 1.9.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fef0508cb4e1c21019a53af178fd9ba6d2a6b4c4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libosinfo/Makefile                         |  14 +--
 libosinfo/PLIST                            | 170 +++++++++--------------------
 libosinfo/distinfo                         |   8 +-
 libosinfo/patches/patch-configure          |  19 ----
 libosinfo/patches/patch-osinfo_meson.build |  14 +++
 5 files changed, 77 insertions(+), 148 deletions(-)

diffs:
diff --git a/libosinfo/Makefile b/libosinfo/Makefile
index cf8bce8eeb..916899f9ca 100644
--- a/libosinfo/Makefile
+++ b/libosinfo/Makefile
@@ -1,27 +1,27 @@
 # $NetBSD$
 
-DISTNAME=	libosinfo-1.2.0
+DISTNAME=	libosinfo-1.9.0
 CATEGORIES=	sysutils
 MASTER_SITES=	https://releases.pagure.org/libosinfo/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://libosinfo.org/
 COMMENT=	Library for querying information from the OSInfo database
 LICENSE=	gnu-lgpl-v2
 
-GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config intltool gmake
+USE_TOOLS+=	pkg-config intltool
 
 PKGCONFIG_OVERRIDE+=	osinfo/libosinfo-1.0.pc.in
 
-CHECK_PORTABILITY_SKIP+=	configure
-
 DEPENDS+=		pciids-[0-9]*:../../misc/pciids
-CONFIGURE_ARGS+=	--with-pci-ids-path=${PREFIX}/share/pciids
+MESON_ARGS+=		-Dwith-pci-ids-path=${PREFIX}/share/pciids
 DEPENDS+=		usbids-[0-9]*:../../misc/usbids
-CONFIGURE_ARGS+=	--with-usb-ids-path=${PREFIX}/share/usbids
+MESON_ARGS+=		-Dwith-usb-ids-path=${PREFIX}/share/usbids
 
+.include "../../net/libsoup/buildlink3.mk"
+.include "../../devel/meson/build.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/libosinfo/PLIST b/libosinfo/PLIST
index 13b7baeeef..cbcf3de277 100644
--- a/libosinfo/PLIST
+++ b/libosinfo/PLIST
@@ -19,6 +19,10 @@ include/libosinfo-1.0/osinfo/osinfo_devicelist.h
 include/libosinfo-1.0/osinfo/osinfo_entity.h
 include/libosinfo-1.0/osinfo/osinfo_enum_types.h
 include/libosinfo-1.0/osinfo/osinfo_filter.h
+include/libosinfo-1.0/osinfo/osinfo_firmware.h
+include/libosinfo-1.0/osinfo/osinfo_firmwarelist.h
+include/libosinfo-1.0/osinfo/osinfo_image.h
+include/libosinfo-1.0/osinfo/osinfo_imagelist.h
 include/libosinfo-1.0/osinfo/osinfo_install_config.h
 include/libosinfo-1.0/osinfo/osinfo_install_config_param.h
 include/libosinfo-1.0/osinfo/osinfo_install_config_paramlist.h
@@ -26,6 +30,7 @@ include/libosinfo-1.0/osinfo/osinfo_install_script.h
 include/libosinfo-1.0/osinfo/osinfo_install_scriptlist.h
 include/libosinfo-1.0/osinfo/osinfo_list.h
 include/libosinfo-1.0/osinfo/osinfo_loader.h
+include/libosinfo-1.0/osinfo/osinfo_macros.h
 include/libosinfo-1.0/osinfo/osinfo_media.h
 include/libosinfo-1.0/osinfo/osinfo_medialist.h
 include/libosinfo-1.0/osinfo/osinfo_os.h
@@ -43,52 +48,58 @@ include/libosinfo-1.0/osinfo/osinfo_tree.h
 include/libosinfo-1.0/osinfo/osinfo_treelist.h
 include/libosinfo-1.0/osinfo/osinfo_version.h
 lib/girepository-1.0/Libosinfo-1.0.typelib
-lib/libosinfo-1.0.la
+lib/libosinfo-1.0.so
+lib/libosinfo-1.0.so.0
+lib/libosinfo-1.0.so.0.1009.0
 lib/pkgconfig/libosinfo-1.0.pc
 man/man1/osinfo-detect.1
 man/man1/osinfo-install-script.1
 man/man1/osinfo-query.1
 share/gir-1.0/Libosinfo-1.0.gir
+share/gtk-doc/html/Libosinfo/Libosinfo-OsinfoFilter.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-avatar-format.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-datamap.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-datamaplist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-db.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-deployment.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-deploymentlist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-device-driver.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-device-driverlist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-device.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-devicelink.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-devicelinkfilter.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-devicelinklist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-devicelist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-entity.html
 share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-enum-types.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-firmware.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-firmwarelist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-image.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-imagelist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-install-config-param.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-install-config-paramlist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-install-config.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-install-script.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-install-scriptlist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-list.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-loader.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-media.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-medialist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-os-variant.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-os-variantlist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-os.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-oslist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-platform.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-platformlist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-product.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-productfilter.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-productlist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-resources.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-resourceslist.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-tree.html
+share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-treelist.html
 share/gtk-doc/html/Libosinfo/Libosinfo-osinfo-version.html
 share/gtk-doc/html/Libosinfo/Libosinfo.devhelp2
-share/gtk-doc/html/Libosinfo/OsinfoAvatarFormat.html
-share/gtk-doc/html/Libosinfo/OsinfoDatamap.html
-share/gtk-doc/html/Libosinfo/OsinfoDatamapList.html
-share/gtk-doc/html/Libosinfo/OsinfoDb.html
-share/gtk-doc/html/Libosinfo/OsinfoDeployment.html
-share/gtk-doc/html/Libosinfo/OsinfoDeploymentList.html
-share/gtk-doc/html/Libosinfo/OsinfoDevice.html
-share/gtk-doc/html/Libosinfo/OsinfoDeviceDriver.html
-share/gtk-doc/html/Libosinfo/OsinfoDeviceDriverList.html
-share/gtk-doc/html/Libosinfo/OsinfoDeviceLink.html
-share/gtk-doc/html/Libosinfo/OsinfoDeviceLinkFilter.html
-share/gtk-doc/html/Libosinfo/OsinfoDeviceLinkList.html
-share/gtk-doc/html/Libosinfo/OsinfoDeviceList.html
-share/gtk-doc/html/Libosinfo/OsinfoEntity.html
-share/gtk-doc/html/Libosinfo/OsinfoFilter.html
-share/gtk-doc/html/Libosinfo/OsinfoInstallConfig.html
-share/gtk-doc/html/Libosinfo/OsinfoInstallConfigParam.html
-share/gtk-doc/html/Libosinfo/OsinfoInstallConfigParamList.html
-share/gtk-doc/html/Libosinfo/OsinfoInstallScript.html
-share/gtk-doc/html/Libosinfo/OsinfoInstallScriptList.html
-share/gtk-doc/html/Libosinfo/OsinfoList.html
-share/gtk-doc/html/Libosinfo/OsinfoLoader.html
-share/gtk-doc/html/Libosinfo/OsinfoMedia.html
-share/gtk-doc/html/Libosinfo/OsinfoMediaList.html
-share/gtk-doc/html/Libosinfo/OsinfoOs.html
-share/gtk-doc/html/Libosinfo/OsinfoOsList.html
-share/gtk-doc/html/Libosinfo/OsinfoOsVariant.html
-share/gtk-doc/html/Libosinfo/OsinfoOsVariantList.html
-share/gtk-doc/html/Libosinfo/OsinfoPlatform.html
-share/gtk-doc/html/Libosinfo/OsinfoPlatformList.html
-share/gtk-doc/html/Libosinfo/OsinfoProduct.html
-share/gtk-doc/html/Libosinfo/OsinfoProductFilter.html
-share/gtk-doc/html/Libosinfo/OsinfoProductList.html
-share/gtk-doc/html/Libosinfo/OsinfoResources.html
-share/gtk-doc/html/Libosinfo/OsinfoResourcesList.html
-share/gtk-doc/html/Libosinfo/OsinfoTree.html
-share/gtk-doc/html/Libosinfo/OsinfoTreeList.html
 share/gtk-doc/html/Libosinfo/annotation-glossary.html
 share/gtk-doc/html/Libosinfo/api-index-full.html
 share/gtk-doc/html/Libosinfo/ch01.html
@@ -103,99 +114,22 @@ share/gtk-doc/html/Libosinfo/right.png
 share/gtk-doc/html/Libosinfo/style.css
 share/gtk-doc/html/Libosinfo/up-insensitive.png
 share/gtk-doc/html/Libosinfo/up.png
-share/locale/af/LC_MESSAGES/libosinfo.mo
-share/locale/am/LC_MESSAGES/libosinfo.mo
-share/locale/anp/LC_MESSAGES/libosinfo.mo
-share/locale/ar/LC_MESSAGES/libosinfo.mo
-share/locale/as/LC_MESSAGES/libosinfo.mo
-share/locale/ast/LC_MESSAGES/libosinfo.mo
-share/locale/bal/LC_MESSAGES/libosinfo.mo
-share/locale/be/LC_MESSAGES/libosinfo.mo
-share/locale/bg/LC_MESSAGES/libosinfo.mo
-share/locale/bn/LC_MESSAGES/libosinfo.mo
-share/locale/bn_IN/LC_MESSAGES/libosinfo.mo
-share/locale/bo/LC_MESSAGES/libosinfo.mo
-share/locale/br/LC_MESSAGES/libosinfo.mo
-share/locale/brx/LC_MESSAGES/libosinfo.mo
-share/locale/bs/LC_MESSAGES/libosinfo.mo
 share/locale/ca/LC_MESSAGES/libosinfo.mo
 share/locale/cs/LC_MESSAGES/libosinfo.mo
-share/locale/cy/LC_MESSAGES/libosinfo.mo
-share/locale/da/LC_MESSAGES/libosinfo.mo
 share/locale/de/LC_MESSAGES/libosinfo.mo
-share/locale/de_CH/LC_MESSAGES/libosinfo.mo
-share/locale/el/LC_MESSAGES/libosinfo.mo
-share/locale/en_GB/LC_MESSAGES/libosinfo.mo
-share/locale/eo/LC_MESSAGES/libosinfo.mo
 share/locale/es/LC_MESSAGES/libosinfo.mo
-share/locale/et/LC_MESSAGES/libosinfo.mo
 share/locale/eu/LC_MESSAGES/libosinfo.mo
-share/locale/fa/LC_MESSAGES/libosinfo.mo
 share/locale/fi/LC_MESSAGES/libosinfo.mo
 share/locale/fr/LC_MESSAGES/libosinfo.mo
-share/locale/gl/LC_MESSAGES/libosinfo.mo
-share/locale/gu/LC_MESSAGES/libosinfo.mo
-share/locale/he/LC_MESSAGES/libosinfo.mo
-share/locale/hi/LC_MESSAGES/libosinfo.mo
-share/locale/hr/LC_MESSAGES/libosinfo.mo
-share/locale/hu/LC_MESSAGES/libosinfo.mo
-share/locale/ia/LC_MESSAGES/libosinfo.mo
+share/locale/fur/LC_MESSAGES/libosinfo.mo
 share/locale/id/LC_MESSAGES/libosinfo.mo
-share/locale/ilo/LC_MESSAGES/libosinfo.mo
-share/locale/is/LC_MESSAGES/libosinfo.mo
 share/locale/it/LC_MESSAGES/libosinfo.mo
 share/locale/ja/LC_MESSAGES/libosinfo.mo
-share/locale/ka/LC_MESSAGES/libosinfo.mo
-share/locale/kk/LC_MESSAGES/libosinfo.mo
-share/locale/km/LC_MESSAGES/libosinfo.mo
-share/locale/kn/LC_MESSAGES/libosinfo.mo
-share/locale/ko/LC_MESSAGES/libosinfo.mo
-share/locale/kw/LC_MESSAGES/libosinfo.mo
-share/locale/kw@kkcor/LC_MESSAGES/libosinfo.mo
-share/locale/kw@uccor/LC_MESSAGES/libosinfo.mo
-share/locale/kw_GB/LC_MESSAGES/libosinfo.mo
-share/locale/ky/LC_MESSAGES/libosinfo.mo
-share/locale/lt/LC_MESSAGES/libosinfo.mo
-share/locale/lv/LC_MESSAGES/libosinfo.mo
-share/locale/mai/LC_MESSAGES/libosinfo.mo
-share/locale/mk/LC_MESSAGES/libosinfo.mo
-share/locale/ml/LC_MESSAGES/libosinfo.mo
-share/locale/mn/LC_MESSAGES/libosinfo.mo
-share/locale/mr/LC_MESSAGES/libosinfo.mo
-share/locale/ms/LC_MESSAGES/libosinfo.mo
-share/locale/nb/LC_MESSAGES/libosinfo.mo
-share/locale/nds/LC_MESSAGES/libosinfo.mo
-share/locale/ne/LC_MESSAGES/libosinfo.mo
-share/locale/nl/LC_MESSAGES/libosinfo.mo
-share/locale/nn/LC_MESSAGES/libosinfo.mo
-share/locale/nso/LC_MESSAGES/libosinfo.mo
-share/locale/or/LC_MESSAGES/libosinfo.mo
-share/locale/pa/LC_MESSAGES/libosinfo.mo
 share/locale/pl/LC_MESSAGES/libosinfo.mo
-share/locale/pt/LC_MESSAGES/libosinfo.mo
 share/locale/pt_BR/LC_MESSAGES/libosinfo.mo
-share/locale/ro/LC_MESSAGES/libosinfo.mo
+share/locale/pt_PT/LC_MESSAGES/libosinfo.mo
 share/locale/ru/LC_MESSAGES/libosinfo.mo
-share/locale/si/LC_MESSAGES/libosinfo.mo
-share/locale/sk/LC_MESSAGES/libosinfo.mo
-share/locale/sl/LC_MESSAGES/libosinfo.mo
-share/locale/sq/LC_MESSAGES/libosinfo.mo
-share/locale/sr/LC_MESSAGES/libosinfo.mo
-share/locale/sr@latin/LC_MESSAGES/libosinfo.mo
-share/locale/sv/LC_MESSAGES/libosinfo.mo
-share/locale/ta/LC_MESSAGES/libosinfo.mo
-share/locale/te/LC_MESSAGES/libosinfo.mo
-share/locale/tg/LC_MESSAGES/libosinfo.mo
-share/locale/th/LC_MESSAGES/libosinfo.mo
 share/locale/tr/LC_MESSAGES/libosinfo.mo
-share/locale/tw/LC_MESSAGES/libosinfo.mo
 share/locale/uk/LC_MESSAGES/libosinfo.mo
-share/locale/ur/LC_MESSAGES/libosinfo.mo
-share/locale/vi/LC_MESSAGES/libosinfo.mo
-share/locale/wba/LC_MESSAGES/libosinfo.mo
-share/locale/yo/LC_MESSAGES/libosinfo.mo
-share/locale/zh_CN/LC_MESSAGES/libosinfo.mo
-share/locale/zh_HK/LC_MESSAGES/libosinfo.mo
-share/locale/zh_TW/LC_MESSAGES/libosinfo.mo
-share/locale/zu/LC_MESSAGES/libosinfo.mo
+share/vala/vapi/libosinfo-1.0.deps
 share/vala/vapi/libosinfo-1.0.vapi
diff --git a/libosinfo/distinfo b/libosinfo/distinfo
index f501763f27..b7188935f2 100644
--- a/libosinfo/distinfo
+++ b/libosinfo/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-RMD160 (libosinfo-1.2.0.tar.gz) = b342a28b7c5c328d73872d9af4abe5eaf63fea5d
-SHA512 (libosinfo-1.2.0.tar.gz) = d98a107a08c5e2cddd746631b3ceac4278184ea5561ad2372d772b8ae253dc1363f217778d105387e5b5c5e86be9607668aa94929ad9b4ee48ab7abf50fb6a01
-Size (libosinfo-1.2.0.tar.gz) = 916787 bytes
-SHA1 (patch-configure) = b2ff8f6934e7275ad08947c8869eaafdbbd05f25
+BLAKE2s (libosinfo-1.9.0.tar.xz) = 649240c4d2ee7292ce8690dca9b57d478d405387cf1e82955af7674dc45a1329
+SHA512 (libosinfo-1.9.0.tar.xz) = 2e62e69f4353eb935734f091caa4cc4e3dce74020a93b684807470f068da73e8ecb7f4af0623b6d3053ecff3a34c6709a783dec3d25a56dc69f0e7ff9041cf26
+Size (libosinfo-1.9.0.tar.xz) = 279376 bytes
+SHA1 (patch-osinfo_meson.build) = 160f7ab85854caf7d6dc14b218f88643d007a822
diff --git a/libosinfo/patches/patch-configure b/libosinfo/patches/patch-configure
deleted file mode 100644
index cd02ffa399..0000000000
--- a/libosinfo/patches/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- configure.orig	2018-06-20 09:40:38.000000000 +0000
-+++ configure
-@@ -15346,12 +15346,12 @@ fi
- 
- 
-                 if test "x$VAPIGEN" != "xno"; then
--                        if test "x$enable_vala" == "xcheck" ; then
-+                        if test "x$enable_vala" = "xcheck" ; then
-                                 enable_vala=yes
-                         fi
- 
-                 else
--                        if test "x$enable_vala" == "xyes" ; then
-+                        if test "x$enable_vala" = "xyes" ; then
-                                 as_fn_error $? "Cannot find the \"vapigen\" binary in your PATH" "$LINENO" 5
-                         fi
-                 fi
diff --git a/libosinfo/patches/patch-osinfo_meson.build b/libosinfo/patches/patch-osinfo_meson.build
new file mode 100644
index 0000000000..da8e5f6fc9
--- /dev/null
+++ b/libosinfo/patches/patch-osinfo_meson.build
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix girdir on Linux
+
+--- osinfo/meson.build.orig	2021-02-03 08:20:16.601757000 +0000
++++ osinfo/meson.build
+@@ -224,6 +224,7 @@ if host_machine.system() != 'windows'
+                     'libxml-2.0',
+                 ],
+                 sources: libosinfo_gir[0],
++                gir_dirs: libosinfo_girdir
+             )
+         endif
+     endif
Home | Main Index | Thread Index | Old Index