* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/, net-misc/spice-gtk/files/
@ 2016-02-28 6:15 Matthias Maier
0 siblings, 0 replies; 9+ messages in thread
From: Matthias Maier @ 2016-02-28 6:15 UTC (permalink / raw
To: gentoo-commits
commit: 1cdf89983b9cf8e94d56278aa3d6790230074e20
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 06:03:18 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 06:15:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cdf8998
net-misc/spice-gtk: remove old versions 0.20-r1 0.21 0.25-r1 0.28 0.29
Package-Manager: portage-2.2.26
net-misc/spice-gtk/Manifest | 5 -
.../spice-gtk/files/0.12-parallel-install.patch | 16 --
...ibusbredirparser.pc-rename-to-libusbredir.patch | 57 -------
...build-sys-fix-out-of-tree-build-with-vala.patch | 35 ----
...gtk-0.20-add-spice-channel-string-to-type.patch | 84 ----------
...-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch | 22 ---
...tk-0.25-Do-not-depend-on-libsoup-directly.patch | 29 ----
...25-Introduce-enable-disable-webdav-option.patch | 54 -------
.../files/spice-gtk-0.25-missing_gio_libs.patch | 12 --
net-misc/spice-gtk/files/spice.protocol | 12 --
net-misc/spice-gtk/files/spice.schemas | 41 -----
net-misc/spice-gtk/spice-gtk-0.20-r1.ebuild | 170 -------------------
net-misc/spice-gtk/spice-gtk-0.21.ebuild | 174 --------------------
net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild | 180 ---------------------
net-misc/spice-gtk/spice-gtk-0.28.ebuild | 159 ------------------
net-misc/spice-gtk/spice-gtk-0.29.ebuild | 159 ------------------
16 files changed, 1209 deletions(-)
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 383f868..bcbce6e 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,6 +1 @@
-DIST spice-gtk-0.20.tar.bz2 1210694 SHA256 b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df SHA512 db07d05d93bf5639c193f374b6eb3fe9f6bb198f0146e64f8e6e6c03d12e931c1f18a353aed123fe28535a95eb8448ef8a8babc66bdd283f951b8433839d6b9e WHIRLPOOL 82ea2e7a1ebec0155c6aadd03143456498db332e64f4a2c5cb15beb47e0371790ee5fc29b7ff1b40dba34c63dd021cecf6f27cd1aaa1c58c465f9bb2d22ca50e
-DIST spice-gtk-0.21.tar.bz2 1191082 SHA256 73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564 SHA512 970c5de33c5f2117c4c4c0864da4d3796226771be54fdcc5393d17eefecb297cdc0767003699afa03db7e72a9810de4d157217e40de62013e410b90c8c759151 WHIRLPOOL caabfcc4654077dce70d9f82d7ccd77bd390d365c23f6c82c906b5490c1dd135c82c48e2aab486b699470829b24b3253dcb39c22921c13132dc16a03369d62f9
-DIST spice-gtk-0.25.tar.bz2 1242457 SHA256 0730c6a80ad9f5012f65927d443377019f300573f7ccc93db84eadec462ad087 SHA512 5d44ffa784af3c94492e80129b7350065f4d108c8e3bc42be673fc1f42b47023757d0b8131d047432b7c59c03662db0652759cb4bdf677062a6d1e0508d02bd9 WHIRLPOOL 63002ec6d309c949d296e70ff5e22a7cf9e8300e7001e37a4a5b2de6ccb833915d884798347e04a06c60ea4508f85f265b3d4b4dc1c00a3a8e036ddf21e003f8
-DIST spice-gtk-0.28.tar.bz2 1274095 SHA256 15aeeb63422cb3bfaa2edbf4602ed2025baa4455abfd1677f631245a0d0f81c4 SHA512 a183ab3d9a463de13acc3333d6927fbaba00f184b40f4346d1fd4de94a3394a6cdfeb51b02666be9154d9f65184d1499560f2aa5a387a526915671e951e1493f WHIRLPOOL 96e25ec39b060136b9e6b1cbb5c38c06f319aeb582742acc2741abb29ea45853fe2fe5f2c2da5a0c61176bdd68e37a7be1f64d0b02b1e8db6754514a2a20bfe5
-DIST spice-gtk-0.29.tar.bz2 1277160 SHA256 44c7e22713246a2054c3c3b6e0280fd4c1fdbd2c8d33e5eb95bcda4748d5e973 SHA512 87cdcc5daa0f14eda5225cbe5cf0f29c1fb059c9fbbd6dfd52da02655db13f67f508c448dd5754877e12c577b5efde230914928fd91fcccf33eff52fac2319b0 WHIRLPOOL 96e2a2acaef4b824316aefdf5af59b45b33393264c70761cd7754b860166dafc3340526ca3f51dcf425dd904b35f27c1da83d0124a7c66b0b9fc6de6c0f85d1b
DIST spice-gtk-0.30.tar.bz2 1228727 SHA256 e23323fa399efba17b3c18475ef10a29815851be5e7dbedd246b28ee8eb1379c SHA512 8a0ad6df3b1ab353d1e63178e13e440c07751821d9693a1599d6f61dece6ed20b664511abaa50771b026be0f457787b0bb5b172884e68c7a95d9068b0bb79198 WHIRLPOOL e58798cbabfe716dcf35a7668ed8e9838f347b13dd25e13ec5d290f35da2170d321a9a3bb2701564b14564ee89f2b43c8b6fcb84d85ed2293514a2f7c9d3759a
diff --git a/net-misc/spice-gtk/files/0.12-parallel-install.patch b/net-misc/spice-gtk/files/0.12-parallel-install.patch
deleted file mode 100644
index 04a22bd..0000000
--- a/net-misc/spice-gtk/files/0.12-parallel-install.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 7b29e61..86b3939 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -505,6 +505,11 @@ vncdisplaykeymap_win322xtkbd.c:
- if WITH_PYTHON
- pyexec_LTLIBRARIES = SpiceClientGtk.la
-
-+# workaround for broken parallel install support in automake with LTLIBRARIES
-+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
-+install_pyexecLTLIBRARIES = install-pyexecLTLIBRARIES
-+$(install_pyexecLTLIBRARIES): install-libLTLIBRARIES
-+
- SpiceClientGtk_la_LIBADD = libspice-client-gtk-2.0.la libspice-client-glib-2.0.la $(PYGTK_LIBS)
- SpiceClientGtk_la_CFLAGS = $(GTK_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(WARN_PYFLAGS)
- SpiceClientGtk_la_LDFLAGS = -module -avoid-version -fPIC
diff --git a/net-misc/spice-gtk/files/0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch b/net-misc/spice-gtk/files/0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch
deleted file mode 100644
index 0467945..0000000
--- a/net-misc/spice-gtk/files/0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From a8a6ac1d0f4893860efad48833ce6168f684054a Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 25 Sep 2012 12:59:13 +0200
-Subject: [PATCH 01/21] Deal with libusbredirparser.pc rename to
- libusbredirparser-0.5.pc
-
-The usbredir 0.5 release introduced the new API for 64 bit packet ids, but
-it kept the libusbredirparser.pc name as is, meaning that older versions of
-qemu will still have their pkg-config check for usbredirparser fulfilled,
-and build with the usb-redir device. Due to the API change there will be
-some compiler warnings, but the build will succeed, however the usb-redir
-device will be broken on 32 bit machines.
-
-To solve this, the usbredir-0.5.2 release renames the libusbredirparser.pc
-file to libusbredirparser-0.5.pc, so that it will no longer fulfill the
-pkg-config check of the qemu-1.2 and older releases, stopping the (silent)
-breakage.
-
-spice-gtk does not use the changed parts of the API, but does
-use libusbredirparser for the usbredirfilter* functions. This patch adapts
-spice-gtk's configure to accept both the libusbredirparser-0.5 and the
-libusbredirparser pkg-config names.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- configure.ac | 15 +++++++++++----
- 1 file changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c7367cc..7c59575 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -349,10 +349,17 @@ AC_ARG_ENABLE([usbredir],
- if test "x$enable_usbredir" = "xno"; then
- have_usbredir="no"
- else
-- PKG_CHECK_MODULES([USBREDIR],
-- [libusb-1.0 >= 1.0.9 libusbredirhost >= 0.4.2 libusbredirparser >= 0.4],
-- [have_usbredir=yes],
-- [have_usbredir=no])
-+ if ${PKG_CONFIG} libusbredirparser-0.5; then
-+ PKG_CHECK_MODULES([USBREDIR],
-+ [libusb-1.0 >= 1.0.9 libusbredirhost libusbredirparser-0.5],
-+ [have_usbredir=yes],
-+ [have_usbredir=no])
-+ else
-+ PKG_CHECK_MODULES([USBREDIR],
-+ [libusb-1.0 >= 1.0.9 libusbredirhost >= 0.4.2 libusbredirparser >= 0.4],
-+ [have_usbredir=yes],
-+ [have_usbredir=no])
-+ fi
- if test "x$have_usbredir" = "xno" && test "x$enable_usbredir" = "xyes"; then
- AC_MSG_ERROR([usbredir support explicitly requested, but some required packages are not available])
- fi
---
-1.7.12.1
-
diff --git a/net-misc/spice-gtk/files/0001-build-sys-fix-out-of-tree-build-with-vala.patch b/net-misc/spice-gtk/files/0001-build-sys-fix-out-of-tree-build-with-vala.patch
deleted file mode 100644
index 92be8cc..0000000
--- a/net-misc/spice-gtk/files/0001-build-sys-fix-out-of-tree-build-with-vala.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6d454e4100a01499c13d55057fdd9307437a5f87 Mon Sep 17 00:00:00 2001
-From: Andrew Hughes <gnu.andrew@redhat.com>
-Date: Wed, 16 Jan 2013 22:47:18 +0000
-Subject: build-sys: fix out-of-tree build with vala
-
----
-diff --git a/gtk/controller/Makefile.am b/gtk/controller/Makefile.am
-index f2abf93..00552e8 100644
---- a/gtk/controller/Makefile.am
-+++ b/gtk/controller/Makefile.am
-@@ -76,14 +76,16 @@ spice_controller_dump_SOURCES = dump.c
- spice_controller_dump_LDADD = libspice-controller.la
-
- controller.vala.stamp: $(libspice_controller_la_VALASOURCES) custom.vapi
-- @if test -z "$(VALAC)"; then \
-- echo "" ; \
-- echo " *** Error: missing valac!" ; \
-+ @if test -z "$(VALAC)"; then \
-+ echo "" ; \
-+ echo " *** Error: missing valac!" ; \
- echo " *** You must run autogen.sh or configure --enable-vala" ; \
-- echo "" ; \
-- exit 1 ; \
-+ echo "" ; \
-+ exit 1 ; \
- fi
-- $(VALA_V)$(VALAC) $(VALAFLAGS) $(AM_VALAFLAGS) $(libspice_controller_la_VALASOURCES) -H spice-controller.h
-+ $(VALA_V)$(VALAC) $(VALAFLAGS) $(AM_VALAFLAGS) \
-+ $(addprefix $(srcdir)/,$(libspice_controller_la_VALASOURCES)) \
-+ -H spice-controller.h
- @touch $@
-
- $(libspice_controller_la_BUILT_SOURCES): controller.vala.stamp
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch b/net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch
deleted file mode 100644
index 3375d80..0000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From b85ca792af72d5f1e10aa6af9515eb96a044fc5c Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 26 Jun 2013 15:39:39 +0000
-Subject: Add spice_channel_string_to_type to map files
-
-And document both spice_channel_string_to_type and
-spice_channel_type_to_string.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
-diff --git a/doc/reference/spice-gtk-sections.txt b/doc/reference/spice-gtk-sections.txt
-index e1e2833..8d61aa9 100644
---- a/doc/reference/spice-gtk-sections.txt
-+++ b/doc/reference/spice-gtk-sections.txt
-@@ -98,6 +98,7 @@ spice_channel_disconnect
- spice_channel_test_capability
- spice_channel_test_common_capability
- spice_channel_type_to_string
-+spice_channel_string_to_type
- spice_channel_set_capability
- spice_channel_flush_async
- spice_channel_flush_finish
-diff --git a/gtk/map-file b/gtk/map-file
-index a0b7330..a69eb40 100644
---- a/gtk/map-file
-+++ b/gtk/map-file
-@@ -11,6 +11,7 @@ spice_channel_get_type;
- spice_channel_new;
- spice_channel_open_fd;
- spice_channel_set_capability;
-+spice_channel_string_to_type;
- spice_channel_test_capability;
- spice_channel_test_common_capability;
- spice_channel_type_to_string;
-diff --git a/gtk/spice-channel.c b/gtk/spice-channel.c
-index 0a32d6c..093b292 100644
---- a/gtk/spice-channel.c
-+++ b/gtk/spice-channel.c
-@@ -1884,6 +1884,15 @@ static const char *to_string[] = {
- [ SPICE_CHANNEL_PORT ] = "port",
- };
-
-+/**
-+ * spice_channel_type_to_string:
-+ * @type: a channel-type property value
-+ *
-+ * Convert a channel-type property value to a string.
-+ *
-+ * Returns: string representation of @type.
-+ * Since: 0.20
-+ **/
- const gchar* spice_channel_type_to_string(gint type)
- {
- const char *str = NULL;
-@@ -1895,6 +1904,15 @@ const gchar* spice_channel_type_to_string(gint type)
- return str ? str : "unknown channel type";
- }
-
-+/**
-+ * spice_channel_string_to_type:
-+ * @str: a string representation of the channel-type property
-+ *
-+ * Convert a channel-type property value to a string.
-+ *
-+ * Returns: the channel-type property value for a @str channel
-+ * Since: 0.21
-+ **/
- gint spice_channel_string_to_type(const gchar *str)
- {
- int i;
-diff --git a/gtk/spice-glib-sym-file b/gtk/spice-glib-sym-file
-index 2b172d0..8540307 100644
---- a/gtk/spice-glib-sym-file
-+++ b/gtk/spice-glib-sym-file
-@@ -14,6 +14,7 @@ spice_channel_set_capability
- spice_channel_test_capability
- spice_channel_test_common_capability
- spice_channel_type_to_string
-+spice_channel_string_to_type
- spice_client_error_quark
- spice_cursor_channel_get_type
- spice_display_channel_get_type
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch b/net-misc/spice-gtk/files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch
deleted file mode 100644
index 83e51db..0000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f31bc2a9a6700bebc258130e802f40180af77d8e Mon Sep 17 00:00:00 2001
-From: Marc-André Lureau <marcandre.lureau@redhat.com>
-Date: Fri, 20 Sep 2013 15:54:58 +0000
-Subject: build-sys: fix g_clear_pointer usage on old glib
-
-As pointed out and verified on the ML after 0.21 release by Klaus
-Hochlehnert.
----
-diff --git a/gtk/channel-cursor.c b/gtk/channel-cursor.c
-index 0443b9f..bbfb3c9 100644
---- a/gtk/channel-cursor.c
-+++ b/gtk/channel-cursor.c
-@@ -15,6 +15,7 @@
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-+#include "glib-compat.h"
- #include "spice-client.h"
- #include "spice-common.h"
-
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch b/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch
deleted file mode 100644
index fe24734..0000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1dcf7acb4288a27f125458bfa86cf614437657d5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@stepping-stone.ch>
-Date: Tue, 20 May 2014 18:49:28 +0200
-Subject: [PATCH 2/2] Do not depend on libsoup directly
-
-The libsoup-dependency is not directly used but comes in as a dependency
-of phodav and phodav has libsoup correctly recorded in its pkg-config
-file.
----
- configure.ac | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 70ab75c..f47ee20 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -267,9 +267,6 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0 > 2.0.0)
- AC_SUBST(GTHREAD_CFLAGS)
- AC_SUBST(GTHREAD_LIBS)
-
--PKG_CHECK_MODULES(SOUP, libsoup-2.4)
--AC_SUBST(SOUP_CFLAGS)
--AC_SUBST(SOUP_LIBS)
- AC_ARG_ENABLE([webdav],
- AS_HELP_STRING([--enable-webdav=@<:@auto/yes/no@:>@],
- [Enable webdav support @<:@default=auto@:>@]),
---
-1.9.2
-
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch b/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch
deleted file mode 100644
index 817a9b0..0000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From f25626a68a2fb83b02ee7a13dd4887d1305bc068 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@stepping-stone.ch>
-Date: Tue, 20 May 2014 18:48:05 +0200
-Subject: [PATCH 1/2] Introduce --enable/disable-webdav option
-
-This makes the phodav dependency configureable.
-And name it after the corresponding channel.
----
- configure.ac | 21 +++++++++++++++++----
- 1 file changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d89bd6f..70ab75c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -270,10 +270,23 @@ AC_SUBST(GTHREAD_LIBS)
- PKG_CHECK_MODULES(SOUP, libsoup-2.4)
- AC_SUBST(SOUP_CFLAGS)
- AC_SUBST(SOUP_LIBS)
-+AC_ARG_ENABLE([webdav],
-+ AS_HELP_STRING([--enable-webdav=@<:@auto/yes/no@:>@],
-+ [Enable webdav support @<:@default=auto@:>@]),
-+ [],
-+ [enable_webdav="auto"])
-+
-+if test "x$enable_webdav" = "xno"; then
-+ have_phodav="no"
-+else
-+ PKG_CHECK_MODULES(PHODAV, [libphodav-1.0], [have_phodav=yes], [have_phodav=no])
-+ AC_SUBST(PHODAV_CFLAGS)
-+ AC_SUBST(PHODAV_LIBS)
-
--PKG_CHECK_MODULES(PHODAV, [libphodav-1.0], [have_phodav=yes], [have_phodav=no])
--AC_SUBST(PHODAV_CFLAGS)
--AC_SUBST(PHODAV_LIBS)
-+ if test "x$have_phodav" = "xno" && test "x$enable_webdav" = "xyes"; then
-+ AC_MSG_ERROR([webdav support explicitly requested, but some required packages are not available])
-+ fi
-+fi
- AS_IF([test "x$have_phodav" = "xyes"],
- AC_DEFINE(USE_PHODAV, [1], [Define if supporting phodav]))
-
-@@ -754,7 +767,7 @@ AC_MSG_NOTICE([
- Smartcard support: ${have_smartcard}
- USB redirection support: ${have_usbredir} ${with_usbredir_hotplug}
- DBus: ${have_dbus}
-- PhoDAV: ${have_phodav}
-+ WebDAV support: ${have_phodav}
-
- Now type 'make' to build $PACKAGE
-
---
-1.9.2
-
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch b/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch
deleted file mode 100644
index 8429afd..0000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 8da1a11..6332db9 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -189,6 +189,7 @@ libspice_client_glib_2_0_la_LIBADD = \
- $(top_builddir)/spice-common/common/libspice-common-client.la \
- $(GLIB2_LIBS) \
- $(SOUP_LIBS) \
-+ $(GIO_LIBS) \
- $(GOBJECT2_LIBS) \
- $(CELT051_LIBS) \
- $(OPUS_LIBS) \
diff --git a/net-misc/spice-gtk/files/spice.protocol b/net-misc/spice-gtk/files/spice.protocol
deleted file mode 100644
index 348247f..0000000
--- a/net-misc/spice-gtk/files/spice.protocol
+++ /dev/null
@@ -1,12 +0,0 @@
-[Protocol]
-exec=/usr/bin/spicy --uri="%u"
-protocol=spice
-input=none
-output=none
-helper=true
-listing=
-reading=false
-writing=false
-makedir=false
-deleting=false
-
diff --git a/net-misc/spice-gtk/files/spice.schemas b/net-misc/spice-gtk/files/spice.schemas
deleted file mode 100644
index 43b1217..0000000
--- a/net-misc/spice-gtk/files/spice.schemas
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-<schemalist>
-<schema>
- <key>/schemas/desktop/gnome/url-handlers/spice/enabled</key>
- <applyto>/desktop/gnome/url-handlers/spice/enabled</applyto>
- <owner>spice</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>How to handle spice URLs</short>
- <long>Set to true to have a program specified in command handle spice URLs</long>
- </locale>
-</schema>
-
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/spice/command</key>
- <applyto>/desktop/gnome/url-handlers/spice/command</applyto>
- <owner>spice</owner>
- <type>string</type>
- <default>/usr/bin/spicy --uri="%s"</default>
- <locale name="C">
- <short>URL handler for spice URIs</short>
- <long>URL handler for spice URIs</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/spice/need-terminal</key>
- <applyto>/desktop/gnome/url-handlers/spice/need-terminal</applyto>
- <owner>spice</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Run program in terminal</short>
- <long>True if the program to handle this URL should be run in a terminal</long>
- </locale>
- </schema>
-</schemalist>
-</gconfschemafile>
-
diff --git a/net-misc/spice-gtk/spice-gtk-0.20-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.20-r1.ebuild
deleted file mode 100644
index e447d1bd..0000000
--- a/net-misc/spice-gtk/spice-gtk-0.20-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 vala
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio
-python sasl smartcard static-libs usbredir vala"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ?? ( pulseaudio gstreamer )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="${PYTHON_DEPS}
- pulseaudio? ( media-sound/pulseaudio[glib] )
- gstreamer? (
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10 )
- >=x11-libs/pixman-0.17.7
- >=media-libs/celt-0.5.1.1:0.5.1
- dev-libs/openssl
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- x11-libs/gtk+:2[introspection?]
- >=dev-libs/glib-2.26:2
- >=x11-libs/cairo-1.2
- virtual/jpeg
- sys-libs/zlib
- dbus? ( dev-libs/dbus-glib )
- introspection? ( dev-libs/gobject-introspection )
- python? ( dev-python/pygtk:2 )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/libcacard )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- virtual/libgudev:=
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.101 )
- )"
-DEPEND="${RDEPEND}
- dev-lang/python
- dev-python/pyparsing
- dev-perl/Text-CSV
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )"
-
-# Hard-deps while building from git:
-# dev-lang/vala:0.14
-# dev-lang/perl
-
-GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
-GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
-
-src_prepare() {
- use vala && vala_src_prepare
- mkdir ${GTK2_BUILDDIR} ${GTK3_BUILDDIR} || die
-
- epatch "${FILESDIR}"/${P}-add-spice-channel-string-to-type.patch
-}
-
-src_configure() {
- local myconf
- local audio="no"
-
- use gstreamer && audio="gstreamer"
- use pulseaudio && audio="pulse"
-
- if use vala ; then
- # force vala regen for MinGW, etc
- rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
- fi
-
- myconf="
- $(use_enable static-libs static) \
- $(use_enable introspection) \
- --with-audio=${audio} \
- $(use_with python) \
- $(use_with sasl) \
- $(use_enable smartcard) \
- $(use_enable usbredir) \
- $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
- $(use_with usbredir usb-acl-helper-dir /usr/libexec) \
- $(use_enable policykit polkit) \
- $(use_enable vala) \
- $(use_enable dbus) \
- $(use_enable doc gtk-doc) \
- --disable-werror \
- --enable-pie"
-
- cd ${GTK2_BUILDDIR}
- echo "Running configure in ${GTK2_BUILDDIR}"
- ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
- --with-gtk=2.0 \
- ${myconf}
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- echo "Running configure in ${GTK3_BUILDDIR}"
- ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
- --with-gtk=3.0 \
- ${myconf}
- fi
-}
-
-src_compile() {
- cd ${GTK2_BUILDDIR}
- einfo "Running make in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make in ${GTK3_BUILDDIR}"
- default
- fi
-}
-
-src_test() {
- cd ${GTK2_BUILDDIR}
- einfo "Running make check in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make check in ${GTK3_BUILDDIR}"
- default
- fi
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
- cd ${GTK2_BUILDDIR}
- einfo "Running make check in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make install in ${GTK3_BUILDDIR}"
- default
- fi
-
- # Remove .la files if they're not needed
- use static-libs || prune_libtool_files
-
- use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.21.ebuild b/net-misc/spice-gtk/spice-gtk-0.21.ebuild
deleted file mode 100644
index efdc404..0000000
--- a/net-misc/spice-gtk/spice-gtk-0.21.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 vala
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio
-python sasl smartcard static-libs usbredir vala"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ?? ( pulseaudio gstreamer )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="${PYTHON_DEPS}
- pulseaudio? ( media-sound/pulseaudio[glib] )
- gstreamer? (
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10 )
- >=x11-libs/pixman-0.17.7
- >=media-libs/celt-0.5.1.1:0.5.1
- dev-libs/openssl
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- x11-libs/gtk+:2[introspection?]
- >=dev-libs/glib-2.26:2
- >=x11-libs/cairo-1.2
- virtual/jpeg
- sys-libs/zlib
- dbus? ( dev-libs/dbus-glib )
- introspection? ( dev-libs/gobject-introspection )
- python? ( dev-python/pygtk:2 )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/libcacard )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- virtual/libgudev:=
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- !~sys-auth/polkit-0.111 )
- )"
-DEPEND="${RDEPEND}
- dev-lang/python
- dev-python/pyparsing
- dev-perl/Text-CSV
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )"
-
-# Hard-deps while building from git:
-# dev-lang/vala:0.14
-# dev-lang/perl
-
-GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
-GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
-
-src_prepare() {
-
- epatch "${FILESDIR}"/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch
-
- epatch_user
-
- use vala && vala_src_prepare
- mkdir ${GTK2_BUILDDIR} ${GTK3_BUILDDIR} || die
-}
-
-src_configure() {
- local myconf
- local audio="no"
-
- use gstreamer && audio="gstreamer"
- use pulseaudio && audio="pulse"
-
- if use vala ; then
- # force vala regen for MinGW, etc
- rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
- fi
-
- myconf="
- $(use_enable static-libs static) \
- $(use_enable introspection) \
- --with-audio=${audio} \
- $(use_with python) \
- $(use_with sasl) \
- $(use_enable smartcard) \
- $(use_enable usbredir) \
- $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
- $(use_with usbredir usb-acl-helper-dir /usr/libexec) \
- $(use_enable policykit polkit) \
- $(use_enable vala) \
- $(use_enable dbus) \
- $(use_enable doc gtk-doc) \
- --disable-werror \
- --enable-pie"
-
- cd ${GTK2_BUILDDIR}
- echo "Running configure in ${GTK2_BUILDDIR}"
- ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
- --with-gtk=2.0 \
- ${myconf}
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- echo "Running configure in ${GTK3_BUILDDIR}"
- ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
- --with-gtk=3.0 \
- ${myconf}
- fi
-}
-
-src_compile() {
- cd ${GTK2_BUILDDIR}
- einfo "Running make in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make in ${GTK3_BUILDDIR}"
- default
- fi
-}
-
-src_test() {
- cd ${GTK2_BUILDDIR}
- einfo "Running make check in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make check in ${GTK3_BUILDDIR}"
- default
- fi
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
- cd ${GTK2_BUILDDIR}
- einfo "Running make check in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make install in ${GTK3_BUILDDIR}"
- default
- fi
-
- # Remove .la files if they're not needed
- use static-libs || prune_libtool_files
-
- use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild
deleted file mode 100644
index 4f5d78f..0000000
--- a/net-misc/spice-gtk/spice-gtk-0.25-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1 vala
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
-IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio
-python sasl smartcard static-libs usbredir vala webdav"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ?? ( pulseaudio gstreamer )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="${PYTHON_DEPS}
- pulseaudio? ( media-sound/pulseaudio[glib] )
- gstreamer? (
- media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10 )
- >=x11-libs/pixman-0.17.7
- >=media-libs/celt-0.5.1.1:0.5.1
- media-libs/opus
- dev-libs/openssl
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- x11-libs/gtk+:2[introspection?]
- >=dev-libs/glib-2.26:2
- >=x11-libs/cairo-1.2
- virtual/jpeg
- sys-libs/zlib
- dbus? ( dev-libs/dbus-glib )
- introspection? ( dev-libs/gobject-introspection )
- python? ( dev-python/pygtk:2 )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/qemu[smartcard] )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- virtual/libgudev:=
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- !~sys-auth/polkit-0.111 )
- )
- webdav? ( net-libs/phodav:1.0 )"
-DEPEND="${RDEPEND}
- dev-lang/python
- dev-python/pyparsing
- dev-perl/Text-CSV
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )"
-
-# Hard-deps while building from git:
-# dev-lang/vala:0.14
-# dev-lang/perl
-
-GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
-GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${P}-Introduce-enable-disable-webdav-option.patch" \
- "${FILESDIR}/${P}-Do-not-depend-on-libsoup-directly.patch" \
- "${FILESDIR}/${P}-missing_gio_libs.patch"
- epatch_user
-
- AT_NO_RECURSIVE="yes" eautoreconf
-
- use vala && vala_src_prepare
- mkdir ${GTK2_BUILDDIR} ${GTK3_BUILDDIR} || die
-}
-
-src_configure() {
- local myconf
- local audio="no"
-
- use gstreamer && audio="gstreamer"
- use pulseaudio && audio="pulse"
-
- if use vala ; then
- # force vala regen for MinGW, etc
- rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
- fi
-
- myconf="
- $(use_enable static-libs static) \
- $(use_enable introspection) \
- --with-audio=${audio} \
- $(use_with python) \
- $(use_with sasl) \
- $(use_enable smartcard) \
- $(use_enable usbredir) \
- $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
- $(use_with usbredir usb-acl-helper-dir /usr/libexec) \
- $(use_enable policykit polkit) \
- $(use_enable vala) \
- $(use_enable webdav) \
- $(use_enable dbus) \
- $(use_enable doc gtk-doc) \
- --disable-werror \
- --enable-pie"
-
- cd ${GTK2_BUILDDIR}
- echo "Running configure in ${GTK2_BUILDDIR}"
- ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
- --with-gtk=2.0 \
- ${myconf}
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- echo "Running configure in ${GTK3_BUILDDIR}"
- ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
- --with-gtk=3.0 \
- ${myconf}
- fi
-}
-
-src_compile() {
- cd ${GTK2_BUILDDIR}
- einfo "Running make in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make in ${GTK3_BUILDDIR}"
- default
- fi
-}
-
-src_test() {
- cd ${GTK2_BUILDDIR}
- einfo "Running make check in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make check in ${GTK3_BUILDDIR}"
- default
- fi
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
- cd ${GTK2_BUILDDIR}
- einfo "Running make check in ${GTK2_BUILDDIR}"
- default
-
- if use gtk3; then
- cd ${GTK3_BUILDDIR}
- einfo "Running make install in ${GTK3_BUILDDIR}"
- default
- fi
-
- # Remove .la files if they're not needed
- use static-libs || prune_libtool_files
-
- use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.28.ebuild b/net-misc/spice-gtk/spice-gtk-0.28.ebuild
deleted file mode 100644
index 34ea2b7..0000000
--- a/net-misc/spice-gtk/spice-gtk-0.28.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multibuild python-single-r1 vala
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm ~ia64 ~ppc ppc64 ~sparc x86"
-IUSE="dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- ?? ( pulseaudio gstreamer )
-"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
- ${PYTHON_DEPS}
- pulseaudio? ( media-sound/pulseaudio[glib] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0 )
- >=x11-libs/pixman-0.17.7
- >=media-libs/celt-0.5.1.1:0.5.1
- media-libs/opus
- dev-libs/openssl:=
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- x11-libs/gtk+:2[introspection?]
- >=dev-libs/glib-2.28:2
- >=x11-libs/cairo-1.2
- virtual/jpeg:=
- sys-libs/zlib
- introspection? ( dev-libs/gobject-introspection )
- lz4? ( app-arch/lz4 )
- python? ( dev-python/pygtk:2 )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/qemu[smartcard] )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- virtual/libgudev:=
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- !~sys-auth/polkit-0.111 )
- )
- webdav? (
- net-libs/phodav:2.0
- >=dev-libs/glib-2.43.90:2
- >=net-libs/libsoup-2.49.91 )
-"
-DEPEND="${RDEPEND}
- dev-lang/python
- dev-python/pyparsing
- dev-perl/Text-CSV
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-# Hard-deps while building from git:
-# dev-lang/vala:0.14
-# dev-lang/perl
-
-src_prepare() {
- epatch_user
-
- AT_NO_RECURSIVE="yes" eautoreconf
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local myconf
- local audio="no"
-
- use gstreamer && audio="gstreamer"
- use pulseaudio && audio="pulse"
-
- if use vala ; then
- # force vala regen for MinGW, etc
- rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
- fi
-
- myconf="
- --disable-maintainer-mode \
- $(use_enable static-libs static) \
- $(use_enable introspection) \
- --with-audio=${audio} \
- $(use_with sasl) \
- $(use_enable smartcard) \
- $(use_enable usbredir) \
- $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
- $(use_with usbredir usb-acl-helper-dir /usr/libexec) \
- $(use_enable policykit polkit) \
- $(use_enable vala) \
- $(use_enable webdav) \
- $(use_enable dbus) \
- --disable-gtk-doc \
- --disable-werror \
- --enable-pie"
-
- # Parameter of --with-gtk
- MULTIBUILD_VARIANTS=( 2.0 )
- use gtk3 && MULTIBUILD_VARIANTS+=( 3.0 )
-
- configure() {
- local myconf=()
- myconf+=( --with-gtk=${MULTIBUILD_VARIANT} )
-
- if [[ ${MULTIBUILD_ID} =~ "2.0" ]] ; then
- myconf+=( $(use_with python) )
- else
- myconf+=( --without-python )
- fi
-
- ECONF_SOURCE="${S}" econf $@ ${myconf[@]}
- }
- multibuild_foreach_variant run_in_build_dir configure ${myconf}
-}
-
-src_compile() {
- multibuild_foreach_variant run_in_build_dir default
-}
-
-src_test() {
- multibuild_foreach_variant run_in_build_dir default
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
- multibuild_foreach_variant run_in_build_dir default
-
- # Remove .la files if they're not needed
- use static-libs || prune_libtool_files
-
- use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.29.ebuild b/net-misc/spice-gtk/spice-gtk-0.29.ebuild
deleted file mode 100644
index 33656b0..0000000
--- a/net-misc/spice-gtk/spice-gtk-0.29.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multibuild python-single-r1 vala
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- ?? ( pulseaudio gstreamer )
-"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
- ${PYTHON_DEPS}
- pulseaudio? ( media-sound/pulseaudio[glib] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0 )
- >=x11-libs/pixman-0.17.7
- >=media-libs/celt-0.5.1.1:0.5.1
- media-libs/opus
- dev-libs/openssl:=
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- x11-libs/gtk+:2[introspection?]
- >=dev-libs/glib-2.28:2
- >=x11-libs/cairo-1.2
- virtual/jpeg:=
- sys-libs/zlib
- introspection? ( dev-libs/gobject-introspection )
- lz4? ( app-arch/lz4 )
- python? ( dev-python/pygtk:2 )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/qemu[smartcard] )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- virtual/libgudev:=
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- !~sys-auth/polkit-0.111 )
- )
- webdav? (
- net-libs/phodav:2.0
- >=dev-libs/glib-2.43.90:2
- >=net-libs/libsoup-2.49.91 )
-"
-DEPEND="${RDEPEND}
- dev-lang/python
- dev-python/pyparsing
- dev-perl/Text-CSV
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-# Hard-deps while building from git:
-# dev-lang/vala:0.14
-# dev-lang/perl
-
-src_prepare() {
- epatch_user
-
- AT_NO_RECURSIVE="yes" eautoreconf
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local myconf
- local audio="no"
-
- use gstreamer && audio="gstreamer"
- use pulseaudio && audio="pulse"
-
- if use vala ; then
- # force vala regen for MinGW, etc
- rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
- fi
-
- myconf="
- --disable-maintainer-mode \
- $(use_enable static-libs static) \
- $(use_enable introspection) \
- --with-audio=${audio} \
- $(use_with sasl) \
- $(use_enable smartcard) \
- $(use_enable usbredir) \
- $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
- $(use_with usbredir usb-acl-helper-dir /usr/libexec) \
- $(use_enable policykit polkit) \
- $(use_enable vala) \
- $(use_enable webdav) \
- $(use_enable dbus) \
- --disable-gtk-doc \
- --disable-werror \
- --enable-pie"
-
- # Parameter of --with-gtk
- MULTIBUILD_VARIANTS=( 2.0 )
- use gtk3 && MULTIBUILD_VARIANTS+=( 3.0 )
-
- configure() {
- local myconf=()
- myconf+=( --with-gtk=${MULTIBUILD_VARIANT} )
-
- if [[ ${MULTIBUILD_ID} =~ "2.0" ]] ; then
- myconf+=( $(use_with python) )
- else
- myconf+=( --without-python )
- fi
-
- ECONF_SOURCE="${S}" econf $@ ${myconf[@]}
- }
- multibuild_foreach_variant run_in_build_dir configure ${myconf}
-}
-
-src_compile() {
- multibuild_foreach_variant run_in_build_dir default
-}
-
-src_test() {
- multibuild_foreach_variant run_in_build_dir default
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
- multibuild_foreach_variant run_in_build_dir default
-
- # Remove .la files if they're not needed
- use static-libs || prune_libtool_files
-
- use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/, net-misc/spice-gtk/files/
@ 2016-08-17 20:14 Ian Stakenvicius
0 siblings, 0 replies; 9+ messages in thread
From: Ian Stakenvicius @ 2016-08-17 20:14 UTC (permalink / raw
To: gentoo-commits
commit: c772ac4e3d9c439779e97994d752a4b7afb645c4
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 20:13:30 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 20:13:53 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c772ac4e
net-misc/spice-gtk: explicitly link libX11 the right way for ld.gold
Bug: http://bugs.gentoo.org/585118
Package-Manager: portage-2.2.28
.../spice-gtk/files/spice-gtk-0.31-x11-libs.patch | 34 ++++++++++++++++++++++
.../spice-gtk/files/spice-gtk-0.32-x11-libs.patch | 34 ++++++++++++++++++++++
net-misc/spice-gtk/spice-gtk-0.31.ebuild | 2 ++
net-misc/spice-gtk/spice-gtk-0.32-r1.ebuild | 1 +
net-misc/spice-gtk/spice-gtk-0.32-r2.ebuild | 1 +
5 files changed, 72 insertions(+)
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.31-x11-libs.patch b/net-misc/spice-gtk/files/spice-gtk-0.31-x11-libs.patch
new file mode 100644
index 0000000..0d7e715
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.31-x11-libs.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac 2016-08-17 14:16:14.671302073 -0400
++++ b/configure.ac 2016-08-17 14:14:57.351587309 -0400
+@@ -151,8 +151,12 @@
+ SPICE_GTK_REQUIRES="${SPICE_GTK_REQUIRES} gtk+-$GTK_API_VERSION >= $GTK_REQUIRED"
+
+ PKG_CHECK_EXISTS([gtk+-x11-$with_gtk], [have_x11=yes], [have_x11=no])
+-AS_IF([test "x$have_x11" = "xyes"], [AC_DEFINE([HAVE_X11], 1, [Have x11?])])
++AS_IF([test "x$have_x11" = "xyes"], [
++AC_DEFINE([HAVE_X11], 1, [Have x11?])
++PKG_CHECK_MODULES(X11, x11)])
+ AM_CONDITIONAL([WITH_DISPLAY_X11], [test "x$have_x11" = "xyes"])
++AC_SUBST(X11_CFLAGS)
++AC_SUBST(X11_LIBS)
+
+ PKG_CHECK_EXISTS([gtk+-quartz-$with_gtk], [have_quartz=yes], [have_quartz=no])
+ AS_IF([test "x$have_quartz" = "xyes"], [AC_DEFINE([HAVE_QUARTZ], 1, [Have Quartz?])])
+--- a/src/Makefile.am 2016-02-18 10:29:04.000000000 -0500
++++ b/src/Makefile.am 2016-08-17 14:18:46.340742557 -0400
+@@ -103,6 +103,7 @@
+ $(GUDEV_CFLAGS) \
+ $(SOUP_CFLAGS) \
+ $(PHODAV_CFLAGS) \
++ $(X11_CFLAGS) \
+ $(LZ4_CFLAGS) \
+ $(NULL)
+
+@@ -123,6 +124,7 @@
+ $(GTK_LIBS) \
+ $(CAIRO_LIBS) \
+ $(EPOXY_LIBS) \
++ $(X11_LIBS) \
+ $(LIBM) \
+ $(NULL)
+
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.32-x11-libs.patch b/net-misc/spice-gtk/files/spice-gtk-0.32-x11-libs.patch
new file mode 100644
index 0000000..02ea218
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.32-x11-libs.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac 2016-06-16 07:34:31.000000000 -0400
++++ b/configure.ac 2016-08-17 15:41:03.322532729 -0400
+@@ -163,6 +163,13 @@
+ AM_CONDITIONAL([WITH_DISPLAY_WINDOWS], [test "x$have_win32" = "xyes"])
+
+ AC_CHECK_HEADERS([X11/XKBlib.h])
++AS_IF([test "x$have_quartz" != "xyes"],[
++ AS_IF([test "x$have_win32" != "xyes"],[
++ PKG_CHECK_MODULES(X11,x11)
++ ])
++])
++AC_SUBST(X11_CFLAGS)
++AC_SUBST(X11_LIBS)
+
+ AC_ARG_WITH([pnp-ids-path],
+ AC_HELP_STRING([--with-pnp-ids-path],
+--- a/src/Makefile.am 2016-08-17 15:44:42.081663331 -0400
++++ b/src/Makefile.am 2016-08-17 15:45:24.701493950 -0400
+@@ -100,6 +100,7 @@
+ $(GUDEV_CFLAGS) \
+ $(SOUP_CFLAGS) \
+ $(PHODAV_CFLAGS) \
++ $(X11_CFLAGS) \
+ $(LZ4_CFLAGS) \
+ $(NULL)
+
+@@ -119,6 +120,7 @@
+ libspice-client-glib-2.0.la \
+ $(GTK_LIBS) \
+ $(CAIRO_LIBS) \
++ $(X11_LIBS) \
+ $(LIBM) \
+ $(NULL)
+
diff --git a/net-misc/spice-gtk/spice-gtk-0.31.ebuild b/net-misc/spice-gtk/spice-gtk-0.31.ebuild
index 332eca9..3682e02 100644
--- a/net-misc/spice-gtk/spice-gtk-0.31.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.31.ebuild
@@ -45,6 +45,7 @@ RDEPEND="
x11-libs/gtk+:2[introspection?]
>=dev-libs/glib-2.28:2
>=x11-libs/cairo-1.2
+ x11-libs/libX11
virtual/jpeg:0=
sys-libs/zlib
introspection? ( dev-libs/gobject-introspection )
@@ -89,6 +90,7 @@ DEPEND="${RDEPEND}
addpredict /dev
src_prepare() {
+ epatch "${FILESDIR}"/${P}-x11-libs.patch
epatch_user
AT_NO_RECURSIVE="yes" eautoreconf
diff --git a/net-misc/spice-gtk/spice-gtk-0.32-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.32-r1.ebuild
index 7847756..0fac346 100644
--- a/net-misc/spice-gtk/spice-gtk-0.32-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.32-r1.ebuild
@@ -80,6 +80,7 @@ DEPEND="${RDEPEND}
addpredict /dev
src_prepare() {
+ epatch "${FILESDIR}"/${P}-x11-libs.patch
epatch_user
AT_NO_RECURSIVE="yes" eautoreconf
diff --git a/net-misc/spice-gtk/spice-gtk-0.32-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.32-r2.ebuild
index 33d4a5b..ea87c5a 100644
--- a/net-misc/spice-gtk/spice-gtk-0.32-r2.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.32-r2.ebuild
@@ -84,6 +84,7 @@ DEPEND="${RDEPEND}
addpredict /dev
src_prepare() {
+ epatch "${FILESDIR}"/${P}-x11-libs.patch
epatch_user
AT_NO_RECURSIVE="yes" eautoreconf
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/, net-misc/spice-gtk/files/
@ 2018-08-07 0:07 Virgil Dupras
0 siblings, 0 replies; 9+ messages in thread
From: Virgil Dupras @ 2018-08-07 0:07 UTC (permalink / raw
To: gentoo-commits
commit: 20549bbffcf99fc94c3a0a5a6a80aa4bfcfd1546
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 7 00:06:32 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Tue Aug 7 00:07:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20549bbf
net-misc/spice-gtk: remove vulnerable version
Bug: https://bugs.gentoo.org/650878
Package-Manager: Portage-2.3.44, Repoman-2.3.10
net-misc/spice-gtk/Manifest | 1 -
.../files/spice-gtk-0.33-sys-sysmacros.h.patch | 44 ------
net-misc/spice-gtk/spice-gtk-0.33-r2.ebuild | 152 ---------------------
3 files changed, 197 deletions(-)
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index c985c143d93..cb5fee8a774 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,2 +1 @@
-DIST spice-gtk-0.33.tar.bz2 1383927 BLAKE2B 96cbe8d3f81d596c4fd0d85cc0fd96588029a3b486327c64c5084b82e2c3acefee648a836ca46363dc03aff33dd72a4001c2ac8513b18b6479b56d11cc86f60e SHA512 ee5750194057a7f568641f6382d6969b67dc7271b4d13037570b79cdecd70a7eeb457ad349d3ed8e576f1fbd9701fac7d24607d5cbde8af0e030433b347abc80
DIST spice-gtk-0.34.tar.bz2 1480566 BLAKE2B 35350cf930d091fa11df1d573f9eff23696745a20e88fcd20783c108b6ddca9064bc4e75d414f23bd94318e37d509e581866c5dcc955cd21ca7c9384b492f0ec SHA512 17ea737511855b47f5eaf5143756483542cf8ee83f8d276cbfb2c0407355f68ed329fcbed8a67737179f3e53587710634d6faa856590234ee68be7b4b13f2689
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.33-sys-sysmacros.h.patch b/net-misc/spice-gtk/files/spice-gtk-0.33-sys-sysmacros.h.patch
deleted file mode 100644
index 902ee9dd029..00000000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.33-sys-sysmacros.h.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a27a83da30d58511b2a5f2cdb13ebd4fca7a3d0a Mon Sep 17 00:00:00 2001
-From: Pavel Grunt <pgrunt@redhat.com>
-Date: Tue, 1 Nov 2016 17:08:01 +0100
-Subject: [PATCH] Adjust include header to new location of macros
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-minor & major macros were moved to sysmacros.h
-
-usbutil.c: In function ‘spice_usbutil_get_sysfs_attribute’:
-usbutil.c:110:14: warning: ‘__major_from_sys_types’ is deprecated:
- In the GNU C Library, `major' is defined by <sys/sysmacros.h>.
- For historical compatibility, it is currently defined by
- <sys/types.h> as well, but we plan to remove this soon.
- To use `major', include <sys/sysmacros.h> directly.
- If you did not intend to use a system-defined macro `major',
- you should #undef it after including <sys/types.h>.
- [-Wdeprecated-declarations]
- major(stat_buf.st_rdev), minor(stat_buf.st_rdev), attribute);
-
-Acked-by: Victor Toso <victortoso@redhat.com>
----
- src/usbutil.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/usbutil.c b/src/usbutil.c
-index 7bfbe44..b68a2e1 100644
---- a/src/usbutil.c
-+++ b/src/usbutil.c
-@@ -30,7 +30,10 @@
- #ifdef __linux__
- #include <stdio.h>
- #include <unistd.h>
-+#include <sys/sysmacros.h>
-+#ifndef major /* major and minor macros were moved to sys/sysmacros.h from sys/types.h */
- #include <sys/types.h>
-+#endif
- #include <sys/stat.h>
- #endif
- #include "usbutil.h"
---
-2.10.2
-
diff --git a/net-misc/spice-gtk/spice-gtk-0.33-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.33-r2.ebuild
deleted file mode 100644
index 843d6f96a7e..00000000000
--- a/net-misc/spice-gtk/spice-gtk-0.33-r2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils xdg-utils vala readme.gentoo-r1
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="dbus gstaudio gstvideo gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
-
-REQUIRED_USE="?? ( pulseaudio gstaudio )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- pulseaudio? ( media-sound/pulseaudio[glib] )
- gstvideo? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- )
- gstaudio? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- )
- >=x11-libs/pixman-0.17.7
- >=media-libs/celt-0.5.1.1:0.5.1
- media-libs/opus
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- >=dev-libs/glib-2.36:2
- >=x11-libs/cairo-1.2
- virtual/jpeg:0=
- sys-libs/zlib
- introspection? ( dev-libs/gobject-introspection )
- lz4? ( app-arch/lz4 )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/qemu[smartcard] )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- virtual/libgudev:=
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- !~sys-auth/polkit-0.111 )
- )
- webdav? (
- net-libs/phodav:2.0
- >=dev-libs/glib-2.43.90:2
- >=net-libs/libsoup-2.49.91 )
-"
-DEPEND="${RDEPEND}
- >=app-emulation/spice-protocol-0.12.12
- dev-perl/Text-CSV
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.33-sys-sysmacros.h.patch
-)
-
-src_prepare() {
- # bug 558558
- export GIT_CEILING_DIRECTORIES="${WORKDIR}"
- echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
-
- default
-
- eautoreconf
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- # Prevent sandbox violations, bug #581836
- # https://bugzilla.gnome.org/show_bug.cgi?id=744134
- # https://bugzilla.gnome.org/show_bug.cgi?id=744135
- addpredict /dev
-
- # Clean up environment, bug #586642
- xdg_environment_reset
-
- local myconf
-
- if use vala ; then
- # force vala regen for MinGW, etc
- rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
- fi
-
- myconf="
- --disable-maintainer-mode \
- $(use_enable static-libs static) \
- $(use_enable introspection) \
- $(use_with sasl) \
- $(use_enable smartcard) \
- $(use_enable usbredir) \
- $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
- $(use_with usbredir usb-acl-helper-dir /usr/libexec) \
- $(use_with gtk3 gtk 3.0) \
- $(use_enable policykit polkit) \
- $(use_enable pulseaudio pulse) \
- $(use_enable gstaudio) \
- $(use_enable gstvideo) \
- $(use_enable mjpeg builtin-mjpeg) \
- $(use_enable vala) \
- $(use_enable webdav) \
- $(use_enable dbus) \
- --disable-gtk-doc \
- --disable-werror \
- --enable-pie"
-
- econf ${myconf}
-}
-
-src_compile() {
- # Prevent sandbox violations, bug #581836
- # https://bugzilla.gnome.org/show_bug.cgi?id=744134
- # https://bugzilla.gnome.org/show_bug.cgi?id=744135
- addpredict /dev
-
- default
-}
-
-src_install() {
- default
-
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
- # Remove .la files if they're not needed
- use static-libs || prune_libtool_files
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
- readme.gentoo_create_doc
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/, net-misc/spice-gtk/files/
@ 2019-02-16 17:59 Aaron Bauman
0 siblings, 0 replies; 9+ messages in thread
From: Aaron Bauman @ 2019-02-16 17:59 UTC (permalink / raw
To: gentoo-commits
commit: 0c57f77f684053bbc14049127f8c537874ad61c1
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com>
AuthorDate: Sat Feb 16 03:38:17 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 17:59:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c57f77f
net-misc/spice-gtk: fix build for >=libressl-2.7.0
NB: spice-gtk-0.34-libressl.patch was not used anywhere.
Closes: https://bugs.gentoo.org/664512
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11062
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
...ibressl.patch => spice-gtk-0.35-libressl.patch} | 25 ++--
net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild | 154 +++++++++++++++++++++
2 files changed, 170 insertions(+), 9 deletions(-)
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch b/net-misc/spice-gtk/files/spice-gtk-0.35-libressl.patch
similarity index 54%
rename from net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch
rename to net-misc/spice-gtk/files/spice-gtk-0.35-libressl.patch
index e39efaee274..6ecea6d11c2 100644
--- a/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch
+++ b/net-misc/spice-gtk/files/spice-gtk-0.35-libressl.patch
@@ -1,16 +1,21 @@
https://bugs.gentoo.org/631250
https://631250.bugs.gentoo.org/attachment.cgi?id=513720
+https://bugs.gentoo.org/664512
+https://cgit.freedesktop.org/spice/spice-common/commit/?id=8e8476d932d9866d950fe616fe1c10361b75a3a2
+https://cgit.freedesktop.org/spice/spice-gtk/commit/?id=a45e8a56e389e41c891eaa204b16dd89e74e2e69
+
diff --git a/spice-common/common/ssl_verify.c b/spice-common/common/ssl_verify.c
index a9ed650..821faa9 100644
--- a/spice-common/common/ssl_verify.c
+++ b/spice-common/common/ssl_verify.c
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,8 @@
#include <string.h>
#include <gio/gio.h>
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || \
++ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
{
return M_ASN1_STRING_data(asn1);
@@ -18,12 +23,13 @@ diff --git a/src/bio-gio.c b/src/bio-gio.c
index 9358fae..30aa73b 100644
--- a/src/bio-gio.c
+++ b/src/bio-gio.c
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,8 @@
#include "spice-util.h"
#include "bio-gio.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
static BIO_METHOD one_static_bio;
static int BIO_meth_set_read(BIO_METHOD *biom,
@@ -31,12 +37,13 @@ diff --git a/src/spice-channel.c b/src/spice-channel.c
index 4c3db9d..9df0203 100644
--- a/src/spice-channel.c
+++ b/src/spice-channel.c
-@@ -55,7 +55,7 @@ static void spice_channel_reset_capabilities(SpiceChannel *channel);
+@@ -55,7 +55,8 @@ static void spice_channel_reset_capabilities(SpiceChannel *channel);
static void spice_channel_send_migration_handshake(SpiceChannel *channel);
static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
{
if (pkey->type != EVP_PKEY_RSA) {
diff --git a/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
new file mode 100644
index 00000000000..c72b4911bbd
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils xdg-utils vala readme.gentoo-r1
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
+HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
+
+REQUIRED_USE="?? ( pulseaudio gstaudio )"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ pulseaudio? ( media-sound/pulseaudio[glib] )
+ gstvideo? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0
+ )
+ gstaudio? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0
+ )
+ >=x11-libs/pixman-0.17.7
+ media-libs/opus
+ gtk3? ( x11-libs/gtk+:3[introspection?] )
+ >=dev-libs/glib-2.36:2
+ >=x11-libs/cairo-1.2
+ virtual/jpeg:0=
+ sys-libs/zlib
+ introspection? ( dev-libs/gobject-introspection )
+ lz4? ( app-arch/lz4 )
+ sasl? ( dev-libs/cyrus-sasl )
+ smartcard? ( app-emulation/qemu[smartcard] )
+ usbredir? (
+ sys-apps/hwids
+ >=sys-apps/usbredir-0.4.2
+ virtual/libusb:1
+ virtual/libgudev:=
+ policykit? (
+ sys-apps/acl
+ >=sys-auth/polkit-0.110-r1
+ !~sys-auth/polkit-0.111 )
+ )
+ webdav? (
+ net-libs/phodav:2.0
+ >=dev-libs/glib-2.43.90:2
+ >=net-libs/libsoup-2.49.91 )
+"
+DEPEND="${RDEPEND}
+ >=app-emulation/spice-protocol-0.12.14
+ dev-perl/Text-CSV
+ >=dev-util/gtk-doc-am-1.14
+ >=dev-util/intltool-0.40.0
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.34-openssl11.patch
+ "${FILESDIR}"/${P}-libressl.patch
+)
+
+src_prepare() {
+ # bug 558558
+ export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+ echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
+
+ default
+
+ eautoreconf
+
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ # Prevent sandbox violations, bug #581836
+ # https://bugzilla.gnome.org/show_bug.cgi?id=744134
+ # https://bugzilla.gnome.org/show_bug.cgi?id=744135
+ addpredict /dev
+
+ # Clean up environment, bug #586642
+ xdg_environment_reset
+
+ local myconf
+
+ if use vala ; then
+ # force vala regen for MinGW, etc
+ rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
+ fi
+
+ myconf="
+ $(use_enable static-libs static)
+ $(use_enable introspection)
+ $(use_with sasl)
+ $(use_enable smartcard)
+ $(use_enable usbredir)
+ $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
+ $(use_with usbredir usb-acl-helper-dir /usr/libexec)
+ $(use_with gtk3 gtk 3.0)
+ $(use_enable policykit polkit)
+ $(use_enable pulseaudio pulse)
+ $(use_enable gstaudio)
+ $(use_enable gstvideo)
+ $(use_enable mjpeg builtin-mjpeg)
+ $(use_enable vala)
+ $(use_enable webdav)
+ $(use_enable dbus)
+ --disable-celt051
+ --disable-gtk-doc
+ --disable-maintainer-mode
+ --disable-werror
+ --enable-pie"
+
+ econf ${myconf}
+}
+
+src_compile() {
+ # Prevent sandbox violations, bug #581836
+ # https://bugzilla.gnome.org/show_bug.cgi?id=744134
+ # https://bugzilla.gnome.org/show_bug.cgi?id=744135
+ addpredict /dev
+
+ default
+}
+
+src_install() {
+ default
+
+ dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+
+ # Remove .la files if they're not needed
+ use static-libs || prune_libtool_files
+
+ make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+ readme.gentoo_create_doc
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/, net-misc/spice-gtk/files/
@ 2020-04-18 18:56 Matthias Maier
0 siblings, 0 replies; 9+ messages in thread
From: Matthias Maier @ 2020-04-18 18:56 UTC (permalink / raw
To: gentoo-commits
commit: f4756d05b995e091e325abc50e5dab9045f07936
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 18:39:56 2020 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 18:56:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4756d05
net-misc/spice-gtk: drop old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
net-misc/spice-gtk/Manifest | 1 -
.../spice-gtk/files/spice-gtk-0.34-openssl11.patch | 16 ---
net-misc/spice-gtk/metadata.xml | 4 -
net-misc/spice-gtk/spice-gtk-0.35.ebuild | 145 ---------------------
4 files changed, 166 deletions(-)
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 0d667aeb7c4..7c7ebad5736 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,2 +1 @@
-DIST spice-gtk-0.35.tar.bz2 1437231 BLAKE2B f2731a794cf22b491bf858fff44506288af730b37f1c37e16ac3042d662373b4e4021808d5ca72440012fb36a5119ad11858cb8cf872b04376518487faebef49 SHA512 f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729
DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch b/net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch
deleted file mode 100644
index 572475d79a4..00000000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://617764.bugs.gentoo.org/attachment.cgi?id=522368
-https://bugs.gentoo.org/617764
-
---- spice-gtk-0.34.orig/src/spice-channel.c 2017-07-12 10:23:31.000000000 +0200
-+++ spice-gtk-0.34/src/spice-channel.c 2018-03-04 13:12:14.351051444 +0100
-@@ -392,8 +392,10 @@
-
- g_type_class_add_private(klass, sizeof(SpiceChannelPrivate));
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- SSL_library_init();
- SSL_load_error_strings();
-+#endif
- }
-
- /* ---------------------------------------------------------------- */
diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
index 34612a8b0ba..713b32ac3ec 100644
--- a/net-misc/spice-gtk/metadata.xml
+++ b/net-misc/spice-gtk/metadata.xml
@@ -6,8 +6,6 @@
<name>Gentoo Virtualization Project</name>
</maintainer>
<use>
- <flag name="dbus">Support for desktop integration such as
- automounting and other APIs exposed by your DE via D-Bus</flag>
<flag name="gtk3">Build the spice client (spicy), requires <pkg>x11-libs/gtk+</pkg>:3</flag>
<flag name="policykit">Enable <pkg>sys-auth/polkit</pkg> support for the
usbredir acl helper</flag>
@@ -16,7 +14,5 @@
<flag name="mjpeg">Enable builtin mjpeg video decoder</flag>
<flag name="webdav">Support for folder-sharing between guest and client
using <pkg>net-libs/phodav</pkg></flag>
- <flag name="gstaudio">Using gstreamer backend as audio decodec support</flag>
- <flag name="gstvideo">Using gstreamer backend as video decodec support</flag>
</use>
</pkgmetadata>
diff --git a/net-misc/spice-gtk/spice-gtk-0.35.ebuild b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
deleted file mode 100644
index 485627726ec..00000000000
--- a/net-misc/spice-gtk/spice-gtk-0.35.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils ltprune xdg-utils vala readme.gentoo-r1
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
-
-REQUIRED_USE="?? ( pulseaudio gstaudio )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- pulseaudio? ( media-sound/pulseaudio[glib] )
- gstvideo? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- )
- gstaudio? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- )
- >=x11-libs/pixman-0.17.7
- media-libs/opus
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- >=dev-libs/glib-2.46:2
- >=x11-libs/cairo-1.2
- virtual/jpeg:0=
- sys-libs/zlib
- introspection? ( dev-libs/gobject-introspection )
- lz4? ( app-arch/lz4 )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/qemu[smartcard] )
- usbredir? (
- dev-libs/libgudev:=
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- !~sys-auth/polkit-0.111 )
- )
- webdav? (
- net-libs/phodav:2.0
- >=net-libs/libsoup-2.49.91 )
-"
-DEPEND="${RDEPEND}
- >=app-emulation/spice-protocol-0.12.14
- dev-perl/Text-CSV
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.34-openssl11.patch
-)
-
-src_prepare() {
- # bug 558558
- export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-
- default
-
- eautoreconf
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- # Prevent sandbox violations, bug #581836
- # https://bugzilla.gnome.org/show_bug.cgi?id=744134
- # https://bugzilla.gnome.org/show_bug.cgi?id=744135
- addpredict /dev
-
- # Clean up environment, bug #586642
- xdg_environment_reset
-
- local myconf
- myconf="
- $(use_enable static-libs static)
- $(use_enable introspection)
- $(use_with sasl)
- $(use_enable smartcard)
- $(use_enable usbredir)
- $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
- $(use_with usbredir usb-acl-helper-dir /usr/libexec)
- $(use_with gtk3 gtk 3.0)
- $(use_enable policykit polkit)
- $(use_enable pulseaudio pulse)
- $(use_enable gstaudio)
- $(use_enable gstvideo)
- $(use_enable mjpeg builtin-mjpeg)
- $(use_enable vala)
- $(use_enable webdav)
- $(use_enable dbus)
- --disable-celt051
- --disable-gtk-doc
- --disable-maintainer-mode
- --disable-werror
- --enable-pie"
-
- econf ${myconf}
-}
-
-src_compile() {
- # Prevent sandbox violations, bug #581836
- # https://bugzilla.gnome.org/show_bug.cgi?id=744134
- # https://bugzilla.gnome.org/show_bug.cgi?id=744135
- addpredict /dev
-
- default
-}
-
-src_install() {
- default
-
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
- # Remove .la files if they're not needed
- use static-libs || prune_libtool_files
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
- readme.gentoo_create_doc
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/, net-misc/spice-gtk/files/
@ 2021-10-31 5:06 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2021-10-31 5:06 UTC (permalink / raw
To: gentoo-commits
commit: 58996c17fc14caab6f1a678b5d326be0e76b94a4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 31 05:05:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 05:05:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58996c17
net-misc/spice-gtk: fix finding newer pyparsing
Closes: https://bugs.gentoo.org/820074
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/spice-gtk-0.39-fix-finding-pyparsing.patch | 13 +++++++++++++
net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild | 8 ++++++--
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch b/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch
new file mode 100644
index 00000000000..9a3cdd09006
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.39-fix-finding-pyparsing.patch
@@ -0,0 +1,13 @@
+https://gitlab.freedesktop.org/spice/spice-common/-/issues/5
+https://bugs.gentoo.org/820074
+--- a/subprojects/spice-common/meson.build
++++ b/subprojects/spice-common/meson.build
+@@ -132,7 +132,7 @@ if spice_common_generate_client_code or spice_common_generate_server_code
+ 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/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild
index 7005e220e2e..08fdbf6d9fa 100644
--- a/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.39-r1.ebuild
@@ -79,9 +79,13 @@ BDEPEND="
')
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.39-fix-finding-pyparsing.patch
+)
+
python_check_deps() {
- has_version "dev-python/six[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
+ has_version -b "dev-python/six[${PYTHON_USEDEP}]" &&
+ has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
}
src_prepare() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/, net-misc/spice-gtk/files/
@ 2021-12-25 0:02 Mike Gilbert
0 siblings, 0 replies; 9+ messages in thread
From: Mike Gilbert @ 2021-12-25 0:02 UTC (permalink / raw
To: gentoo-commits
commit: 65870053ec411056eefe286d150b3707bc68d539
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 21:44:35 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Dec 25 00:02:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65870053
net-misc/spice-gtk: drop 0.37-r3, 0.38-r2, 0.38-r3
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-misc/spice-gtk/Manifest | 2 -
.../spice-gtk-0.37-adjust-to-window-scaling.patch | 132 -------------------
net-misc/spice-gtk/spice-gtk-0.37-r3.ebuild | 140 ---------------------
net-misc/spice-gtk/spice-gtk-0.38-r2.ebuild | 110 ----------------
net-misc/spice-gtk/spice-gtk-0.38-r3.ebuild | 125 ------------------
5 files changed, 509 deletions(-)
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 4be76f585699..5de070645502 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,3 +1 @@
-DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029
-DIST spice-gtk-0.38.tar.xz 796112 BLAKE2B c1542b5b76f9e23ffd1910273f358f656198829b1f615c6a8e0931a79d14920132c861facd534f4cf05f03c4f64a50f628f7daa93be581d5ac815f224b81fe16 SHA512 27b44ac9f0cee2737ce03bb3f47c62fc0ee2402c291c49fc56cffc4ccb63e2cab001a68ba865a6375d82cb38444408d59c68469783ee4279fa818d8682e902f3
DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch b/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch
deleted file mode 100644
index 504cb7c4848b..000000000000
--- a/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 262c84081fbd3cfc3d92e6ae9a60a780549d6c2f Mon Sep 17 00:00:00 2001
-From: Snir Sheriber <ssheribe@redhat.com>
-Date: Thu, 28 Feb 2019 11:44:34 +0200
-Subject: [PATCH] Adjust to window scaling
-
-When GDK_SCALE is != 1 and egl is used, the image presented does not
-fit to the window (scale of 2 is often used with hidpi monitors).
-Usually this is not a problem since all components are adjusted by
-gdk/gtk but with egl, pixel-based data is not being scaled. In this
-case window's scale value can be used in order to determine whether
-to use a pixel resource with higher resolution data.
-
-In order to reproduce the problem set spice with virgl/Intel-vGPU
-and run spice-gtk with GDK_SCALE=2
-
-This issue was also reported at freedesktop gitlab repo:
-https://gitlab.freedesktop.org/spice/spice-gtk/issues/99
-
-Signed-off-by: Snir Sheriber <ssheribe@redhat.com>
-Acked-by: Victor Toso <victortoso@redhat.com>
----
- src/spice-widget-egl.c | 7 ++++---
- src/spice-widget.c | 27 +++++++++++++++++++--------
- 2 files changed, 23 insertions(+), 11 deletions(-)
-
-diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
-index 43fccd7..7bae4e5 100644
---- a/src/spice-widget-egl.c
-+++ b/src/spice-widget-egl.c
-@@ -360,9 +360,9 @@ gboolean spice_egl_realize_display(SpiceDisplay *display, GdkWindow *win, GError
- DISPLAY_DEBUG(display, "egl realize");
- if (!spice_widget_init_egl_win(display, win, err))
- return FALSE;
--
-- spice_egl_resize_display(display, gdk_window_get_width(win),
-- gdk_window_get_height(win));
-+ gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
-+ spice_egl_resize_display(display, gdk_window_get_width(win) * scale_factor,
-+ gdk_window_get_height(win) * scale_factor);
-
- return TRUE;
- }
-@@ -426,6 +426,7 @@ void spice_egl_unrealize_display(SpiceDisplay *display)
- #endif
- }
-
-+/* w and h should be adjusted to gdk scaling */
- G_GNUC_INTERNAL
- void spice_egl_resize_display(SpiceDisplay *display, int w, int h)
- {
-diff --git a/src/spice-widget.c b/src/spice-widget.c
-index 1f2a154..a9ba1f1 100644
---- a/src/spice-widget.c
-+++ b/src/spice-widget.c
-@@ -1382,7 +1382,8 @@ static void set_egl_enabled(SpiceDisplay *display, bool enabled)
- }
-
- if (enabled && d->egl.context_ready) {
-- spice_egl_resize_display(display, d->ww, d->wh);
-+ gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
-+ spice_egl_resize_display(display, d->ww * scale_factor, d->wh * scale_factor);
- }
-
- d->egl.enabled = enabled;
-@@ -1978,11 +1979,14 @@ static void transform_input(SpiceDisplay *display,
- SpiceDisplayPrivate *d = display->priv;
- int display_x, display_y, display_w, display_h;
- double is;
-+ gint scale_factor = 1;
-
- spice_display_get_scaling(display, NULL,
- &display_x, &display_y,
- &display_w, &display_h);
--
-+ if (egl_enabled(d)) {
-+ scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
-+ }
- /* For input we need a different scaling factor in order to
- be able to reach the full width of a display. For instance, consider
- a display of 100 pixels showing in a window 10 pixels wide. The normal
-@@ -1998,7 +2002,7 @@ static void transform_input(SpiceDisplay *display,
- coordinates in the inverse direction (window -> display) as the fb size
- (display -> window).
- */
-- is = (double)(d->area.width-1) / (double)(display_w-1);
-+ is = ((double)(d->area.width-1) / (double)(display_w-1)) * scale_factor;
-
- window_x -= display_x;
- window_y -= display_y;
-@@ -2183,8 +2187,10 @@ static void size_allocate(GtkWidget *widget, GtkAllocation *conf, gpointer data)
- d->wh = conf->height;
- recalc_geometry(widget);
- #if HAVE_EGL
-- if (egl_enabled(d))
-- spice_egl_resize_display(display, conf->width, conf->height);
-+ if (egl_enabled(d)) {
-+ gint scale_factor = gtk_widget_get_scale_factor(widget);
-+ spice_egl_resize_display(display, conf->width * scale_factor, conf->height * scale_factor);
-+ }
- #endif
- }
-
-@@ -2942,10 +2948,14 @@ void spice_display_get_scaling(SpiceDisplay *display,
- int ww, wh;
- int x, y, w, h;
- double s;
-+ gint scale_factor = 1;
-
- if (gtk_widget_get_realized (GTK_WIDGET(display))) {
-- ww = gtk_widget_get_allocated_width(GTK_WIDGET(display));
-- wh = gtk_widget_get_allocated_height(GTK_WIDGET(display));
-+ if (egl_enabled(d)) {
-+ scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
-+ }
-+ ww = gtk_widget_get_allocated_width(GTK_WIDGET(display)) * scale_factor;
-+ wh = gtk_widget_get_allocated_height(GTK_WIDGET(display)) * scale_factor;
- } else {
- ww = fbw;
- wh = fbh;
-@@ -3091,7 +3101,8 @@ void spice_display_widget_gl_scanout(SpiceDisplay *display)
- g_clear_error(&err);
- }
-
-- spice_egl_resize_display(display, d->ww, d->wh);
-+ gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
-+ spice_egl_resize_display(display, d->ww * scale_factor, d->wh * scale_factor);
- }
- #endif
-
---
-2.21.0
-
diff --git a/net-misc/spice-gtk/spice-gtk-0.37-r3.ebuild b/net-misc/spice-gtk/spice-gtk-0.37-r3.ebuild
deleted file mode 100644
index e6215587090b..000000000000
--- a/net-misc/spice-gtk/spice-gtk-0.37-r3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools desktop xdg-utils vala readme.gentoo-r1
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
- >=dev-libs/glib-2.46:2
- dev-libs/json-glib:0=
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0[introspection?]
- media-libs/opus
- sys-libs/zlib
- virtual/jpeg:0=
- >=x11-libs/cairo-1.2
- >=x11-libs/pixman-0.17.7
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- introspection? ( dev-libs/gobject-introspection )
- dev-libs/openssl:0=
- lz4? ( app-arch/lz4 )
- pulseaudio? ( media-sound/pulseaudio[glib] )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/qemu[smartcard] )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- !~sys-auth/polkit-0.111 )
- )
- webdav? (
- net-libs/phodav:2.0
- >=net-libs/libsoup-2.49.91:2.4 )
-"
-# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a
-# configure knob. The package is relatively lightweight so we just depend
-# on it unconditionally for now. It would be cleaner to transform this into
-# a USE="vaapi" conditional and patch the buildsystem...
-RDEPEND="${RDEPEND}
- amd64? ( x11-libs/libva:= )
- arm64? ( x11-libs/libva:= )
- x86? ( x11-libs/libva:= )
-"
-DEPEND="${RDEPEND}
- >=app-emulation/spice-protocol-0.14.0
- dev-perl/Text-CSV
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-adjust-to-window-scaling.patch
-)
-
-src_prepare() {
- # bug 558558
- export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-
- default
-
- eautoreconf
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- # Prevent sandbox violations, bug #581836
- # https://bugzilla.gnome.org/show_bug.cgi?id=744134
- # https://bugzilla.gnome.org/show_bug.cgi?id=744135
- addpredict /dev
-
- # Clean up environment, bug #586642
- xdg_environment_reset
-
- local myconf
- myconf="
- $(use_with gtk3 gtk 3.0)
- $(use_enable introspection)
- $(use_enable mjpeg builtin-mjpeg)
- $(use_enable policykit polkit)
- $(use_enable pulseaudio pulse)
- $(use_with sasl)
- $(use_enable smartcard)
- $(use_enable static-libs static)
- $(use_enable usbredir)
- $(use_with usbredir usb-acl-helper-dir /usr/libexec)
- $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
- $(use_enable vala)
- $(use_enable webdav)
- --disable-celt051
- --disable-gtk-doc
- --disable-maintainer-mode
- --disable-werror
- --enable-pie"
-
- econf ${myconf}
-}
-
-src_compile() {
- # Prevent sandbox violations, bug #581836
- # https://bugzilla.gnome.org/show_bug.cgi?id=744134
- # https://bugzilla.gnome.org/show_bug.cgi?id=744135
- addpredict /dev
-
- default
-}
-
-src_install() {
- default
-
- # Remove .la files if they're not needed
- use static-libs || find "${D}" -name '*.la' -delete || die
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
- readme.gentoo_create_doc
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.38-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.38-r2.ebuild
deleted file mode 100644
index d70e837b73f2..000000000000
--- a/net-misc/spice-gtk/spice-gtk-0.38-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit desktop meson readme.gentoo-r1 vala xdg-utils
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
- >=dev-libs/glib-2.46:2
- dev-libs/json-glib:0=
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0[introspection?]
- media-libs/opus
- sys-libs/zlib
- virtual/jpeg:0=
- >=x11-libs/cairo-1.2
- >=x11-libs/pixman-0.17.7
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- introspection? ( dev-libs/gobject-introspection )
- dev-libs/openssl:0=
- lz4? ( app-arch/lz4 )
- pulseaudio? (
- media-plugins/gst-plugins-pulse:1.0
- )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/qemu[smartcard] )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- )
- )
- webdav? (
- net-libs/phodav:2.0
- >=net-libs/libsoup-2.49.91:2.4 )
-"
-# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a
-# configure knob. The package is relatively lightweight so we just depend
-# on it unconditionally for now. It would be cleaner to transform this into
-# a USE="vaapi" conditional and patch the buildsystem...
-RDEPEND="${RDEPEND}
- amd64? ( x11-libs/libva:= )
- arm64? ( x11-libs/libva:= )
- x86? ( x11-libs/libva:= )
-"
-DEPEND="${RDEPEND}
- >=app-emulation/spice-protocol-0.14.1
- dev-perl/Text-CSV
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- default
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature gtk3 gtk)
- $(meson_feature introspection)
- $(meson_use mjpeg builtin-mjpeg)
- $(meson_feature policykit polkit)
- $(meson_feature pulseaudio pulse)
- $(meson_feature lz4)
- $(meson_feature sasl)
- $(meson_feature smartcard)
- $(meson_feature usbredir)
- $(meson_feature vala vapi)
- $(meson_feature webdav)
- )
-
- if use usbredir; then
- emesonargs+=( -D "usb-acl-helper-dir=/usr/libexec" )
- emesonargs+=( -D "usb-ids-path=/usr/share/misc/usb.ids" )
- fi
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
- readme.gentoo_create_doc
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.38-r3.ebuild b/net-misc/spice-gtk/spice-gtk-0.38-r3.ebuild
deleted file mode 100644
index 3d714471af99..000000000000
--- a/net-misc/spice-gtk/spice-gtk-0.38-r3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit desktop meson python-any-r1 readme.gentoo-r1 vala xdg-utils
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
- >=dev-libs/glib-2.46:2
- dev-libs/json-glib:0=
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0[introspection?]
- media-libs/opus
- sys-libs/zlib
- virtual/jpeg:0=
- >=x11-libs/cairo-1.2
- >=x11-libs/pixman-0.17.7
- gtk3? ( x11-libs/gtk+:3[introspection?] )
- introspection? ( dev-libs/gobject-introspection )
- dev-libs/openssl:0=
- lz4? ( app-arch/lz4 )
- pulseaudio? (
- media-plugins/gst-plugins-pulse:1.0
- )
- sasl? ( dev-libs/cyrus-sasl )
- smartcard? ( app-emulation/qemu[smartcard] )
- usbredir? (
- sys-apps/hwids
- >=sys-apps/usbredir-0.4.2
- virtual/libusb:1
- policykit? (
- sys-apps/acl
- >=sys-auth/polkit-0.110-r1
- )
- )
- webdav? (
- net-libs/phodav:2.0
- >=net-libs/libsoup-2.49.91:2.4 )
-"
-# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a
-# configure knob. The package is relatively lightweight so we just depend
-# on it unconditionally for now. It would be cleaner to transform this into
-# a USE="vaapi" conditional and patch the buildsystem...
-RDEPEND="${RDEPEND}
- amd64? ( x11-libs/libva:= )
- arm64? ( x11-libs/libva:= )
- x86? ( x11-libs/libva:= )
-"
-DEPEND="${RDEPEND}
- >=app-emulation/spice-protocol-0.14.1
- dev-perl/Text-CSV
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-BDEPEND="
- $(python_gen_any_dep '
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- ')
-"
-
-python_check_deps() {
- has_version "dev-python/six[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
- sed -i -e "/^ '-Werror',/d" \
- subprojects/spice-common/meson.build || die
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature gtk3 gtk)
- $(meson_feature introspection)
- $(meson_use mjpeg builtin-mjpeg)
- $(meson_feature policykit polkit)
- $(meson_feature pulseaudio pulse)
- $(meson_feature lz4)
- $(meson_feature sasl)
- $(meson_feature smartcard)
- $(meson_feature usbredir)
- $(meson_feature vala vapi)
- $(meson_feature webdav)
- )
-
- if use usbredir; then
- emesonargs+=( -D "usb-acl-helper-dir=/usr/libexec" )
- emesonargs+=( -D "usb-ids-path=/usr/share/misc/usb.ids" )
- fi
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
- readme.gentoo_create_doc
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/, net-misc/spice-gtk/files/
@ 2023-06-27 2:24 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2023-06-27 2:24 UTC (permalink / raw
To: gentoo-commits
commit: aa25ea81d6c4450e4625fd47fe908fc94052ff14
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Mon Jun 26 23:42:22 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 01:44:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa25ea81
net-misc/spice-gtk: Backport fix for erroneous libtool arguments
Closes: https://bugs.gentoo.org/902853
Closes: https://bugs.gentoo.org/888705
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31636
Signed-off-by: Sam James <sam <AT> gentoo.org>
...spice-gtk-0.42-libtool-export-symbols-fix.patch | 66 ++++++++++++++++++++++
...gtk-0.42-r2.ebuild => spice-gtk-0.42-r3.ebuild} | 4 ++
2 files changed, 70 insertions(+)
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.42-libtool-export-symbols-fix.patch b/net-misc/spice-gtk/files/spice-gtk-0.42-libtool-export-symbols-fix.patch
new file mode 100644
index 000000000000..1af5ba26790f
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.42-libtool-export-symbols-fix.patch
@@ -0,0 +1,66 @@
+Bug: https://bugs.gentoo.org/902853
+Bug: https://bugs.gentoo.org/888705
+Upstream: https://gitlab.freedesktop.org/spice/spice-gtk/-/merge_requests/119
+Upstream Bug: https://gitlab.freedesktop.org/spice/spice-gtk/-/issues/169
+
+From 1511f0ad5ea67b4657540c631e3a8c959bb8d578 Mon Sep 17 00:00:00 2001
+From: Frediano Ziglio <freddy77@gmail.com>
+Date: Wed, 21 Jun 2023 18:43:59 +0100
+Subject: [PATCH] Do not use libtool -export-symbols option
+
+This option is intended for libtool, not for any linker.
+Check the support of --version-script option using an empty
+list of symbols to catch some faulty linker supporting that
+option but not allowing not existing symbols (some buggy mold
+versions).
+
+Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -181,14 +181,19 @@ endif
+ #
+
+ # version-script
++test_syms_path = meson.current_source_dir() / 'test-map-file'
++test_version_script = '-Wl,--version-script=@0@'.format(test_syms_path)
++spice_has_version_script = compiler.has_link_argument(test_version_script)
++
+ spice_client_glib_syms = files('map-file')
+ spice_client_glib_syms_path = meson.current_source_dir() / 'map-file'
+ spice_gtk_version_script = '-Wl,--version-script=@0@'.format(spice_client_glib_syms_path)
+-spice_gtk_has_version_script = compiler.has_link_argument(spice_gtk_version_script)
+-if not spice_gtk_has_version_script
+- spice_client_glib_syms = files('spice-glib-sym-file')
+- spice_client_glib_syms_path = meson.current_source_dir() / 'spice-glib-sym-file'
+- spice_gtk_version_script = ['-export-symbols', spice_client_glib_syms_path]
++if not spice_has_version_script
++ if host_machine.system() == 'linux'
++ error('Version scripts should be supported on Linux')
++ endif
++ spice_client_glib_syms = []
++ spice_gtk_version_script = []
+ endif
+
+ # soversion
+@@ -373,11 +378,6 @@ if spice_gtk_has_gtk
+ # libspice-client-gtk.so
+ #
+ spice_client_gtk_syms = spice_client_glib_syms
+- if not spice_gtk_has_version_script
+- spice_client_gtk_syms = files('spice-gtk-sym-file')
+- spice_client_gtk_syms_path = meson.current_source_dir() / 'spice-gtk-sym-file'
+- spice_gtk_version_script = ['-export-symbols', spice_client_gtk_syms_path]
+- endif
+
+ # soversion
+ # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+--- /dev/null
++++ b/src/test-map-file
+@@ -0,0 +1,4 @@
++TEST_LIB {
++local:
++*;
++};
+--
+GitLab
+
diff --git a/net-misc/spice-gtk/spice-gtk-0.42-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild
similarity index 98%
rename from net-misc/spice-gtk/spice-gtk-0.42-r2.ebuild
rename to net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild
index fe18fb9f4736..83318d830e49 100644
--- a/net-misc/spice-gtk/spice-gtk-0.42-r2.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.42-r3.ebuild
@@ -89,6 +89,10 @@ BDEPEND="
vala? ( $(vala_depend) )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.42-libtool-export-symbols-fix.patch"
+)
+
python_check_deps() {
python_has_version "dev-python/six[${PYTHON_USEDEP}]" &&
python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/, net-misc/spice-gtk/files/
@ 2024-05-05 12:54 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-05-05 12:54 UTC (permalink / raw
To: gentoo-commits
commit: 330c8f61442cdeba8962c44c186fd0e8c908ac73
Author: Kostadin Shishmanov <kocelfc <AT> tutanota <DOT> com>
AuthorDate: Sun May 5 12:37:03 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 5 12:53:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=330c8f61
net-misc/spice-gtk: enable py3.12, backport lld 17 fix
Closes: https://bugs.gentoo.org/915210
Closes: https://bugs.gentoo.org/929731
Signed-off-by: Kostadin Shishmanov <kocelfc <AT> tutanota.com>
Closes: https://github.com/gentoo/gentoo/pull/36566
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../spice-gtk/files/spice-gtk-0.42-lld17-fix.patch | 167 +++++++++++++++++++++
...ce-gtk-9999.ebuild => spice-gtk-0.42-r4.ebuild} | 7 +-
net-misc/spice-gtk/spice-gtk-9999.ebuild | 2 +-
3 files changed, 174 insertions(+), 2 deletions(-)
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.42-lld17-fix.patch b/net-misc/spice-gtk/files/spice-gtk-0.42-lld17-fix.patch
new file mode 100644
index 000000000000..b6197fb15ba3
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.42-lld17-fix.patch
@@ -0,0 +1,167 @@
+https://gitlab.freedesktop.org/spice/spice-gtk/-/merge_requests/121
+https://bugs.gentoo.org/915210
+
+From 7e87382b585a799ced543b0c3fd127b2a813285f Mon Sep 17 00:00:00 2001
+From: Frediano Ziglio <freddy77@gmail.com>
+Date: Fri, 23 Jun 2023 21:17:26 +0100
+Subject: [PATCH] Split symbol file in 2 files
+
+One file for spice-glib and another for spice-gtk.
+This avoid having duplicate exports in the future.
+spice_g_signal_connect_object, spice_util_get_debug,
+spice_util_get_version_string, spice_util_set_debug and
+spice_uuid_to_string are exported by both libraries to keep ABI
+compatibility.
+
+Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
+---
+ src/{map-file => map-file-glib} | 22 ---------------------
+ src/map-file-gtk | 35 +++++++++++++++++++++++++++++++++
+ src/meson.build | 17 ++++++++++------
+ 3 files changed, 46 insertions(+), 28 deletions(-)
+ rename src/{map-file => map-file-glib} (89%)
+ create mode 100644 src/map-file-gtk
+
+diff --git a/src/map-file b/src/map-file-glib
+similarity index 89%
+rename from src/map-file
+rename to src/map-file-glib
+index c0d8ca6e..ef0a31f3 100644
+--- a/src/map-file
++++ b/src/map-file-glib
+@@ -31,18 +31,8 @@ spice_display_channel_get_primary;
+ spice_display_channel_get_type;
+ spice_display_channel_gl_draw_done;
+ spice_display_get_gl_scanout;
+-spice_display_get_grab_keys;
+-spice_display_get_pixbuf;
+ spice_display_get_primary;
+-spice_display_get_type;
+ spice_display_gl_draw_done;
+-spice_display_key_event_get_type;
+-spice_display_keyboard_ungrab;
+-spice_display_mouse_ungrab;
+-spice_display_new;
+-spice_display_new_with_monitor;
+-spice_display_send_keys;
+-spice_display_set_grab_keys;
+ spice_file_transfer_task_cancel;
+ spice_file_transfer_task_get_filename;
+ spice_file_transfer_task_get_progress;
+@@ -52,17 +42,7 @@ spice_file_transfer_task_get_type;
+ spice_get_option_group;
+ spice_gl_scanout_free;
+ spice_gl_scanout_get_type;
+-spice_grab_sequence_as_string;
+-spice_grab_sequence_copy;
+-spice_grab_sequence_free;
+-spice_grab_sequence_get_type;
+-spice_grab_sequence_new;
+-spice_grab_sequence_new_from_string;
+ spice_g_signal_connect_object;
+-spice_gtk_session_copy_to_guest;
+-spice_gtk_session_get;
+-spice_gtk_session_get_type;
+-spice_gtk_session_paste_from_guest;
+ spice_inputs_button_press;
+ spice_inputs_button_release;
+ spice_inputs_channel_button_press;
+@@ -185,8 +165,6 @@ spice_usb_device_manager_is_redirecting;
+ spice_usb_device_manager_allocate_device_for_file_descriptor;
+ spice_usb_device_manager_create_shared_cd_device;
+ spice_usb_device_manager_is_device_shared_cd;
+-spice_usb_device_widget_get_type;
+-spice_usb_device_widget_new;
+ spice_usbredir_channel_get_type;
+ spice_util_get_debug;
+ spice_util_get_version_string;
+diff --git a/src/map-file-gtk b/src/map-file-gtk
+new file mode 100644
+index 00000000..ca5dd446
+--- /dev/null
++++ b/src/map-file-gtk
+@@ -0,0 +1,35 @@
++SPICEGTK_1 {
++global:
++spice_display_get_grab_keys;
++spice_display_get_pixbuf;
++spice_display_get_type;
++spice_display_key_event_get_type;
++spice_display_keyboard_ungrab;
++spice_display_mouse_ungrab;
++spice_display_new;
++spice_display_new_with_monitor;
++spice_display_send_keys;
++spice_display_set_grab_keys;
++spice_grab_sequence_as_string;
++spice_grab_sequence_copy;
++spice_grab_sequence_free;
++spice_grab_sequence_get_type;
++spice_grab_sequence_new;
++spice_grab_sequence_new_from_string;
++spice_gtk_session_copy_to_guest;
++spice_gtk_session_get;
++spice_gtk_session_get_type;
++spice_gtk_session_paste_from_guest;
++spice_usb_device_widget_get_type;
++spice_usb_device_widget_new;
++
++/* FIXME: remove the following 5 duplicated symbols in next ABI break */
++spice_g_signal_connect_object;
++spice_util_get_debug;
++spice_util_get_version_string;
++spice_util_set_debug;
++spice_uuid_to_string;
++
++local:
++*;
++};
+diff --git a/src/meson.build b/src/meson.build
+index 852217ac..68fe7ab2 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -185,14 +185,20 @@ test_syms_path = meson.current_source_dir() / 'test-map-file'
+ test_version_script = '-Wl,--version-script=@0@'.format(test_syms_path)
+ spice_has_version_script = compiler.has_link_argument(test_version_script)
+
+-spice_client_glib_syms = files('map-file')
+-spice_client_glib_syms_path = meson.current_source_dir() / 'map-file'
+-spice_gtk_version_script = '-Wl,--version-script=@0@'.format(spice_client_glib_syms_path)
+-if not spice_has_version_script
++if spice_has_version_script
++ spice_client_glib_syms = files('map-file-glib')
++ spice_client_gtk_syms = files('map-file-gtk')
++ spice_client_glib_syms_path = meson.current_source_dir() / 'map-file-glib'
++ spice_client_gtk_syms_path = meson.current_source_dir() / 'map-file-gtk'
++ spice_glib_version_script = '-Wl,--version-script=@0@'.format(spice_client_glib_syms_path)
++ spice_gtk_version_script = '-Wl,--version-script=@0@'.format(spice_client_gtk_syms_path)
++else
+ if host_machine.system() == 'linux'
+ error('Version scripts should be supported on Linux')
+ endif
+ spice_client_glib_syms = []
++ spice_client_gtk_syms = []
++ spice_glib_version_script = []
+ spice_gtk_version_script = []
+ endif
+
+@@ -210,7 +216,7 @@ spice_client_glib_lib = library('spice-client-glib-2.0', spice_client_glib_sourc
+ version : spice_client_glib_so_version,
+ install : true,
+ include_directories : spice_gtk_include,
+- link_args : [spice_gtk_version_script],
++ link_args : [spice_glib_version_script],
+ link_depends : spice_client_glib_syms,
+ dependencies : spice_glib_deps)
+
+@@ -377,7 +383,6 @@ if spice_gtk_has_gtk
+ #
+ # libspice-client-gtk.so
+ #
+- spice_client_gtk_syms = spice_client_glib_syms
+
+ # soversion
+ # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+--
+GitLab
+
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild
similarity index 96%
copy from net-misc/spice-gtk/spice-gtk-9999.ebuild
copy to net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild
index 37eef00f49c0..677217bfee91 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.42-r4.ebuild
@@ -4,7 +4,7 @@
EAPI=8
VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
@@ -89,6 +89,11 @@ BDEPEND="
vala? ( $(vala_depend) )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.42-libtool-export-symbols-fix.patch"
+ "${FILESDIR}/${PN}-0.42-lld17-fix.patch"
+)
+
python_check_deps() {
python_has_version "dev-python/six[${PYTHON_USEDEP}]" &&
python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 37eef00f49c0..5f81513a6c11 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-05-05 12:54 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-25 0:02 [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/, net-misc/spice-gtk/files/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2024-05-05 12:54 Sam James
2023-06-27 2:24 Sam James
2021-10-31 5:06 Sam James
2020-04-18 18:56 Matthias Maier
2019-02-16 17:59 Aaron Bauman
2018-08-07 0:07 Virgil Dupras
2016-08-17 20:14 Ian Stakenvicius
2016-02-28 6:15 Matthias Maier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox