don't forget to commit the patch, don't forget to commit the patch, don't ..

1 files changed, 187 insertions, 0 deletions

diff --git a/app-office/gaby/files/gaby-2.0.2-makefile.patch b/app-office/gaby/files/gaby-2.0.2-makefile.patch
new file mode 100644
index 000000000000..0f0154473c9e
--- /dev/null
+++ b/app-office/gaby/files/gaby-2.0.2-makefile.patch
@@ -0,0 +1,187 @@
+Only in gaby-2.0.2: gaby.spec
+diff -ru gaby-2.0.2/Makefile.in gaby-2.0.2.fix/Makefile.in
+--- gaby-2.0.2/Makefile.in	2001-07-07 12:29:33.000000000 +0200
++++ gaby-2.0.2.fix/Makefile.in	2002-10-11 13:53:43.000000000 +0200
+@@ -428,8 +428,8 @@
+ 
+ 
+ install-exec-local:
+-	./mkinstalldirs $(prefix)/share/doc/gaby
+-	cp COPYING $(prefix)/share/doc/gaby
++	./mkinstalldirs ${DESTDIR}/$(prefix)/share/doc/gaby
++	cp COPYING ${DESTDIR}/$(prefix)/share/doc/gaby
+ 	-test -z "$(SKIPGNOMEDATA)" && ( \
+ 	    gnome-config --datadir &> /dev/null && \
+ 	    cp gnome-gaby*.png \
+Only in gaby-2.0.2/plug-ins/actions/gnomepim: gnome-pim-common.c
+Only in gaby-2.0.2/plug-ins/actions/gnomepim: gnome-pim.h
+Only in gaby-2.0.2/plug-ins/actions/gnomepim: gnome-pim-skels.c
+Only in gaby-2.0.2/plug-ins/actions/gnomepim: gnome-pim-stubs.c
+diff -ru gaby-2.0.2/plug-ins/actions/gnomepim/Makefile.in gaby-2.0.2.fix/plug-ins/actions/gnomepim/Makefile.in
+--- gaby-2.0.2/plug-ins/actions/gnomepim/Makefile.in	2001-07-07 12:31:37.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/actions/gnomepim/Makefile.in	2002-10-11 13:05:52.000000000 +0200
+@@ -149,7 +149,7 @@
+ 
+ libgnomepim_la_LDFLAGS = -module -avoid-version
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR)                               	-I$(includedir)						$(GTK_CFLAGS)						$(GNOME_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR) -I/usr/include/orbit-1.0                              	-I$(includedir)						$(GTK_CFLAGS)						$(GNOME_CFLAGS)
+ 
+ 
+ EXTRA_DIST = gnome-pim.idl
+diff -ru gaby-2.0.2/plug-ins/actions/net/Makefile.in gaby-2.0.2.fix/plug-ins/actions/net/Makefile.in
+--- gaby-2.0.2/plug-ins/actions/net/Makefile.in	2001-07-07 12:31:18.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/actions/net/Makefile.in	2002-10-11 12:41:53.000000000 +0200
+@@ -147,7 +147,7 @@
+ 
+ libnet_la_LDFLAGS = -module -avoid-version
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR)                               	-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR)  ${GDK_PIXBUF_CFLAGS}       	-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
+ 
+ 
+ EXTRA_DIST = README.dtfmdial
+diff -ru gaby-2.0.2/plug-ins/actions/stat/Makefile.in gaby-2.0.2.fix/plug-ins/actions/stat/Makefile.in
+--- gaby-2.0.2/plug-ins/actions/stat/Makefile.in	2001-07-07 12:31:21.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/actions/stat/Makefile.in	2002-10-11 12:44:41.000000000 +0200
+@@ -147,7 +147,7 @@
+ 
+ libstat_la_LDFLAGS = -module -avoid-version
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR)                               	-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR) ${GDK_PIXBUF_CFLAGS}                              	-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+diff -ru gaby-2.0.2/plug-ins/interpreter/python/Makefile.in gaby-2.0.2.fix/plug-ins/interpreter/python/Makefile.in
+--- gaby-2.0.2/plug-ins/interpreter/python/Makefile.in	2001-07-07 12:30:29.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/interpreter/python/Makefile.in	2002-10-11 12:21:37.000000000 +0200
+@@ -145,7 +145,7 @@
+ 
+ libpython_la_SOURCES = python.c
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR) 	-I$(includedir)	  	$(GNOME_CFLAGS)	  	$(GTK_CFLAGS)     	$(PY_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR) 	-I$(includedir)	  	${LIBGLADE_CFLAGS}	${GDK_PIXBUF_CFLAGS}	$(GNOME_CFLAGS)	  	$(GTK_CFLAGS)     	$(PY_CFLAGS)
+ 
+ 
+ libpython_la_LDFLAGS = $(PY_LIB_LOC) -avoid-version
+diff -ru gaby-2.0.2/plug-ins/view/canvas/Makefile.in gaby-2.0.2.fix/plug-ins/view/canvas/Makefile.in
+--- gaby-2.0.2/plug-ins/view/canvas/Makefile.in	2001-07-07 12:31:09.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/view/canvas/Makefile.in	2002-10-11 12:39:34.000000000 +0200
+@@ -152,7 +152,7 @@
+ 
+ libcanvas_la_LIBADD = $(GNOME_LDFLAGS)
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR)					-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR)	${GDK_PIXBUF_CFLAGS}		-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+diff -ru gaby-2.0.2/plug-ins/view/filter/Makefile.in gaby-2.0.2.fix/plug-ins/view/filter/Makefile.in
+--- gaby-2.0.2/plug-ins/view/filter/Makefile.in	2001-07-07 12:30:56.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/view/filter/Makefile.in	2002-10-11 12:36:59.000000000 +0200
+@@ -152,7 +152,7 @@
+ @USE_GNOME_TRUE@libfilter_la_LIBADD = $(GNOME_LDFLAGS)
+ @USE_GNOME_FALSE@libfilter_la_LIBADD = $(GTK_LIBS)
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR)					-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR)	${GDK_PIXBUF_CFLAGS}	-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+diff -ru gaby-2.0.2/plug-ins/view/genealogy/Makefile.in gaby-2.0.2.fix/plug-ins/view/genealogy/Makefile.in
+--- gaby-2.0.2/plug-ins/view/genealogy/Makefile.in	2001-07-07 12:30:49.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/view/genealogy/Makefile.in	2002-10-11 12:33:16.000000000 +0200
+@@ -152,7 +152,7 @@
+ @USE_GNOME_TRUE@libgenealogy_la_LIBADD = $(GNOME_LDFLAGS)
+ @USE_GNOME_FALSE@libgenealogy_la_LIBADD = $(GTK_LIBS)
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR)					-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR) ${GDK_PIXBUF_CFLAGS}			-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+diff -ru gaby-2.0.2/plug-ins/view/gladeform/Makefile.in gaby-2.0.2.fix/plug-ins/view/gladeform/Makefile.in
+--- gaby-2.0.2/plug-ins/view/gladeform/Makefile.in	2001-07-07 12:31:12.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/view/gladeform/Makefile.in	2002-10-11 12:40:24.000000000 +0200
+@@ -152,7 +152,7 @@
+ @USE_GNOME_TRUE@libgladeform_la_LIBADD = $(GNOME_LDFLAGS) $(LIBGLADE_LIBS)
+ @USE_GNOME_FALSE@libgladeform_la_LIBADD = $(GTK_LIBS) $(LIBGLADE_LIBS)
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR)		-I$(includedir)			$(GTK_CFLAGS)			$(GNOME_CFLAGS)			$(LIBGLADE_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR)	${GDK_PIXBUF_CFLAGS}	-I$(includedir)			$(GTK_CFLAGS)			$(GNOME_CFLAGS)			$(LIBGLADE_CFLAGS)
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+diff -ru gaby-2.0.2/plug-ins/view/gnomecard/Makefile.in gaby-2.0.2.fix/plug-ins/view/gnomecard/Makefile.in
+--- gaby-2.0.2/plug-ins/view/gnomecard/Makefile.in	2001-07-07 12:31:05.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/view/gnomecard/Makefile.in	2002-10-11 12:38:33.000000000 +0200
+@@ -152,7 +152,7 @@
+ 
+ libgnomecard_la_LIBADD = $(GNOME_LDFLAGS)
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR)					-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR)	${GDK_PIXBUF_CFLAGS}	-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
+ 
+ 
+ EXTRA_DIST = pixmaps/*.xpm
+diff -ru gaby-2.0.2/plug-ins/view/hello/Makefile.in gaby-2.0.2.fix/plug-ins/view/hello/Makefile.in
+--- gaby-2.0.2/plug-ins/view/hello/Makefile.in	2001-07-07 12:30:46.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/view/hello/Makefile.in	2002-10-11 12:28:30.000000000 +0200
+@@ -152,7 +152,7 @@
+ @USE_GNOME_TRUE@libhello_la_LIBADD = $(GNOME_LDFLAGS)
+ @USE_GNOME_FALSE@libhello_la_LIBADD = $(GTK_LIBS)
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR)					-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR)	${GDK_PIXBUF_CFLAGS}		-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+diff -ru gaby-2.0.2/plug-ins/view/list/Makefile.in gaby-2.0.2.fix/plug-ins/view/list/Makefile.in
+--- gaby-2.0.2/plug-ins/view/list/Makefile.in	2001-07-07 12:30:39.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/view/list/Makefile.in	2002-10-11 12:23:55.000000000 +0200
+@@ -152,7 +152,7 @@
+ @USE_GNOME_TRUE@liblist_la_LIBADD = $(GNOME_LDFLAGS)
+ @USE_GNOME_FALSE@liblist_la_LIBADD = $(GTK_LIBS)
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR)					-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR)					-I$(includedir)		${GDK_PIXBUF_CFLAGS}		$(GTK_CFLAGS) $(GNOME_CFLAGS)
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+diff -ru gaby-2.0.2/plug-ins/view/miniform/Makefile.in gaby-2.0.2.fix/plug-ins/view/miniform/Makefile.in
+--- gaby-2.0.2/plug-ins/view/miniform/Makefile.in	2001-07-07 12:30:53.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/view/miniform/Makefile.in	2002-10-11 12:35:16.000000000 +0200
+@@ -152,7 +152,7 @@
+ @USE_GNOME_TRUE@libminiform_la_LIBADD = $(GNOME_LDFLAGS)
+ @USE_GNOME_FALSE@libminiform_la_LIBADD = $(GTK_LIBS)
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR)					-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR)	${GDK_PIXBUF_CFLAGS}		-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+diff -ru gaby-2.0.2/plug-ins/view/search/Makefile.in gaby-2.0.2.fix/plug-ins/view/search/Makefile.in
+--- gaby-2.0.2/plug-ins/view/search/Makefile.in	2001-07-07 12:30:59.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/view/search/Makefile.in	2002-10-11 12:37:50.000000000 +0200
+@@ -152,7 +152,7 @@
+ @USE_GNOME_TRUE@libsearch_la_LIBADD = $(GNOME_LDFLAGS)
+ @USE_GNOME_FALSE@libsearch_la_LIBADD = $(GTK_LIBS)
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR)					-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR)	${GDK_PIXBUF_CFLAGS}	-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+diff -ru gaby-2.0.2/plug-ins/view/xlist/Makefile.in gaby-2.0.2.fix/plug-ins/view/xlist/Makefile.in
+--- gaby-2.0.2/plug-ins/view/xlist/Makefile.in	2001-07-07 12:30:42.000000000 +0200
++++ gaby-2.0.2.fix/plug-ins/view/xlist/Makefile.in	2002-10-11 12:25:22.000000000 +0200
+@@ -152,7 +152,7 @@
+ @USE_GNOME_TRUE@libxlist_la_LIBADD = $(GNOME_LDFLAGS)
+ @USE_GNOME_FALSE@libxlist_la_LIBADD = $(GTK_LIBS)
+ 
+-INCLUDES =  	-I$(GABY_SRC_DIR)					-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
++INCLUDES =  	-I$(GABY_SRC_DIR)	${GDK_PIXBUF_CFLAGS}	-I$(includedir)						$(GTK_CFLAGS) $(GNOME_CFLAGS)
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h