fix headers
This commit is contained in:
parent
7626a2a823
commit
82360d4174
12
glib-mscver.patch
Normal file
12
glib-mscver.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up glib-2.31.10/glib/gmacros.h.mscver glib-2.31.10/glib/gmacros.h
|
||||||
|
--- glib-2.31.10/glib/gmacros.h.mscver 2012-01-17 22:31:58.016213434 -0500
|
||||||
|
+++ glib-2.31.10/glib/gmacros.h 2012-01-17 22:32:36.884214017 -0500
|
||||||
|
@@ -343,7 +343,7 @@
|
||||||
|
#define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void);
|
||||||
|
#define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void);
|
||||||
|
|
||||||
|
-#elif _MSC_VER >= 1500
|
||||||
|
+#elif defined(_MSC_VER) && (_MSC_VER >= 1500)
|
||||||
|
/* Visual studio 2008 and later has _Pragma */
|
||||||
|
|
||||||
|
#define G_HAS_CONSTRUCTORS 1
|
@ -3,13 +3,16 @@
|
|||||||
Summary: A library of handy utility functions
|
Summary: A library of handy utility functions
|
||||||
Name: glib2
|
Name: glib2
|
||||||
Version: 2.31.10
|
Version: 2.31.10
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://www.gtk.org
|
URL: http://www.gtk.org
|
||||||
#VCS: git:git://git.gnome.org/glib
|
#VCS: git:git://git.gnome.org/glib
|
||||||
Source: http://download.gnome.org/sources/glib/2.31/glib-%{version}.tar.xz
|
Source: http://download.gnome.org/sources/glib/2.31/glib-%{version}.tar.xz
|
||||||
|
|
||||||
|
# upstream fix
|
||||||
|
Patch0: glib-mscver.patch
|
||||||
|
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: gamin-devel
|
BuildRequires: gamin-devel
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
@ -57,6 +60,7 @@ The glib2-static package includes static libraries of the GLib library.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n glib-%{version}
|
%setup -q -n glib-%{version}
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Support builds of both git snapshots and tarballs packed with autogoo
|
# Support builds of both git snapshots and tarballs packed with autogoo
|
||||||
@ -160,6 +164,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 17 2012 Matthias Clasen <mclasen@redhat.com> 2.31.10-2
|
||||||
|
- Fix a header problem that was causing build failures
|
||||||
|
|
||||||
* Mon Jan 16 2012 Matthias Clasen <mclasen@redhat.com> - 2.31.10-1
|
* Mon Jan 16 2012 Matthias Clasen <mclasen@redhat.com> - 2.31.10-1
|
||||||
- Update to 2.31.10
|
- Update to 2.31.10
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user