[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-gnome-platform/, dev-scheme/guile-gnome-platform/files/

2019-10-01 Thread Matt Turner 
commit: 5f0075e8cdd0492ead96502ccdeca7446f800c8e
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Oct  1 20:37:51 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Oct  1 20:40:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0075e8

dev-scheme/guile-gnome-platform: Remove

Bug: https://bugs.gentoo.org/693290
Signed-off-by: Matt Turner  gentoo.org>

 dev-scheme/guile-gnome-platform/Manifest   |  3 -
 .../files/2.16.1-conflicting-types.patch   | 34 ---
 .../guile-gnome-platform/files/2.16.1-gcc45.patch  | 11 
 .../files/2.16.1-gdk-color.patch   | 55 -
 .../files/2.16.1-glib-single-include.patch | 26 
 .../guile-gnome-platform-2.16.1-r1.ebuild  | 70 --
 .../guile-gnome-platform-2.16.2.ebuild | 60 ---
 .../guile-gnome-platform-2.16.5.ebuild | 43 -
 dev-scheme/guile-gnome-platform/metadata.xml   |  8 ---
 9 files changed, 310 deletions(-)

diff --git a/dev-scheme/guile-gnome-platform/Manifest 
b/dev-scheme/guile-gnome-platform/Manifest
deleted file mode 100644
index 35fc80755e2..000
--- a/dev-scheme/guile-gnome-platform/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST guile-gnome-platform-2.16.1.tar.gz 3494333 BLAKE2B 
edd5c91a263c9a6bedb884d842f629c7d4fa610f5a4ba277ca374279a5abbcf5c1fb9ff85f7bb5faaed8905ed0eaf711bd469d86062d293930ca885b1aadc271
 SHA512 
c630e2d67b312fb41c8492f8956902f385faa834094860cac580d1df0329b41790d973f73fd7dd59dc365f5d6cfb6463cde8af90641fbc377680b51616ad8f7a
-DIST guile-gnome-platform-2.16.2.tar.gz 2538191 BLAKE2B 
e16d3d667996c822401a4e3982728db91dda1f02be5739b7dd0795466f0976f3fbb2692a21918f2f6c2502faf5c90bb0d287de171d80cece41353cccb2715488
 SHA512 
5acaa96d8caf82864ada8bfcbc4954a19cd5d7e210245f2e8b31082c6a9e4ab9ba7af5f8e1f762a891e1aad640913a7a205f56dfaed6915a9f782c53e042d042
-DIST guile-gnome-platform-2.16.5.tar.gz 2484146 BLAKE2B 
27111fec80bf7ec52f0c1fe4ef375bd5dd06b1900d13398c5e91d86c1a65efc7723af91e2896f53d8a69f0df849627993a433a07a98920957dcd33981e5f78cb
 SHA512 
fc6afd4b1034f0ff8165611047928e71db445b81e17ef47e0327a511a3733f14a02d308998f7322375acc2713f8bab4de390df39616f55e586adb25fc3160033

diff --git 
a/dev-scheme/guile-gnome-platform/files/2.16.1-conflicting-types.patch 
b/dev-scheme/guile-gnome-platform/files/2.16.1-conflicting-types.patch
deleted file mode 100644
index e470977acbc..000
--- a/dev-scheme/guile-gnome-platform/files/2.16.1-conflicting-types.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugs.gentoo.org/293655
-
 guile-gnome-platform-2.16.1.orig/gtk/gnome/gw/gtk-support.c
2008-07-03 11:52:27.0 -0300
-+++ guile-gnome-platform-2.16.1/gtk/gnome/gw/gtk-support.c 2009-11-27 
03:09:28.204506213 -0200
-@@ -1012,7 +1012,7 @@
- }
- 
- GdkRectangle*
--gtk_widget_get_allocation (GtkWidget *widget)
-+guile_gtk_widget_get_allocation (GtkWidget *widget)
- {
- GdkRectangle *ret = g_new (GdkRectangle, 1);
- *ret = widget->allocation;
 guile-gnome-platform-2.16.1.orig/gtk/gnome/gw/gtk-support.h
2008-04-09 19:10:40.0 -0300
-+++ guile-gnome-platform-2.16.1/gtk/gnome/gw/gtk-support.h 2009-11-27 
03:08:29.385756221 -0200
-@@ -117,6 +117,6 @@
- guint _wrap_gtk_ui_manager_add_ui_from_string (GtkUIManager *ui, const gchar 
*string, GError **error);
- 
- GdkWindow* gtk_widget_get_window (GtkWidget *widget);
--GdkRectangle* gtk_widget_get_allocation (GtkWidget *widget);
-+GdkRectangle* guile_gtk_widget_get_allocation (GtkWidget *widget);
- void _wrap_gtk_drag_dest_set (GtkWidget *widget, GtkDestDefaults flags, const 
GList *types, GdkDragAction actions);
- GtkStateType gtk_widget_get_state (GtkWidget *widget);
 guile-gnome-platform-2.16.1.orig/gtk/gnome/overrides/gtk.defs  
2008-04-09 19:12:44.0 -0300
-+++ guile-gnome-platform-2.16.1/gtk/gnome/overrides/gtk.defs   2009-11-27 
03:13:34.667506321 -0200
-@@ -848,7 +848,7 @@
- 
- (define-method get-allocation
-   (of-object "GtkWidget")
--  (c-name "gtk_widget_get_allocation")
-+  (c-name "guile_gtk_widget_get_allocation")
-   (return-type "GdkRectangle*")) ;; same as GtkAllocation
- 
- (define-method get_state

diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch 
b/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch
deleted file mode 100644
index 39c7e94760b..000
--- a/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 common.mk
-+++ common.mk
-@@ -50,7 +50,7 @@
-   guile-snarf $(GUILE_SNARF_CFLAGS) $< > $@ \
-   || { rm $@; false; }
- .c.doc:
--  $(CPP) -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
-+  $(CPP) -P -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
- | grep -E '^\^\^ {.*\^\^ }' > $@ || { rm $@; false; }
- 
- %.scm guile-gnome-gw-%.c: %-spec.scm

diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-gdk-color.patch

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-gnome-platform/

2018-09-09 Thread Amy Liffey 
commit: 67d25a85c1e4288fafcc65548d31d27132ef6fc3
Author: Amy Liffey  gentoo  org>
AuthorDate: Sun Sep  9 13:32:21 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sun Sep  9 13:35:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67d25a85

dev-scheme/guile-gnome-platform: version bump 2.16.5

Closes: https://bugs.gentoo.org/640444
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-scheme/guile-gnome-platform/Manifest   |  1 +
 .../guile-gnome-platform-2.16.5.ebuild | 43 ++
 2 files changed, 44 insertions(+)

diff --git a/dev-scheme/guile-gnome-platform/Manifest 
b/dev-scheme/guile-gnome-platform/Manifest
index e06541b89cc..35fc80755e2 100644
--- a/dev-scheme/guile-gnome-platform/Manifest
+++ b/dev-scheme/guile-gnome-platform/Manifest
@@ -1,2 +1,3 @@
 DIST guile-gnome-platform-2.16.1.tar.gz 3494333 BLAKE2B 
edd5c91a263c9a6bedb884d842f629c7d4fa610f5a4ba277ca374279a5abbcf5c1fb9ff85f7bb5faaed8905ed0eaf711bd469d86062d293930ca885b1aadc271
 SHA512 
c630e2d67b312fb41c8492f8956902f385faa834094860cac580d1df0329b41790d973f73fd7dd59dc365f5d6cfb6463cde8af90641fbc377680b51616ad8f7a
 DIST guile-gnome-platform-2.16.2.tar.gz 2538191 BLAKE2B 
e16d3d667996c822401a4e3982728db91dda1f02be5739b7dd0795466f0976f3fbb2692a21918f2f6c2502faf5c90bb0d287de171d80cece41353cccb2715488
 SHA512 
5acaa96d8caf82864ada8bfcbc4954a19cd5d7e210245f2e8b31082c6a9e4ab9ba7af5f8e1f762a891e1aad640913a7a205f56dfaed6915a9f782c53e042d042
+DIST guile-gnome-platform-2.16.5.tar.gz 2484146 BLAKE2B 
27111fec80bf7ec52f0c1fe4ef375bd5dd06b1900d13398c5e91d86c1a65efc7723af91e2896f53d8a69f0df849627993a433a07a98920957dcd33981e5f78cb
 SHA512 
fc6afd4b1034f0ff8165611047928e71db445b81e17ef47e0327a511a3733f14a02d308998f7322375acc2713f8bab4de390df39616f55e586adb25fc3160033

diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.5.ebuild 
b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.5.ebuild
new file mode 100644
index 000..8a50cbeef7c
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Guile Scheme code that wraps the GNOME developer platform"
+HOMEPAGE="https://www.gnu.org/software/guile-gnome/;
+SRC_URI="https://ftp.gnu.org/pub/gnu/guile-gnome/${PN}/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   dev-libs/atk
+   >=dev-libs/g-wrap-1.9.15
+   dev-libs/glib:2
+   dev-scheme/guile:12
+   dev-scheme/guile-cairo
+   dev-scheme/guile-lib
+   gnome-base/gconf:2
+   gnome-base/gnome-vfs:2
+   gnome-base/libbonobo
+   gnome-base/libglade:2.0
+   gnome-base/libgnomecanvas
+   gnome-base/libgnomeui
+   gnome-base/orbit:2
+   x11-libs/gtk+:2
+   x11-libs/pango"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+#needs guile with networking
+RESTRICT=test
+
+src_install() {
+   default
+
+   find "${D}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-gnome-platform/

2018-04-07 Thread Matt Turner 
commit: b34e7c458acf63f65911cf47ad0296a97a11616d
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Apr  7 06:42:12 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Apr  7 06:42:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34e7c45

dev-scheme/guile-gnome-platform: dropped ppc keywords, bug 648236

 dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild | 2 +-
 dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild 
b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
index 0155310f4da..cb8d91a9a8d 100644
--- a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
+++ b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://ftp.gnu.org/pub/gnu/guile-gnome/${PN}/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="

diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild 
b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild
index 1ddcb0e7b35..ee22dd2fc05 100644
--- a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild
+++ b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://ftp.gnu.org/pub/gnu/guile-gnome/${PN}/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-gnome-platform/

2018-04-04 Thread Aaron Bauman 
commit: 62ca1f1aa3ec1f59170782bce4ed6ded7346a6fe
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed Apr  4 20:44:41 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Apr  5 02:04:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62ca1f1a

dev-scheme/guile-gnome-platform: drop EAPI=3 ebuild

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7811

 .../guile-gnome-platform-2.16.1.ebuild | 59 --
 1 file changed, 59 deletions(-)

diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild 
b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild
deleted file mode 100644
index fdd0b82d983..000
--- a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit autotools eutils multilib
-
-DESCRIPTION="Guile Scheme code that wraps the GNOME developer platform"
-HOMEPAGE="https://www.gnu.org/software/guile-gnome;
-SRC_URI="https://ftp.gnu.org/pub/gnu/guile-gnome/${PN}/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-scheme/guile-1.6.4
-   >=dev-libs/g-wrap-1.9.11
-   dev-scheme/guile-cairo
-   dev-libs/atk
-   gnome-base/libbonobo
-   gnome-base/orbit:2
-   >=gnome-base/gconf-2.18:2
-   >=dev-libs/glib-2.10:2
-   >=gnome-base/gnome-vfs-2.16:2
-   >=x11-libs/gtk+-2.10:2
-   >=gnome-base/libglade-2.6:2.0
-   >=gnome-base/libgnomecanvas-2.14
-   >=gnome-base/libgnomeui-2.16
-   >=x11-libs/pango-1.14
-   dev-scheme/guile-lib"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-#needs guile with networking
-RESTRICT=test
-
-src_prepare() {
-   epatch "${FILESDIR}/${PV}-conflicting-types.patch"
-   epatch "${FILESDIR}/${PV}-gcc45.patch"
-   epatch "${FILESDIR}/${PV}-glib-single-include.patch"
-   eautoreconf
-}
-
-src_configure() {
-   econf --disable-Werror
-}
-
-src_compile() {
-   emake -j1 guilegnomedir=/usr/share/guile/site \
-   guilegnomelibdir=/usr/$(get_libdir) || die "emake failed."
-}
-
-src_install() {
-   emake -j1 DESTDIR="${D}" \
-   guilegnomedir=/usr/share/guile/site \
-   guilegnomelibdir=/usr/$(get_libdir) \
-   install || die "emake install failed."
-}

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-gnome-platform/

2018-03-20 Thread Sergei Trofimovich 
commit: 40b7dcca8b7f26ea3f6feaa0fe48a3faa150c807
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Mar 20 07:26:01 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Mar 20 07:26:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40b7dcca

dev-scheme/guile-gnome-platform: stable 2.16.2 for ppc, bug #644320

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

 dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild 
b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild
index 883cd5b1f6f..1ddcb0e7b35 100644
--- a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild
+++ b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://ftp.gnu.org/pub/gnu/guile-gnome/${PN}/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-gnome-platform/files/

2016-09-29 Thread Amy Winston 
commit: aafbc8c1ae9fcd1bef32f88873c208edc1f1afb7
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Wed Sep 28 17:10:11 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Thu Sep 29 17:14:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aafbc8c1

dev-scheme/guile-gnome-platform: remove unused patches

 .../files/2.15.92-add-atk-overrides.patch  | 12 ---
 .../files/2.15.92-add-cairo-fix-from-bzr.patch | 91 --
 2 files changed, 103 deletions(-)

diff --git 
a/dev-scheme/guile-gnome-platform/files/2.15.92-add-atk-overrides.patch 
b/dev-scheme/guile-gnome-platform/files/2.15.92-add-atk-overrides.patch
deleted file mode 100644
index 6168c79..
--- a/dev-scheme/guile-gnome-platform/files/2.15.92-add-atk-overrides.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN guile-gnome-platform-2.15.92.orig/atk/gnome/Makefile.am 
guile-gnome-platform-2.15.92/atk/gnome/Makefile.am
 guile-gnome-platform-2.15.92.orig/atk/gnome/Makefile.am2007-06-01 
13:50:55.0 -0700
-+++ guile-gnome-platform-2.15.92/atk/gnome/Makefile.am 2007-06-01 
13:51:52.0 -0700
-@@ -6,7 +6,7 @@
- 
- if HAVE_PANGO
- guilemodule_DATA += atk.scm
--SUBDIRS += gw
-+SUBDIRS += gw overrides
- endif
- 
- EXTRA_DIST = atk.scm

diff --git 
a/dev-scheme/guile-gnome-platform/files/2.15.92-add-cairo-fix-from-bzr.patch 
b/dev-scheme/guile-gnome-platform/files/2.15.92-add-cairo-fix-from-bzr.patch
deleted file mode 100644
index 030e5c1..
--- a/dev-scheme/guile-gnome-platform/files/2.15.92-add-cairo-fix-from-bzr.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-=== modified file 'ChangeLog'
 ChangeLog  2007-05-24 15:14:46 +
-+++ ChangeLog  2007-05-25 15:49:00 +
-@@ -1,3 +1,16 @@
-+2007-05-25  Andy Wingo  
-+
-+  * gnome/gw/cairo-spec.scm: Now that we are actually making a
-+  shlib, init guile-cairo in the shlib instead of in every dependant
-+  wrapset.
-+
-+  * gnome/gw/Makefile.am: I tried really hard to avoid making a
-+  shared library for this g-wrap wrapset, since it is not necessary
-+  at all, but I have failed for the moment: other wrapsets depending
-+  on this one will check to see that something has registered the
-+  "guile-cairo" wrapset with the C g-wrap runtime, which will fail
-+  unless we actually have a shlib that registers the wrapset. Suck.
-+
- 2007-05-24  Andy Wingo  
- 
-   * == Released guile-gnome-platform version 2.15.92 ==
-
-=== modified file 'gnome/gw/Makefile.am'
 gnome/gw/Makefile.am   2007-05-20 17:43:35 +
-+++ gnome/gw/Makefile.am   2007-05-25 15:49:00 +
-@@ -1,5 +1,27 @@
- include $(top_srcdir)/common.mk
- 
--guilegwmodule_DATA = cairo-spec.scm
-+guilegwmodule_DATA = cairo-spec.scm cairo.scm
- 
- EXTRA_DIST = cairo-spec.scm
-+
-+CLEANFILES = $(wildcard gnome-*.log)
-+
-+# I wanted to avoid having a cairo shlib, because there is no need, but
-+# fighting g-wrap is too difficult for the moment.
-+
-+guilegnomelib_LTLIBRARIES = libgw-guile-gnome-cairo.la
-+
-+
-+## cairo
-+nodist_libgw_guile_gnome_cairo_la_SOURCES = guile-gnome-gw-cairo.c
-+
-+libgw_guile_gnome_cairo_la_CFLAGS = $(GUILE_GLIB_CFLAGS) $(GLIB_CFLAGS) \
-+  $(AM_CFLAGS) $(GUILE_CAIRO_CFLAGS) $(GUILE_CFLAGS) \
-+  $(G_WRAP_CFLAGS)
-+libgw_guile_gnome_cairo_la_LIBADD = $(GUILE_CAIRO_LIBS) $(GUILE_LIBS) \
-+  $(G_WRAP_LIBS) $(GUILE_GLIB_LIBS)
-+libgw_guile_gnome_cairo_la_LDFLAGS = -module
-+
-+CLEANFILES += $(wildcard guile-gnome-gw-cairo.*) cairo.scm
-+
-+BUILT_SOURCES = guile-gnome-gw-cairo.c
-
-=== modified file 'gnome/gw/cairo-spec.scm'
 gnome/gw/cairo-spec.scm2007-05-20 22:39:45 +
-+++ gnome/gw/cairo-spec.scm2007-05-25 15:49:00 +
-@@ -27,7 +27,7 @@
- (define-module (gnome gw cairo-spec)
-   #:use-module (oop goops)
-   #:use-module (gnome gw support g-wrap)
--  #:use-module (gnome gw support defs)
-+  #:use-module (gnome gw gobject-spec)
-   #:use-module (gnome gw support gobject))
- 
- ;; G-Wrap inelegance
-@@ -116,8 +116,6 @@
- (define-class  ())
- (define-method (global-declarations-cg (ws ) (a 
))
-   '("#include \n"))
--(define-method (initializations-cg (wrapset ) (a 
) err)
--  (list "scm_init_cairo ();\n"))
- 
- (define-class  ()
-   #:id 'gnome-cairo
-@@ -144,6 +142,14 @@
-   #:take "scm_take_cairo_font_options"))
-   (add-type-alias! ws "cairo_font_options_t*" 'cairo-font-options-t))
- 
-+(define-method (global-declarations-cg (ws ))
-+  (list (next-method)
-+"#include \n"))
-+
-+(define-method (initializations-cg (wrapset ) err)
-+  (list (next-method)
-+"scm_init_cairo ();\n"))
-+
- ;; pango-cairo
- ;; cairo_t, cairo_font_options_t
- 
-