diff --git a/misc/osinfo/libosinfo/Makefile b/misc/osinfo/libosinfo/Makefile index 28440cf485e..b5f6cb35b3c 100644 --- a/misc/osinfo/libosinfo/Makefile +++ b/misc/osinfo/libosinfo/Makefile @@ -1,14 +1,12 @@ -# $OpenBSD: Makefile,v 1.9 2019/08/04 09:01:55 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.10 2020/05/31 10:36:47 ajacoutot Exp $ COMMENT= library for managing information about operating systems DISTNAME= libosinfo-${V} -SHARED_LIBS += osinfo-1.0 1.4 # 1006.0 +SHARED_LIBS += osinfo-1.0 1.5 # 0.1008.0 -WANTLIB += c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 iconv -WANTLIB += idn2 intl lzma m pcre pthread soup-2.4 unistring xml2 -WANTLIB += xslt z +WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl soup-2.4 xml2 xslt MODULES= x11/gnome @@ -27,9 +25,7 @@ RUN_DEPENDS= misc/hwdata \ TEST_DEPENDS= misc/osinfo/osinfo-db -CONFIGURE_ARGS= --with-usb-ids-path=${LOCALBASE}/share/hwdata/usb.ids \ - --with-pci-ids-path=${LOCALBASE}/share/hwdata/pnp.ids - -MAKE_FLAGS= NO_UNDEFINED_FLAGS= +CONFIGURE_ARGS= -Dwith-pci-ids-path=${LOCALBASE}/share/hwdata/pnp.ids \ + -Dwith-usb-ids-path=${LOCALBASE}/share/hwdata/usb.ids .include diff --git a/misc/osinfo/libosinfo/distinfo b/misc/osinfo/libosinfo/distinfo index e35fc84fecb..c5effe4bfc4 100644 --- a/misc/osinfo/libosinfo/distinfo +++ b/misc/osinfo/libosinfo/distinfo @@ -1,2 +1,2 @@ -SHA256 (libosinfo-1.6.0.tar.gz) = PDhcHM60YwH9x5EV57KOPfeqJvr84KeHpgEyqGoZkMc= -SIZE (libosinfo-1.6.0.tar.gz) = 1024787 +SHA256 (libosinfo-1.8.0.tar.xz) = Sf8yvg0gn2yZSA4ouUNArD3QFYMirkMDrfvf6XOhCKU= +SIZE (libosinfo-1.8.0.tar.xz) = 273324 diff --git a/misc/osinfo/libosinfo/patches/patch-osinfo_meson_build b/misc/osinfo/libosinfo/patches/patch-osinfo_meson_build new file mode 100644 index 00000000000..81e243520d6 --- /dev/null +++ b/misc/osinfo/libosinfo/patches/patch-osinfo_meson_build @@ -0,0 +1,20 @@ +$OpenBSD: patch-osinfo_meson_build,v 1.1 2020/05/31 10:36:47 ajacoutot Exp $ + +1st chunk: should default to the value of b_lundef. + +Index: osinfo/meson.build +--- osinfo/meson.build.orig ++++ osinfo/meson.build +@@ -130,11 +130,8 @@ libosinfo_private_headers = [ + ] + + libosinfo_link_args = [] +-if meson.get_compiler('c').has_link_argument('-Wl,--no-undefined') +- libosinfo_link_args += ['-Wl,--no-undefined'] +-endif + +-if host_machine.system() == 'linux' ++if host_machine.system() == 'linux' or host_machine.system() == 'openbsd' + libosinfo_link_args += [ + '-Wl,--version-script,@0@/@1@'.format( + meson.current_source_dir(), diff --git a/misc/osinfo/libosinfo/pkg/PLIST b/misc/osinfo/libosinfo/pkg/PLIST index c461694b803..74275602a8a 100644 --- a/misc/osinfo/libosinfo/pkg/PLIST +++ b/misc/osinfo/libosinfo/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2019/05/10 13:04:56 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.4 2020/05/31 10:36:47 ajacoutot Exp $ @pkgpath misc/libosinfo @bin bin/osinfo-detect @bin bin/osinfo-install-script @@ -22,6 +22,8 @@ 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 @@ -31,6 +33,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 @@ -47,60 +50,58 @@ include/libosinfo-1.0/osinfo/osinfo_resourceslist.h 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/ lib/girepository-1.0/Libosinfo-1.0.typelib -lib/libosinfo-1.0.a -lib/libosinfo-1.0.la @lib lib/libosinfo-1.0.so.${LIBosinfo-1.0_VERSION} lib/pkgconfig/libosinfo-1.0.pc @man man/man1/osinfo-detect.1 @man man/man1/osinfo-install-script.1 @man man/man1/osinfo-query.1 -share/gir-1.0/ share/gir-1.0/Libosinfo-1.0.gir share/gtk-doc/html/Libosinfo/ +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/OsinfoImage.html -share/gtk-doc/html/Libosinfo/OsinfoImageList.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 @@ -115,141 +116,21 @@ 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/ -share/locale/anp/LC_MESSAGES/ -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/ -share/locale/bal/LC_MESSAGES/ -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/ -share/locale/bo/LC_MESSAGES/ -share/locale/bo/LC_MESSAGES/libosinfo.mo -share/locale/br/ -share/locale/br/LC_MESSAGES/ -share/locale/br/LC_MESSAGES/libosinfo.mo -share/locale/brx/ -share/locale/brx/LC_MESSAGES/ -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/ -share/locale/de_CH/LC_MESSAGES/ -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/ -share/locale/ia/LC_MESSAGES/ -share/locale/ia/LC_MESSAGES/libosinfo.mo share/locale/id/LC_MESSAGES/libosinfo.mo -share/locale/ilo/ -share/locale/ilo/LC_MESSAGES/ -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/ -share/locale/km/LC_MESSAGES/ -share/locale/km/LC_MESSAGES/libosinfo.mo -share/locale/kn/LC_MESSAGES/libosinfo.mo -share/locale/ko/LC_MESSAGES/libosinfo.mo -share/locale/kw/ -share/locale/kw/LC_MESSAGES/ -share/locale/kw/LC_MESSAGES/libosinfo.mo -share/locale/kw@kkcor/ -share/locale/kw@kkcor/LC_MESSAGES/ -share/locale/kw@kkcor/LC_MESSAGES/libosinfo.mo -share/locale/kw@uccor/ -share/locale/kw@uccor/LC_MESSAGES/ -share/locale/kw@uccor/LC_MESSAGES/libosinfo.mo -share/locale/kw_GB/ -share/locale/kw_GB/LC_MESSAGES/ -share/locale/kw_GB/LC_MESSAGES/libosinfo.mo -share/locale/ky/ -share/locale/ky/LC_MESSAGES/ -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/ -share/locale/nso/LC_MESSAGES/ -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/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/pt_PT/ +share/locale/pt_PT/LC_MESSAGES/ +share/locale/pt_PT/LC_MESSAGES/libosinfo.mo share/locale/tr/LC_MESSAGES/libosinfo.mo -share/locale/tw/ -share/locale/tw/LC_MESSAGES/ -share/locale/tw/LC_MESSAGES/libosinfo.mo share/locale/uk/LC_MESSAGES/libosinfo.mo -share/locale/ur/ -share/locale/ur/LC_MESSAGES/ -share/locale/ur/LC_MESSAGES/libosinfo.mo -share/locale/vi/LC_MESSAGES/libosinfo.mo -share/locale/wba/ -share/locale/wba/LC_MESSAGES/ -share/locale/wba/LC_MESSAGES/libosinfo.mo -share/locale/yo/ -share/locale/yo/LC_MESSAGES/ -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/ -share/locale/zu/LC_MESSAGES/ -share/locale/zu/LC_MESSAGES/libosinfo.mo -share/vala/ -share/vala/vapi/ +share/vala/vapi/libosinfo-1.0.deps share/vala/vapi/libosinfo-1.0.vapi