garnome snapshot 18Aug2005

[Stef van der Made <svdmade planet nl>]

Hi Guys,

These are the walls I keep hitting

1 cairo doesn't pickup on my libpng.pc files in /usr/local/lib/pkgconfig 
(fixed by copying the file)
2 libexif.pc is not found by nautilus copied libexif.pc to the garnome 
pkgconfig folder
3 dia needs gcc 4 fixes for compilation (patch attached)
4 gimp needs gimp-print and pygtk (patches attached)

I'm now hitting a wall for two issues

When compiling gnome-pilot I'm running into this issue:

Making all in libgpilotdCM
make[3]: Entering directory 
`/usr/download/garnome-2.11-20050819.1645/office/gnome-pilot/work/main.d/gnome-pilot-2.0.13/libgpilotdCM'
no --always-private-header -w gnome-pilot-conduit-management.gob
make[3]: no: Command not found
make[3]: *** [gnome-pilot-conduit-management.c] Error 127

I've compiled get text from bootstrap and applied the pilot-link-0.12 
patches but I can't get this issue solved yet.

Secondly gimp still doesn't feel like compiling to the end. I've checked 
the 2 .so files for rsvg for the missing refrences but to no avail they 
look missing.

This is the compile log for gimp


make[4]: Entering directory 
`/usr/download/garnome-2.11-20050819.1645/fifth-toe/gimp/work/main.d/gimp-2.3.3/plug-ins/common'
/bin/sh ../../libtool --tag=CC --mode=link cc  -g -g 
-I/usr/test/garnome/include -L/usr/test/garnome/lib -O2 -pipe -m3dnow 
-mtune=athlon-tbird -Wall  -Wl,--export-dynamic -L/usr/test/garnome/lib 
-o sv
g  svg-svg.o ../../libgimp/libgimpui-2.0.la 
../../libgimpconfig/libgimpconfig-2.0.la 
../../libgimpwidgets/libgimpwidgets-2.0.la ../../libgimp/libgimp-2.0.la 
../../libgimpcolor/libgimpcolor-2.0.la ../.
./libgimpmath/libgimpmath-2.0.la ../../libgimpbase/libgimpbase-2.0.la 
-L/usr/test/garnome/lib -lrsvg-2 -lrsvg-2-libart -lgdk_pixbuf-2.0 -lm 
-lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0   -Wl,--rpath -W
l,/usr/test/garnome/lib -L/usr/test/garnome/lib -lgtk-x11-2.0 
-lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 
-lpango-1.0 -lfreetype -lz -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2
.0    
cc -g -g -I/usr/test/garnome/include -O2 -pipe -m3dnow 
-mtune=athlon-tbird -Wall -Wl,--export-dynamic -o .libs/svg svg-svg.o 
-Wl,--rpath -Wl,/usr/test/garnome/lib  -L/usr/test/garnome/lib ../../libgim
p/.libs/libgimpui-2.0.so ../../libgimpconfig/.libs/libgimpconfig-2.0.so 
../../libgimpwidgets/.libs/libgimpwidgets-2.0.so 
../../libgimp/.libs/libgimp-2.0.so 
../../libgimpcolor/.libs/libgimpcolor-2.0.so
../../libgimpmath/.libs/libgimpmath-2.0.so 
../../libgimpbase/.libs/libgimpbase-2.0.so 
/usr/test/garnome/lib/librsvg-2.so 
/usr/test/garnome/lib/librsvg-2-libart.so 
/usr/test/garnome/lib/libgtk-x11-2.0
.so /usr/test/garnome/lib/libgdk-x11-2.0.so 
/usr/test/garnome/lib/libatk-1.0.so 
/usr/test/garnome/lib/libgdk_pixbuf-2.0.so -lm 
/usr/test/garnome/lib/libpangocairo-1.0.so /usr/test/garnome/lib/libpango
-1.0.so /usr/test/garnome/lib/libfreetype.so -lz 
/usr/test/garnome/lib/libcairo.so 
/usr/test/garnome/lib/libgobject-2.0.so 
/usr/test/garnome/lib/libgmodule-2.0.so -ldl 
/usr/test/garnome/lib/libglib-2.
0.so -Wl,--rpath -Wl,/usr/test/garnome/lib
svg-svg.o(.text+0x2d2): In function `load_rsvg_pixbuf':
/usr/download/garnome-2.11-20050819.1645/fifth-toe/gimp/work/main.d/gimp-2.3.3/plug-ins/common/svg.c:437: 
undefined reference to `rsvg_handle_set_dpi_x_y'
svg-svg.o(.text+0x752): In function `load_rsvg_size':
/usr/download/garnome-2.11-20050819.1645/fifth-toe/gimp/work/main.d/gimp-2.3.3/plug-ins/common/svg.c:534: 
undefined reference to `rsvg_handle_set_dpi_x_y'
collect2: ld returned 1 exit status
make[4]: *** [svg] Error 1

Does anybody have any tips please ?


Cheers,

Stef

diff -ruN garnome-2.11-20050819.1645/fifth-toe/gimp/Makefile garnome-2.11-20050819.1645orig/fifth-toe/gimp/Makefile
--- garnome-2.11-20050819.1645/fifth-toe/gimp/Makefile	2005-08-12 02:12:22.000000000 +0200
+++ garnome-2.11-20050819.1645orig/fifth-toe/gimp/Makefile	2005-08-20 22:03:13.000000000 +0200
@@ -5,7 +5,7 @@
 
 MASTER_SITES = ftp://ftp.gimp.org/pub/gimp/v2.3/
 
-LIBDEPS = platform/gtk+ platform/libart_lgpl
+LIBDEPS = bootstrap/pygtk fifth-toe/gimp-print platform/gtk+ platform/libart_lgpl
 
 DESCRIPTION = gimp
 define BLURB
diff -ruN garnome-2.11-20050819.1645/fifth-toe/gimp/Makefile~ garnome-2.11-20050819.1645orig/fifth-toe/gimp/Makefile~
--- garnome-2.11-20050819.1645/fifth-toe/gimp/Makefile~	1970-01-01 01:00:00.000000000 +0100
+++ garnome-2.11-20050819.1645orig/fifth-toe/gimp/Makefile~	2005-08-20 14:00:16.000000000 +0200
@@ -0,0 +1,24 @@
+GARNAME = gimp
+GARVERSION = 2.3.3
+CATEGORIES = fifth-toe
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
+
+MASTER_SITES = ftp://ftp.gimp.org/pub/gimp/v2.3/
+
+LIBDEPS = bootstrap/pygtk platform/gtk+ platform/libart_lgpl
+
+DESCRIPTION = gimp
+define BLURB
+ #FIXME: blurb goes here
+endef
+
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include ../category.mk
+
+CC := $(shell echo $(CC) | sed -e 's/ccache //g')
+CXX := $(shell echo $(CXX) | sed -e 's/ccache //g')
diff -ruN garnome-2.11-20050819.1645/fifth-toe/gimp-print/Makefile garnome-2.11-20050819.1645orig/fifth-toe/gimp-print/Makefile
--- garnome-2.11-20050819.1645/fifth-toe/gimp-print/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ garnome-2.11-20050819.1645orig/fifth-toe/gimp-print/Makefile	2005-08-20 13:35:15.000000000 +0200
@@ -0,0 +1,19 @@
+GARNAME = gimp-print
+GARVERSION = 4.2.7
+CATEGORIES = fifth-toe
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+
+MASTER_SITES = http://download.sourceforge.net/gimp-print/
+
+DESCRIPTION = gimp-print
+define BLURB
+ #FIXME: blurb goes here
+endef
+
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include ../category.mk
diff -ruN garnome-2.11-20050819.1645/fifth-toe/gimp-print/checksums garnome-2.11-20050819.1645orig/fifth-toe/gimp-print/checksums
--- garnome-2.11-20050819.1645/fifth-toe/gimp-print/checksums	1970-01-01 01:00:00.000000000 +0100
+++ garnome-2.11-20050819.1645orig/fifth-toe/gimp-print/checksums	2005-08-20 13:35:48.000000000 +0200
@@ -0,0 +1 @@
+766be49f44a6a682d857e5aefec414d4  download/gimp-print-4.2.7.tar.gz

diff -ruN garnome-2.11-20050819.1645/office/dia/Makefile garnome-2.11-20050819.1645orig/office/dia/Makefile
--- garnome-2.11-20050819.1645/office/dia/Makefile	2004-09-16 10:37:31.000000000 +0200
+++ garnome-2.11-20050819.1645orig/office/dia/Makefile	2005-08-20 14:14:27.000000000 +0200
@@ -2,7 +2,7 @@
 GARVERSION = 0.94
 CATEGORIES = office
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
-
+PATCHFILES=gccfixes.diff
 LIBDEPS = platform/libgnomeui
 
 DESCRIPTION = dia
diff -ruN garnome-2.11-20050819.1645/office/dia/checksums garnome-2.11-20050819.1645orig/office/dia/checksums
--- garnome-2.11-20050819.1645/office/dia/checksums	2004-09-16 10:37:31.000000000 +0200
+++ garnome-2.11-20050819.1645orig/office/dia/checksums	2005-08-20 17:17:11.000000000 +0200
@@ -1 +1,2 @@
 63584224912dab49fed8d2cf87ea2d85  download/dia-0.94.tar.bz2
+e31430272c7149faec5b16abb4cb9f1e  download/gccfixes.diff
diff -ruN garnome-2.11-20050819.1645/office/dia/files/gccfixes.diff garnome-2.11-20050819.1645orig/office/dia/files/gccfixes.diff
--- garnome-2.11-20050819.1645/office/dia/files/gccfixes.diff	1970-01-01 01:00:00.000000000 +0100
+++ garnome-2.11-20050819.1645orig/office/dia/files/gccfixes.diff	2005-08-20 14:14:01.000000000 +0200
@@ -0,0 +1,23 @@
+diff -urNad dia-0.94.0/objects/custom/shape_info.h /tmp/dpep.ExtaJr/dia-0.94.0/objects/custom/shape_info.h
+--- dia-0.94.0/objects/custom/shape_info.h	2004-08-16 09:56:15.000000000 +0200
++++ /tmp/dpep.ExtaJr/dia-0.94.0/objects/custom/shape_info.h	2005-04-18 13:59:58.462997944 +0200
+@@ -166,7 +166,7 @@
+ 
+ void shape_info_realise(ShapeInfo* info);
+ void shape_info_print(ShapeInfo *info);
+-void parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle *s);
++static void parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle *s);
+ 
+ /*MC 11/03 handy g_new0 variant for struct with variable size */
+ #define g_new0_ext(struct_type, ext_size)		\
+diff -urNad dia-0.94.0/plug-ins/python/pydia-object.h /tmp/dpep.ExtaJr/dia-0.94.0/plug-ins/python/pydia-object.h
+--- dia-0.94.0/plug-ins/python/pydia-object.h	2004-08-16 09:56:20.000000000 +0200
++++ /tmp/dpep.ExtaJr/dia-0.94.0/plug-ins/python/pydia-object.h	2005-04-18 13:58:54.139776560 +0200
+@@ -23,6 +23,7 @@
+ #include <Python.h>
+ 
+ #include "object.h"
++#include "lib/object.h"
+ 
+ typedef struct {
+     PyObject_HEAD

Only in boe2/: pygtk
diff -ruN boe/pygtk/Makefile boe2/pygtk/Makefile
--- boe/pygtk/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ boe2/pygtk/Makefile	2005-08-20 13:59:53.000000000 +0200
@@ -0,0 +1,19 @@
+GARNAME = pygtk
+GARVERSION = 2.7.3
+CATEGORIES = fifth-toe
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
+
+#LIBDEPS = fifth-toe/loudmouth platform/libgnomeui
+
+DESCRIPTION = pygtk
+define BLURB
+ #FIXME: blurb goes here
+endef
+
+CONFIGURE_SCRIPTS = $(WORKSRC)/configure
+BUILD_SCRIPTS = $(WORKSRC)/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include ../category.mk
diff -ruN boe/pygtk/checksums boe2/pygtk/checksums
--- boe/pygtk/checksums	1970-01-01 01:00:00.000000000 +0100
+++ boe2/pygtk/checksums	2005-08-20 14:06:59.000000000 +0200
@@ -0,0 +1 @@
+17986ed00ce4b3fb3e699c7f3735942c  download/pygtk-2.7.3.tar.bz2