On Sat, 27 Oct 2001, Stefan van der Eijk wrote:
> >That's true, many apps needs patching because they don't take care
> >of the real include path of ORBit and gdk-pixbuf, and simply assume
> >they stay in /usr/include.
> >
> Is there an standard & easy way to do this?
Quite a few gnome 1.x packages are moving their header files away from
$includedir; it's not an easy job to follow the change. What listed
below is just from my memory, and not certified to be correct.
1. Upgrade ORBit to >= 0.5.10
2. Upgrade oaf
3. Recompile gnome-libs, with the attached patch
4. Upgrade gdk-pixbuf
5. Upgrade bonobo (patch0 is not needed)
7. patch other apps when necessary
To patch other apps, generally see what point does it fail to compile,
then modify Makefile.am in that directory to include appropriate
CFLAGS. I believe not all apps need patching though :)
Abel
diff -ur gnome-libs-2001-09-18/Makefile.am gnome-libs-2001-09-24/Makefile.am
--- gnome-libs-2001-09-18/Makefile.am Fri Nov 10 04:29:13 2000
+++ gnome-libs-2001-09-24/Makefile.am Thu Sep 20 03:03:19 2001
@@ -19,7 +19,8 @@
libgnome libgnomeui gtk-xmhtml zvt \
libgnorba idl $(test_gnome) devel-docs gnome-data man
-include_HEADERS = gnome.h
+gnomeincludedir=$(includedir)/gnome-1.0
+gnomeinclude_HEADERS = gnome.h
EXTRA_DIST = HACKING gnomeConf.sh.in gnome-bug.in gnome-config.in \
gnome-libs.spec.in
diff -ur gnome-libs-2001-09-18/configure.in gnome-libs-2001-09-24/configure.in
--- gnome-libs-2001-09-18/configure.in Tue Sep 11 14:41:37 2001
+++ gnome-libs-2001-09-24/configure.in Thu Sep 20 03:03:19 2001
@@ -391,7 +391,7 @@
dnl These definitions are expanded in make and gnome-config
GNOME_LIBDIR='-L${libdir}'
-GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
+GNOME_INCLUDEDIR='-I${includedir}/gnome-1.0 -DNEED_GNOMESUPPORT_H
+-I${pkglibdir}/include'
GNOME_IDLDIR='-I${datadir}/idl'
dnl
diff -ur gnome-libs-2001-09-18/gtk-xmhtml/Makefile.am
gnome-libs-2001-09-24/gtk-xmhtml/Makefile.am
--- gnome-libs-2001-09-18/gtk-xmhtml/Makefile.am Thu Feb 25 12:21:50 1999
+++ gnome-libs-2001-09-24/gtk-xmhtml/Makefile.am Thu Sep 20 03:03:21 2001
@@ -1,6 +1,6 @@
## Procesed by automake to procduce Makefile.in
-libgtkxmhtmlincludedir = $(includedir)/gtk-xmhtml
+libgtkxmhtmlincludedir = $(includedir)/gnome-1.0/gtk-xmhtml
INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) @GTK_CFLAGS@ \
-DWITH_GTK -DDEBUG -DGNOME_LIB
diff -ur gnome-libs-2001-09-18/libart_lgpl/Makefile.am
gnome-libs-2001-09-24/libart_lgpl/Makefile.am
--- gnome-libs-2001-09-18/libart_lgpl/Makefile.am Wed Aug 8 06:35:53 2001
+++ gnome-libs-2001-09-24/libart_lgpl/Makefile.am Thu Sep 20 03:03:22 2001
@@ -56,7 +56,7 @@
libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@
libart_lgpl_la_LIBADD = -lm
-libart_lgplincdir = $(includedir)/libart_lgpl
+libart_lgplincdir = $(includedir)/gnome-1.0/libart_lgpl
libart_lgplinc_HEADERS = \
art_affine.h \
art_alphagamma.h \
diff -ur gnome-libs-2001-09-18/libart_lgpl/configure.in
gnome-libs-2001-09-24/libart_lgpl/configure.in
--- gnome-libs-2001-09-18/libart_lgpl/configure.in Wed May 23 03:23:36 2001
+++ gnome-libs-2001-09-24/libart_lgpl/configure.in Fri Sep 21 01:49:15 2001
@@ -48,8 +48,8 @@
changequote([,])dnl
LIBART_LIBDIR='-L${libdir}'
-LIBART_INCLUDEDIR='-I${includedir}'
-LIBART_LIBS='-lart_lgpl'
+LIBART_INCLUDEDIR='-I${includedir}/gnome-1.0'
+LIBART_LIBS='-lart_lgpl -lm'
AC_SUBST(LIBART_LIBDIR)
AC_SUBST(LIBART_INCLUDEDIR)
diff -ur gnome-libs-2001-09-18/libgnome/Makefile.am
gnome-libs-2001-09-24/libgnome/Makefile.am
--- gnome-libs-2001-09-18/libgnome/Makefile.am Thu Apr 19 03:37:13 2001
+++ gnome-libs-2001-09-24/libgnome/Makefile.am Thu Sep 20 03:03:23 2001
@@ -7,7 +7,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-libgnomeincludedir = $(includedir)/libgnome
+libgnomeincludedir = $(includedir)/gnome-1.0/libgnome
INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
diff -ur gnome-libs-2001-09-18/libgnomeui/Makefile.am
gnome-libs-2001-09-24/libgnomeui/Makefile.am
--- gnome-libs-2001-09-18/libgnomeui/Makefile.am Fri Feb 16 13:16:59 2001
+++ gnome-libs-2001-09-24/libgnomeui/Makefile.am Thu Sep 20 03:03:26 2001
@@ -12,7 +12,7 @@
#
# Install location for header files
#
-libgnomeuiincludedir = $(includedir)/libgnomeui
+libgnomeuiincludedir = $(includedir)/gnome-1.0/libgnomeui
INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
diff -ur gnome-libs-2001-09-18/libgnorba/Makefile.am
gnome-libs-2001-09-24/libgnorba/Makefile.am
--- gnome-libs-2001-09-18/libgnorba/Makefile.am Tue Sep 21 04:47:38 1999
+++ gnome-libs-2001-09-24/libgnorba/Makefile.am Thu Sep 20 03:03:27 2001
@@ -4,7 +4,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-libgnorbaincludedir = $(includedir)/libgnorba
+libgnorbaincludedir = $(includedir)/gnome-1.0/libgnorba
EXTRA_DIST = yes.xpm no.xpm
diff -ur gnome-libs-2001-09-18/support/Makefile.am
gnome-libs-2001-09-24/support/Makefile.am
--- gnome-libs-2001-09-18/support/Makefile.am Sun Mar 28 06:31:28 1999
+++ gnome-libs-2001-09-24/support/Makefile.am Thu Sep 20 03:03:28 2001
@@ -16,7 +16,8 @@
findme.h poptint.h
# Hmm... should we move `error.h' here.
-include_HEADERS = popt-gnome.h
+gnomeincludedir=$(includedir)/gnome-1.0
+gnomeinclude_HEADERS = popt-gnome.h
popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c
diff -ur gnome-libs-2001-09-18/zvt/Makefile.am gnome-libs-2001-09-24/zvt/Makefile.am
--- gnome-libs-2001-09-18/zvt/Makefile.am Mon Jan 22 06:36:49 2001
+++ gnome-libs-2001-09-24/zvt/Makefile.am Thu Sep 20 03:03:29 2001
@@ -2,7 +2,7 @@
lib_LTLIBRARIES = libzvt.la
noinst_PROGRAMS = zterm test-utmp
-libzvtincludedir = $(includedir)/zvt
+libzvtincludedir = $(includedir)/gnome-1.0/zvt
INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
diff -ur gnome-libs-2001-09-18/libart_lgpl/libart-config.in
gnome-libs-2001-09-24/libart_lgpl/libart-config.in
--- gnome-libs-2001-09-18/libart_lgpl/libart-config.in Thu Nov 19 12:54:18 1998
+++ gnome-libs-2001-09-24/libart_lgpl/libart-config.in Tue Sep 25 17:52:29 2001
@@ -3,6 +3,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
+includedir=@includedir@
+libdir=@libdir@
usage="\
Usage: libart-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs]
[--cflags]"
@@ -39,14 +41,10 @@
echo @LIBART_VERSION@
;;
--cflags)
- if test @includedir@ != /usr/include ; then
- includes=-I@includedir@
- fi
- echo $includes
+ echo @LIBART_INCLUDEDIR@
;;
--libs)
- libdirs=-L@libdir@
- echo $libdirs -lart_lgpl -lm
+ echo @LIBART_LIBDIR@ @LIBART_LIBS@
;;
*)
echo "${usage}" 1>&2
