Merge remote-tracking branch 'origin/master' into f17
This commit is contained in:
Christophe Fergeau
commit
5ba542e1b0
69
0001-Fix-read_uint-macros-on-big-endian-archs.patch
Normal file
69
0001-Fix-read_uint-macros-on-big-endian-archs.patch
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
From 0649b10ed5839e407984a7118c69ca8379b4a0e4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christophe Fergeau <cfergeau@redhat.com>
|
||||||
|
Date: Fri, 6 Apr 2012 15:17:43 +0200
|
||||||
|
Subject: [PATCH] Fix read_uint* macros on big-endian archs
|
||||||
|
|
||||||
|
---
|
||||||
|
gtk/generated_demarshallers.c | 12 ++++++------
|
||||||
|
gtk/generated_demarshallers1.c | 12 ++++++------
|
||||||
|
2 files changed, 12 insertions(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/gtk/generated_demarshallers.c b/gtk/generated_demarshallers.c
|
||||||
|
index f34dc12..6d67551 100644
|
||||||
|
--- a/gtk/generated_demarshallers.c
|
||||||
|
+++ b/gtk/generated_demarshallers.c
|
||||||
|
@@ -18,17 +18,17 @@
|
||||||
|
#define write_int8(ptr, val) *(int8_t *)(ptr) = val
|
||||||
|
#define read_uint8(ptr) (*((uint8_t *)(ptr)))
|
||||||
|
#define write_uint8(ptr, val) *(uint8_t *)(ptr) = val
|
||||||
|
-#define read_int16(ptr) ((int16_t)SPICE_BYTESWAP16(*((uint16_t *)(ptr)))
|
||||||
|
+#define read_int16(ptr) ((int16_t)SPICE_BYTESWAP16(*((uint16_t *)(ptr))))
|
||||||
|
#define write_int16(ptr, val) *(uint16_t *)(ptr) = SPICE_BYTESWAP16((uint16_t)val)
|
||||||
|
-#define read_uint16(ptr) ((uint16_t)SPICE_BYTESWAP16(*((uint16_t *)(ptr)))
|
||||||
|
+#define read_uint16(ptr) ((uint16_t)SPICE_BYTESWAP16(*((uint16_t *)(ptr))))
|
||||||
|
#define write_uint16(ptr, val) *(uint16_t *)(ptr) = SPICE_BYTESWAP16((uint16_t)val)
|
||||||
|
-#define read_int32(ptr) ((int32_t)SPICE_BYTESWAP32(*((uint32_t *)(ptr)))
|
||||||
|
+#define read_int32(ptr) ((int32_t)SPICE_BYTESWAP32(*((uint32_t *)(ptr))))
|
||||||
|
#define write_int32(ptr, val) *(uint32_t *)(ptr) = SPICE_BYTESWAP32((uint32_t)val)
|
||||||
|
-#define read_uint32(ptr) ((uint32_t)SPICE_BYTESWAP32(*((uint32_t *)(ptr)))
|
||||||
|
+#define read_uint32(ptr) ((uint32_t)SPICE_BYTESWAP32(*((uint32_t *)(ptr))))
|
||||||
|
#define write_uint32(ptr, val) *(uint32_t *)(ptr) = SPICE_BYTESWAP32((uint32_t)val)
|
||||||
|
-#define read_int64(ptr) ((int64_t)SPICE_BYTESWAP64(*((uint64_t *)(ptr)))
|
||||||
|
+#define read_int64(ptr) ((int64_t)SPICE_BYTESWAP64(*((uint64_t *)(ptr))))
|
||||||
|
#define write_int64(ptr, val) *(uint64_t *)(ptr) = SPICE_BYTESWAP64((uint64_t)val)
|
||||||
|
-#define read_uint64(ptr) ((uint64_t)SPICE_BYTESWAP64(*((uint64_t *)(ptr)))
|
||||||
|
+#define read_uint64(ptr) ((uint64_t)SPICE_BYTESWAP64(*((uint64_t *)(ptr))))
|
||||||
|
#define write_uint64(ptr, val) *(uint64_t *)(ptr) = SPICE_BYTESWAP64((uint64_t)val)
|
||||||
|
#else
|
||||||
|
#define read_int8(ptr) (*((int8_t *)(ptr)))
|
||||||
|
diff --git a/gtk/generated_demarshallers1.c b/gtk/generated_demarshallers1.c
|
||||||
|
index 633044c..5364769 100644
|
||||||
|
--- a/gtk/generated_demarshallers1.c
|
||||||
|
+++ b/gtk/generated_demarshallers1.c
|
||||||
|
@@ -18,17 +18,17 @@
|
||||||
|
#define write_int8(ptr, val) *(int8_t *)(ptr) = val
|
||||||
|
#define read_uint8(ptr) (*((uint8_t *)(ptr)))
|
||||||
|
#define write_uint8(ptr, val) *(uint8_t *)(ptr) = val
|
||||||
|
-#define read_int16(ptr) ((int16_t)SPICE_BYTESWAP16(*((uint16_t *)(ptr)))
|
||||||
|
+#define read_int16(ptr) ((int16_t)SPICE_BYTESWAP16(*((uint16_t *)(ptr))))
|
||||||
|
#define write_int16(ptr, val) *(uint16_t *)(ptr) = SPICE_BYTESWAP16((uint16_t)val)
|
||||||
|
-#define read_uint16(ptr) ((uint16_t)SPICE_BYTESWAP16(*((uint16_t *)(ptr)))
|
||||||
|
+#define read_uint16(ptr) ((uint16_t)SPICE_BYTESWAP16(*((uint16_t *)(ptr))))
|
||||||
|
#define write_uint16(ptr, val) *(uint16_t *)(ptr) = SPICE_BYTESWAP16((uint16_t)val)
|
||||||
|
-#define read_int32(ptr) ((int32_t)SPICE_BYTESWAP32(*((uint32_t *)(ptr)))
|
||||||
|
+#define read_int32(ptr) ((int32_t)SPICE_BYTESWAP32(*((uint32_t *)(ptr))))
|
||||||
|
#define write_int32(ptr, val) *(uint32_t *)(ptr) = SPICE_BYTESWAP32((uint32_t)val)
|
||||||
|
-#define read_uint32(ptr) ((uint32_t)SPICE_BYTESWAP32(*((uint32_t *)(ptr)))
|
||||||
|
+#define read_uint32(ptr) ((uint32_t)SPICE_BYTESWAP32(*((uint32_t *)(ptr))))
|
||||||
|
#define write_uint32(ptr, val) *(uint32_t *)(ptr) = SPICE_BYTESWAP32((uint32_t)val)
|
||||||
|
-#define read_int64(ptr) ((int64_t)SPICE_BYTESWAP64(*((uint64_t *)(ptr)))
|
||||||
|
+#define read_int64(ptr) ((int64_t)SPICE_BYTESWAP64(*((uint64_t *)(ptr))))
|
||||||
|
#define write_int64(ptr, val) *(uint64_t *)(ptr) = SPICE_BYTESWAP64((uint64_t)val)
|
||||||
|
-#define read_uint64(ptr) ((uint64_t)SPICE_BYTESWAP64(*((uint64_t *)(ptr)))
|
||||||
|
+#define read_uint64(ptr) ((uint64_t)SPICE_BYTESWAP64(*((uint64_t *)(ptr))))
|
||||||
|
#define write_uint64(ptr, val) *(uint64_t *)(ptr) = SPICE_BYTESWAP64((uint64_t)val)
|
||||||
|
#else
|
||||||
|
#define read_int8(ptr) (*((int8_t *)(ptr)))
|
||||||
|
--
|
||||||
|
1.7.9.3
|
||||||
|
|
||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
Name: spice-gtk
|
Name: spice-gtk
|
||||||
Version: 0.11
|
Version: 0.11
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: A GTK+ widget for SPICE clients
|
Summary: A GTK+ widget for SPICE clients
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -21,6 +21,7 @@ License: LGPLv2+
|
|||||||
URL: http://spice-space.org/page/Spice-Gtk
|
URL: http://spice-space.org/page/Spice-Gtk
|
||||||
Source0: http://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.bz2
|
Source0: http://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.bz2
|
||||||
Patch0: 0001-usbredir-Check-for-existing-usb-channels-after-libus.patch
|
Patch0: 0001-usbredir-Check-for-existing-usb-channels-after-libus.patch
|
||||||
|
Patch1: 0001-Fix-read_uint-macros-on-big-endian-archs.patch
|
||||||
|
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
BuildRequires: gtk2-devel >= 2.14
|
BuildRequires: gtk2-devel >= 2.14
|
||||||
@ -48,8 +49,6 @@ BuildRequires: spice-protocol
|
|||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
Requires: spice-glib%{?_isa} = %{version}-%{release}
|
Requires: spice-glib%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
ExclusiveArch: %{ix86} x86_64
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Client libraries for SPICE desktop servers.
|
Client libraries for SPICE desktop servers.
|
||||||
|
|
||||||
@ -148,6 +147,7 @@ fi
|
|||||||
|
|
||||||
pushd spice-gtk-%{version}
|
pushd spice-gtk-%{version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%if %{with_gtk3}
|
%if %{with_gtk3}
|
||||||
@ -260,6 +260,11 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la
|
|||||||
%{_bindir}/spicy-stats
|
%{_bindir}/spicy-stats
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 10 2012 Christophe Fergeau <cfergeau@redhat.com> - 0.11-5
|
||||||
|
- Fix build on PPC
|
||||||
|
- Remove ExclusiveArch. While spice-gtk will build on ARM and PPC, it
|
||||||
|
hasn't been tested on these arch, so there may be some bugs.
|
||||||
|
|
||||||
* Tue Mar 20 2012 Hans de Goede <hdegoede@redhat.com> - 0.11-4
|
* Tue Mar 20 2012 Hans de Goede <hdegoede@redhat.com> - 0.11-4
|
||||||
- Add missing BuildRequires: usbutils, so that we get proper USB device
|
- Add missing BuildRequires: usbutils, so that we get proper USB device
|
||||||
descriptions in the USB device selection menu
|
descriptions in the USB device selection menu
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user