Hi, the attached files to add autopackage support to goffice (the tgz contains the added ones). It's against today's cvs HEAD. I've ran gnumeric against the package-built goffice and it worked well AFAICT (basic charting functionality). Readymade packages are available at [1]. These will be used for abiword's charting plugin.
Autopackage is a binary cross-distribution packaging format for x86 linux[2]. [1] http://www.abisource.com/~rob/repo/goffice/ [2] http://autopackage.org Best, Rob
? autopackage
? goffice-apkg-2.diff
? goffice-apkg-diff-2.tgz
? goffice-apkg-diff.tgz
? goffice-apkg.diff
? m4
? goffice/.deps
? goffice/binreloc.c
? goffice/binreloc.h
? goffice/cut-n-paste/foocanvas/.deps
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/goffice/Makefile.am,v
retrieving revision 1.29
diff -u -r1.29 Makefile.am
--- Makefile.am 1 Apr 2005 12:04:21 -0000 1.29
+++ Makefile.am 6 Sep 2005 14:34:58 -0000
@@ -1,6 +1,6 @@
# Makefile.am for goffice
-SUBDIRS = goffice tests pixmaps plugins po
+SUBDIRS = goffice tests pixmaps plugins po autopackage
EXTRA_DIST = README NEWS BUGS MAINTAINERS AUTHORS \
goffice.mk \
Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/goffice/autogen.sh,v
retrieving revision 1.4
diff -u -r1.4 autogen.sh
--- autogen.sh 23 Mar 2005 11:25:58 -0000 1.4
+++ autogen.sh 6 Sep 2005 14:34:58 -0000
@@ -44,6 +44,8 @@
exit 1
fi
+export ACLOCAL_FLAGS="-I $srcdir/m4"
+
GNOME_DATADIR="$gnome_datadir"
. $gnome_autogen
Index: configure.in
===================================================================
RCS file: /cvs/gnome/goffice/configure.in,v
retrieving revision 1.60
diff -u -r1.60 configure.in
--- configure.in 16 Aug 2005 01:10:55 -0000 1.60
+++ configure.in 6 Sep 2005 14:34:58 -0000
@@ -461,6 +461,15 @@
AC_DEFINE(GO_VERSION_EXTRA, "goffice_version_extra",
[Extra, possibly empty tag for this release])
+dnl *******************
+dnl Autopackage support
+dnl *******************
+AC_SUBST(VERSION, ${VERSION})
+AC_SUBST(BINARY_VERSION, goffice_version_epoch.goffice_version_major)
+AM_BINRELOC
+AM_CONDITIONAL(WITH_BINRELOC, test "x$br_cv_binreloc" = "xyes")
+
+
AC_CONFIG_FILES([
Makefile
libgoffice-1.pc
@@ -486,6 +495,8 @@
pixmaps/Makefile
po/Makefile.in
tests/Makefile
+autopackage/Makefile
+autopackage/goffice-gtk.apspec
])
AC_OUTPUT
@@ -500,4 +511,5 @@
Cairo support: ${cairo_msg}
UI: ${ui_msg}
+ Binreloc: ${br_cv_binreloc}
"
Index: goffice.mk
===================================================================
RCS file: /cvs/gnome/goffice/goffice.mk,v
retrieving revision 1.11
diff -u -r1.11 goffice.mk
--- goffice.mk 1 Apr 2005 12:04:21 -0000 1.11
+++ goffice.mk 6 Sep 2005 14:34:58 -0000
@@ -1,7 +1,8 @@
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
- $(GOFFICE_CFLAGS)
+ $(GOFFICE_CFLAGS) \
+ $(BINRELOC_CFLAGS)
GOFFICE_PLUGIN_FLAGS = $(GOFFICE_PLUGIN_LDFLAGS)
goffice_include_dir = $(includedir)/libgoffice-1/goffice
Index: goffice/Makefile.am
===================================================================
RCS file: /cvs/gnome/goffice/goffice/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- goffice/Makefile.am 8 Jun 2005 06:36:03 -0000 1.17
+++ goffice/Makefile.am 6 Sep 2005 14:34:58 -0000
@@ -26,7 +26,9 @@
libgoffice_1_la_SOURCES = \
$(BUILT_SOURCES) \
goffice.c \
- goffice-priv.h
+ goffice-priv.h \
+ binreloc.c \
+ binreloc.h
libgoffice_1_ladir = $(goffice_include_dir)
libgoffice_1_la_HEADERS = \
Index: goffice/goffice.c
===================================================================
RCS file: /cvs/gnome/goffice/goffice/goffice.c,v
retrieving revision 1.26
diff -u -r1.26 goffice.c
--- goffice/goffice.c 30 Aug 2005 00:50:10 -0000 1.26
+++ goffice/goffice.c 6 Sep 2005 14:34:58 -0000
@@ -21,6 +21,7 @@
#include <goffice/goffice-config.h>
#include <goffice/goffice.h>
+#include <goffice/binreloc.h>
#include <goffice/goffice-priv.h>
#include <goffice/graph/gog-series.h>
#include <goffice/graph/gog-plot.h>
@@ -91,6 +92,27 @@
libgoffice_lib_dir = g_build_filename (dir,
"lib", "goffice", GOFFICE_VERSION, NULL);
g_free (dir);
+}
+#elif defined ENABLE_BINRELOC
+{
+ gchar *dir;
+ gbr_init_lib (NULL);
+ dir = gbr_find_data_dir (NULL);
+ if (dir) {
+ libgoffice_data_dir = g_build_filename (dir,
+ "goffice", GOFFICE_VERSION, NULL);
+ libgoffice_icon_dir = g_build_filename (dir,
+ "pixmaps", "goffice", NULL);
+ }
+ dir = gbr_find_locale_dir (NULL);
+ if (dir) {
+ libgoffice_locale_dir = dir;
+ }
+ dir = gbr_find_lib_dir (NULL);
+ if (dir) {
+ libgoffice_lib_dir = g_build_filename (dir,
+ "goffice", GOFFICE_VERSION, NULL);
+ }
}
#endif
goffice-apkg-diff-2.tgz
Description: GNU Zip compressed data
_______________________________________________ gnumeric-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/gnumeric-list
