From 22019f213c5ae92fd3f5b60b06bff003c6d43c14 Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Wed, 24 Mar 2010 15:53:08 +0000
Subject: [PATCH] update from latest gnome foocanvas
---
foocanvas/zmap_source/configure.in | 2 +-
foocanvas/zmap_source/configure.in.diff | 9 ++++++---
foocanvas/zmap_source/libfoocanvas/Makefile.am | 2 +-
foocanvas/zmap_source/libfoocanvas/Makefile.am.diff | 9 +++++----
foocanvas/zmap_source/libfoocanvas/libfoocanvas.pc.in | 2 +-
.../zmap_source/libfoocanvas/libfoocanvas.pc.in.diff | 7 ++++---
6 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/foocanvas/zmap_source/configure.in b/foocanvas/zmap_source/configure.in
index a335f7175..cfb00feca 100644
--- a/foocanvas/zmap_source/configure.in
+++ b/foocanvas/zmap_source/configure.in
@@ -1,5 +1,5 @@
AC_PREREQ(2.50)
-AC_INIT([libfoocanvas], [0.1])
+AC_INIT([libzmapfoocanvas], [0.1])
AC_CONFIG_SRCDIR([libfoocanvas/foo-canvas.c])
AC_CONFIG_HEADERS([config.h])
diff --git a/foocanvas/zmap_source/configure.in.diff b/foocanvas/zmap_source/configure.in.diff
index c3ef696ad..49dfa206f 100644
--- a/foocanvas/zmap_source/configure.in.diff
+++ b/foocanvas/zmap_source/configure.in.diff
@@ -1,6 +1,9 @@
---- ./tmp_merged_foocanvas/configure.in 2010-03-24 10:47:06.722000000 +0000
-+++ ./tmp_zmap_foocanvas/configure.in 2010-03-24 10:47:01.212000000 +0000
-@@ -3,7 +3,8 @@
+--- ./tmp_merged_foocanvas/configure.in 2010-03-24 14:47:04.503000000 +0000
++++ ./tmp_zmap_foocanvas/configure.in 2010-03-24 14:47:01.317000000 +0000
+@@ -1,9 +1,10 @@
+ AC_PREREQ(2.50)
+-AC_INIT([libfoocanvas], [0.1])
++AC_INIT([libzmapfoocanvas], [0.1])
AC_CONFIG_SRCDIR([libfoocanvas/foo-canvas.c])
AC_CONFIG_HEADERS([config.h])
diff --git a/foocanvas/zmap_source/libfoocanvas/Makefile.am b/foocanvas/zmap_source/libfoocanvas/Makefile.am
index fb3f838eb..4fdf45f61 100644
--- a/foocanvas/zmap_source/libfoocanvas/Makefile.am
+++ b/foocanvas/zmap_source/libfoocanvas/Makefile.am
@@ -18,7 +18,7 @@ libzmapfoocanvas_la_LIBADD = \
$(RENDER_LIBS) \
$(LIBFOOCANVAS_LIBS)
-libfoocanvasincludedir = $(includedir)/libfoocanvas-1.0/libfoocanvas
+libfoocanvasincludedir = $(includedir)/libzmapfoocanvas-1.0/libfoocanvas
libfoocanvasinclude_HEADERS = \
foo-canvas-line.h \
diff --git a/foocanvas/zmap_source/libfoocanvas/Makefile.am.diff b/foocanvas/zmap_source/libfoocanvas/Makefile.am.diff
index deea17d67..20b0cab4c 100644
--- a/foocanvas/zmap_source/libfoocanvas/Makefile.am.diff
+++ b/foocanvas/zmap_source/libfoocanvas/Makefile.am.diff
@@ -1,6 +1,6 @@
---- ./tmp_merged_foocanvas/libfoocanvas/Makefile.am 2010-03-16 15:14:38.377000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/Makefile.am 2010-03-16 15:14:36.883000000 +0000
-@@ -12,9 +12,9 @@
+--- ./tmp_merged_foocanvas/libfoocanvas/Makefile.am 2010-03-24 14:47:04.378000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/Makefile.am 2010-03-24 14:47:01.337000000 +0000
+@@ -12,34 +12,40 @@
-DG_LOG_DOMAIN=\"Foocanvas\" \
-DVERSION=\"$(VERSION)\"
@@ -12,7 +12,8 @@
$(RENDER_LIBS) \
$(LIBFOOCANVAS_LIBS)
-@@ -22,24 +22,30 @@
+-libfoocanvasincludedir = $(includedir)/libfoocanvas-1.0/libfoocanvas
++libfoocanvasincludedir = $(includedir)/libzmapfoocanvas-1.0/libfoocanvas
libfoocanvasinclude_HEADERS = \
foo-canvas-line.h \
diff --git a/foocanvas/zmap_source/libfoocanvas/libfoocanvas.pc.in b/foocanvas/zmap_source/libfoocanvas/libfoocanvas.pc.in
index 0f6822eb4..662494f5a 100644
--- a/foocanvas/zmap_source/libfoocanvas/libfoocanvas.pc.in
+++ b/foocanvas/zmap_source/libfoocanvas/libfoocanvas.pc.in
@@ -8,4 +8,4 @@ Description: libzmapfoocanvas
Requires: pango gtk+-2.0
Version: @VERSION@
Libs: -L${libdir} -lzmapfoocanvas
-Cflags: -I${includedir}/libfoocanvas-1.0
+Cflags: -I${includedir}/libzmapfoocanvas-1.0
diff --git a/foocanvas/zmap_source/libfoocanvas/libfoocanvas.pc.in.diff b/foocanvas/zmap_source/libfoocanvas/libfoocanvas.pc.in.diff
index 897c36603..7112b5b90 100644
--- a/foocanvas/zmap_source/libfoocanvas/libfoocanvas.pc.in.diff
+++ b/foocanvas/zmap_source/libfoocanvas/libfoocanvas.pc.in.diff
@@ -1,5 +1,5 @@
---- ./tmp_merged_foocanvas/libfoocanvas/libfoocanvas.pc.in 2010-03-16 15:14:38.378000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/libfoocanvas.pc.in 2010-03-16 15:14:36.982000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/libfoocanvas.pc.in 2010-03-24 14:47:04.379000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/libfoocanvas.pc.in 2010-03-24 14:47:01.523000000 +0000
@@ -3,9 +3,9 @@
libdir=@libdir@
includedir=@includedir@
@@ -11,5 +11,6 @@
Requires: pango gtk+-2.0
Version: @VERSION@
-Libs: -L${libdir} -lfoocanvas
+-Cflags: -I${includedir}/libfoocanvas-1.0
+Libs: -L${libdir} -lzmapfoocanvas
- Cflags: -I${includedir}/libfoocanvas-1.0
++Cflags: -I${includedir}/libzmapfoocanvas-1.0
--
GitLab