First of all, I have just subscribed to this list, so apologies if this
has already been covered. Could someone point me to a searchable
archive of this list?
Anyways, here is a patch I had to apply to nautilus-1.0.6-1mdk.src.rpm
in order to get it to build for me:
nautilus.spec.patch:
---cut here---
--- nautilus.spec.orig Sun Nov 18 14:01:24 2001
+++ nautilus.spec Sun Nov 18 14:31:10 2001
@@ -1,6 +1,6 @@
Name: nautilus
Version: 1.0.6
-Release: 1mdk
+Release: 2mdk
Summary: Nautilus is a file manager for the GNOME desktop environment.
Group: File tools
License: GPL
@@ -19,6 +19,8 @@
Patch14: nautilus-1.0.6-links.patch.bz2
# (fc) 1.0.4-6mdk don't eject automounted cdroms
Patch15: nautilus-1.0.6-automount.patch.bz2
+# (rts) 1.0.6-2mdk put -I/usr/include after -I/usr/include/gnome-xml
+Patch16: nautilus-1.0.6-xml-include.patch.bz2
BuildRoot:%{_tmppath}/%{name}-%{version}-root
Requires: liboaf0 >= 0.6.6-1mdk
@@ -96,6 +98,7 @@
%patch12 -p1 -b .dynamic
%patch14 -p1 -b .links
%patch15 -p1 -b .autofs
+%patch16 -p1 -b .xml-include
#needed by patch2
automake
@@ -223,6 +226,9 @@
%endif
%changelog
+* Sun Nov 18 2001 Ryan T. Sammartino <[EMAIL PROTECTED]> 1.0.6-2mdk
+- Patch16: fixup libxml include paths
+
* Thu Nov 15 2001 Frederic Crozat <[EMAIL PROTECTED]> 1.0.6-1mdk
- Release 1.0.6
- Remove patches 0, 2, 4, 8, 9, 13 (merged upstream)
---cut here---
nautilus-1.0.6-xml-include-patch:
---cut here---
--- nautilus-1.0.6/configure.in.xml-include Sun Nov 18 14:03:32 2001
+++ nautilus-1.0.6/configure.in Sun Nov 18 14:04:49 2001
@@ -714,7 +714,10 @@ then
fi
dnl Flags for libraries that Nautilus depends on
-NAUTILUS_DEPENDENCY_CFLAGS="`$GNOME_CONFIG --cflags bonobo bonobox bonobox_print
gnomecanvaspixbuf xml vfs eel`"
+dnl Put xml first, since bonobo adds -I/usr/include, which means that
+dnl #include <libxml/...> might include the libxml2 header file in
+dnl /usr/include/libxml/..., when we really want /usr/include/gnome-xml/...
+NAUTILUS_DEPENDENCY_CFLAGS="`$GNOME_CONFIG --cflags xml bonobo bonobox bonobox_print
+gnomecanvaspixbuf vfs eel`"
NAUTILUS_DEPENDENCY_LIBS="`$GNOME_CONFIG --libs bonobo bonobox bonobox_print
gnomecanvaspixbuf xml vfs eel`"
AC_SUBST(NAUTILUS_DEPENDENCY_CFLAGS)
AC_SUBST(NAUTILUS_DEPENDENCY_LIBS)
---cut here---
--
Ryan T. Sammartino ([EMAIL PROTECTED])
http://members.shaw.ca/ryants/
*** Please note the new e-mail address and homepage.
aphorism, n.:
A concise, clever statement.
afterism, n.:
A concise, clever statement you don't think of until too late.
-- James Alexander Thom
--
Ryan T. Sammartino ([EMAIL PROTECTED])
http://members.shaw.ca/ryants/
*** Please note the new e-mail address and homepage.
Abstainer, n.:
A weak person who yields to the temptation of denying himself a
pleasure.
-- Ambrose Bierce, "The Devil's Dictionary"
