[Pkg-libvirt-commits] [SCM] libgtk-vnc Debian packaging branch, master, updated. debian/0.4.1-1
Guido Günther
agx at sigxcpu.org
Fri Jul 16 16:46:43 UTC 2010
The following commit has been merged in the master branch:
commit 5a5910e9a3f88b101aa122919cddac9405f6cc9d
Author: Guido Günther <agx at sigxcpu.org>
Date: Thu Jul 15 20:33:26 2010 +0200
Drop patches applied upstream
0001-say-disconnected-from-server-only-once-connected.patch
0002-remove-WERROR_CFLAGS.patch
0004-Don-t-use-PATH_MAX.patch
0005-Drop-space-after-Wl-in-libgtk_vnc_1_0_la_LDFLAGS.patch
0006-Add-Wl-since-no-undefined-is-a-linker-option.patch
0007-Explicitly-link-against-X11-libs-for-XkbGetKeyboard.patch
0008-Add-missing-symbols.patch
0009-Fix-missing-intialisation-of-sysdir-and-uderdir.patch
diff --git a/debian/patches/0003-fix-build-with-xulrunner-1.9.1.patch b/debian/patches/0001-fix-build-with-xulrunner-1.9.1.patch
similarity index 100%
rename from debian/patches/0003-fix-build-with-xulrunner-1.9.1.patch
rename to debian/patches/0001-fix-build-with-xulrunner-1.9.1.patch
diff --git a/debian/patches/0001-say-disconnected-from-server-only-once-connected.patch b/debian/patches/0001-say-disconnected-from-server-only-once-connected.patch
deleted file mode 100644
index 9c49347..0000000
--- a/debian/patches/0001-say-disconnected-from-server-only-once-connected.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Michal Suchanek <hramrach at centrum.cz>
-Date: Tue, 18 Aug 2009 18:20:46 +0200
-Subject: [PATCH] say "disconnected from server" only once connected
-
-Closes: #540435
----
- examples/gvncviewer.c | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/examples/gvncviewer.c b/examples/gvncviewer.c
-index 28b0fb8..c3fbd74 100644
---- a/examples/gvncviewer.c
-+++ b/examples/gvncviewer.c
-@@ -84,9 +84,12 @@ static void vnc_ungrab(GtkWidget *vncdisplay, GtkWidget *window)
- set_title(VNC_DISPLAY(vncdisplay), window, FALSE);
- }
-
-+static int connected = 0;
-+
- static void vnc_connected(GtkWidget *vncdisplay G_GNUC_UNUSED)
- {
- printf("Connected to server\n");
-+ connected = 1;
- }
-
- static void vnc_initialized(GtkWidget *vncdisplay, GtkWidget *window)
-@@ -110,7 +113,10 @@ static void vnc_desktop_resize(GtkWidget *vncdisplay G_GNUC_UNUSED,
-
- static void vnc_disconnected(GtkWidget *vncdisplay G_GNUC_UNUSED)
- {
-- printf("Disconnected from server\n");
-+ if(connected)
-+ printf("Disconnected from server\n");
-+ else
-+ printf("Failed to connect to server\n");
- gtk_main_quit();
- }
-
---
diff --git a/debian/patches/0002-remove-WERROR_CFLAGS.patch b/debian/patches/0002-remove-WERROR_CFLAGS.patch
deleted file mode 100644
index 63f263d..0000000
--- a/debian/patches/0002-remove-WERROR_CFLAGS.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Fri, 23 Oct 2009 21:29:45 +0200
-Subject: [PATCH] remove WERROR_CFLAGS
-
-to fix build
----
- plugin/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/plugin/Makefile.am b/plugin/Makefile.am
-index 2fa8777..1bd70c3 100644
---- a/plugin/Makefile.am
-+++ b/plugin/Makefile.am
-@@ -12,7 +12,7 @@ gtk_vnc_plugin_la_LDFLAGS = \
- -module -avoid-version
- gtk_vnc_plugin_la_CFLAGS = \
- -I$(top_srcdir)/src @GTK_CFLAGS@ \
-- @FIREFOX_PLUGIN_CFLAGS@ @WARNING_CFLAGS@ @WERROR_CFLAGS@
-+ @FIREFOX_PLUGIN_CFLAGS@ @WARNING_CFLAGS@
-
- all-local: gtk-vnc-plugin.so
-
---
diff --git a/debian/patches/0004-Don-t-use-PATH_MAX.patch b/debian/patches/0004-Don-t-use-PATH_MAX.patch
deleted file mode 100644
index fb3e8ee..0000000
--- a/debian/patches/0004-Don-t-use-PATH_MAX.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From: Emilio Pozuelo Monfort <pochu at debian.org>
-Date: Sun, 28 Feb 2010 17:30:11 +0100
-Subject: [PATCH] Don't use PATH_MAX
-
-Closes: #561004
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=604448
----
- src/vncdisplay.c | 67 ++++++++++++++++++++++++++++++-----------------------
- 1 files changed, 38 insertions(+), 29 deletions(-)
-
-diff --git a/src/vncdisplay.c b/src/vncdisplay.c
-index f779a63..98c2795 100644
---- a/src/vncdisplay.c
-+++ b/src/vncdisplay.c
-@@ -1998,67 +1998,76 @@ static void vnc_display_init(VncDisplay *display)
- priv->gvnc = gvnc_new(&vnc_display_ops, obj);
- }
-
--static int vnc_display_best_path(char *buf,
-- int buflen,
-- const char *basedir,
-- const char *basefile,
-- char **dirs,
-- unsigned int ndirs)
-+static char* vnc_display_best_path(const char *basedir,
-+ const char *basefile,
-+ char **dirs,
-+ unsigned int ndirs)
- {
- unsigned int i;
-+ char *path;
- for (i = 0 ; i < ndirs ; i++) {
- struct stat sb;
-- snprintf(buf, buflen-1, "%s/%s/%s", dirs[i], basedir, basefile);
-- buf[buflen-1] = '\0';
-- if (stat(buf, &sb) == 0)
-- return 0;
-+ path = g_strdup_printf ("%s/%s/%s", dirs[i], basedir, basefile);
-+ if (stat(path, &sb) == 0)
-+ return path;
-+ g_free (path);
- }
-- return -1;
-+ return NULL;
- }
-
- static int vnc_display_set_x509_credential(VncDisplay *obj, const char *name)
- {
-- char file[PATH_MAX];
-- char sysdir[PATH_MAX];
-+ gboolean ret = FALSE;
-+ char *file;
-+ char *sysdir;
- #ifndef WIN32
-- char userdir[PATH_MAX];
-+ char *userdir;
- struct passwd *pw;
- char *dirs[] = { sysdir, userdir };
- #else
- char *dirs[] = { sysdir };
- #endif
-
-- strncpy(sysdir, SYSCONFDIR "/pki", PATH_MAX-1);
-- sysdir[PATH_MAX-1] = '\0';
--
- #ifndef WIN32
- if (!(pw = getpwuid(getuid())))
- return TRUE;
-
-- snprintf(userdir, PATH_MAX-1, "%s/.pki", pw->pw_dir);
-- userdir[PATH_MAX-1] = '\0';
-+ userdir = g_strdup_printf("%s/.pki", pw->pw_dir);
- #endif
-
-- if (vnc_display_best_path(file, PATH_MAX, "CA", "cacert.pem",
-- dirs, sizeof(dirs)/sizeof(dirs[0])) < 0)
-- return TRUE;
-+ sysdir = g_strdup_printf("%s/pki", SYSCONFDIR);
-+
-+ if ((file = vnc_display_best_path("CA", "cacert.pem", dirs,
-+ sizeof(dirs)/sizeof(dirs[0]))) == NULL) {
-+ ret = TRUE;
-+ goto ret;
-+ }
- gvnc_set_credential_x509_cacert(obj->priv->gvnc, file);
-+ g_free (file);
-
- /* Don't mind failures of CRL */
-- if (vnc_display_best_path(file, PATH_MAX, "CA", "cacrl.pem",
-- dirs, sizeof(dirs)/sizeof(dirs[0])) == 0)
-+ if ((file = vnc_display_best_path("CA", "cacrl.pem", dirs,
-+ sizeof(dirs)/sizeof(dirs[0]))) != NULL)
- gvnc_set_credential_x509_cacert(obj->priv->gvnc, file);
-+ g_free (file);
-
- /* Set client key & cert if we have them. Server will reject auth
- * if it decides it requires them*/
-- if (vnc_display_best_path(file, PATH_MAX, name, "private/clientkey.pem",
-- dirs, sizeof(dirs)/sizeof(dirs[0])) == 0)
-+ if ((file = vnc_display_best_path(name, "private/clientkey.pem", dirs,
-+ sizeof(dirs)/sizeof(dirs[0]))) != NULL)
- gvnc_set_credential_x509_key(obj->priv->gvnc, file);
-- if (vnc_display_best_path(file, PATH_MAX, name, "clientcert.pem",
-- dirs, sizeof(dirs)/sizeof(dirs[0])) == 0)
-+ g_free (file);
-+ if ((file = vnc_display_best_path(name, "clientcert.pem", dirs,
-+ sizeof(dirs)/sizeof(dirs[0]))) != NULL)
- gvnc_set_credential_x509_cert(obj->priv->gvnc, file);
-+ g_free (file);
-
-- return FALSE;
-+ ret:
-+#ifndef WIN32
-+ g_free (userdir);
-+#endif
-+ g_free (sysdir);
-+ return ret;
- }
-
- gboolean vnc_display_set_credential(VncDisplay *obj, int type, const gchar *data)
---
diff --git a/debian/patches/0005-Drop-space-after-Wl-in-libgtk_vnc_1_0_la_LDFLAGS.patch b/debian/patches/0005-Drop-space-after-Wl-in-libgtk_vnc_1_0_la_LDFLAGS.patch
deleted file mode 100644
index 372115a..0000000
--- a/debian/patches/0005-Drop-space-after-Wl-in-libgtk_vnc_1_0_la_LDFLAGS.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Tue, 2 Mar 2010 09:55:46 +0100
-Subject: [PATCH] Drop space after -Wl, in libgtk_vnc_1_0_la_LDFLAGS
-
-otherwise the linker script gets silently ignored.
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=611930
----
- src/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index cae7406..865505e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -12,7 +12,7 @@ libgtk_vnc_1_0_la_CFLAGS = @GTK_CFLAGS@ @GNUTLS_CFLAGS@ \
- -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
- -DG_LOG_DOMAIN=\"gtk-vnc\" \
- -I$(top_srcdir)/gnulib/lib -I../gnulib/lib
--libgtk_vnc_1_0_la_LDFLAGS = -Wl, @LD_VERSION_SCRIPT_SUPPORT@ \
-+libgtk_vnc_1_0_la_LDFLAGS = -Wl, at LD_VERSION_SCRIPT_SUPPORT@ \
- -version-info 0:1:0 -no-undefined
-
- gtk_vnc_includedir = $(includedir)/gtk-vnc-1.0/
---
diff --git a/debian/patches/0006-Add-Wl-since-no-undefined-is-a-linker-option.patch b/debian/patches/0006-Add-Wl-since-no-undefined-is-a-linker-option.patch
deleted file mode 100644
index fd2a518..0000000
--- a/debian/patches/0006-Add-Wl-since-no-undefined-is-a-linker-option.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 4 Mar 2010 07:23:19 +0100
-Subject: [PATCH] Add -Wl since --no-undefined is a linker option
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=611934
----
- src/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 865505e..89b8731 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -13,7 +13,7 @@ libgtk_vnc_1_0_la_CFLAGS = @GTK_CFLAGS@ @GNUTLS_CFLAGS@ \
- -DG_LOG_DOMAIN=\"gtk-vnc\" \
- -I$(top_srcdir)/gnulib/lib -I../gnulib/lib
- libgtk_vnc_1_0_la_LDFLAGS = -Wl, at LD_VERSION_SCRIPT_SUPPORT@ \
-- -version-info 0:1:0 -no-undefined
-+ -version-info 0:1:0 -Wl,--no-undefined
-
- gtk_vnc_includedir = $(includedir)/gtk-vnc-1.0/
- gtk_vnc_include_HEADERS = vncdisplay.h
---
diff --git a/debian/patches/0007-Explicitly-link-against-X11-libs-for-XkbGetKeyboard.patch b/debian/patches/0007-Explicitly-link-against-X11-libs-for-XkbGetKeyboard.patch
deleted file mode 100644
index 17b705c..0000000
--- a/debian/patches/0007-Explicitly-link-against-X11-libs-for-XkbGetKeyboard.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 4 Mar 2010 07:23:57 +0100
-Subject: [PATCH] Explicitly link against X11 libs for XkbGetKeyboard
-
-and friends. Fixes linking with --no-undefined as well as binutils-gold.
-
-Closes: #554751
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=611935
----
- configure.ac | 4 ++++
- src/Makefile.am | 2 ++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2131706..f888ee3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -105,6 +105,10 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
-
-+PKG_CHECK_MODULES(X11, x11,,AC_MSG_NOTICE([Not building against X11]))
-+AC_SUBST(X11_CFLAGS)
-+AC_SUBST(X11_LIBS)
-+
- save_CFLAGS="$CFLAGS"
- save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 89b8731..e1d5552 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -5,9 +5,11 @@ lib_LTLIBRARIES = libgtk-vnc-1.0.la
-
- libgtk_vnc_1_0_la_LIBADD = @GTK_LIBS@ @GNUTLS_LIBS@ \
- @GTHREAD_LIBS@ @SASL_LIBS@ \
-+ @X11_LIBS@ \
- ../gnulib/lib/libgnu.la
- libgtk_vnc_1_0_la_CFLAGS = @GTK_CFLAGS@ @GNUTLS_CFLAGS@ \
- @GTHREAD_CFLAGS@ @SASL_CFLAGS@ @WARNING_CFLAGS@ \
-+ @X11_CFLAGS@ \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
- -DG_LOG_DOMAIN=\"gtk-vnc\" \
---
diff --git a/debian/patches/0008-Add-missing-symbols.patch b/debian/patches/0008-Add-missing-symbols.patch
deleted file mode 100644
index 632a6d6..0000000
--- a/debian/patches/0008-Add-missing-symbols.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Fri, 5 Mar 2010 22:46:03 +0100
-Subject: [PATCH] Add missing symbols
-
-don't version them for now until this is soreted out with upstream.
----
- src/libgtk-vnc_sym.version | 11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git a/src/libgtk-vnc_sym.version b/src/libgtk-vnc_sym.version
-index 4a88740..a77a9f1 100644
---- a/src/libgtk-vnc_sym.version
-+++ b/src/libgtk-vnc_sym.version
-@@ -53,6 +53,17 @@
- vnc_display_set_force_size;
- vnc_display_get_force_size;
-
-+# introduced with 0.3.8
-+ vnc_display_get_option_entries;
-+
-+# introduced with 0.3.9
-+ vnc_display_set_depth;
-+ vnc_display_get_depth;
-+
-+ vnc_display_depth_color_get_type;
-+
-+ vnc_display_request_update;
-+
- local:
- *;
- };
---
diff --git a/debian/patches/0009-Fix-missing-intialisation-of-sysdir-and-uderdir.patch b/debian/patches/0009-Fix-missing-intialisation-of-sysdir-and-uderdir.patch
deleted file mode 100644
index f041a93..0000000
--- a/debian/patches/0009-Fix-missing-intialisation-of-sysdir-and-uderdir.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sun, 4 Apr 2010 14:27:28 +0200
-Subject: [PATCH] Fix missing intialisation of sysdir and uderdir
-
-introduced by PATH_MAX removal.
-
-Closes: #576102
----
- src/vncdisplay.c | 15 +++++----------
- 1 files changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/src/vncdisplay.c b/src/vncdisplay.c
-index 98c2795..89811f6 100644
---- a/src/vncdisplay.c
-+++ b/src/vncdisplay.c
-@@ -2019,24 +2019,19 @@ static int vnc_display_set_x509_credential(VncDisplay *obj, const char *name)
- {
- gboolean ret = FALSE;
- char *file;
-- char *sysdir;
-+ char *sysdir = g_strdup_printf("%s/pki", SYSCONFDIR);
- #ifndef WIN32
-- char *userdir;
- struct passwd *pw;
-- char *dirs[] = { sysdir, userdir };
--#else
-- char *dirs[] = { sysdir };
--#endif
-
--#ifndef WIN32
- if (!(pw = getpwuid(getuid())))
- return TRUE;
-
-- userdir = g_strdup_printf("%s/.pki", pw->pw_dir);
-+ char *userdir = userdir = g_strdup_printf("%s/.pki", pw->pw_dir);
-+ char *dirs[] = { sysdir, userdir };
-+#else
-+ char *dirs[] = { sysdir };
- #endif
-
-- sysdir = g_strdup_printf("%s/pki", SYSCONFDIR);
--
- if ((file = vnc_display_best_path("CA", "cacert.pem", dirs,
- sizeof(dirs)/sizeof(dirs[0]))) == NULL) {
- ret = TRUE;
---
diff --git a/debian/patches/series b/debian/patches/series
index 2b43721..843b232 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1 @@
-0001-say-disconnected-from-server-only-once-connected.patch
-0002-remove-WERROR_CFLAGS.patch
-0003-fix-build-with-xulrunner-1.9.1.patch
-0004-Don-t-use-PATH_MAX.patch
-0005-Drop-space-after-Wl-in-libgtk_vnc_1_0_la_LDFLAGS.patch
-0006-Add-Wl-since-no-undefined-is-a-linker-option.patch
-0007-Explicitly-link-against-X11-libs-for-XkbGetKeyboard.patch
-0008-Add-missing-symbols.patch
-0009-Fix-missing-intialisation-of-sysdir-and-uderdir.patch
+0001-fix-build-with-xulrunner-1.9.1.patch
--
libgtk-vnc Debian packaging
More information about the Pkg-libvirt-commits
mailing list