Fixed building problems on Darwin

This commit is contained in:
adam 2004-04-15 06:25:12 +00:00
parent ef8b97512b
commit 674cc04e60
7 changed files with 79 additions and 7 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.15 2004/04/01 18:21:20 jmmv Exp $ $NetBSD: distinfo,v 1.16 2004/04/15 06:25:12 adam Exp $
SHA1 (gnome-vfs-2.6.0.tar.bz2) = a5cfea7568259fc6fe98322a7a01eb70d8f5f615 SHA1 (gnome-vfs-2.6.0.tar.bz2) = a5cfea7568259fc6fe98322a7a01eb70d8f5f615
Size (gnome-vfs-2.6.0.tar.bz2) = 1431274 bytes Size (gnome-vfs-2.6.0.tar.bz2) = 1431274 bytes
@ -6,5 +6,9 @@ SHA1 (patch-aa) = 3a8113f861efeb12bec86bff06df1c7d44e7131b
SHA1 (patch-ab) = 9fc885b1ef1e9dd05f4b3041963df298dbfba582 SHA1 (patch-ab) = 9fc885b1ef1e9dd05f4b3041963df298dbfba582
SHA1 (patch-ac) = 6790f1ee67f12690bd648d258e87456c2639b560 SHA1 (patch-ac) = 6790f1ee67f12690bd648d258e87456c2639b560
SHA1 (patch-ad) = 326e835c7fd1d2e25ac2ae4736347d38ffe8ea06 SHA1 (patch-ad) = 326e835c7fd1d2e25ac2ae4736347d38ffe8ea06
SHA1 (patch-ag) = 73f73a29f7ac4ef644b21cd41b8b0c2d51b4d76e SHA1 (patch-ae) = 5e52bb80ce3070d04c85c363c0ba1360ab7edb37
SHA1 (patch-ai) = b92f3aad5f3a807c74c6711fd4d40971658e1903 SHA1 (patch-af) = c820b7ed8ba0a9b0a5b81d8763b718349566a62b
SHA1 (patch-ag) = 2d502c6a8550cca7fe8c45969e874d05328dec7e
SHA1 (patch-ah) = 0b4d5ef53d47a0be87a6b1b529b65fd186525a72
SHA1 (patch-ai) = 5aebccc7769917d0a9d17136946dbfbfa71d9a06
SHA1 (patch-aj) = 54c8b54edb456687b7c79ec94d0e3951c1c5f8fe

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ae,v 1.3 2004/04/15 06:25:12 adam Exp $
--- configure.orig Wed Apr 14 23:18:49 2004
+++ configure
@@ -20202,7 +20202,7 @@ if test -z "`$INTLTOOL_PERL -v | fgrep '
echo "$as_me: error: perl 5.x required for intltool" >&2;}
{ (exit 1); exit 1; }; }
fi
-if `perl -e "require XML::Parser" 2>/dev/null`; then
+if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
:
else
{ { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5

View file

@ -0,0 +1,12 @@
$NetBSD: patch-af,v 1.3 2004/04/15 06:25:12 adam Exp $
--- libgnomevfs/gnome-vfs-cdrom.c.orig Wed Apr 14 23:57:03 2004
+++ libgnomevfs/gnome-vfs-cdrom.c
@@ -34,6 +34,7 @@
#include <glib.h>
#include <libgnomevfs/gnome-vfs-i18n.h>
+#include <modules/cdda-cdrom-extensions.h>
#ifdef __linux__
#include <linux/cdrom.h>

View file

@ -1,7 +1,16 @@
$NetBSD: patch-ag,v 1.5 2004/04/01 18:21:20 jmmv Exp $ $NetBSD: patch-ag,v 1.6 2004/04/15 06:25:12 adam Exp $
--- modules/Makefile.in.orig 2004-01-30 11:09:38.000000000 +0000 --- modules/Makefile.in.orig Mon Mar 22 13:47:17 2004
+++ modules/Makefile.in +++ modules/Makefile.in
@@ -242,7 +242,7 @@ EXTRA_DIST = \
@BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la
@BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS =
-module_flags = -export_dynamic -avoid-version -module -no-undefined
+module_flags = -export_dynamic -avoid-version -module
modulesdir = $(libdir)/gnome-vfs-2.0/modules
modules_LTLIBRARIES = \
@@ -270,7 +270,7 @@ modules_LTLIBRARIES = \ @@ -270,7 +270,7 @@ modules_LTLIBRARIES = \
# Not currently supported # Not currently supported

View file

@ -0,0 +1,12 @@
$NetBSD: patch-ah,v 1.3 2004/04/15 06:25:12 adam Exp $
--- libgnomevfs/Makefile.in.orig Thu Apr 15 07:48:59 2004
+++ libgnomevfs/Makefile.in
@@ -284,7 +284,6 @@ libgnomevfs_2_la_LIBADD = \
libgnomevfs_2_la_LDFLAGS = \
-version-info $(LIBGNOMEVFS_CURRENT):$(LIBGNOMEVFS_REVISION):$(LIBGNOMEVFS_AGE) \
-export-symbols-regex "^[^_].*" \
- -no-undefined \
$(NULL)

View file

@ -1,7 +1,16 @@
$NetBSD: patch-ai,v 1.6 2004/04/01 18:21:20 jmmv Exp $ $NetBSD: patch-ai,v 1.7 2004/04/15 06:25:12 adam Exp $
--- modules/vfolder/Makefile.in.orig 2004-01-30 11:09:38.000000000 +0000 --- modules/vfolder/Makefile.in.orig Mon Mar 22 13:47:18 2004
+++ modules/vfolder/Makefile.in +++ modules/vfolder/Makefile.in
@@ -235,7 +235,7 @@ EXTRA_DIST = \
### Module setup
-module_flags = -export_dynamic -avoid-version -module -no-undefined
+module_flags = -export_dynamic -avoid-version -module
modulesdir = $(libdir)/gnome-vfs-2.0/modules
modules_LTLIBRARIES = libvfolder-desktop.la
@@ -259,7 +259,7 @@ libvfolder_desktop_la_LIBADD = \ @@ -259,7 +259,7 @@ libvfolder_desktop_la_LIBADD = \

View file

@ -0,0 +1,13 @@
$NetBSD: patch-aj,v 1.4 2004/04/15 06:25:12 adam Exp $
--- monikers/Makefile.in.orig Thu Apr 15 08:20:36 2004
+++ monikers/Makefile.in
@@ -239,7 +239,7 @@ libmoniker_gnome_vfs_std_la_LIBADD = \
libmoniker_gnome_vfs_std_la_LDFLAGS = \
- -module -avoid-version -no-undefined
+ -module -avoid-version
subdir = monikers
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs