diff --git a/x11/virt-viewer/Makefile b/x11/virt-viewer/Makefile index d4176835b96..559fb5e5733 100644 --- a/x11/virt-viewer/Makefile +++ b/x11/virt-viewer/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.54 2021/02/14 16:44:33 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.55 2021/04/24 09:48:48 ajacoutot Exp $ BROKEN-hppa= build stuck on virt-viewer-window.c COMMENT= graphics viewer for KVM guest displays -DISTNAME= virt-viewer-9.0 -REVISION= 1 +DISTNAME= virt-viewer-10.0 CATEGORIES= x11 @@ -16,24 +15,17 @@ MAINTAINER= Antoine Jacoutot # GPLv2+ PERMIT_PACKAGE= Yes -WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext -WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 -WANTLIB += c cairo cairo-gobject crypto curl epoxy expat ffi fontconfig -WANTLIB += freetype fribidi gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 -WANTLIB += glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0 gpg-error -WANTLIB += graphite2 gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstreamer-1.0 -WANTLIB += gsttag-1.0 gstvideo-1.0 gthread-2.0 gtk-3 gtk-vnc-2.0 -WANTLIB += gvnc-1.0 harfbuzz hogweed iconv icudata icuuc idn2 -WANTLIB += intl jpeg json-glib-1.0 lz4 lzma m nettle nghttp2 opus -WANTLIB += orc-0.4 p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pcre pcre2-8 pixman-1 png sasl2 spice-client-glib-2.0 -WANTLIB += spice-client-gtk-3.0 ssh2 ssl tasn1 unistring util -WANTLIB += virt virt-glib-1.0 vte-2.91 xcb xcb-render xcb-shm -WANTLIB += xml2 yajl z +WANTLIB += c gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 +WANTLIB += gtk-3 gtk-vnc-2.0 gvnc-1.0 intl m pango-1.0 spice-client-glib-2.0 +WANTLIB += spice-client-gtk-3.0 virt virt-glib-1.0 vte-2.91 xml2 MASTER_SITES= http://virt-manager.org/download/sources/virt-viewer/ +EXTRACT_SUFX= .tar.xz -USE_GMAKE= Yes +MODULES= devel/meson + +BUILD_DEPENDS= devel/gettext,-tools \ + shells/bash-completion LIB_DEPENDS= devel/libvirt-glib \ devel/vte3 \ @@ -44,12 +36,7 @@ RUN_DEPENDS= devel/desktop-file-utils \ x11/gtk+3,-guic \ misc/shared-mime-info -MODULES= textproc/intltool - -CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= --disable-update-mimedb -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= -Dovirt=disabled DEBUG_PACKAGES= ${BUILD_PACKAGES} diff --git a/x11/virt-viewer/distinfo b/x11/virt-viewer/distinfo index 384949094b1..a7f37896b58 100644 --- a/x11/virt-viewer/distinfo +++ b/x11/virt-viewer/distinfo @@ -1,2 +1,2 @@ -SHA256 (virt-viewer-9.0.tar.gz) = kbQzg6C9TPMXMmnmdNZf0gX3w0vFqMtPs2QN638dSCU= -SIZE (virt-viewer-9.0.tar.gz) = 1176991 +SHA256 (virt-viewer-10.0.tar.xz) = 0jvAoG5AJ8N7g4bP0Chu83vXOJdxU3QKsbazMRkjicU= +SIZE (virt-viewer-10.0.tar.xz) = 256372 diff --git a/x11/virt-viewer/patches/patch-src_virt-viewer-app_c b/x11/virt-viewer/patches/patch-src_virt-viewer-app_c new file mode 100644 index 00000000000..fd046976d48 --- /dev/null +++ b/x11/virt-viewer/patches/patch-src_virt-viewer-app_c @@ -0,0 +1,19 @@ +$OpenBSD: patch-src_virt-viewer-app_c,v 1.1 2021/04/24 09:48:48 ajacoutot Exp $ + +From 9e36a59c806de3de77c046df0b8c80bd9a0f4863 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A1n=20Tomko?= +Date: Fri, 23 Apr 2021 15:58:56 +0200 +Subject: [PATCH] src: initialize keymaps variable + +Index: src/virt-viewer-app.c +--- src/virt-viewer-app.c.orig ++++ src/virt-viewer-app.c +@@ -592,7 +592,7 @@ static + void virt_viewer_app_set_keymap(VirtViewerApp *self, const gchar *keymap_string) + { + VirtViewerAppPrivate *priv = virt_viewer_app_get_instance_private(self); +- gchar **key, **keymaps, **valkey, **valuekeys = NULL; ++ gchar **key, **keymaps = NULL, **valkey, **valuekeys = NULL; + VirtViewerKeyMapping *keyMappingArray, *keyMappingPtr; + guint *mappedArray, *ptrMove; + diff --git a/x11/virt-viewer/pkg/PLIST b/x11/virt-viewer/pkg/PLIST index e533b70378f..cf789a268d2 100644 --- a/x11/virt-viewer/pkg/PLIST +++ b/x11/virt-viewer/pkg/PLIST @@ -1,114 +1,57 @@ -@comment $OpenBSD: PLIST,v 1.15 2018/10/02 07:36:58 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.16 2021/04/24 09:48:48 ajacoutot Exp $ @bin bin/remote-viewer @bin bin/virt-viewer @man man/man1/remote-viewer.1 @man man/man1/virt-viewer.1 -share/appdata/ -share/appdata/remote-viewer.appdata.xml share/applications/remote-viewer.desktop +share/bash-completion/completions/virt-viewer share/icons/hicolor/16x16/apps/virt-viewer.png share/icons/hicolor/22x22/apps/virt-viewer.png share/icons/hicolor/24x24/apps/virt-viewer.png -share/icons/hicolor/24x24/devices/virt-viewer-usb.png -share/icons/hicolor/24x24/devices/virt-viewer-usb.svg share/icons/hicolor/256x256/apps/virt-viewer.png share/icons/hicolor/32x32/apps/virt-viewer.png share/icons/hicolor/48x48/apps/virt-viewer.png -share/locale/af/LC_MESSAGES/virt-viewer.mo -share/locale/am/LC_MESSAGES/virt-viewer.mo -share/locale/anp/LC_MESSAGES/virt-viewer.mo -share/locale/ar/LC_MESSAGES/virt-viewer.mo +share/icons/hicolor/scalable/apps/virt-viewer.svg share/locale/as/LC_MESSAGES/virt-viewer.mo -share/locale/ast/LC_MESSAGES/virt-viewer.mo -share/locale/bal/LC_MESSAGES/virt-viewer.mo -share/locale/be/LC_MESSAGES/virt-viewer.mo share/locale/bg/LC_MESSAGES/virt-viewer.mo share/locale/bn/LC_MESSAGES/virt-viewer.mo share/locale/bn_IN/LC_MESSAGES/virt-viewer.mo -share/locale/bo/LC_MESSAGES/virt-viewer.mo -share/locale/br/LC_MESSAGES/virt-viewer.mo -share/locale/brx/LC_MESSAGES/virt-viewer.mo -share/locale/bs/LC_MESSAGES/virt-viewer.mo share/locale/ca/LC_MESSAGES/virt-viewer.mo share/locale/cs/LC_MESSAGES/virt-viewer.mo -share/locale/cy/LC_MESSAGES/virt-viewer.mo -share/locale/da/LC_MESSAGES/virt-viewer.mo share/locale/de/LC_MESSAGES/virt-viewer.mo -share/locale/de_CH/LC_MESSAGES/virt-viewer.mo -share/locale/el/LC_MESSAGES/virt-viewer.mo -share/locale/en_GB/LC_MESSAGES/virt-viewer.mo -share/locale/eo/LC_MESSAGES/virt-viewer.mo share/locale/es/LC_MESSAGES/virt-viewer.mo -share/locale/et/LC_MESSAGES/virt-viewer.mo share/locale/eu/LC_MESSAGES/virt-viewer.mo -share/locale/fa/LC_MESSAGES/virt-viewer.mo share/locale/fi/LC_MESSAGES/virt-viewer.mo share/locale/fr/LC_MESSAGES/virt-viewer.mo -share/locale/gl/LC_MESSAGES/virt-viewer.mo share/locale/gu/LC_MESSAGES/virt-viewer.mo -share/locale/he/LC_MESSAGES/virt-viewer.mo share/locale/hi/LC_MESSAGES/virt-viewer.mo -share/locale/hr/LC_MESSAGES/virt-viewer.mo share/locale/hu/LC_MESSAGES/virt-viewer.mo -share/locale/ia/LC_MESSAGES/virt-viewer.mo share/locale/id/LC_MESSAGES/virt-viewer.mo -share/locale/ilo/LC_MESSAGES/virt-viewer.mo -share/locale/is/LC_MESSAGES/virt-viewer.mo share/locale/it/LC_MESSAGES/virt-viewer.mo share/locale/ja/LC_MESSAGES/virt-viewer.mo -share/locale/ka/LC_MESSAGES/virt-viewer.mo -share/locale/kk/LC_MESSAGES/virt-viewer.mo -share/locale/km/LC_MESSAGES/virt-viewer.mo share/locale/kn/LC_MESSAGES/virt-viewer.mo share/locale/ko/LC_MESSAGES/virt-viewer.mo -share/locale/kw/LC_MESSAGES/virt-viewer.mo -share/locale/kw@kkcor/LC_MESSAGES/virt-viewer.mo -share/locale/kw@uccor/LC_MESSAGES/virt-viewer.mo -share/locale/kw_GB/LC_MESSAGES/virt-viewer.mo -share/locale/ky/LC_MESSAGES/virt-viewer.mo -share/locale/lt/LC_MESSAGES/virt-viewer.mo -share/locale/lv/LC_MESSAGES/virt-viewer.mo -share/locale/mai/LC_MESSAGES/virt-viewer.mo -share/locale/mk/LC_MESSAGES/virt-viewer.mo share/locale/ml/LC_MESSAGES/virt-viewer.mo -share/locale/mn/LC_MESSAGES/virt-viewer.mo share/locale/mr/LC_MESSAGES/virt-viewer.mo -share/locale/ms/LC_MESSAGES/virt-viewer.mo share/locale/nb/LC_MESSAGES/virt-viewer.mo -share/locale/nds/LC_MESSAGES/virt-viewer.mo -share/locale/ne/LC_MESSAGES/virt-viewer.mo share/locale/nl/LC_MESSAGES/virt-viewer.mo -share/locale/nn/LC_MESSAGES/virt-viewer.mo -share/locale/nso/LC_MESSAGES/virt-viewer.mo share/locale/or/LC_MESSAGES/virt-viewer.mo share/locale/pa/LC_MESSAGES/virt-viewer.mo share/locale/pl/LC_MESSAGES/virt-viewer.mo share/locale/pt/LC_MESSAGES/virt-viewer.mo share/locale/pt_BR/LC_MESSAGES/virt-viewer.mo -share/locale/ro/LC_MESSAGES/virt-viewer.mo share/locale/ru/LC_MESSAGES/virt-viewer.mo share/locale/si/LC_MESSAGES/virt-viewer.mo share/locale/sk/LC_MESSAGES/virt-viewer.mo -share/locale/sl/LC_MESSAGES/virt-viewer.mo -share/locale/sq/LC_MESSAGES/virt-viewer.mo -share/locale/sr/LC_MESSAGES/virt-viewer.mo -share/locale/sr@latin/LC_MESSAGES/virt-viewer.mo share/locale/sv/LC_MESSAGES/virt-viewer.mo share/locale/ta/LC_MESSAGES/virt-viewer.mo share/locale/te/LC_MESSAGES/virt-viewer.mo -share/locale/tg/LC_MESSAGES/virt-viewer.mo -share/locale/th/LC_MESSAGES/virt-viewer.mo share/locale/tr/LC_MESSAGES/virt-viewer.mo -share/locale/tw/LC_MESSAGES/virt-viewer.mo share/locale/uk/LC_MESSAGES/virt-viewer.mo -share/locale/ur/LC_MESSAGES/virt-viewer.mo -share/locale/vi/LC_MESSAGES/virt-viewer.mo -share/locale/wba/LC_MESSAGES/virt-viewer.mo -share/locale/yo/LC_MESSAGES/virt-viewer.mo share/locale/zh_CN/LC_MESSAGES/virt-viewer.mo -share/locale/zh_HK/LC_MESSAGES/virt-viewer.mo share/locale/zh_TW/LC_MESSAGES/virt-viewer.mo -share/locale/zu/LC_MESSAGES/virt-viewer.mo +share/metainfo/ +share/metainfo/remote-viewer.appdata.xml share/mime/packages/virt-viewer-mime.xml @tag update-desktop-database @tag gtk-update-icon-cache %D/share/icons/hicolor