diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | mingw32-virt-viewer.spec.in | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/virt-glib-compat.h | 56 | ||||
| -rw-r--r-- | virt-viewer.spec.in | 1 |
5 files changed, 60 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 548b945..ca3956e 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_CANONICAL_HOST m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) AM_SILENT_RULES([yes]) -GLIB2_REQUIRED=2.12.0 +GLIB2_REQUIRED=2.22.0 LIBXML2_REQUIRED="2.6.0" LIBVIRT_REQUIRED="0.9.7" GTK2_REQUIRED="2.18.0" diff --git a/mingw32-virt-viewer.spec.in b/mingw32-virt-viewer.spec.in index beeb73f..76bd9ac 100644 --- a/mingw32-virt-viewer.spec.in +++ b/mingw32-virt-viewer.spec.in @@ -21,6 +21,7 @@ Source0: ftp://virt-manager.org/downloads/virt-viewer/virt-viewer-%{versi BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mingw32-filesystem >= 23 +BuildRequires: mingw32-glib2 >= 2.22 %if %{with_gtk3} BuildRequires: mingw32-gtk3 >= 3.0.0 %else diff --git a/src/Makefile.am b/src/Makefile.am index 5daa98a..8f9339c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,6 +32,7 @@ $(BUILT_SOURCES): %: %.etemplate $(ENUMS_FILES) COMMON_SOURCES = \ $(BUILT_SOURCES) \ + virt-glib-compat.h \ virt-gtk-compat.h \ virt-viewer-util.h virt-viewer-util.c \ virt-viewer-auth.h virt-viewer-auth.c \ diff --git a/src/virt-glib-compat.h b/src/virt-glib-compat.h new file mode 100644 index 0000000..23345a0 --- /dev/null +++ b/src/virt-glib-compat.h @@ -0,0 +1,56 @@ +/* + * Virt Viewer: A virtual machine console viewer + * + * Copyright (C) 2007-2009 Red Hat, Inc. + * Copyright (C) 2009-2012 Daniel P. Berrange + * Copyright (C) 2010 Marc-André Lureau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange@redhat.com> + */ + +#include <config.h> + +#ifndef _VIRT_GLIB_COMPAT_H +# define _VIRT_GLIB_COMPAT_H 1 + +#include <glib-object.h> + +G_BEGIN_DECLS + +#ifndef g_clear_pointer +#define g_clear_pointer(pp, destroy) \ + G_STMT_START { \ + G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \ + /* Only one access, please */ \ + gpointer *_pp = (gpointer *) (pp); \ + gpointer _p; \ + /* This assignment is needed to avoid a gcc warning */ \ + GDestroyNotify _destroy = (GDestroyNotify) (destroy); \ + \ + (void) (0 ? (gpointer) *(pp) : 0); \ + do \ + _p = g_atomic_pointer_get (_pp); \ + while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_pp, _p, NULL)); \ + \ + if (_p) \ + _destroy (_p); \ + } G_STMT_END +#endif + +G_END_DECLS + +#endif // _VIRT_GLIB_COMPAT_H diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in index 3227238..e3b2c52 100644 --- a/virt-viewer.spec.in +++ b/virt-viewer.spec.in @@ -38,6 +38,7 @@ Requires(postun): %{_sbindir}/update-alternatives Requires(post): desktop-file-utils Requires(postun): desktop-file-utils +BuildRequires: glib2-devel >= 2.22 %if %{with_gtk3} BuildRequires: gtk3-devel >= 3.0.0 %else |