cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove uneeded part of patch.

Browse Source
This commit is contained in:
ajacoutot 2011-08-22 15:26:40 +00:00
parent 4dae6f19c7
commit d7c1501255
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/glib2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.128 2011/08/16 15:03:46 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.129 2011/08/22 15:26:40 ajacoutot Exp $
COMMENT-main= general-purpose utility library COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation COMMENT-docs= glib2 documentation
@ -8,7 +8,7 @@ DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION} PKGNAME-main= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION} PKGNAME-docs= glib2-docs-${VERSION}
REVISION-main= 2 REVISION-main= 3
CATEGORIES= devel CATEGORIES= devel

23
devel/glib2/patches/patch-gio_gunixmount_c
View File

@ -1,10 +1,9 @@
$OpenBSD: patch-gio_gunixmount_c,v 1.4 2011/06/28 09:40:13 ajacoutot Exp $ $OpenBSD: patch-gio_gunixmount_c,v 1.5 2011/08/22 15:26:40 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=653553
https://bugzilla.gnome.org/show_bug.cgi?id=653555 https://bugzilla.gnome.org/show_bug.cgi?id=653555
--- gio/gunixmount.c.orig Sat Nov 6 16:38:54 2010 --- gio/gunixmount.c.orig Sat Nov 6 16:38:54 2010
+++ gio/gunixmount.c Tue Jun 28 10:18:02 2011 +++ gio/gunixmount.c Mon Aug 22 11:43:50 2011
@@ -29,6 +29,12 @@ @@ -29,6 +29,12 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
@ -18,23 +17,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=653555
#include <glib.h> #include <glib.h>
#include "gunixvolumemonitor.h" #include "gunixvolumemonitor.h"
#include "gunixmount.h" #include "gunixmount.h"
@@ -423,8 +429,14 @@ g_unix_mount_unmount (GMount *mount, @@ -451,10 +457,21 @@ g_unix_mount_eject (GMount *mount,
gpointer user_data)
{
GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
- char *argv[] = {"umount", NULL, NULL};
+ gchar *umount;
+ umount = g_find_program_in_path("umount");
+ if (!umount)
+ umount = "/sbin/umount";
+
+ char *argv[] = {umount, NULL, NULL};
+
if (unix_mount->mount_path != NULL)
argv[1] = unix_mount->mount_path;
else
@@ -451,10 +463,21 @@ g_unix_mount_eject (GMount *mount,
GUnixMount *unix_mount = G_UNIX_MOUNT (mount); GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
char *argv[] = {"eject", NULL, NULL}; char *argv[] = {"eject", NULL, NULL};