pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

spice-gtk: remove, used for updating sysutils/spice-gtk



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Mon Jul 11 09:54:25 2022 +0200
Changeset:	f8a175e84c6fc0d735d80c0f79512d448e63e830

Modified Files:
	Makefile
	gnome-boxes/Makefile
Removed Files:
	spice-gtk/DESCR
	spice-gtk/Makefile
	spice-gtk/PLIST
	spice-gtk/buildlink3.mk
	spice-gtk/distinfo
	spice-gtk/patches/patch-subprojects_spice-common_common_recorder_make-it-quick_config.gnu.mk
	spice-gtk/patches/patch-subprojects_spice-common_meson.build
	spice-gtk/patches/patch-vapi_meson.build

Log Message:
spice-gtk: remove, used for updating sysutils/spice-gtk

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

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

diffstat:
 Makefile                                           |  14 ++-
 gnome-boxes/Makefile                               |   2 +-
 spice-gtk/DESCR                                    |   1 -
 spice-gtk/Makefile                                 |  41 -------
 spice-gtk/PLIST                                    | 122 ---------------------
 spice-gtk/buildlink3.mk                            |  22 ----
 spice-gtk/distinfo                                 |   8 --
 ...mon_common_recorder_make-it-quick_config.gnu.mk |  15 ---
 .../patch-subprojects_spice-common_meson.build     |  15 ---
 spice-gtk/patches/patch-vapi_meson.build           |  22 ----
 10 files changed, 9 insertions(+), 253 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index eab99e969e..570c02e531 100644
--- a/Makefile
+++ b/Makefile
@@ -339,6 +339,7 @@ SUBDIR+=	bstone
 SUBDIR+=	bsvc
 SUBDIR+=	btop
 SUBDIR+=	bub-n-bros
+SUBDIR+=	buddy
 SUBDIR+=	budgie-desktop
 SUBDIR+=	budgie-screensaver
 SUBDIR+=	bugdom
@@ -4429,6 +4430,7 @@ SUBDIR+=	py-pysph
 SUBDIR+=	py-pysphere
 SUBDIR+=	py-pystatsd
 SUBDIR+=	py-pyswisseph
+SUBDIR+=	py-pytest-lazy-fixture
 SUBDIR+=	py-pythia
 SUBDIR+=	py-pythics
 SUBDIR+=	py-python-application
@@ -5318,7 +5320,6 @@ SUBDIR+=	spectacle
 SUBDIR+=	spectra
 SUBDIR+=	speedx
 SUBDIR+=	spfmilter
-SUBDIR+=	spice-gtk
 SUBDIR+=	spice-html5
 SUBDIR+=	spice-vdagent
 SUBDIR+=	spid-compliant-certificates
@@ -5409,6 +5410,7 @@ SUBDIR+=	swisseph
 SUBDIR+=	sxemacs
 SUBDIR+=	sxid
 SUBDIR+=	sylfilter
+SUBDIR+=	sylvan
 SUBDIR+=	symbolic++
 SUBDIR+=	symmetrica
 SUBDIR+=	symon
@@ -6061,16 +6063,16 @@ SUBDIR+=	you-get
 SUBDIR+=	yp-tools
 SUBDIR+=	ypbind-mt
 SUBDIR+=	ypserv
-SUBDIR+=	zabbix54-agent
-SUBDIR+=	zabbix54-frontend
-SUBDIR+=	zabbix54-java
-SUBDIR+=	zabbix54-proxy
-SUBDIR+=	zabbix54-server
 SUBDIR+=	zabbix60-agent
 SUBDIR+=	zabbix60-frontend
 SUBDIR+=	zabbix60-java
 SUBDIR+=	zabbix60-proxy
 SUBDIR+=	zabbix60-server
+SUBDIR+=	zabbix62-agent
+SUBDIR+=	zabbix62-frontend
+SUBDIR+=	zabbix62-java
+SUBDIR+=	zabbix62-proxy
+SUBDIR+=	zabbix62-server
 SUBDIR+=	zbackup
 SUBDIR+=	zdbsp
 SUBDIR+=	zed
diff --git a/gnome-boxes/Makefile b/gnome-boxes/Makefile
index f52a622b8c..869d62ff17 100644
--- a/gnome-boxes/Makefile
+++ b/gnome-boxes/Makefile
@@ -27,7 +27,7 @@ pre-configure:
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../wip/libgudev/buildlink3.mk"
 .include "../../devel/libhandy1/buildlink3.mk"
-.include "../../wip/spice-gtk/buildlink3.mk"
+.include "../../sysutils/spice-gtk/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../sysutils/gnome-tracker/buildlink3.mk"
 .include "../../wip/libvirt-glib/buildlink3.mk"
diff --git a/spice-gtk/DESCR b/spice-gtk/DESCR
deleted file mode 100644
index 3765d11452..0000000000
--- a/spice-gtk/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Client libraries for SPICE desktop servers.
diff --git a/spice-gtk/Makefile b/spice-gtk/Makefile
deleted file mode 100644
index 22015693d7..0000000000
--- a/spice-gtk/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	spice-gtk-0.39
-CATEGORIES=	sysutils
-MASTER_SITES=	https://www.spice-space.org/download/gtk/
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://www.spice-space.org/spice-gtk.html
-COMMENT=	GTK+ widget for SPICE clients
-LICENSE=	gnu-lgpl-v2.1
-
-DEPENDS+=	${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
-DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-BUILD_DEPENDS+=	gtk-doc-[0-9]*:../../textproc/gtk-doc
-BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
-
-USE_TOOLS+=		pkg-config
-USE_PKGLOCALEDIR=	yes
-
-PKGCONFIG_OVERRIDE+=	spice-client-glib-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	spice-client-gtk-3.0.pc.in
-
-MESON_ARGS+=		-Dintrospection=enabled
-MESON_ARGS+=		-Dvapi=enabled
-
-PYTHON_VERSIONS_INCOMPATIBLE=	27
-
-.include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../lang/vala/buildlink3.mk"
-.include "../../devel/meson/build.mk"
-.include "../../lang/python/pyversion.mk"
-.include "../../audio/libopus/buildlink3.mk"
-.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../sysutils/spice-protocol/buildlink3.mk"
-.include "../../textproc/json-glib/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/spice-gtk/PLIST b/spice-gtk/PLIST
deleted file mode 100644
index 95309bad1c..0000000000
--- a/spice-gtk/PLIST
+++ /dev/null
@@ -1,122 +0,0 @@
-@comment $NetBSD$
-bin/spicy
-bin/spicy-screenshot
-bin/spicy-stats
-include/spice-client-glib-2.0/channel-cursor.h
-include/spice-client-glib-2.0/channel-display.h
-include/spice-client-glib-2.0/channel-inputs.h
-include/spice-client-glib-2.0/channel-main.h
-include/spice-client-glib-2.0/channel-playback.h
-include/spice-client-glib-2.0/channel-port.h
-include/spice-client-glib-2.0/channel-record.h
-include/spice-client-glib-2.0/channel-smartcard.h
-include/spice-client-glib-2.0/channel-usbredir.h
-include/spice-client-glib-2.0/channel-webdav.h
-include/spice-client-glib-2.0/qmp-port.h
-include/spice-client-glib-2.0/smartcard-manager.h
-include/spice-client-glib-2.0/spice-audio.h
-include/spice-client-glib-2.0/spice-channel.h
-include/spice-client-glib-2.0/spice-client.h
-include/spice-client-glib-2.0/spice-file-transfer-task.h
-include/spice-client-glib-2.0/spice-glib-enums.h
-include/spice-client-glib-2.0/spice-option.h
-include/spice-client-glib-2.0/spice-session.h
-include/spice-client-glib-2.0/spice-types.h
-include/spice-client-glib-2.0/spice-uri.h
-include/spice-client-glib-2.0/spice-util.h
-include/spice-client-glib-2.0/spice-version.h
-include/spice-client-glib-2.0/usb-device-manager.h
-include/spice-client-gtk-3.0/spice-client-gtk.h
-include/spice-client-gtk-3.0/spice-grabsequence.h
-include/spice-client-gtk-3.0/spice-gtk-session.h
-include/spice-client-gtk-3.0/spice-widget-enums.h
-include/spice-client-gtk-3.0/spice-widget.h
-include/spice-client-gtk-3.0/usb-device-widget.h
-lib/girepository-1.0/SpiceClientGLib-2.0.typelib
-lib/girepository-1.0/SpiceClientGtk-3.0.typelib
-lib/libspice-client-glib-2.0.so
-lib/libspice-client-glib-2.0.so.8
-lib/libspice-client-glib-2.0.so.8.7.0
-lib/libspice-client-gtk-3.0.so
-lib/libspice-client-gtk-3.0.so.5
-lib/libspice-client-gtk-3.0.so.5.0.0
-lib/pkgconfig/spice-client-glib-2.0.pc
-lib/pkgconfig/spice-client-gtk-3.0.pc
-man/man1/spice-client.1
-share/gir-1.0/SpiceClientGLib-2.0.gir
-share/gir-1.0/SpiceClientGtk-3.0.gir
-share/gtk-doc/html/spice-gtk/SpiceAudio.html
-share/gtk-doc/html/spice-gtk/SpiceChannel.html
-share/gtk-doc/html/spice-gtk/SpiceCursorChannel.html
-share/gtk-doc/html/spice-gtk/SpiceDisplay.html
-share/gtk-doc/html/spice-gtk/SpiceDisplayChannel.html
-share/gtk-doc/html/spice-gtk/SpiceFileTransferTask.html
-share/gtk-doc/html/spice-gtk/SpiceGtkSession.html
-share/gtk-doc/html/spice-gtk/SpiceInputsChannel.html
-share/gtk-doc/html/spice-gtk/SpiceMainChannel.html
-share/gtk-doc/html/spice-gtk/SpicePlaybackChannel.html
-share/gtk-doc/html/spice-gtk/SpicePortChannel.html
-share/gtk-doc/html/spice-gtk/SpiceQmpPort.html
-share/gtk-doc/html/spice-gtk/SpiceRecordChannel.html
-share/gtk-doc/html/spice-gtk/SpiceSession.html
-share/gtk-doc/html/spice-gtk/SpiceSmartcardChannel.html
-share/gtk-doc/html/spice-gtk/SpiceSmartcardManager.html
-share/gtk-doc/html/spice-gtk/SpiceURI.html
-share/gtk-doc/html/spice-gtk/SpiceUsbDeviceManager.html
-share/gtk-doc/html/spice-gtk/SpiceUsbDeviceWidget.html
-share/gtk-doc/html/spice-gtk/SpiceUsbredirChannel.html
-share/gtk-doc/html/spice-gtk/SpiceWebdavChannel.html
-share/gtk-doc/html/spice-gtk/annotation-glossary.html
-share/gtk-doc/html/spice-gtk/api-index-deprecated.html
-share/gtk-doc/html/spice-gtk/api-index-full.html
-share/gtk-doc/html/spice-gtk/api-reference.html
-share/gtk-doc/html/spice-gtk/application-support.html
-share/gtk-doc/html/spice-gtk/ch01.html
-share/gtk-doc/html/spice-gtk/ch02.html
-share/gtk-doc/html/spice-gtk/ch03.html
-share/gtk-doc/html/spice-gtk/home.png
-share/gtk-doc/html/spice-gtk/index.html
-share/gtk-doc/html/spice-gtk/ix02.html
-share/gtk-doc/html/spice-gtk/ix03.html
-share/gtk-doc/html/spice-gtk/ix04.html
-share/gtk-doc/html/spice-gtk/ix05.html
-share/gtk-doc/html/spice-gtk/ix06.html
-share/gtk-doc/html/spice-gtk/ix07.html
-share/gtk-doc/html/spice-gtk/ix08.html
-share/gtk-doc/html/spice-gtk/ix09.html
-share/gtk-doc/html/spice-gtk/ix10.html
-share/gtk-doc/html/spice-gtk/ix11.html
-share/gtk-doc/html/spice-gtk/ix12.html
-share/gtk-doc/html/spice-gtk/ix13.html
-share/gtk-doc/html/spice-gtk/ix14.html
-share/gtk-doc/html/spice-gtk/ix15.html
-share/gtk-doc/html/spice-gtk/ix16.html
-share/gtk-doc/html/spice-gtk/ix17.html
-share/gtk-doc/html/spice-gtk/ix18.html
-share/gtk-doc/html/spice-gtk/ix19.html
-share/gtk-doc/html/spice-gtk/ix20.html
-share/gtk-doc/html/spice-gtk/ix21.html
-share/gtk-doc/html/spice-gtk/ix22.html
-share/gtk-doc/html/spice-gtk/ix23.html
-share/gtk-doc/html/spice-gtk/ix24.html
-share/gtk-doc/html/spice-gtk/ix25.html
-share/gtk-doc/html/spice-gtk/left-insensitive.png
-share/gtk-doc/html/spice-gtk/left.png
-share/gtk-doc/html/spice-gtk/object-tree.html
-share/gtk-doc/html/spice-gtk/right-insensitive.png
-share/gtk-doc/html/spice-gtk/right.png
-share/gtk-doc/html/spice-gtk/spice-gtk-Utilities.html
-share/gtk-doc/html/spice-gtk/spice-gtk-spice-version.html
-share/gtk-doc/html/spice-gtk/spice-gtk.devhelp2
-share/gtk-doc/html/spice-gtk/style.css
-share/gtk-doc/html/spice-gtk/up-insensitive.png
-share/gtk-doc/html/spice-gtk/up.png
-share/locale/cs/LC_MESSAGES/spice-gtk.mo
-share/locale/de/LC_MESSAGES/spice-gtk.mo
-share/locale/fr/LC_MESSAGES/spice-gtk.mo
-share/locale/it/LC_MESSAGES/spice-gtk.mo
-share/locale/ru/LC_MESSAGES/spice-gtk.mo
-share/vala/vapi/spice-client-glib-2.0.deps
-share/vala/vapi/spice-client-glib-2.0.vapi
-share/vala/vapi/spice-client-gtk-3.0.deps
-share/vala/vapi/spice-client-gtk-3.0.vapi
diff --git a/spice-gtk/buildlink3.mk b/spice-gtk/buildlink3.mk
deleted file mode 100644
index edf2cec5eb..0000000000
--- a/spice-gtk/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.5 2021/11/15 22:54:00 wiz Exp $
-
-BUILDLINK_TREE+=	spice-gtk
-
-.if !defined(SPICE_GTK_BUILDLINK3_MK)
-SPICE_GTK_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.spice-gtk+=	spice-gtk>=0.39
-BUILDLINK_ABI_DEPENDS.spice-gtk?=	spice-gtk>=0.39
-BUILDLINK_PKGSRCDIR.spice-gtk?=		../../wip/spice-gtk
-
-.include "../../audio/libopus/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../sysutils/spice-protocol/buildlink3.mk"
-.include "../../textproc/json-glib/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/pixman/buildlink3.mk"
-.endif	# SPICE_GTK_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-spice-gtk
diff --git a/spice-gtk/distinfo b/spice-gtk/distinfo
deleted file mode 100644
index 87af252531..0000000000
--- a/spice-gtk/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD$
-
-BLAKE2s (spice-gtk-0.39.tar.xz) = 6c78762219e820f302a8b2502a9ba40114d6eea7fc60b51a966da2dea5a30807
-SHA512 (spice-gtk-0.39.tar.xz) = ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2
-Size (spice-gtk-0.39.tar.xz) = 845528 bytes
-SHA1 (patch-subprojects_spice-common_common_recorder_make-it-quick_config.gnu.mk) = b1b125b33292370bf46ce621f540217dd34417c7
-SHA1 (patch-subprojects_spice-common_meson.build) = aa5274b68f64ea08ba91da2f28dbbfc0e8a3c841
-SHA1 (patch-vapi_meson.build) = ab38cab9efb27a59874f45679e2bc6e63512ec0c
diff --git a/spice-gtk/patches/patch-subprojects_spice-common_common_recorder_make-it-quick_config.gnu.mk b/spice-gtk/patches/patch-subprojects_spice-common_common_recorder_make-it-quick_config.gnu.mk
deleted file mode 100644
index 0347009ecd..0000000000
--- a/spice-gtk/patches/patch-subprojects_spice-common_common_recorder_make-it-quick_config.gnu.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix unportable test(1) operator.
-
---- subprojects/spice-common/common/recorder/make-it-quick/config.gnu.mk.orig	2020-12-01 16:32:04.099737200 +0000
-+++ subprojects/spice-common/common/recorder/make-it-quick/config.gnu.mk
-@@ -215,7 +215,7 @@ MIQ_CFGTEST=	"$<" -o "$<".exe > "$<".err
- 		[ -x "$<".exe ] &&					\
- 		"$<".exe > "$<".out					\
- 		$(MIQ_CFGSET)
--MIQ_CFG_PRINT=	if [ $$MIQ_CFGRC == 1 ]; then				\
-+MIQ_CFG_PRINT=	if [ $$MIQ_CFGRC = 1 ]; then				\
- 		    echo "$(POS_COLOR)OK$(DEF_COLOR)";			\
- 		else							\
- 		    echo "$(ERR_COLOR)NO$(DEF_COLOR)";			\
diff --git a/spice-gtk/patches/patch-subprojects_spice-common_meson.build b/spice-gtk/patches/patch-subprojects_spice-common_meson.build
deleted file mode 100644
index 1ab51cfc57..0000000000
--- a/spice-gtk/patches/patch-subprojects_spice-common_meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix pyparsing import
-
---- subprojects/spice-common/meson.build.orig	2020-12-01 16:32:00.384746800 +0000
-+++ subprojects/spice-common/meson.build
-@@ -132,7 +132,7 @@ if spice_common_generate_client_code or
-   if get_option('python-checks')
-     foreach module : ['six', 'pyparsing']
-       message('Checking for python module @0@'.format(module))
--      cmd = run_command(python, '-m', module)
-+      cmd = run_command(python, '-c', 'import @0@'.format(module))
-       if cmd.returncode() != 0
-         error('Python module @0@ not found'.format(module))
-       endif
diff --git a/spice-gtk/patches/patch-vapi_meson.build b/spice-gtk/patches/patch-vapi_meson.build
deleted file mode 100644
index ba1fab4034..0000000000
--- a/spice-gtk/patches/patch-vapi_meson.build
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Fix girdirs on Linux
-
---- vapi/meson.build.orig	2020-12-01 16:31:58.783751000 +0000
-+++ vapi/meson.build
-@@ -2,13 +2,14 @@ if spice_gtk_has_vala
-   spice_glib_vapi = gnome.generate_vapi('spice-client-glib-2.0',
-                       install : true,
-                       packages : ['gio-2.0', 'gstreamer-1.0'],
-+                      gir_dirs: spice_gtk_datadir / 'gir-1.0',
-                       sources : spice_client_glib_gir[0])
- 
-   if spice_gtk_has_gtk
-     gnome.generate_vapi('spice-client-gtk-3.0',
-                         install : true,
-                         packages : ['gtk+-3.0', 'gstreamer-1.0', spice_glib_vapi],
--                        gir_dirs : meson.build_root() / 'src',
-+                        gir_dirs : [meson.build_root() / 'src', spice_gtk_datadir / 'gir-1.0'],
-                         vapi_dirs : meson.current_build_dir(),
-                         sources : spice_client_gtk_gir[0])
-   endif


Home | Main Index | Thread Index | Old Index