commit efca921deff50ac5a05083a58083c76fa0397060
Author: Jan Rękorajski <[email protected]>
Date: Mon Dec 21 19:08:30 2015 +0100
- fix inlining confusion on gcc 5.x
- rel 20
glib.spec | 4 +++-
inline.patch | 26 ++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/glib.spec b/glib.spec
index 23203ca..ae86f42 100644
--- a/glib.spec
+++ b/glib.spec
@@ -13,7 +13,7 @@ Summary(pl.UTF-8): Biblioteka zawierająca wiele
użytecznych funkcji C
Summary(tr.UTF-8): Yararlı ufak yordamlar kitaplığı
Name: glib
Version: 1.2.10
-Release: 19
+Release: 20
Epoch: 1
License: LGPL
Group: Libraries
@@ -29,6 +29,7 @@ Patch4: %{name}-gcc34.patch
Patch5: %{name}-slist_remove.patch
Patch6: format-security.patch
Patch7: texi-subsection.patch
+Patch8: inline.patch
URL: http://www.gtk.org/
BuildRequires: autoconf >= 2.13
BuildRequires: automake >= 1.4
@@ -109,6 +110,7 @@ Biblioteki statyczne do glib.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
rm -f acinclude.m4
diff --git a/inline.patch b/inline.patch
new file mode 100644
index 0000000..4fe77c6
--- /dev/null
+++ b/inline.patch
@@ -0,0 +1,26 @@
+--- glib-1.2.10/glib.h~ 2001-02-27 04:44:38.000000000 +0100
++++ glib-1.2.10/glib.h 2015-12-21 19:07:13.973726258 +0100
+@@ -203,18 +203,11 @@
+ #endif
+ #ifndef G_INLINE_FUNC
+ # ifdef __GNUC__
+-# ifdef __OPTIMIZE__
+-# define G_INLINE_FUNC extern inline
+-# else
+-# undef G_CAN_INLINE
+-# define G_INLINE_FUNC extern
+-# endif
+-# else /* !__GNUC__ */
+-# ifdef G_CAN_INLINE
+-# define G_INLINE_FUNC static inline
+-# else
+-# define G_INLINE_FUNC extern
+-# endif
++# define G_INLINE_FUNC static __inline __attribute__ ((unused))
++# elif defined (G_CAN_INLINE)
++# define G_INLINE_FUNC static inline
++# else
++# define G_INLINE_FUNC extern
+ # endif /* !__GNUC__ */
+ #endif /* !G_INLINE_FUNC */
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glib.git/commitdiff/efca921deff50ac5a05083a58083c76fa0397060
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
