r54977 - in /desktop/unstable/vino/debian: control control.in patches/05_use-system-miniupnpc.patch
jbicha at users.alioth.debian.org
jbicha at users.alioth.debian.org
Tue Dec 5 21:12:06 UTC 2017
Author: jbicha
Date: Tue Dec 5 21:12:05 2017
New Revision: 54977
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54977
Log:
Copy latest 05_use-system-miniupnpc.patch from Ubuntu (still disabled though)
Modified:
desktop/unstable/vino/debian/control
desktop/unstable/vino/debian/control.in
desktop/unstable/vino/debian/patches/05_use-system-miniupnpc.patch
Modified: desktop/unstable/vino/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/control?rev=54977&op=diff
==============================================================================
--- desktop/unstable/vino/debian/control [utf-8] (original)
+++ desktop/unstable/vino/debian/control [utf-8] Tue Dec 5 21:12:05 2017
@@ -6,7 +6,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Jeremy Bicha <jbicha at debian.org>, Michael Biebl <biebl at debian.org>
Build-Depends: debhelper (>= 10),
gnome-pkg-tools (>= 0.10),
gnome-common,
@@ -18,6 +18,7 @@
libgnutls28-dev,
libgtk-3-dev (>= 3.0.0),
libjpeg-dev,
+# libminiupnpc-dev (>= 1.9),
libnotify-dev (>= 0.7.0),
libsecret-1-dev,
libtelepathy-glib-dev (>= 0.18.0),
Modified: desktop/unstable/vino/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/control.in?rev=54977&op=diff
==============================================================================
--- desktop/unstable/vino/debian/control.in [utf-8] (original)
+++ desktop/unstable/vino/debian/control.in [utf-8] Tue Dec 5 21:12:05 2017
@@ -14,6 +14,7 @@
libgnutls28-dev,
libgtk-3-dev (>= 3.0.0),
libjpeg-dev,
+# libminiupnpc-dev (>= 1.9),
libnotify-dev (>= 0.7.0),
libsecret-1-dev,
libtelepathy-glib-dev (>= 0.18.0),
Modified: desktop/unstable/vino/debian/patches/05_use-system-miniupnpc.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vino/debian/patches/05_use-system-miniupnpc.patch?rev=54977&op=diff
==============================================================================
--- desktop/unstable/vino/debian/patches/05_use-system-miniupnpc.patch [utf-8] (original)
+++ desktop/unstable/vino/debian/patches/05_use-system-miniupnpc.patch [utf-8] Tue Dec 5 21:12:05 2017
@@ -3,11 +3,15 @@
https://trac.transmissionbt.com/ticket/4323 for similar code
Author: Jeremy Bicha <jbicha at ubuntu.com>
Forwarded: no
-Index: vino-3.2.2/Makefile.am
-===================================================================
---- vino-3.2.2.orig/Makefile.am 2011-10-24 17:36:19.000000000 +0200
-+++ vino-3.2.2/Makefile.am 2011-11-15 21:50:01.974331566 +0100
-@@ -39,29 +39,6 @@
+---
+ Makefile.am | 29 +----------------------------
+ configure.ac | 7 +++++++
+ server/vino-upnp.c | 28 ++++++++++++++++++----------
+ 3 files changed, 26 insertions(+), 38 deletions(-)
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -36,29 +36,6 @@ libeggsmclient_la_SOURCES = \
server/smclient/eggdesktopfile.c \
server/smclient/eggdesktopfile.h
@@ -37,7 +41,7 @@
if VINO_HAVE_SELF_IFADDRS
VINO_IFADDRS_sources = \
server/libvncserver/ifaddr/getifaddrs.c \
-@@ -104,12 +81,10 @@
+@@ -101,12 +78,10 @@ vino_server_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/common \
-I$(top_srcdir)/server/libvncserver \
@@ -50,23 +54,23 @@
$(LIBGCRYPT_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
-@@ -125,6 +100,7 @@
+@@ -122,6 +97,7 @@ vino_server_LDADD = \
$(VINO_SERVER_LIBS) \
$(LIBGCRYPT_LIBS) \
$(JPEG_LIBS) \
+ $(LIBUPNP_LIBS) \
$(X_LIBS) $(XTEST_LIBS) $(XSHM_LIBS) $(XDAMAGE_LIBS) $(ZLIB_LIBS)
- if VINO_ENABLE_HTTP_SERVER
-@@ -177,7 +153,6 @@
+ if VINO_HAVE_TELEPATHY_GLIB
+@@ -169,7 +145,6 @@ vino_server_SOURCES = \
server/vino-dbus-error.h \
server/vino-upnp.h \
server/vino-upnp.c \
- $(VINO_MINIUPNP_sources) \
$(VINO_IFADDR_sources) \
$(VINO_LIBVNCSERVER_sources) \
- $(VINO_HTTP_sources) \
-@@ -350,8 +325,6 @@
+ $(VINO_TELEPATHY_GLIB_sources)
+@@ -294,8 +269,6 @@ dist_noinst_DATA = \
server/libvncserver/tabletranstemplate.c \
server/libvncserver/tableinitcmtemplate.c \
server/libvncserver/zrleencodetemplate.c \
@@ -74,14 +78,12 @@
- server/miniupnp/LICENCE \
\
ChangeLog.pre-git \
- intltool-extract.in \
-Index: vino-3.2.2/configure.ac
-===================================================================
---- vino-3.2.2.orig/configure.ac 2011-11-14 18:31:38.000000000 +0100
-+++ vino-3.2.2/configure.ac 2011-11-15 21:50:01.978331565 +0100
-@@ -322,6 +322,13 @@
- [AC_MSG_ERROR([IPv6 support requested but not found])])])
- AC_MSG_RESULT([$have_ipv6])
+ vino.doap
+--- a/configure.ac
++++ b/configure.ac
+@@ -277,6 +277,13 @@ AS_IF([test x$with_systemduserunitdir !=
+ [AC_SUBST([systemduserunitdir], [$with_systemduserunitdir])])
+ AM_CONDITIONAL([INSTALL_USER_UNITS], [test -n "$with_systemduserunitdir" -a "x$with_systemduserunitdir" != xno])
+dnl ----------------------------------------------------------------------------
+dnl
@@ -92,4 +94,91 @@
+
# GNOME libraries
GTK_VERSION=3.0.0
- GLIB_VERSION=2.17.0
+ GLIB_VERSION=2.32.0
+--- a/server/vino-upnp.c
++++ b/server/vino-upnp.c
+@@ -27,8 +27,8 @@
+ #endif
+
+ #include <string.h>
+-#include "miniupnp/miniupnpc.h"
+-#include "miniupnp/upnpcommands.h"
++#include <miniupnpc/miniupnpc.h>
++#include <miniupnpc/upnpcommands.h>
+
+ #include "vino-upnp.h"
+ #include "vino-util.h"
+@@ -72,6 +72,7 @@ update_upnp_status (VinoUpnp *upnp)
+ {
+ struct UPNPDev * devlist;
+ int res;
++ int upnperror = 0;
+
+ if (upnp->priv->have_igd)
+ return TRUE;
+@@ -79,7 +80,7 @@ update_upnp_status (VinoUpnp *upnp)
+ clean_upnp_data (upnp);
+
+ dprintf (UPNP, "UPnP: Doing the discovery... ");
+- devlist = upnpDiscover (2000, NULL, NULL, 0);
++ devlist = upnpDiscover (2000, NULL, NULL, 0, 0, &upnperror);
+ if (!devlist)
+ {
+ dprintf (UPNP, "nothing found, aborting.");
+@@ -180,7 +181,7 @@ vino_upnp_get_external_ip (VinoUpnp *upn
+ return NULL;
+
+ UPNP_GetExternalIPAddress (upnp->priv->urls->controlURL,
+- upnp->priv->data->servicetype,
++ upnp->priv->data->first.servicetype,
+ ip);
+ if (ip[0])
+ if (strcmp (ip, "0.0.0.0") == 0)
+@@ -211,11 +212,15 @@ vino_upnp_add_port (VinoUpnp *upnp, int
+ ext_port = g_strdup_printf ("%d", local_port);
+ dprintf (UPNP, "UPnP: Trying to forward port %d...: ", local_port);
+ UPNP_GetSpecificPortMappingEntry (upnp->priv->urls->controlURL,
+- upnp->priv->data->servicetype,
++ upnp->priv->data->first.servicetype,
+ ext_port,
+ "TCP",
++ NULL,
+ int_client_tmp,
+- int_port_tmp);
++ int_port_tmp,
++ NULL,
++ NULL,
++ NULL);
+ if ( (strcmp (int_client_tmp, upnp->priv->lanaddr) == 0) && (strcmp (int_port_tmp, ext_port) == 0) )
+ {
+ dprintf (UPNP, "UPnP: Found a previous redirect\n");
+@@ -247,12 +252,14 @@ vino_upnp_add_port (VinoUpnp *upnp, int
+ g_get_host_name ());
+
+ err = UPNP_AddPortMapping (upnp->priv->urls->controlURL,
+- upnp->priv->data->servicetype,
++ upnp->priv->data->first.servicetype,
+ ext_port,
+ int_port,
+ upnp->priv->lanaddr,
+ desc,
+- "TCP");
++ "TCP",
++ NULL,
++ NULL);
+ if (err == 0)
+ {
+ upnp->priv->port = local_port;
+@@ -285,9 +292,10 @@ vino_upnp_remove_port (VinoUpnp *upnp)
+
+ port = g_strdup_printf ("%d", upnp->priv->port);
+ err = UPNP_DeletePortMapping (upnp->priv->urls->controlURL,
+- upnp->priv->data->servicetype,
++ upnp->priv->data->first.servicetype,
+ port,
+- "TCP");
++ "TCP",
++ NULL);
+ if (err == 0)
+ dprintf (UPNP, "UPnP: Removed forwarded port %d\n", upnp->priv->port);
+ else
More information about the pkg-gnome-commits
mailing list