Hello community, here is the log from the commit of package gtk-vnc for openSUSE:Factory checked in at 2012-07-03 13:56:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk-vnc (Old) and /work/SRC/openSUSE:Factory/.gtk-vnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtk-vnc", Maintainer is "gnome-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gtk-vnc/gtk-vnc.changes 2012-06-10 21:51:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtk-vnc.new/gtk-vnc.changes 2012-07-03 13:56:42.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 2 21:45:50 UTC 2012 - dimstar@opensuse.org + +- Add gtk-vnc-glib231-debug.patch: Ensure debugging works on + GLib >= 2.32. Without this, it will be difficult to do any + debugging work in case of issues (gvncviewer --gtk-vnc-debug). + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/gtk-vnc/gtk-vnc2.changes 2012-06-10 21:51:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtk-vnc.new/gtk-vnc2.changes 2012-07-03 13:56:42.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Jul 2 21:45:50 UTC 2012 - dimstar@opensuse.org + +- Add gtk-vnc-glib231-debug.patch: Ensure debugging works on + GLib >= 2.32. Without this, it will be difficult to do any + debugging work in case of issues (gvncviewer --gtk-vnc-debug). + +------------------------------------------------------------------- +Wed May 23 15:13:19 UTC 2012 - vuntz@opensuse.org + +- Remove xz BuildRequires now that it comes for free in the build + system. + +------------------------------------------------------------------- @@ -4,2 +17,3 @@ -- Use BuildRequires: libgnutls-devel instead of gnutls-devel for - Factory in keeping with gnutls package naming changes. +- Use pkgconfig(gnutls) BuildRequires instead of gnutls-devel. This + is more correct and helps avoid the issue with gnutls-devel + having been removed from Factory. New: ---- gtk-vnc-glib231-debug.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk-vnc.spec ++++++ --- /var/tmp/diff_new_pack.LFhUT1/_old 2012-07-03 13:56:43.000000000 +0200 +++ /var/tmp/diff_new_pack.LFhUT1/_new 2012-07-03 13:56:43.000000000 +0200 @@ -57,6 +57,8 @@ Release: 0 # FIXME: see if the browser plugin can be built (last try 0.4.2) Source: http://download.gnome.org/sources/gtk-vnc/0.5/%{_name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gtk-vnc-glib231-debug.patch dimstar@opensuse.org -- Ensure debugging works on GLib >= 2.32, taken from git +Patch0: gtk-vnc-glib231-debug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://gtk-vnc.sf.net/ @@ -196,6 +198,7 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 translation-update-upstream %build ++++++ gtk-vnc2.spec ++++++ --- /var/tmp/diff_new_pack.LFhUT1/_old 2012-07-03 13:56:43.000000000 +0200 +++ /var/tmp/diff_new_pack.LFhUT1/_new 2012-07-03 13:56:43.000000000 +0200 @@ -31,11 +31,6 @@ Name: gtk-vnc2 %define _name gtk-vnc BuildRequires: cyrus-sasl-devel -%if 0%{?suse_version} > 1210 -BuildRequires: libgnutls-devel -%else -BuildRequires: gnutls-devel -%endif BuildRequires: gobject-introspection-devel %if %{build_for_gtk2} BuildRequires: gtk2-devel @@ -53,8 +48,7 @@ %if ! %{build_for_gtk2} BuildRequires: vala %endif -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz +BuildRequires: pkgconfig(gnutls) >= 1.4.0 BuildRequires: pkgconfig(libpulse-simple) Summary: A GTK widget for VNC clients License: LGPL-2.1 ; LGPL-2.1+ @@ -63,6 +57,8 @@ Release: 0 # FIXME: see if the browser plugin can be built (last try 0.4.2) Source: http://download.gnome.org/sources/gtk-vnc/0.5/%{_name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM gtk-vnc-glib231-debug.patch dimstar@opensuse.org -- Ensure debugging works on GLib >= 2.32, taken from git +Patch0: gtk-vnc-glib231-debug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://gtk-vnc.sf.net/ @@ -202,6 +198,7 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 translation-update-upstream %build ++++++ gtk-vnc-glib231-debug.patch ++++++ Index: gtk-vnc-0.5.0/src/Makefile.am =================================================================== --- gtk-vnc-0.5.0.orig/src/Makefile.am +++ gtk-vnc-0.5.0/src/Makefile.am @@ -48,7 +48,7 @@ libgvnc_1_0_la_CFLAGS = \ $(WARNING_CFLAGS) \ -DSYSCONFDIR=""$(sysconfdir)"" \ -DPACKAGE_LOCALE_DIR=""$(datadir)/locale"" \ - -DG_LOG_DOMAIN="gvnc" + -DG_LOG_DOMAIN="gtk-vnc" libgvnc_1_0_la_LDFLAGS = \ $(VERSION_SCRIPT_FLAGS)$(GVNC_VERSION_FILE) \ -version-info 0:1:0 $(NO_UNDEFINED_FLAGS) @@ -109,7 +109,7 @@ libgvncpulse_1_0_la_CFLAGS = \ $(WARNING_CFLAGS) \ -DSYSCONFDIR=""$(sysconfdir)"" \ -DPACKAGE_LOCALE_DIR=""$(datadir)/locale"" \ - -DG_LOG_DOMAIN="pulse-vnc" + -DG_LOG_DOMAIN="gtk-vnc" libgvncpulse_1_0_la_LDFLAGS = \ $(VERSION_SCRIPT_FLAGS)$(GVNCPULSE_VERSION_FILE) \ -version-info 0:1:0 $(NO_UNDEFINED_FLAGS) Index: gtk-vnc-0.5.0/src/vncutil.c =================================================================== --- gtk-vnc-0.5.0.orig/src/vncutil.c +++ gtk-vnc-0.5.0/src/vncutil.c @@ -20,6 +20,9 @@ #include <config.h> +#include <stdlib.h> +#include <string.h> + #include "vncutil.h" @@ -27,6 +30,18 @@ static gboolean debugFlag = FALSE; void vnc_util_set_debug(gboolean enabled) { +#if GLIB_CHECK_VERSION(2, 31, 0) + if (enabled) { + gchar *doms = getenv("G_MESSAGES_DEBUG"); + if (!doms) { + setenv("G_MESSAGES_DEBUG", G_LOG_DOMAIN, 1); + } else if (!strstr(doms, G_LOG_DOMAIN)) { + gchar *newdoms = g_strdup_printf("%s %s", doms, G_LOG_DOMAIN); + setenv("G_MESSAGES_DEBUG", newdoms, 1); + g_free(newdoms); + } + } +#endif debugFlag = enabled; } Index: gtk-vnc-0.5.0/src/Makefile.in =================================================================== --- gtk-vnc-0.5.0.orig/src/Makefile.in +++ gtk-vnc-0.5.0/src/Makefile.in @@ -488,7 +488,7 @@ libgvnc_1_0_la_CFLAGS = \ $(WARNING_CFLAGS) \ -DSYSCONFDIR=""$(sysconfdir)"" \ -DPACKAGE_LOCALE_DIR=""$(datadir)/locale"" \ - -DG_LOG_DOMAIN="gvnc" + -DG_LOG_DOMAIN="gtk-vnc" libgvnc_1_0_la_LDFLAGS = \ $(VERSION_SCRIPT_FLAGS)$(GVNC_VERSION_FILE) \ @@ -539,7 +539,7 @@ libgvnc_1_0_la_SOURCES = coroutine.h d3d @HAVE_PULSEAUDIO_TRUE@ $(WARNING_CFLAGS) \ @HAVE_PULSEAUDIO_TRUE@ -DSYSCONFDIR=""$(sysconfdir)"" \ @HAVE_PULSEAUDIO_TRUE@ -DPACKAGE_LOCALE_DIR=""$(datadir)/locale"" \ -@HAVE_PULSEAUDIO_TRUE@ -DG_LOG_DOMAIN="pulse-vnc" +@HAVE_PULSEAUDIO_TRUE@ -DG_LOG_DOMAIN="gtk-vnc" @HAVE_PULSEAUDIO_TRUE@libgvncpulse_1_0_la_LDFLAGS = \ @HAVE_PULSEAUDIO_TRUE@ $(VERSION_SCRIPT_FLAGS)$(GVNCPULSE_VERSION_FILE) \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org