From 933ec94127d2c6eda87341c1b622717f5211d6c5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 29 Mar 2011 11:55:39 +0200 Subject: [PATCH] glib: update to glib-2.28.4 Signed-off-by: Stephan Raue --- packages/devel/glib/meta | 2 +- .../patches/glib-2.28.2-linux_magic_h.patch | 24 ------------------- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 packages/devel/glib/patches/glib-2.28.2-linux_magic_h.patch diff --git a/packages/devel/glib/meta b/packages/devel/glib/meta index 0ee8aeda04..b338e660cf 100644 --- a/packages/devel/glib/meta +++ b/packages/devel/glib/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="glib" -PKG_VERSION="2.28.2" +PKG_VERSION="2.28.4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" diff --git a/packages/devel/glib/patches/glib-2.28.2-linux_magic_h.patch b/packages/devel/glib/patches/glib-2.28.2-linux_magic_h.patch deleted file mode 100644 index 10cc356846..0000000000 --- a/packages/devel/glib/patches/glib-2.28.2-linux_magic_h.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur glib-2.28.1-old/configure.ac glib-2.28.1-new/configure.ac ---- glib-2.28.1-old/configure.ac 2011-02-17 20:33:11.000000000 -0800 -+++ glib-2.28.1-new/configure.ac 2011-02-18 09:19:32.000000000 -0800 -@@ -858,6 +858,7 @@ - AC_CHECK_HEADERS([sys/vfs.h sys/mount.h sys/vmount.h sys/statfs.h sys/statvfs.h]) - AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h sys/sysctl.h fstab.h]) - AC_CHECK_HEADERS([sys/uio.h sys/mkdev.h]) -+AC_CHECK_HEADERS([linux/magic.h]) - - # check for structure fields - AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec]) -diff -Naur glib-2.28.1-old/glib/gfileutils.c glib-2.28.1-new/glib/gfileutils.c ---- glib-2.28.1-old/glib/gfileutils.c 2011-02-11 07:23:12.000000000 -0800 -+++ glib-2.28.1-new/glib/gfileutils.c 2011-02-18 09:19:32.000000000 -0800 -@@ -54,7 +54,9 @@ - #include "glibintl.h" - - #ifdef __linux__ /* for btrfs check */ -+#ifdef HAVE_LINUX_MAGIC_H - #include -+#endif - #include - #endif -