glib: updated to 2.18.2, updated checksum and build_depends, removed

NetBSD patches.

--HG--
extra : convert_revision : f4a62389207c9349988e296d8b174e89593b30be
This commit is contained in:
Juan RP 2008-10-20 17:23:34 +02:00
parent 7fc3181aa2
commit 8fd730d342
2 changed files with 4 additions and 40 deletions

View file

@ -1,35 +0,0 @@
$NetBSD: patch-ba,v 1.3 2008/09/06 11:07:20 obache Exp $
--- gio/gunixmounts.c.orig 2008-09-02 15:09:19.000000000 +0000
+++ gio/gunixmounts.c
@@ -563,7 +563,11 @@ get_mtab_monitor_file (void)
static GList *
_g_get_unix_mounts (void)
{
+#ifdef __NetBSD__
+ struct statvfs *mntent = NULL;
+#else
struct statfs *mntent = NULL;
+#endif
int num_mounts, i;
GUnixMountEntry *mount_entry;
GList *return_list;
@@ -580,8 +584,18 @@ _g_get_unix_mounts (void)
mount_entry->mount_path = g_strdup (mntent[i].f_mntonname);
mount_entry->device_path = g_strdup (mntent[i].f_mntfromname);
+#if defined(__digital__)
+ mount_entry->filesystem_type = g_strdup ("unknown");
+#else
mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename);
+#endif
+#if defined(__NetBSD__)
+ if (mntent[i].f_flag & MNT_RDONLY)
+#elif defined(__digital__)
+ if (mntent[i].f_flags & M_RDONLY)
+#else
if (mntent[i].f_flags & MNT_RDONLY)
+#endif
mount_entry->is_read_only = TRUE;
mount_entry->is_system_internal =

View file

@ -1,14 +1,11 @@
# Template build file for 'glib'
pkgname=glib
version=2.18.1
patch_files="$pkgname-fix-statfs-netbsd.diff"
version=2.18.2
distfiles="
http://ftp.gnome.org/pub/gnome/sources/glib/2.18/$pkgname-$version@.tar.bz2"
make_cmd="$XBPS_MASTERDIR/bin/gmake"
# Disable FAM for now and use the installed pcre package instead
# of the supplied one.
configure_args="--disable-fam --with-pcre=system"
configure_env="ac_cv_func_statfs=no"
ignore_files="charset.alias"
build_style=gnu_configure
pkgconfig_override="glib-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc
@ -16,8 +13,10 @@ pkgconfig_override="glib-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc
gio-unix-2.0.pc"
short_desc="The GNU library of C routines"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=264b37584419d983685910adde8f7b282eccc1ad
checksum=95e99ab4f1ccc9abd48636ae2aeefa102d9749a5fc8ea6386e44683942fd7333
long_desc="
GLib is a library containing many useful C routines for things such
as trees, hashes, lists and strings. It is a useful general purpose
C library used by projects such as GTK+, GIMP and GNOME."
build_depends="pcre-7.8 pkg-config-0.23"