Hello community, here is the log from the commit of package spice-gtk for openSUSE:Factory checked in at 2017-03-03 17:32:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spice-gtk (Old) and /work/SRC/openSUSE:Factory/.spice-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spice-gtk" Fri Mar 3 17:32:30 2017 rev:34 rq:460985 version:0.33 Changes: -------- --- /work/SRC/openSUSE:Factory/spice-gtk/spice-gtk.changes 2017-02-16 16:43:20.224575817 +0100 +++ /work/SRC/openSUSE:Factory/.spice-gtk.new/spice-gtk.changes 2017-03-03 17:32:31.322980715 +0100 @@ -1,0 +2,10 @@ +Tue Feb 28 06:06:56 UTC 2017 - [email protected] + +- Drop pkgconfig(pygtk-2.0) BuildRequires: No longer needed, nor + used as gtk2 support was dropped. +- Add spice-gtk-remove-pygtk-bindings-leftovers.patch: Remove + leftover pygtk bindings, patch from upstream git. +- Stop using sed to insert usbredirhost-0.5 into configure checks, + no longer needed: fixed upstream. + +------------------------------------------------------------------- New: ---- spice-gtk-remove-pygtk-bindings-leftovers.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spice-gtk.spec ++++++ --- /var/tmp/diff_new_pack.lDJOyw/_old 2017-03-03 17:32:31.974888604 +0100 +++ /var/tmp/diff_new_pack.lDJOyw/_new 2017-03-03 17:32:31.974888604 +0100 @@ -31,12 +31,17 @@ Patch0: spice-gtk-polkit-privs.patch # PATCH-FIX-UPSTREAM 48da2c66-fix-lz4-deps.patch [email protected] -- better lz4 checks Patch1: 48da2c66-fix-lz4-deps.patch +# PATCH-FIX-UPSTREAM spice-gtk-remove-pygtk-bindings-leftovers.patch [email protected] -- Remove pygtk leftover bindings +Patch2: spice-gtk-remove-pygtk-bindings-leftovers.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: cyrus-sasl-devel BuildRequires: gstreamer-plugins-bad BuildRequires: gstreamer-plugins-good BuildRequires: intltool BuildRequires: libacl-devel BuildRequires: libjpeg-devel +BuildRequires: libtool BuildRequires: python-pyparsing BuildRequires: python-six BuildRequires: vala @@ -68,11 +73,7 @@ BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(pixman-1) >= 0.17.7 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.96 -BuildRequires: pkgconfig(pygtk-2.0) >= 2.0.0 # spice-protocol is bundled, but we still need the system-wide .pc file for the pkgconfig() requires magic -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool BuildRequires: pkgconfig(spice-protocol) >= 0.12.12 BuildRequires: pkgconfig(usbutils) Recommends: %{name}-lang @@ -143,10 +144,7 @@ %setup -q %patch0 -p1 %patch1 -p1 - -# Replace usbredirhost with usbredirhost-0.5... fail if no longer needed -grep usbredirhost-0.5 configure && false -sed -i "s:libusbredirparser:libusbredirparser-0.5:g" configure{.ac,} +%patch2 -p1 %build autoreconf -fi @@ -158,7 +156,8 @@ --disable-lz4 \ --disable-smartcard \ %endif - --disable-silent-rules + --disable-silent-rules \ + %{nil} make %{?_smp_mflags} %install ++++++ spice-gtk-remove-pygtk-bindings-leftovers.patch ++++++ >From 96ed6b7aaff7493de5f181d08834a67e2f452969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <[email protected]> Date: Fri, 27 Jan 2017 14:38:14 +0400 Subject: pygtk: remove bindings leftover MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PyGtk 2.0 got removed in 0917002c48a0a5deb615d120a0e5997eefc89fd4, remove some remaining files. Signed-off-by: Marc-André Lureau <[email protected]> Acked-by: Pavel Grunt <[email protected]> diff --git a/src/Makefile.am b/src/Makefile.am index b991a5f..7542fac 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,8 +37,6 @@ EXTRA_DIST = \ map-file \ spice-glib-sym-file \ spice-gtk-sym-file \ - spice-client-gtk-manual.defs \ - spice-client-gtk.override \ spice-marshal.txt \ spice-version.h.in \ $(NULL) diff --git a/src/spice-client-gtk-manual.defs b/src/spice-client-gtk-manual.defs deleted file mode 100644 index 9631b74..0000000 --- a/src/spice-client-gtk-manual.defs +++ /dev/null @@ -1,117 +0,0 @@ -(define-method set_display - (of-object "SpiceMainChannel") - (c-name "spice_main_set_display") - (return-type "none") - (parameters - '("int" "id") - '("int" "x") - '("int" "y") - '("int" "width") - '("int" "height") - ) -) - -(define-method clipboard_grab - (of-object "SpiceMainChannel") - (c-name "spice_main_clipboard_grab") - (return-type "none") - (parameters - '("int*" "types") - '("int" "ntypes") - ) -) - -(define-method clipboard_release - (of-object "SpiceMainChannel") - (c-name "spice_main_clipboard_release") - (return-type "none") -) - -(define-method motion - (of-object "SpiceInputsChannel") - (c-name "spice_inputs_motion") - (return-type "none") - (parameters - '("gint" "dx") - '("gint" "dy") - '("gint" "button_state") - ) -) - -(define-method position - (of-object "SpiceInputsChannel") - (c-name "spice_inputs_position") - (return-type "none") - (parameters - '("gint" "x") - '("gint" "y") - '("gint" "display") - '("gint" "button_state") - ) -) - -(define-method button_press - (of-object "SpiceInputsChannel") - (c-name "spice_inputs_button_press") - (return-type "none") - (parameters - '("gint" "button") - '("gint" "button_state") - ) -) - -(define-method button_release - (of-object "SpiceInputsChannel") - (c-name "spice_inputs_button_release") - (return-type "none") - (parameters - '("gint" "button") - '("gint" "button_state") - ) -) - -(define-method key_press - (of-object "SpiceInputsChannel") - (c-name "spice_inputs_key_press") - (return-type "none") - (parameters - '("guint" "keyval") - ) -) - -(define-method key_release - (of-object "SpiceInputsChannel") - (c-name "spice_inputs_key_release") - (return-type "none") - (parameters - '("guint" "keyval") - ) -) - -(define-method set_key_locks - (of-object "SpiceInputsChannel") - (c-name "spice_inputs_set_key_locks") - (return-type "none") - (parameters - '("guint" "locks") - ) -) - -(define-enum ClientError - (in-module "Spice") - (c-name "SpiceClientError") - (values - '("failed" "SPICE_CLIENT_ERROR_FAILED") - ) -) - -(define-function spice_audio_new - (c-name "spice_audio_new") - (is-constructor-of "SpiceAudio") - (return-type "SpiceAudio*") - (parameters - '("SpiceSession*" "session") - '("GMainContext*" "context") - '("const-char*" "name") - ) -) diff --git a/src/spice-client-gtk.override b/src/spice-client-gtk.override deleted file mode 100644 index 41aeee3..0000000 --- a/src/spice-client-gtk.override +++ /dev/null @@ -1,171 +0,0 @@ -%% -headers -#include <Python.h> -#include "pygobject.h" -#include "spice-common.h" -#include "spice-widget.h" -#include "spice-gtk-session.h" -#include "spice-audio.h" -#include "usb-device-widget.h" -%% -modulename spice_client_gtk -%% -import gobject.GObject as PyGObject_Type -import gtk.DrawingArea as PyGtkDrawingArea_Type -import gtk.Widget as PyGtkWidget_Type -import gtk.VBox as PyGtkVBox_Type -%% -ignore-glob - *_get_type -%% -%% -override spice_display_send_keys kwargs -static PyObject* -_wrap_spice_display_send_keys(PyGObject *self, - PyObject *args, PyObject *kwargs) -{ - static char *kwlist[] = {"keys", "kind", NULL}; - PyObject *keyList; - int kind = SPICE_DISPLAY_KEY_EVENT_CLICK; - int i, len; - guint *keys; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, - "O|I:SpiceDisplay.send_keys", kwlist, - &keyList, &kind)) - return NULL; - - if (!PyList_Check(keyList)) - return NULL; - - len = PyList_Size(keyList); - keys = g_malloc0(sizeof(guint)*len); - - for (i = 0 ; i < len ; i++) { - PyObject *val; - char *sym; - val = PyList_GetItem(keyList, i); - sym = PyString_AsString(val); - if (!sym) { - g_free(keys); - return NULL; - } - keys[i] = gdk_keyval_from_name(sym); - } - - spice_display_send_keys(SPICE_DISPLAY(self->obj), keys, len, kind); - g_free(keys); - - Py_INCREF(Py_None); - return Py_None; -} -%% -override spice_display_get_grab_keys kwargs -static PyObject* -_wrap_spice_display_get_grab_keys(PyGObject *self, - PyObject *args, PyObject *kwargs) -{ - SpiceGrabSequence *seq; - PyObject *keyList; - int i; - - seq = spice_display_get_grab_keys(SPICE_DISPLAY(self->obj)); - - keyList = PyList_New(0); - for (i = 0 ; i < seq->nkeysyms ; i++) - PyList_Append(keyList, PyInt_FromLong(seq->keysyms[i])); - - return keyList; -} -%% -override spice_display_set_grab_keys kwargs -static PyObject* -_wrap_spice_display_set_grab_keys(PyGObject *self, - PyObject *args, PyObject *kwargs) -{ - static char *kwlist[] = {"keys", NULL}; - PyObject *keyList; - int i; - guint nkeysyms; - guint *keysyms; - SpiceGrabSequence *seq; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, - "O|I:SpiceDisplay.set_grab_keys", kwlist, - &keyList)) - return NULL; - - if (!PyList_Check(keyList)) - return NULL; - - nkeysyms = PyList_Size(keyList); - keysyms = g_new0(guint, nkeysyms); - - for (i = 0 ; i < nkeysyms ; i++) { - PyObject *val = PyList_GetItem(keyList, i); - keysyms[i] = (guint)PyInt_AsLong(val); - } - - seq = spice_grab_sequence_new(nkeysyms, keysyms); - g_free(keysyms); - - spice_display_set_grab_keys(SPICE_DISPLAY(self->obj), seq); - - spice_grab_sequence_free(seq); - - Py_INCREF(Py_None); - return Py_None; -} -%% -override spice_session_get_channels -static PyObject* -_wrap_spice_session_get_channels(PyGObject *self, - PyObject *args, PyObject *kwargs) -{ - PyObject *py_list; - GList *list, *tmp; - PyObject *chann; - - list = spice_session_get_channels(SPICE_SESSION(self->obj)); - - if ((py_list = PyList_New(0)) == NULL) { - return NULL; - } - for (tmp = list; tmp != NULL; tmp = tmp->next) { - chann = pygobject_new(G_OBJECT(tmp->data)); - if (chann == NULL) { - Py_DECREF(py_list); - return NULL; - } - PyList_Append(py_list, chann); - Py_DECREF(chann); - } - return py_list; -} -%% -override spice_audio_new -static int -_wrap_spice_audio_new(PyGObject *self, - PyObject *args, PyObject *kwargs) -{ - static char *kwlist[] = {"session", "context", "name", NULL}; - PyGObject *session = NULL; - PyObject *py_context = NULL; - char *name = NULL; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, - "O!|Os:SpiceAudio", kwlist, - &PySpiceSession_Type, &session, - &py_context, &name)) - return -1; - - self->obj = (GObject *)spice_audio_new(SPICE_SESSION(session->obj), NULL, NULL); - - if (!self->obj) { - PyErr_SetString(PyExc_RuntimeError, "could not create SpiceAudio object"); - return -1; - } - pygobject_register_wrapper((PyObject *)self); - return 0; - -} -- cgit v0.10.2
