rpms/glib2
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fix headers

Browse Source
This commit is contained in:
Matthias Clasen 2012-01-17 22:34:03 -05:00
parent 7626a2a823
commit 82360d4174
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glib-mscver.patch Normal file
View 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

9
glib2.spec
View File

@ -3,13 +3,16 @@
Summary: A library of handy utility functions
Name: glib2
Version: 2.31.10
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtk.org
#VCS: git:git://git.gnome.org/glib
Source: http://download.gnome.org/sources/glib/2.31/glib-%{version}.tar.xz
# upstream fix
Patch0: glib-mscver.patch
BuildRequires: pkgconfig
BuildRequires: gamin-devel
BuildRequires: gettext
@ -57,6 +60,7 @@ The glib2-static package includes static libraries of the GLib library.
%prep
%setup -q -n glib-%{version}
%patch0 -p1
%build
# Support builds of both git snapshots and tarballs packed with autogoo
@ -160,6 +164,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
%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
- Update to 2.31.10