[packages/spice-controller] - saving last version of spice-controller library and its vapi from spice-gtk.spec - added no-tunnel
qboosh
qboosh at pld-linux.org
Sun May 17 11:37:48 CEST 2020
commit 5e6f069866479dd38fd28bc2480e9a542463806b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun May 17 11:38:10 2020 +0200
- saving last version of spice-controller library and its vapi from spice-gtk.spec
- added no-tunnel patch (adapt for recent spice-protocol with removed tunnel channel functionality)
- added proto-headers patch (controller proto headers removed from recent spice-protocol)
spice-controller-am.patch | 11 ++
spice-controller-no-tunnel.patch | 118 +++++++++++++
spice-controller-proto-headers.patch | 325 +++++++++++++++++++++++++++++++++++
spice-controller.spec | 180 +++++++++++++++++++
4 files changed, 634 insertions(+)
---
diff --git a/spice-controller.spec b/spice-controller.spec
new file mode 100644
index 0000000..b7dc9b6
--- /dev/null
+++ b/spice-controller.spec
@@ -0,0 +1,180 @@
+#
+# Conditional build:
+%bcond_without static_libs # static libraries
+
+Summary: SPICE Client controller library
+Summary(pl.UTF-8): Biblioteka kontrolera klienta SPICE
+Name: spice-controller
+Version: 0.34
+Release: 1
+License: LGPL v2.1+
+Group: X11/Applications
+Source0: https://www.spice-space.org/download/gtk/spice-gtk-%{version}.tar.bz2
+# Source0-md5: ec01b0b50337aa23f0566423b2f83109
+Patch0: %{name}-am.patch
+Patch1: %{name}-no-tunnel.patch
+Patch2: %{name}-proto-headers.patch
+URL: https://spice-space.org/
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.11
+BuildRequires: cairo-devel >= 1.2.0
+BuildRequires: celt051-devel >= 0.5.1.1
+BuildRequires: cyrus-sasl-devel >= 2.0
+BuildRequires: gcc >= 5:3.0
+BuildRequires: gettext-tools >= 0.17
+BuildRequires: glib2-devel >= 1:2.36
+BuildRequires: gobject-introspection-devel >= 0.9.4
+BuildRequires: gstreamer-devel >= 1.0
+BuildRequires: gstreamer-plugins-base-devel >= 1.0
+BuildRequires: gtk-doc >= 1.14
+BuildRequires: libjpeg-devel
+BuildRequires: libsoup-devel >= 2.50
+BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:2.0
+BuildRequires: lz4-devel
+BuildRequires: openssl-devel >= 1.0.0
+BuildRequires: opus-devel >= 0.9.14
+BuildRequires: pixman-devel >= 0.17.7
+BuildRequires: pkgconfig
+BuildRequires: pulseaudio-devel
+BuildRequires: sed >= 4.0
+BuildRequires: spice-protocol >= 0.12.11
+BuildRequires: zlib-devel
+Requires: glib2 >= 1:2.36
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+SPICE Client controller library.
+
+%description -l pl.UTF-8
+Biblioteka kontrolera klienta SPICE.
+
+%package devel
+Summary: Header files for SPICE Client contoller library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki klienckiej SPICE controller
+Group: X11/Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: glib2-devel >= 1:2.36
+
+%description devel
+Header files for SPICE Client controller library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki klienckiej SPICE controller.
+
+%package static
+Summary: Static SPICE controller library
+Summary(pl.UTF-8): Statyczna biblioteka kliencka SPICE controller
+Group: X11/Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+Static SPICE Client controller library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka kliencka SPICE controller.
+
+%package -n vala-spice-controller
+Summary: Vala API for SPICE controller protocol headers
+Summary(pl.UTF-8): Interfejs języka Vala do nagłówków protokołu kontrolera SPICE
+# there was mistaken vala-spice-protocol 0.35 through 0.38 containing spice-client-glib and spice-client-gtk APIs
+Group: Development/Libraries
+Requires: spice-controller-devel = %{version}-%{release}
+Requires: spice-protocol >= 0.12.11
+Requires: vala >= 2:0.14
+# old name of vala-spice-protocol
+Obsoletes: vala-spice-gtk < 0.7
+# vapi name is "spice-protocol", but it actually refers only to controller parts (controller_prot, foreign_menu_prot)
+Obsoletes: vala-spice-protocol < 0.35
+%if "%{_rpmversion}" >= "4.6"
+BuildArch: noarch
+%endif
+
+%description -n vala-spice-controller
+Vala API for SPICE controller protocol headers.
+
+%description -n vala-spice-controller -l pl.UTF-8
+Interfejs języka Vala do nagłówków protokołu kontrolera SPICE.
+
+%prep
+%setup -q -n spice-gtk-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%build
+%{__gettextize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd spice-common
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ..
+# smartcard,usbredir,webdav options don't affect controller library
+%configure \
+ --disable-gtk-doc \
+ --enable-lz4 \
+ --disable-silent-rules \
+ --disable-smartcard \
+ %{?with_static_libs:--enable-static} \
+ --disable-usbredir \
+ --disable-webdav \
+ --without-gtk \
+ --with-html-dir=%{_gtkdocdir} \
+ --with-pnp-ids-path=/lib/hwdata/pnp.ids \
+ --with-usb-ids-path=/lib/hwdata/usb.ids
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install -j1 \
+ DESTDIR=$RPM_BUILD_ROOT
+
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/* \
+ $RPM_BUILD_ROOT%{_mandir}/man1/* \
+ $RPM_BUILD_ROOT%{_localedir}/*/LC_MESSAGES/spice-gtk.mo
+%{__rm} -r $RPM_BUILD_ROOT%{_gtkdocdir}/spice-gtk
+
+# libspice-client-glib
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libspice-client-glib-2.0.* \
+ $RPM_BUILD_ROOT%{_libdir}/girepository-1.0/SpiceClientGLib-2.0.typelib \
+ $RPM_BUILD_ROOT%{_datadir}/gir-1.0/SpiceClientGLib-2.0.gir \
+ $RPM_BUILD_ROOT%{_pkgconfigdir}/spice-client-glib-2.0.pc
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/spice-client-glib-2.0
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc AUTHORS NEWS README THANKS TODO
+%attr(755,root,root) %{_libdir}/libspice-controller.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libspice-controller.so.0
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libspice-controller.so
+%{_includedir}/spice-controller
+%{_pkgconfigdir}/spice-controller.pc
+
+%if %{with static_libs}
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libspice-controller.a
+%endif
+
+%files -n vala-spice-controller
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/spice-protocol.vapi
diff --git a/spice-controller-am.patch b/spice-controller-am.patch
new file mode 100644
index 0000000..f5805c8
--- /dev/null
+++ b/spice-controller-am.patch
@@ -0,0 +1,11 @@
+--- spice-gtk-0.20/configure.ac.orig 2013-06-26 15:55:08.000000000 +0200
++++ spice-gtk-0.20/configure.ac 2013-07-19 18:01:59.371274971 +0200
+@@ -7,7 +7,7 @@
+ AC_CONFIG_HEADER([config.h])
+ AC_CONFIG_AUX_DIR([build-aux])
+
+-AM_INIT_AUTOMAKE([foreign dist-bzip2 -Wall -Werror -Wno-portability])
++AM_INIT_AUTOMAKE([foreign dist-bzip2 -Wall -Wno-portability])
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ LT_INIT
+ AM_MAINTAINER_MODE
diff --git a/spice-controller-no-tunnel.patch b/spice-controller-no-tunnel.patch
new file mode 100644
index 0000000..93dd158
--- /dev/null
+++ b/spice-controller-no-tunnel.patch
@@ -0,0 +1,118 @@
+TunnelChannel support has been removed from spice-protocol 0.14
+--- spice-gtk-0.31/spice-common/spice.proto.orig 2016-03-10 17:05:02.000000000 +0100
++++ spice-gtk-0.31/spice-common/spice.proto 2020-05-16 21:33:40.991128832 +0200
+@@ -1185,113 +1185,7 @@
+ } start_mark;
+ };
+
+-enum16 tunnel_service_type {
+- INVALID,
+- GENERIC,
+- IPP,
+-};
+-
+-enum16 tunnel_ip_type {
+- INVALID,
+- IPv4,
+-};
+-
+-struct TunnelIpInfo {
+- tunnel_ip_type type;
+- switch (type) {
+- case IPv4:
+- uint8 ipv4[4];
+- } u;
+-} @ctype(SpiceMsgTunnelIpInfo);
+-
+-channel TunnelChannel : BaseChannel {
+- server:
+- message {
+- uint16 max_num_of_sockets;
+- uint32 max_socket_data_size;
+- } init = 101;
+-
+- message {
+- uint32 service_id;
+- TunnelIpInfo virtual_ip;
+- } service_ip_map;
+-
+- message {
+- uint16 connection_id;
+- uint32 service_id;
+- uint32 tokens;
+- } socket_open;
+-
+- message {
+- uint16 connection_id;
+- } socket_fin;
+-
+- message {
+- uint16 connection_id;
+- } socket_close;
+-
+- message {
+- uint16 connection_id;
+- uint8 data[] @end;
+- } socket_data;
+-
+- message {
+- uint16 connection_id;
+- } socket_closed_ack;
+-
+- message {
+- uint16 connection_id;
+- uint32 num_tokens;
+- } @ctype(SpiceMsgTunnelSocketTokens) socket_token;
+-
+- client:
+- message {
+- tunnel_service_type type;
+- uint32 id;
+- uint32 group;
+- uint32 port;
+- uint8 *name[cstring()] @nocopy;
+- uint8 *description[cstring()] @nocopy;
+- switch (type) {
+- case IPP:
+- TunnelIpInfo ip @ctype(SpiceMsgTunnelIpInfo);
+- } u;
+- } @ctype(SpiceMsgcTunnelAddGenericService) service_add = 101;
+-
+- message {
+- uint32 id;
+- } @ctype(SpiceMsgcTunnelRemoveService) service_remove;
+-
+- message {
+- uint16 connection_id;
+- uint32 tokens;
+- } socket_open_ack;
+-
+- message {
+- uint16 connection_id;
+- } socket_open_nack;
+-
+- message {
+- uint16 connection_id;
+- } socket_fin;
+-
+- message {
+- uint16 connection_id;
+- } socket_closed;
+-
+- message {
+- uint16 connection_id;
+- } socket_closed_ack;
+-
+- message {
+- uint16 connection_id;
+- uint8 data[] @end;
+- } socket_data;
+-
+- message {
+- uint16 connection_id;
+- uint32 num_tokens;
+- } @ctype(SpiceMsgcTunnelSocketTokens) socket_token;
++channel TunnelChannel {
+ };
+
+ enum32 vsc_message_type {
diff --git a/spice-controller-proto-headers.patch b/spice-controller-proto-headers.patch
new file mode 100644
index 0000000..7214aa6
--- /dev/null
+++ b/spice-controller-proto-headers.patch
@@ -0,0 +1,325 @@
+--- spice-gtk-0.34/src/controller/controller_prot.h.orig 1970-01-01 01:00:00.000000000 +0100
++++ spice-gtk-0.34/src/controller/controller_prot.h 2020-05-17 10:25:16.006993884 +0200
+@@ -0,0 +1,125 @@
++/*
++ Copyright (C) 2009 Red Hat, Inc.
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ 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/>.
++*/
++
++#ifndef _H_CONTROLLER_PROT
++#define _H_CONTROLLER_PROT
++
++#include <spice/macros.h>
++#include <spice/types.h>
++#include <spice/start-packed.h>
++
++#define CONTROLLER_MAGIC SPICE_MAGIC_CONST("CTRL")
++#define CONTROLLER_VERSION 1
++
++
++typedef struct SPICE_ATTR_PACKED ControllerInitHeader {
++ uint32_t magic;
++ uint32_t version;
++ uint32_t size;
++} ControllerInitHeader;
++
++typedef struct SPICE_ATTR_PACKED ControllerInit {
++ ControllerInitHeader base;
++ uint64_t credentials;
++ uint32_t flags;
++} ControllerInit;
++
++enum {
++ CONTROLLER_FLAG_EXCLUSIVE = 1 << 0,
++};
++
++typedef struct SPICE_ATTR_PACKED ControllerMsg {
++ uint32_t id;
++ uint32_t size;
++} ControllerMsg;
++
++enum {
++ //external app -> spice client
++ CONTROLLER_HOST = 1,
++ CONTROLLER_PORT,
++ CONTROLLER_SPORT,
++ CONTROLLER_PASSWORD,
++
++ CONTROLLER_SECURE_CHANNELS,
++ CONTROLLER_DISABLE_CHANNELS,
++
++ CONTROLLER_TLS_CIPHERS,
++ CONTROLLER_CA_FILE,
++ CONTROLLER_HOST_SUBJECT,
++
++ CONTROLLER_FULL_SCREEN,
++ CONTROLLER_SET_TITLE,
++
++ CONTROLLER_CREATE_MENU,
++ CONTROLLER_DELETE_MENU,
++
++ CONTROLLER_HOTKEYS,
++ CONTROLLER_SEND_CAD,
++
++ CONTROLLER_CONNECT,
++ CONTROLLER_SHOW,
++ CONTROLLER_HIDE,
++
++ CONTROLLER_ENABLE_SMARTCARD,
++
++ CONTROLLER_COLOR_DEPTH,
++ CONTROLLER_DISABLE_EFFECTS,
++
++ CONTROLLER_ENABLE_USB,
++ CONTROLLER_ENABLE_USB_AUTOSHARE,
++ CONTROLLER_USB_FILTER,
++
++ CONTROLLER_PROXY,
++
++ //spice client -> external app
++ CONTROLLER_MENU_ITEM_CLICK = 1001,
++};
++
++#define CONTROLLER_TRUE (1 << 0)
++
++enum {
++ CONTROLLER_SET_FULL_SCREEN = CONTROLLER_TRUE,
++ CONTROLLER_AUTO_DISPLAY_RES = 1 << 1,
++};
++
++typedef struct SPICE_ATTR_PACKED ControllerValue {
++ ControllerMsg base;
++ uint32_t value;
++} ControllerValue;
++
++typedef struct SPICE_ATTR_PACKED ControllerData {
++ ControllerMsg base;
++ uint8_t data[0];
++} ControllerData;
++
++#define CONTROLLER_MENU_ITEM_DELIMITER "\n"
++#define CONTROLLER_MENU_PARAM_DELIMITER "\r"
++
++enum {
++ CONTROLLER_MENU_FLAGS_SEPARATOR = 1 << 0,
++ CONTROLLER_MENU_FLAGS_DISABLED = 1 << 1,
++ CONTROLLER_MENU_FLAGS_POPUP = 1 << 2,
++ CONTROLLER_MENU_FLAGS_CHECKED = 1 << 3,
++ CONTROLLER_MENU_FLAGS_GRAYED = 1 << 4,
++};
++
++#define SPICE_MENU_INTERNAL_ID_BASE 0x1300
++#define SPICE_MENU_INTERNAL_ID_SHIFT 8
++
++#include <spice/end-packed.h>
++
++#endif
+--- spice-gtk-0.34/src/controller/foreign_menu_prot.h.orig 1970-01-01 01:00:00.000000000 +0100
++++ spice-gtk-0.34/src/controller/foreign_menu_prot.h 2020-05-17 10:47:35.843068703 +0200
+@@ -0,0 +1,105 @@
++/*
++ Copyright (C) 2009 Red Hat, Inc.
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ 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/>.
++*/
++
++#ifndef _H_FOREIGN_MENU_PROT
++#define _H_FOREIGN_MENU_PROT
++
++#include <spice/macros.h>
++#include <spice/types.h>
++#include <spice/start-packed.h>
++
++#define FOREIGN_MENU_MAGIC SPICE_MAGIC_CONST("FRGM")
++#define FOREIGN_MENU_VERSION 1
++
++typedef struct SPICE_ATTR_PACKED FrgMenuInitHeader {
++ uint32_t magic;
++ uint32_t version;
++ uint32_t size;
++} FrgMenuInitHeader;
++
++typedef struct SPICE_ATTR_PACKED FrgMenuInit {
++ FrgMenuInitHeader base;
++ uint64_t credentials;
++ uint8_t title[0]; //UTF8
++} FrgMenuInit;
++
++typedef struct SPICE_ATTR_PACKED FrgMenuMsg {
++ uint32_t id;
++ uint32_t size;
++} FrgMenuMsg;
++
++enum {
++ //external app -> spice client
++ FOREIGN_MENU_SET_TITLE = 1,
++ FOREIGN_MENU_ADD_ITEM,
++ FOREIGN_MENU_MODIFY_ITEM,
++ FOREIGN_MENU_REMOVE_ITEM,
++ FOREIGN_MENU_CLEAR,
++
++ //spice client -> external app
++ FOREIGN_MENU_ITEM_EVENT = 1001,
++ FOREIGN_MENU_APP_ACTIVATED,
++ FOREIGN_MENU_APP_DEACTIVATED,
++};
++
++typedef struct SPICE_ATTR_PACKED FrgMenuSetTitle {
++ FrgMenuMsg base;
++ uint8_t string[0]; //UTF8
++} FrgMenuSetTitle;
++
++enum {
++ FOREIGN_MENU_ITEM_TYPE_CHECKED = 1 << 0,
++ FOREIGN_MENU_ITEM_TYPE_DIM = 1 << 1,
++ FOREIGN_MENU_ITEM_TYPE_SEPARATOR = 1 << 2
++};
++
++#define FOREIGN_MENU_INVALID_ID 0
++
++typedef struct SPICE_ATTR_PACKED FrgMenuAddItem {
++ FrgMenuMsg base;
++ uint32_t id;
++ uint32_t type;
++ uint32_t position;
++ uint8_t string[0]; //UTF8
++} FrgMenuAddItem, FrgMenuModItem;
++
++typedef struct SPICE_ATTR_PACKED FrgMenuRmItem {
++ FrgMenuMsg base;
++ uint32_t id;
++} FrgMenuRmItem;
++
++typedef struct FrgMenuMsg FrgMenuRmItems;
++typedef struct FrgMenuMsg FrgMenuDelete;
++
++enum {
++ FOREIGN_MENU_EVENT_CLICK,
++ FOREIGN_MENU_EVENT_CHECKED,
++ FOREIGN_MENU_EVENT_UNCHECKED
++};
++
++typedef struct SPICE_ATTR_PACKED FrgMenuEvent {
++ FrgMenuMsg base;
++ uint32_t id;
++ uint32_t action; //FOREIGN_MENU_EVENT_?
++} FrgMenuEvent;
++
++typedef struct FrgMenuMsg FrgMenuActivate;
++typedef struct FrgMenuMsg FrgMenuDeactivate;
++
++#include <spice/end-packed.h>
++
++#endif
+--- spice-gtk-0.34/src/controller/menu.c.orig 2017-07-28 17:58:06.000000000 +0200
++++ spice-gtk-0.34/src/controller/menu.c 2020-05-17 10:27:04.609738866 +0200
+@@ -17,7 +17,7 @@
+ #include <glib-object.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <spice/controller_prot.h>
++#include "controller_prot.h"
+ #include <custom.h>
+
+
+--- spice-gtk-0.34/src/controller/test.c.orig 2017-06-15 11:56:24.000000000 +0200
++++ spice-gtk-0.34/src/controller/test.c 2020-05-17 10:27:20.036321960 +0200
+@@ -17,7 +17,7 @@
+
+ #include <stdio.h>
+ #include <stdint.h>
+-#include <spice/controller_prot.h>
++#include "controller_prot.h"
+
+ #include "spice-controller.h"
+
+--- spice-gtk-0.34/src/controller/spice-controller.h.orig 2017-07-28 17:58:06.000000000 +0200
++++ spice-gtk-0.34/src/controller/spice-controller.h 2020-05-17 10:27:46.462845462 +0200
+@@ -8,9 +8,10 @@
+ #include <glib-object.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <spice/controller_prot.h>
+ #include <gio/gio.h>
+
++#include "controller_prot.h"
++
+ G_BEGIN_DECLS
+
+
+--- spice-gtk-0.34/src/controller/controller.c.orig 2017-07-28 17:58:06.000000000 +0200
++++ spice-gtk-0.34/src/controller/controller.c 2020-05-17 10:28:05.806074004 +0200
+@@ -17,7 +17,7 @@
+ #include <glib-object.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <spice/controller_prot.h>
++#include "controller_prot.h"
+ #include <gio/gio.h>
+ #include <custom.h>
+ #include <spice-controller-listener.h>
+--- spice-gtk-0.34/src/controller/foreign-menu.c.orig 2017-07-28 17:58:06.000000000 +0200
++++ spice-gtk-0.34/src/controller/foreign-menu.c 2020-05-17 10:49:42.862380580 +0200
+@@ -18,8 +18,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <gio/gio.h>
+-#include <spice/foreign_menu_prot.h>
+-#include <spice/controller_prot.h>
++#include "foreign_menu_prot.h"
++#include "controller_prot.h"
+ #include <custom.h>
+ #include <spice-foreign-menu-listener.h>
+
+--- spice-gtk-0.34/src/controller/Makefile.am.orig 2017-06-15 11:56:24.000000000 +0200
++++ spice-gtk-0.34/src/controller/Makefile.am 2020-05-17 10:29:07.929070788 +0200
+@@ -70,7 +70,7 @@
+
+ libspice_controllerincludedir = $(includedir)/spice-controller
+ libspice_controllerinclude_HEADERS = \
+- spice-controller.h
++ spice-controller.h controller_prot.h foreign_menu_prot.h
+
+ test_controller_SOURCES = test.c
+ test_controller_LDADD = libspice-controller.la
+--- spice-gtk-0.34/data/spice-protocol.vapi.orig 2017-06-15 11:56:24.000000000 +0200
++++ spice-gtk-0.34/data/spice-protocol.vapi 2020-05-17 11:28:28.126450211 +0200
+@@ -1,5 +1,5 @@
+ namespace SpiceProtocol {
+- [CCode (cprefix = "Controller", cheader_filename = "spice/controller_prot.h")]
++ [CCode (cprefix = "Controller", cheader_filename = "spice-controller/controller_prot.h")]
+ namespace Controller {
+ [CCode (cname = "CONTROLLER_MAGIC")]
+ public const uint32 MAGIC;
+@@ -117,7 +117,7 @@
+ }
+ }
+
+- [CCode (cprefix = "FrgMenu", cheader_filename = "spice/foreign_menu_prot.h")]
++ [CCode (cprefix = "FrgMenu", cheader_filename = "spice-controller/foreign_menu_prot.h")]
+ namespace ForeignMenu {
+ [CCode (cname = "FOREIGN_MENU_MAGIC")]
+ public const uint32 MAGIC;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/spice-controller.git/commitdiff/5e6f069866479dd38fd28bc2480e9a542463806b
More information about the pld-cvs-commit
mailing list