debian/0000755000000000000000000000000012314266651007174 5ustar debian/watch0000644000000000000000000000015011762421764010225 0ustar version=3 ftp://ftp.gnu.org/pub/gnu/guile-gnome/guile-gnome-platform/guile-gnome-platform-(.*)\.tar\.gz debian/guile-gnome2-vfs.install0000644000000000000000000000021111762421764013650 0ustar usr/share/guile-gnome-2/gnome/gw/gnome-vfs.scm usr/share/guile-gnome-2/gnome/vfs.scm usr/lib/guile-gnome-2/libgw-guile-gnome-gnome-vfs.* debian/README.source0000644000000000000000000000126511762421764011363 0ustar Building guile-gnome-platform for Debian ---------------------------------------- The guile-gnome-platform source package uses quilt to apply and remove its patches. Please refer to /usr/share/doc/quilt/README.source for information about how to use quilt for source packages. The quilt series is generated from the Git repository, using TopGit. This process is documented in /usr/share/doc/topgit/HOWTO-tg2quilt.gz. The guile-gnome-platform package uses the branch layout described in the aforementioned document. You can find the Git repository at . -- Andreas Rottmann , Thu, 5 Nov 2009 16:27:21 +0100 debian/guile-gnome-2.stx0000644000000000000000000000172511762421764012314 0ustar w_title(guile-gnome-0)dnl w_section(1)dnl w_author(Andreas Rottmann)dnl w_man_desc(starts guile and sets it up for loading guile-gnome modules) ! SYNOPSIS ''guile-gnome-0'' [ /guile options/ ] ! DESCRIPTION The purpose of this script is twofold. First, it serves to find ''guile'' in the load path instead of statically "linking" to /usr/bin/guile. Second, it will set up the guile load path and the library path such that using guile-gnome modules will /Just Work/. This is necessary because we might choose to break the application interfaces in the future, so we need to allow for parallel installs. Note that the proper way to make a script that will use this as the interpreter is as follows: {{{ #! /bin/sh exec guile-gnome-0 -s $0 "$@" !# }}} This will allow the shell to find ''guile-gnome-0'' in the path. ! ENVIRONMENT GUILE_LOAD_PATH:: LD_LIBRARY_PATH:: These are extended (or set, if unset or empty) before ''exec''-ing ''guile''. ! SEE ALSO ''guile'' (1) debian/guile-gnome2-glib.install0000644000000000000000000000174311762421764014002 0ustar usr/share/guile-gnome-2/gnome/gobject/config.scm usr/share/guile-gnome-2/gnome/gobject/event-repl.scm usr/share/guile-gnome-2/gnome/gobject/gclosure.scm usr/share/guile-gnome-2/gnome/gobject/generics.scm usr/share/guile-gnome-2/gnome/gobject/gobject.scm usr/share/guile-gnome-2/gnome/gobject/gparameter.scm usr/share/guile-gnome-2/gnome/gobject/gsignal.scm usr/share/guile-gnome-2/gnome/gobject/gtype.scm usr/share/guile-gnome-2/gnome/gobject/gvalue.scm usr/share/guile-gnome-2/gnome/gobject/utils.scm usr/share/guile-gnome-2/gnome/gw/support/modules.scm usr/share/guile-gnome-2/gnome/gw/generics.scm usr/share/guile-gnome-2/gnome/gw/glib.scm usr/share/guile-gnome-2/gnome/gw/gobject.scm usr/share/guile-gnome-2/gnome/glib.scm usr/share/guile-gnome-2/gnome/gobject.scm usr/share/guile/site/gnome-2.scm usr/lib/guile-gnome-2/libgw-guile-gnome-gobject.* usr/lib/guile-gnome-2/libgw-guile-gnome-glib.* usr/lib/libguile-gnome-gobject-2.so.* usr/lib/libguile-gnome-gobject-2.so usr/bin/guile-gnome-2 debian/guile-gnome2-gtk.examples0000644000000000000000000000006011762421764014011 0ustar gtk/examples/*.scm gtk/examples/guile-gtk-demo/ debian/guile-gnome2-gtk.install0000644000000000000000000000167611762421764013657 0ustar usr/share/guile-gnome-2/gnome/gtk/ usr/share/guile-gnome-2/gnome/gw/atk.scm usr/share/guile-gnome-2/gnome/gw/pango.scm usr/share/guile-gnome-2/gnome/gw/gdk.scm usr/share/guile-gnome-2/gnome/gw/gtk.scm usr/share/guile-gnome-2/gnome/gw/libglade.scm usr/share/guile-gnome-2/gnome/gw/cairo.scm usr/share/guile-gnome-2/gnome/atk.scm usr/share/guile-gnome-2/gnome/gtk.scm usr/share/guile-gnome-2/gnome/pango.scm usr/share/guile-gnome-2/gnome/glade.scm usr/share/guile-gnome-2/gnome/contrib/texinfo-buffer.scm usr/share/guile-gnome-2/gnome/contrib/filtered-list.scm usr/share/guile-gnome-2/gnome/contrib/delay-tree-model.scm usr/share/guile-gnome-2/gnome/contrib/help-browser.scm usr/lib/guile-gnome-2/libgw-guile-gnome-atk.* usr/lib/guile-gnome-2/libgw-guile-gnome-pango.* usr/lib/guile-gnome-2/libgw-guile-gnome-gdk.* usr/lib/guile-gnome-2/libgw-guile-gnome-gtk.* usr/lib/guile-gnome-2/libgw-guile-gnome-libglade.* usr/lib/guile-gnome-2/libgw-guile-gnome-cairo.* debian/shlibs.local0000644000000000000000000000005511762421764011500 0ustar libguile-gnome-gobject-0 0 guile-gnome0-glib debian/rules0000755000000000000000000000405512314266123010252 0ustar #!/usr/bin/make -f #export DH_VERBOSE=1 include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/class/autotools-vars.mk include /usr/share/cdbs/1/rules/autoreconf.mk DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror GUILE=guile-2.0 DEB_DH_INSTALL_ARGS := --sourcedir=$(DEB_DESTDIR) DEB_MAKE_CHECK_TARGET = check DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) xvfb-run -a $(MAKE) # Make sure guile-gnome2-glib is built first $(addprefix binary/guile-gnome2-,gtk gconf gnome gnome-ui vfs):: binary/guile-gnome2-glib install/guile-gnome2-glib:: stx2any -T man debian/guile-gnome-2.stx > debian/guile-gnome-2.man # Empty dependency_libs in .la files, courtesy of gnome-pkg-tools $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: for file in $(wildcard debian/$(cdbs_curpkg)/usr/lib/*/*.la); do \ sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \ done DEB_DH_MAKESHLIBS_ARGS := -V -X"libgw-guile-" DEB_COMPRESS_EXCLUDE_ALL := .scm DEB_SHLIBDEPS_LIBRARY_guile-gnome2-glib := guile-gnome2-glib DEB_SHLIBDEPS_INCLUDE_guile-gnome2-glib := debian/guile-gnome2-glib/usr/lib/ DEB_SHLIBDEPS_LIBRARY_guile-gnome2-gtk := guile-gnome2-glib DEB_SHLIBDEPS_INCLUDE_guile-gnome2-gtk := debian/guile-gnome2-glib/usr/lib/ DEB_SHLIBDEPS_LIBRARY_guile-gnome2-gconf := guile-gnome2-glib DEB_SHLIBDEPS_INCLUDE_guile-gnome2-gconf := debian/guile-gnome2-glib/usr/lib/ DEB_SHLIBDEPS_LIBRARY_guile-gnome2-gnome := guile-gnome2-glib DEB_SHLIBDEPS_INCLUDE_guile-gnome2-gnome := debian/guile-gnome2-glib/usr/lib/ DEB_SHLIBDEPS_LIBRARY_guile-gnome2-gnome-ui := guile-gnome2-glib DEB_SHLIBDEPS_INCLUDE_guile-gnome2-gnome-ui := debian/guile-gnome2-glib/usr/lib/ DEB_SHLIBDEPS_LIBRARY_guile-gnome2-canvas := guile-gnome2-glib DEB_SHLIBDEPS_INCLUDE_guile-gnome2-canvas := debian/guile-gnome2-glib/usr/lib/ DEB_SHLIBDEPS_LIBRARY_guile-gnome2-vfs := guile-gnome2-glib DEB_SHLIBDEPS_INCLUDE_guile-gnome2-vfs := debian/guile-gnome2-glib/usr/lib/ clean:: rm -f glib/gnome/gobject/guile-gnome-gobject rm -f debian/guile-gnome-2.man rm -f config.log debian/guile-gnome2-glib.examples0000644000000000000000000000002411762421764014141 0ustar glib/examples/*.scm debian/guile-gnome2-gconf.install0000644000000000000000000000020311762421764014147 0ustar usr/share/guile-gnome-2/gnome/gw/gconf.scm usr/share/guile-gnome-2/gnome/gconf.scm usr/lib/guile-gnome-2/libgw-guile-gnome-gconf.* debian/guile-gnome2-gnome-ui.install0000644000000000000000000000022011762421764014572 0ustar usr/share/guile-gnome-2/gnome/gw/libgnomeui.scm usr/share/guile-gnome-2/gnome/gnome-ui.scm usr/lib/guile-gnome-2/libgw-guile-gnome-libgnomeui.* debian/copyright0000644000000000000000000000147511762421764011142 0ustar This package was debianized by Andreas Rottmann on Tue Dec 7 19:40:21 CET 2004. It was downloaded from ftp://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/. Upstream Authors: Martin Baulig Ariel Rios Andy Wingo Marius Vollmer Patrick Bernaud Jan Nieuwenhuizen Andreas Rottmann Marcello Mathias Herreshoff Toby D. Reeves James Henstridge Thomas Vander Stichele Dirk Herrmann Thien-Thi Nguyen Jim Blandy Copyright © 2001-2009, Free Software Foundation Licensed under the GNU General Public License, version 2 or later. Debian GNU/Linux users may find this license in /usr/share/common-licenses/GPL-2. debian/guile-gnome2-glib.manpages0000644000000000000000000000003111762421764014114 0ustar debian/guile-gnome-2.man debian/guile-gnome2-dev.install0000644000000000000000000000074411762421764013643 0ustar usr/lib/pkgconfig/guile-gnome-defs-2.pc usr/lib/pkgconfig/guile-gnome-glib-2.pc usr/lib/pkgconfig/guile-gnome-gtk-2.pc usr/lib/pkgconfig/guile-gnome-libgnomeui-2.pc usr/include/guile-gnome-2/guile-gnome-gobject.h usr/include/guile-gnome-2/guile-gnome-gobject/ usr/share/guile-gnome-2/gnome/overrides/ usr/share/guile-gnome-2/gnome/gw/*-spec.scm usr/share/guile-gnome-2/gnome/gw/support/defs.scm usr/share/guile-gnome-2/gnome/gw/support/gobject.scm usr/share/guile-gnome-2/gnome/defs/ debian/guile-gnome2-canvas.install0000644000000000000000000000020611762421764014331 0ustar usr/share/guile-gnome-2/gnome/gw/canvas.scm usr/share/guile-gnome-2/gnome/canvas.scm usr/lib/guile-gnome-2/libgw-guile-gnome-canvas.* debian/source/0000755000000000000000000000000011762421764010500 5ustar debian/source/format0000644000000000000000000000001411762421764011706 0ustar 3.0 (quilt) debian/patches/0000755000000000000000000000000011762421764010627 5ustar debian/patches/fixes/0000755000000000000000000000000012314266646011745 5ustar debian/patches/fixes/0005-Fix-configure-s-interpretation-of-disable-Werror.patch0000644000000000000000000000136711762421764024652 0ustar From: Andreas Rottmann Date: Wed, 30 May 2012 22:54:51 +0200 Subject: Fix configure's interpretation of --disable-Werror --- configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3c787c4..514019a 100644 --- a/configure.ac +++ b/configure.ac @@ -64,8 +64,10 @@ you run guile. (Which is a pain.)]) fi WARN_CFLAGS=-Wall -AC_ARG_ENABLE([Werror], AC_HELP_STRING([--enable-Werror],[Stop the build on warnings]), - [WARN_CFLAGS="-Wall -Werror"], []) +AC_ARG_ENABLE([Werror], AC_HELP_STRING([--enable-Werror],[Stop the build on warnings])) +if test "$enable_Werror" = yes; then + WARN_CFLAGS="-Wall -Werror" +fi AC_SUBST(WARN_CFLAGS) DISABLE_DEPRECATED=false debian/patches/fixes/0004-Allow-configuring-guile-and-guile-snarf-executables.patch0000644000000000000000000001225311762421764025317 0ustar From: Andreas Rottmann Date: Tue, 29 May 2012 18:46:26 +0200 Subject: Allow configuring `guile' and `guile-snarf' executables * configure.ac (GUILE, GUILE_SNARF): New precious variables. * common.mk, glib/test-suite/Makefile.am: Use these make variables instead of hardcoding `guile' and `guile-snarf'. --- common.mk | 4 ++-- configure.ac | 9 +++++++++ glib/bin/Makefile.am | 2 ++ glib/bin/guile-gnome.in | 6 +++--- glib/test-suite/Makefile.am | 10 +++++----- tests.mk | 1 - 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/common.mk b/common.mk index 75c2ece..a7f1cc6 100644 --- a/common.mk +++ b/common.mk @@ -45,14 +45,14 @@ GUILE_LOAD_PATH:=$(BUILD_GUILE_PATH)$(SOURCE_GUILE_PATH):${G_WRAP_MODULE_DIR}:${ export GUILE_LOAD_PATH .c.x: - guile-snarf $(GUILE_SNARF_CFLAGS) $< > $@ \ + $(GUILE_SNARF) $(GUILE_SNARF_CFLAGS) $< > $@ \ || { rm $@; false; } .c.doc: $(CPP) -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \ | grep -E '(\^\^ {|\^\^ })' > $@ || { rm $@; false; } %.scm guile-gnome-gw-%.c: %-spec.scm - guile $(GUILE_FLAGS) -c \ + $(GUILE) $(GUILE_FLAGS) -c \ "(debug-set! stack 400000) \ (use-modules (gnome-@API_VERSION@)) \ (use-modules (g-wrap)) \ diff --git a/configure.ac b/configure.ac index 055041d..3c787c4 100644 --- a/configure.ac +++ b/configure.ac @@ -93,6 +93,15 @@ else AC_MSG_NOTICE([found Guile $GUILE_EFFECTIVE_VERSION.x]) fi +AC_ARG_VAR([GUILE], [`guile' executable to use in build]) +if test -z "$GUILE"; then + GUILE=guile +fi +AC_ARG_VAR([GUILE_SNARF], [`guile-snarf' executable to use in build]) +if test -z "$GUILE_SNARF"; then + GUILE_SNARF=guile-snarf +fi + # Check for g-wrap PKG_CHECK_MODULES(G_WRAP, g-wrap-2.0-guile >= 1.9.14) diff --git a/glib/bin/Makefile.am b/glib/bin/Makefile.am index 4acf541..379c31d 100644 --- a/glib/bin/Makefile.am +++ b/glib/bin/Makefile.am @@ -8,6 +8,7 @@ all-local: $(bin_SCRIPTS) guile-gnome-@API_VERSION@: guile-gnome.in Makefile if test -f $@; then chmod +w $@; fi sed -e "s|@API_VERSION\@|@API_VERSION@|g" \ + -e "s|@GUILE\@|$(GUILE)|g" \ -e "s|@running-uninstalled\@|#t|g" \ -e "s|@guilegnomedir\@|$(guilegnomedir)|g" \ -e "s|@guilegnomelibdir\@|$(guilegnomelibdir)|g" \ @@ -19,6 +20,7 @@ install-exec-local: Makefile @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" sed -e "s|@API_VERSION\@|@API_VERSION@|g" \ + -e "s|@GUILE\@|$(GUILE)|g" \ -e "s|@running-uninstalled\@|#f|g" \ -e "s|@guilegnomedir\@|$(guilegnomedir)|g" \ -e "s|@guilegnomelibdir\@|$(guilegnomelibdir)|g" \ diff --git a/glib/bin/guile-gnome.in b/glib/bin/guile-gnome.in index 4d6c29e..f96f179 100644 --- a/glib/bin/guile-gnome.in +++ b/glib/bin/guile-gnome.in @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2012 Free Software Foundation, Inc. # Public domain. # Written by Andy Wingo for guile-gnome. @@ -54,6 +54,6 @@ export GUILE_LOAD_PATH LD_LIBRARY_PATH # Taken from autoconf.info, "Portable Shell" case $# in -0) exec guile;; -*) exec guile "$@";; +0) exec @GUILE@;; +*) exec @GUILE@ "$@";; esac diff --git a/glib/test-suite/Makefile.am b/glib/test-suite/Makefile.am index 53453d6..67f3cd5 100644 --- a/glib/test-suite/Makefile.am +++ b/glib/test-suite/Makefile.am @@ -43,7 +43,7 @@ TESTS_ENVIRONMENT=\ WRAPSET_API_FILE=$(srcdir)/wrapset.api \ LTDL_LIBRARY_PATH=.:${LTDL_LIBRARY_PATH} \ GUILE_LOAD_PATH=".:${srcdir:-.}/..:..:${GUILE_LOAD_PATH}" \ - $(top_builddir)/dev-environ guile --debug -e main -s -c \ + $(top_builddir)/dev-environ $(GUILE) --debug -c \ '(debug-set! stack 100000)' \ -e main -s @@ -54,14 +54,14 @@ script := '(load (getenv "DOC_SCM"))\ *modules*)' gobject.api.update: - $(top_builddir)/dev-environ guile --debug -e update-api -s $(srcdir)/api.scm \ + $(top_builddir)/dev-environ $(GUILE) --debug -e update-api -s $(srcdir)/api.scm \ $(shell DOC_SCM=$(srcdir)/../doc/gobject/guile-gnome-gobject.scm \ - guile -c $(script)) > $(srcdir)/gobject.api + $(GUILE) -c $(script)) > $(srcdir)/gobject.api wrapset.api.update: WRAPSET_MODULES="$(wrapset_modules)" \ WRAPSET_API_FILE=$(srcdir)/wrapset.api \ - $(top_builddir)/dev-environ guile --debug -e update-api -s $(srcdir)/wrapset.scm + $(top_builddir)/dev-environ $(GUILE) --debug -e update-api -s $(srcdir)/wrapset.scm %.check: % $(TESTS_ENVIRONMENT) $(srcdir)/$* @@ -74,7 +74,7 @@ TESTS = guile-gobject-test \ gw-test-%.scm gw-test-%.c: gw-test-%-spec.scm echo GLP=$(GUILE_LOAD_PATH) - guile $(GUILE_FLAGS) -c \ + $(GUILE) $(GUILE_FLAGS) -c \ "(use-modules (g-wrap)) \ (use-modules (g-wrap guile)) \ (use-modules (gw-test-$*-spec)) \ diff --git a/tests.mk b/tests.mk index 229f65b..0cdf4d5 100644 --- a/tests.mk +++ b/tests.mk @@ -32,7 +32,6 @@ extra_module_names = wrapset_modules = ($(top_module_name) $(gw_module_name) $(extra_module_names)) WRAPSET_TESTS_ENV = WRAPSET_MODULES="$(wrapset_modules)" WRAPSET_API_FILE=$(srcdir)/wrapset.api DEV_ENV = $(top_builddir)/dev-environ -GUILE = guile TESTS_ENVIRONMENT=$(WRAPSET_TESTS_ENV) $(DEV_ENV) $(GUILE) $(GUILE_FLAGS) -e main -s debian/patches/fixes/build-absolute-paths.patch0000644000000000000000000000252512314266412017011 0ustar Description: Use absolute paths; handle GUILE_LOAD_PATH being unset Author: Andy Wingo Origin: backport, http://git.savannah.gnu.org/cgit/guile-gnome.git/commit/?id=f37f03bb957701d80a1c3977b3f0f3995b6ec655 Forwarded: not-needed Last-Update: 2014-03-25 Index: b/common.mk =================================================================== --- a/common.mk +++ b/common.mk @@ -39,9 +39,9 @@ GUILE_SNARF_CFLAGS = $(DEFS) $(AM_CFLAGS) $(GUILE_CFLAGS) $(G_WRAP_CFLAGS) PACKAGES = atk cairo corba defs gconf glib gnome-vfs gtk libglade libgnome libgnomecanvas libgnomeui pango -SOURCE_GUILE_PATH=$(shell echo $(addprefix $(top_srcdir)/,$(PACKAGES)) | sed -e 's/ /:/g'):$(srcdir) -BUILD_GUILE_PATH=$(if $(filter-out $(top_srcdir),$(top_builddir)),$(shell echo -n $(addprefix $(top_builddir)/,$(PACKAGES)): | sed -e 's/ /:/g'),) -GUILE_LOAD_PATH:=$(BUILD_GUILE_PATH)$(SOURCE_GUILE_PATH):${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH} +SOURCE_GUILE_PATH=$(shell echo $(addprefix $(abs_top_srcdir)/,$(PACKAGES)) | sed -e 's/ /:/g'):$(srcdir) +BUILD_GUILE_PATH=$(if $(filter-out $(abs_top_srcdir),$(abs_top_builddir)),$(shell echo -n $(addprefix $(abs_top_builddir)/,$(PACKAGES)): | sed -e 's/ /:/g'),) +GUILE_LOAD_PATH:=$(BUILD_GUILE_PATH)$(SOURCE_GUILE_PATH):${G_WRAP_MODULE_DIR}$(if ${GUILE_LOAD_PATH},:${GUILE_LOAD_PATH}) export GUILE_LOAD_PATH .c.x: debian/patches/fixes/0002-Fix-FTBFS-with-GTK-2.24-due-to-GTK-deprecated-symbol.patch0000644000000000000000000000152211762421764024133 0ustar From: Regis Boudin Date: Tue, 29 May 2012 18:00:16 +0200 Subject: Fix FTBFS with GTK 2.24 due to GTK deprecated symbol. Bug-Debian: http://bugs.debian.org/634292 --- libgnomecanvas/gnome/gw/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgnomecanvas/gnome/gw/Makefile.am b/libgnomecanvas/gnome/gw/Makefile.am index 3e92848..6d21153 100644 --- a/libgnomecanvas/gnome/gw/Makefile.am +++ b/libgnomecanvas/gnome/gw/Makefile.am @@ -19,7 +19,7 @@ libgw_guile_gnome_canvas_la_SOURCES = \ libgw_guile_gnome_canvas_la_CFLAGS = $(GUILE_GLIB_CFLAGS) \ $(AM_CFLAGS) $(CANVAS_CFLAGS) $(GUILE_CFLAGS) \ - $(G_WRAP_CFLAGS) -DGTK_DISABLE_DEPRECATED + $(G_WRAP_CFLAGS) $(GTK_DEPRECATED_CFLAGS) libgw_guile_gnome_canvas_la_LIBADD = $(CANVAS_LIBS) $(GUILE_GLIB_LIBS) \ $(GUILE_LIBS) $(G_WRAP_LIBS) debian/patches/fixes/0006-Fix-deprecated-includes-of-glib-sub-headers.patch0000644000000000000000000000221511762421764023516 0ustar From: Andreas Rottmann Date: Sat, 2 Jun 2012 16:15:25 +0200 Subject: Fix deprecated includes of glib sub-headers Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665552 --- corba/gnome/corba/guile-gnome-corba-generic.c | 2 +- glib/gnome/gobject/guile-support.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/corba/gnome/corba/guile-gnome-corba-generic.c b/corba/gnome/corba/guile-gnome-corba-generic.c index fe3418b..d44ac2c 100644 --- a/corba/gnome/corba/guile-gnome-corba-generic.c +++ b/corba/gnome/corba/guile-gnome-corba-generic.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include static GQuark quark_corba_typecode = 0; diff --git a/glib/gnome/gobject/guile-support.h b/glib/gnome/gobject/guile-support.h index 43346bc..0a63c9d 100644 --- a/glib/gnome/gobject/guile-support.h +++ b/glib/gnome/gobject/guile-support.h @@ -24,7 +24,7 @@ #ifndef __GUILE_SUPPORT_H__ #define __GUILE_SUPPORT_H__ -#include +#include #include debian/patches/fixes/0003-Link-libguile-gnome-corba-against-libORBit.patch0000644000000000000000000000211311762421764023311 0ustar From: Colin Watson Date: Tue, 29 May 2012 18:00:16 +0200 Subject: Link libguile-gnome-corba against libORBit Bug-Ubuntu: https://bugs.launchpad.net/bugs/832914 Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=657947 Last-Update: 2011-09-01 --- corba/gnome/corba/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corba/gnome/corba/Makefile.am b/corba/gnome/corba/Makefile.am index 19eb186..9b69891 100644 --- a/corba/gnome/corba/Makefile.am +++ b/corba/gnome/corba/Makefile.am @@ -15,7 +15,7 @@ libguile_gnome_corba_@API_VERSION@_la_SOURCES = $(C_FILES) $(H_FILES) libguile_gnome_corba_@API_VERSION@_la_CFLAGS = $(CORBA_CFLAGS) \ $(AM_CFLAGS) $(GUILE_GLIB_CFLAGS) $(GUILE_CFLAGS) -DORBIT2_STUBS_API -libguile_gnome_corba_@API_VERSION@_la_LIBADD = $(GUILE_GLIB_LIBS) $(GUILE_LIBS) +libguile_gnome_corba_@API_VERSION@_la_LIBADD = $(CORBA_LIBS) $(GUILE_GLIB_LIBS) $(GUILE_LIBS) libguile_gnome_corba_@API_VERSION@_la_LDFLAGS = -export-dynamic # FIXME: version info guile_gnome_includedir = $(includedir)/guile-gnome-@API_VERSION@ debian/patches/fixes/automake-parallel-tests.patch0000644000000000000000000000302112314266543017516 0ustar Description: Handle Automake parallel test harness Author: Colin Watson Forwarded: no Last-Update: 2014-03-25 Index: b/glib/test-suite/Makefile.am =================================================================== --- a/glib/test-suite/Makefile.am +++ b/glib/test-suite/Makefile.am @@ -36,7 +36,8 @@ gw_module_name = (gnome gw $(wrapset_stem)) extra_module_names = wrapset_modules = ($(top_module_name) $(gw_module_name) $(extra_module_names)) -TESTS_ENVIRONMENT=\ +LOG_COMPILER=\ + env \ API_FILE=$(srcdir)/gobject.api \ DOC_SCM=$(srcdir)/../doc/gobject/guile-gnome-gobject.scm \ WRAPSET_MODULES="$(wrapset_modules)" \ @@ -64,7 +65,7 @@ $(top_builddir)/dev-environ $(GUILE) --debug -e update-api -s $(srcdir)/wrapset.scm %.check: % - $(TESTS_ENVIRONMENT) $(srcdir)/$* + $(LOG_COMPILER) $(srcdir)/$* EXTRA_DIST+=gobject.api api.scm wrapset.api wrapset.scm Index: b/tests.mk =================================================================== --- a/tests.mk +++ b/tests.mk @@ -33,12 +33,12 @@ WRAPSET_TESTS_ENV = WRAPSET_MODULES="$(wrapset_modules)" WRAPSET_API_FILE=$(srcdir)/wrapset.api DEV_ENV = $(top_builddir)/dev-environ -TESTS_ENVIRONMENT=$(WRAPSET_TESTS_ENV) $(DEV_ENV) $(GUILE) $(GUILE_FLAGS) -e main -s +LOG_COMPILER=env $(WRAPSET_TESTS_ENV) $(DEV_ENV) $(GUILE) $(GUILE_FLAGS) -e main -s wrapset.api.update: $(WRAPSET_TESTS_ENV) $(DEV_ENV) $(GUILE) -e update-api -s $(srcdir)/wrapset.scm %.check: % - $(TESTS_ENVIRONMENT) $(srcdir)/$* + $(LOG_COMPILER) $(srcdir)/$* TESTS = wrapset.scm debian/patches/fixes/0001-Bug-592486-Increase-stack-size-for-GLib-tests.patch0000644000000000000000000000164411762421764023206 0ustar From: Andreas Rottmann Date: Tue, 29 May 2012 18:00:15 +0200 Subject: Bug 592486 -- Increase stack size for GLib tests See , and --- glib/test-suite/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glib/test-suite/Makefile.am b/glib/test-suite/Makefile.am index 651e14c..53453d6 100644 --- a/glib/test-suite/Makefile.am +++ b/glib/test-suite/Makefile.am @@ -43,7 +43,9 @@ TESTS_ENVIRONMENT=\ WRAPSET_API_FILE=$(srcdir)/wrapset.api \ LTDL_LIBRARY_PATH=.:${LTDL_LIBRARY_PATH} \ GUILE_LOAD_PATH=".:${srcdir:-.}/..:..:${GUILE_LOAD_PATH}" \ - $(top_builddir)/dev-environ guile --debug -e main -s + $(top_builddir)/dev-environ guile --debug -e main -s -c \ + '(debug-set! stack 100000)' \ + -e main -s script := '(load (getenv "DOC_SCM"))\ (for-each \ debian/patches/series0000644000000000000000000000071212314266430012033 0ustar fixes/0001-Bug-592486-Increase-stack-size-for-GLib-tests.patch fixes/0002-Fix-FTBFS-with-GTK-2.24-due-to-GTK-deprecated-symbol.patch fixes/0003-Link-libguile-gnome-corba-against-libORBit.patch fixes/0004-Allow-configuring-guile-and-guile-snarf-executables.patch fixes/0005-Fix-configure-s-interpretation-of-disable-Werror.patch fixes/0006-Fix-deprecated-includes-of-glib-sub-headers.patch fixes/build-absolute-paths.patch fixes/automake-parallel-tests.patch debian/compat0000644000000000000000000000000211762421764010376 0ustar 5 debian/control0000644000000000000000000000542312314266650010602 0ustar Source: guile-gnome-platform Section: lisp Priority: extra Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Andreas Rottmann Standards-Version: 3.9.3 Homepage: http://www.gnu.org/software/guile-gnome/ Build-Depends: cdbs (>= 0.4.49), debhelper (>> 7), dh-autoreconf, xvfb, xauth, xfonts-base, stx2any, guile-2.0-dev, guile-library (>= 0.1.6), g-wrap (>= 1.9.14-1), guile-g-wrap (>= 1.9.14-1), libgwrap-runtime-dev (>= 1.9.11), guile-cairo-dev (>= 1.4.0), libglib2.0-dev (>= 2.12.13), libgtk2.0-dev (>= 2.10.13), libgconf2-dev (>= 2.18.0), libglade2-dev (>= 1:2.6.2), libgnomevfs2-dev (>= 2.18.1), libgnome2-dev (>= 2.18.0), libgnomeui-dev (>= 2.18.1) Package: guile-gnome2-glib Architecture: any Depends: guile-g-wrap (>= 1.9.9), ${shlibs:Depends}, ${misc:Depends} Description: Guile bindings for GLib This package contains Guile modules that provide access to the GLib library, including its object system, GObject. Package: guile-gnome2-gconf Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Guile bindings for GConf This package contains Guile modules that provide access to the GConf library. Package: guile-gnome2-gtk Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Guile bindings for GTK+, libglade, Pango and ATK This package contains Guile modules that provide access to the GTK+ widget set library and its companion libraries libglade, Pango and ATK. Package: guile-gnome2-gnome Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Guile bindings for libgnome This package contains Guile modules that provide access to the libgnome library. Package: guile-gnome2-gnome-ui Architecture: any Depends: guile-gnome2-gtk (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Guile bindings for libgnome This package contains Guile modules that provide access to the libgnomeui library. Package: guile-gnome2-canvas Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Guile bindings for libgnomecanvas This package contains Guile modules that provide access to the libgnomecanvas library. Package: guile-gnome2-vfs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Guile bindings for GnomeVFS This package contains Guile modules that provide access to the GnomeVFS library. Package: guile-gnome2-dev Section: libdevel Architecture: any Depends: g-wrap (>= 1.9.9), guile-gnome2-glib (= ${binary:Version}), ${misc:Depends} Description: Guile GObject binding support library, development files This package contains the development files for the Guile GObject binding support library. . You only need to install this package for building new wrapsets based on the guile-gnome GObject bindings. debian/gbp.conf0000644000000000000000000000010411762421764010612 0ustar [DEFAULT] pristine-tar = True [git-buildpackage] sign-tags = True debian/guile-gnome2-gnome.install0000644000000000000000000000021111762421764014157 0ustar usr/share/guile-gnome-2/gnome/gw/libgnome.scm usr/share/guile-gnome-2/gnome/gnome.scm usr/lib/guile-gnome-2/libgw-guile-gnome-libgnome.* debian/changelog0000644000000000000000000001517512314266651011057 0ustar guile-gnome-platform (2.16.2-1.1ubuntu1) trusty; urgency=medium * Switch to guile-2.0-dev. * Backport build fix from upstream to use absolute paths and handle GUILE_LOAD_PATH being unset. * Handle the Automake parallel test harness. * Use dh-autoreconf to help apply these changes. -- Colin Watson Tue, 25 Mar 2014 11:51:05 +0000 guile-gnome-platform (2.16.2-1.1) unstable; urgency=medium * Non-maintainer upload. * debian/rules - use /usr/share/cdbs/1/class/autotools-vars.mk, instead of hardcoding autotools versions (Closes: #713193) -- Hideki Yamane Tue, 11 Feb 2014 17:59:09 +0900 guile-gnome-platform (2.16.2-1) unstable; urgency=low * New upstream version: - obsoletes patch fixes/gtk-2.18-build. - other patches rebased. - new patch to allow building against guile-1.8. - new patch to preserve meaning of --disable-Werror configure option. - needs g-wrap (>= 1.9.14); Build-Depends adjusted. * New patch to fix deprecated glib includes (closes: #665552). * debian/rules: - Use -a flag for xvfb-run to guard against potential build failures. - Bump automake and autoconf versions (1.11 and 2.69, respectively) to match new upstream. Build-Depends adjusted. * Bump Standards-Version to 3.9.3 (no changes). * Drop tg2quilt in favor of gbp-pq, as this requires no special knowledge from collaborators. -- Andreas Rottmann Sat, 02 Jun 2012 16:30:43 +0200 guile-gnome-platform (2.16.1-6.1) unstable; urgency=low * Non-maintainer upload. * Don't pass -GTK_DISABLE_DEPRECATED when using libgnomeui, as GtkCallbackMarshal is disabled with GTK 2.24. Closes: #634292. * Explicitly link with orbit, fixing the test suite. * Finish emptying dependency_libs from the .la files. Closes: #642695. -- Regis Boudin Tue, 04 Oct 2011 19:26:06 +0100 guile-gnome-platform (2.16.1-6) unstable; urgency=low * Standards-Version 3.9.2, no changes. * Fix debian/rules wrt. cdbs deprecation warnings. * Tighten Build-Depends on g-wrap to ensure Bug#625187 is not encountered. * guile-gnome2-glib: Don't install public .la files (closes: #621172). -- Andreas Rottmann Tue, 03 May 2011 01:00:31 +0200 guile-gnome-platform (2.16.1-5) unstable; urgency=low * New patch: fixes/snarf-newer-cpp (closes: #620264). * Switch package format to source format 3.0 (quilt): - Drop Build-Depends on quilt. - Removed quilt-related stuff from debian/rules. * Standards-Version 3.9.1: - Include build rules to empty dependency_libs in .la files. -- Andreas Rottmann Fri, 01 Apr 2011 13:14:11 +0200 guile-gnome-platform (2.16.1-4) unstable; urgency=low * New patch: fixes/gtk-2.18-build (closes: #549752). * Added README.source, referring to tg2quilt HOWTO. -- Andreas Rottmann Thu, 05 Nov 2009 16:28:43 +0100 guile-gnome-platform (2.16.1-3) unstable; urgency=low * Standards-Version 3.8.3: - Changed Section of source package to `lisp'. * Now using topgit with dpkg-buildpackage to manage the package: - debian/rules: Add optional tg2quilt.mk include. * New patch: fixes/link-with-guile-cairo (closes: #522531). -- Andreas Rottmann Mon, 17 Aug 2009 18:53:44 +0200 guile-gnome-platform (2.16.1-2) unstable; urgency=low * debian/rules: Use patchsys-quilt.mk, Build-Depends adjusted accordingly. * New patch: glib-test-stack-depth.patch. - Increases the maximum stack depth for the glib test suite (closes: #490312). * debian/rules: Enabled DEB_AUTO_UPDATE_{AUTOMAKE,ACLOCAL,AUTOCONF,LIBTOOL}, as the added patch touches a Makefile.am. * Add automake1.10, libtool to Build-Depends for the same reason. * Standards-Version 3.8.1 (no changes). -- Andreas Rottmann Sat, 06 Jun 2009 16:16:33 +0200 guile-gnome-platform (2.16.1-1) unstable; urgency=low * New upstream release. * Upstream bumped API, hence all package names changed from guile-gnome0-* to guile-gnome2-*. * Standards-Version 3.8.0 (no changes). * Remove unused guile-gnome2-cairo.install file. * Added ${misc:Depends} to all packages. * Do not build-depend on a -1 revision of the g-wrap packages. * Add a proper "Copyright YEARS AUTHORS" line to debian/copyright. -- Andreas Rottmann Sun, 01 Mar 2009 22:51:48 +0100 guile-gnome-platform (2.15.95-2) unstable; urgency=low * Fix build-depends (added xauth and xfonts-base, both needed by xvfb-run). -- Andreas Rottmann Wed, 05 Dec 2007 13:42:44 +0100 guile-gnome-platform (2.15.95-1) unstable; urgency=low * New upstream release (closes: #437293). * Run configure with --disable-Werror (closes: #366627). * Updated Build-Depends to include libgwrap-runtime-dev (closes: #436318). * Standards-Version 3.7.3 (no changes). * Don't run autotools during build. * Remove 01_dev-upstream-20050917.patch - no longer needed. * Build-Depend on xvfb and use that to run the testsuite. * Include .so symlink in guile-gnome0-glib (closes: #355369). * Include manpage for guile-gnome-0. * Add Homepage field in debian/control. * Added watch file. -- Andreas Rottmann Tue, 04 Dec 2007 22:02:10 +0100 guile-gnome-platform (2.7.99-4) unstable; urgency=high * Revert auto-update of control, since it's forbidden by release policy, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=311724. * Also update libtool (closes: #328946). -- Andreas Rottmann Sun, 18 Sep 2005 13:36:17 +0200 guile-gnome-platform (2.7.99-3) unstable; urgency=high * Rebuild against current g-wrap (to further the libffi transition, urgency set to high). * Pull in upstream changes as 01_dev-upstream-20050917.patch, replacing the old patch. This now contains a fix for the gtk-list-XXX crashes and the 64bit warnings (closes: #304936). * Standards-Version 3.6.2 (no changes). -- Andreas Rottmann Sat, 17 Sep 2005 14:52:02 +0200 guile-gnome-platform (2.7.99-2) unstable; urgency=low * Pull in upstream changes as 01_dev-upstream-20050410.patch, containing build fixes (closes: #303624). - Use simple-patchsys from CDBS. - Build-Depend on g-wrap >= 1.9.5-2 since upstream changes depend on that. * Auto-generate control from control.in (currently disabled due to #301692). -- Andreas Rottmann Sun, 10 Apr 2005 22:25:17 +0200 guile-gnome-platform (2.7.99-1) unstable; urgency=low * Initial packaging (closes: #205465). -- Andreas Rottmann Fri, 11 Mar 2005 12:09:26 +0100