Rename glib template to something more correct, while I'm here
add a patch from pkgsrc to make it build. --HG-- extra : convert_revision : b90f70cc5983c63bb79a586a773260b27650fc51
This commit is contained in:
parent
75a8b0aa46
commit
3eb2bfea4a
2 changed files with 42 additions and 1 deletions
35
templates/glib-2.18.1-fix-statfs-netbsd.diff
Normal file
35
templates/glib-2.18.1-fix-statfs-netbsd.diff
Normal file
|
@ -0,0 +1,35 @@
|
|||
$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 =
|
|
@ -9,6 +9,9 @@ pkgname=glib-2.18.1
|
|||
# Suffix extraction, only supported: zip and tar/tar+(gz|bzip2).
|
||||
extract_sufx=".tar.bz2"
|
||||
|
||||
# Patches to be applied to the source before building it.
|
||||
patch_files="glib-2.18.1-fix-statfs-netbsd.diff"
|
||||
|
||||
# Use this if pkgname doesn't match or if there are multiple
|
||||
# source distribution files.
|
||||
#distfiles=""
|
||||
|
@ -16,11 +19,14 @@ extract_sufx=".tar.bz2"
|
|||
# URL to fetch
|
||||
url=http://ftp.gnome.org/pub/gnome/sources/glib/2.18
|
||||
|
||||
make_cmd="$PKGFS_MASTERDIR/bin/gmake"
|
||||
|
||||
# Arguments passed to configure if $build_style = {,gnu_}configure.
|
||||
#configure_args=""
|
||||
|
||||
# Arguments passed to configure through the environment
|
||||
configure_env="ac_cv_func_statfs=no"
|
||||
configure_env="ac_cv_path_PKG_CONFIG=$PKGFS_MASTERDIR/bin/pkg-config
|
||||
ac_cv_func_statfs=no"
|
||||
|
||||
# Build style: gnu_configure, bsd-makefile, gnu-makefile, configure.
|
||||
build_style=gnu_configure
|
Loading…
Reference in a new issue