diff options
| author | minskim <minskim@pkgsrc.org> | 2004-04-23 03:29:27 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2004-04-23 03:29:27 +0000 |
| commit | 9d64e2d31ec56a0b9623f145f4bd62cea9689f14 (patch) | |
| tree | ce2e2fd3096a2cfa3725a0190323e6b608d63b0c /sysutils | |
| parent | c08eda06f3a766aee6b52c04e9a89f15ca2736a0 (diff) | |
| download | pkgsrc-9d64e2d31ec56a0b9623f145f4bd62cea9689f14.tar.gz | |
patch-af adds #include <modules/cdda-cdrom-extensions.h>, which causes
build errors on Linux because it contains some definitions conflicting
with linux/cdrom.h. Include cdda-cdrom-extensions.h only when
linux/cdrom.h is not included.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gnome-vfs2/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/gnome-vfs2/patches/patch-af | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo index 4bd08924d29..2ad59f75497 100644 --- a/sysutils/gnome-vfs2/distinfo +++ b/sysutils/gnome-vfs2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2004/04/15 06:25:12 adam Exp $ +$NetBSD: distinfo,v 1.17 2004/04/23 03:29:27 minskim Exp $ SHA1 (gnome-vfs-2.6.0.tar.bz2) = a5cfea7568259fc6fe98322a7a01eb70d8f5f615 Size (gnome-vfs-2.6.0.tar.bz2) = 1431274 bytes @@ -7,7 +7,7 @@ SHA1 (patch-ab) = 9fc885b1ef1e9dd05f4b3041963df298dbfba582 SHA1 (patch-ac) = 6790f1ee67f12690bd648d258e87456c2639b560 SHA1 (patch-ad) = 326e835c7fd1d2e25ac2ae4736347d38ffe8ea06 SHA1 (patch-ae) = 5e52bb80ce3070d04c85c363c0ba1360ab7edb37 -SHA1 (patch-af) = c820b7ed8ba0a9b0a5b81d8763b718349566a62b +SHA1 (patch-af) = 4273d773f8f9701262ab541efc43e9f7eb126001 SHA1 (patch-ag) = 2d502c6a8550cca7fe8c45969e874d05328dec7e SHA1 (patch-ah) = 0b4d5ef53d47a0be87a6b1b529b65fd186525a72 SHA1 (patch-ai) = 5aebccc7769917d0a9d17136946dbfbfa71d9a06 diff --git a/sysutils/gnome-vfs2/patches/patch-af b/sysutils/gnome-vfs2/patches/patch-af index 53b8a79b77b..bfed4a82d3f 100644 --- a/sysutils/gnome-vfs2/patches/patch-af +++ b/sysutils/gnome-vfs2/patches/patch-af @@ -1,12 +1,13 @@ -$NetBSD: patch-af,v 1.3 2004/04/15 06:25:12 adam Exp $ +$NetBSD: patch-af,v 1.4 2004/04/23 03:29:27 minskim Exp $ ---- libgnomevfs/gnome-vfs-cdrom.c.orig Wed Apr 14 23:57:03 2004 +--- libgnomevfs/gnome-vfs-cdrom.c.orig 2004-02-16 05:13:24.000000000 -0600 +++ libgnomevfs/gnome-vfs-cdrom.c -@@ -34,6 +34,7 @@ - - #include <glib.h> - #include <libgnomevfs/gnome-vfs-i18n.h> -+#include <modules/cdda-cdrom-extensions.h> +@@ -37,6 +37,8 @@ #ifdef __linux__ #include <linux/cdrom.h> ++#else ++#include <modules/cdda-cdrom-extensions.h> + #endif + + #ifdef HAVE_SYS_CDIO_H |