From 0f077d0789eddc3193aff06f6982a8e8636f8ceb Mon Sep 17 00:00:00 2001 From: drochner Date: Thu, 14 Apr 2011 15:52:51 +0000 Subject: add libchamplain08-0.8.3, the latest stable branch of the map widget (the stable branches are mutually API incompatible but can be installed in parallel) --- geography/libchamplain08/DESCR | 2 ++ geography/libchamplain08/Makefile | 35 +++++++++++++++++++++++++ geography/libchamplain08/PLIST | 43 +++++++++++++++++++++++++++++++ geography/libchamplain08/buildlink3.mk | 21 +++++++++++++++ geography/libchamplain08/distinfo | 7 +++++ geography/libchamplain08/patches/patch-aa | 13 ++++++++++ geography/libchamplain08/patches/patch-ab | 24 +++++++++++++++++ 7 files changed, 145 insertions(+) create mode 100644 geography/libchamplain08/DESCR create mode 100644 geography/libchamplain08/Makefile create mode 100644 geography/libchamplain08/PLIST create mode 100644 geography/libchamplain08/buildlink3.mk create mode 100644 geography/libchamplain08/distinfo create mode 100644 geography/libchamplain08/patches/patch-aa create mode 100644 geography/libchamplain08/patches/patch-ab (limited to 'geography') diff --git a/geography/libchamplain08/DESCR b/geography/libchamplain08/DESCR new file mode 100644 index 00000000000..0a140c18fd4 --- /dev/null +++ b/geography/libchamplain08/DESCR @@ -0,0 +1,2 @@ +libchamplain is a Clutter based widget to display rich, eye-candy and +interactive maps. diff --git a/geography/libchamplain08/Makefile b/geography/libchamplain08/Makefile new file mode 100644 index 00000000000..9d8a2f6a5d7 --- /dev/null +++ b/geography/libchamplain08/Makefile @@ -0,0 +1,35 @@ +# $NetBSD: Makefile,v 1.1.1.1 2011/04/14 15:52:51 drochner Exp $ +# + +DISTNAME= libchamplain-0.8.3 +PKGNAME= libchamplain08-0.8.3 +CATEGORIES= geography +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libchamplain/0.8/} +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://projects.gnome.org/libchamplain/ +COMMENT= Map widget +#LICENSE= # TODO: (see mk/license.mk) + +PKG_DESTDIR_SUPPORT= user-destdir + +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= pkg-config gmake + +PKGCONFIG_OVERRIDE+= champlain-gtk.pc.in +PKGCONFIG_OVERRIDE+= champlain-memphis.pc.in +PKGCONFIG_OVERRIDE+= champlain.pc.in + +# XXX notyet +#PLIST_VARS+= memphis +#.include "../../geography/memphis/buildlink3.mk" +#PLIST.memphis= yes + +.include "../../devel/glib2/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" +.include "../../graphics/clutter-gtk/buildlink3.mk" +.include "../../databases/sqlite3/buildlink3.mk" +.include "../../net/libsoup24/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/geography/libchamplain08/PLIST b/geography/libchamplain08/PLIST new file mode 100644 index 00000000000..ebafbaf42fa --- /dev/null +++ b/geography/libchamplain08/PLIST @@ -0,0 +1,43 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2011/04/14 15:52:51 drochner Exp $ +include/libchamplain-0.8/champlain/champlain-base-marker.h +include/libchamplain-0.8/champlain/champlain-bounding-box.h +include/libchamplain-0.8/champlain/champlain-defines.h +include/libchamplain-0.8/champlain/champlain-enum-types.h +include/libchamplain-0.8/champlain/champlain-error-tile-renderer.h +include/libchamplain-0.8/champlain/champlain-features.h +include/libchamplain-0.8/champlain/champlain-file-cache.h +include/libchamplain-0.8/champlain/champlain-file-tile-source.h +include/libchamplain-0.8/champlain/champlain-image-renderer.h +include/libchamplain-0.8/champlain/champlain-layer.h +include/libchamplain-0.8/champlain/champlain-map-source-chain.h +include/libchamplain-0.8/champlain/champlain-map-source-desc.h +include/libchamplain-0.8/champlain/champlain-map-source-factory.h +include/libchamplain-0.8/champlain/champlain-map-source.h +include/libchamplain-0.8/champlain/champlain-marker.h +include/libchamplain-0.8/champlain/champlain-marshal.h +include/libchamplain-0.8/champlain/champlain-memory-cache.h +include/libchamplain-0.8/champlain/champlain-network-bbox-tile-source.h +include/libchamplain-0.8/champlain/champlain-network-tile-source.h +include/libchamplain-0.8/champlain/champlain-null-tile-source.h +include/libchamplain-0.8/champlain/champlain-point.h +include/libchamplain-0.8/champlain/champlain-polygon.h +include/libchamplain-0.8/champlain/champlain-renderer.h +include/libchamplain-0.8/champlain/champlain-selection-layer.h +include/libchamplain-0.8/champlain/champlain-tile-cache.h +include/libchamplain-0.8/champlain/champlain-tile-source.h +include/libchamplain-0.8/champlain/champlain-tile.h +include/libchamplain-0.8/champlain/champlain-version.h +include/libchamplain-0.8/champlain/champlain-view.h +include/libchamplain-0.8/champlain/champlain.h +include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk-enum-types.h +include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk-marshal.h +include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk.h +include/libchamplain-gtk-0.8/champlain-gtk/gtk-champlain-embed.h +lib/libchamplain-0.8.la +lib/libchamplain-gtk-0.8.la +lib/pkgconfig/champlain-0.8.pc +lib/pkgconfig/champlain-gtk-0.8.pc +share/vala/vapi/champlain-0.8.deps +share/vala/vapi/champlain-0.8.vapi +share/vala/vapi/champlain-gtk-0.8.deps +share/vala/vapi/champlain-gtk-0.8.vapi diff --git a/geography/libchamplain08/buildlink3.mk b/geography/libchamplain08/buildlink3.mk new file mode 100644 index 00000000000..b88a1a0b582 --- /dev/null +++ b/geography/libchamplain08/buildlink3.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/04/14 15:52:51 drochner Exp $ + +BUILDLINK_TREE+= libchamplain08 + +.if !defined(LIBCHAMPLAIN08_BUILDLINK3_MK) +LIBCHAMPLAIN08_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.libchamplain08+= libchamplain08>=0.8.3 +BUILDLINK_ABI_DEPENDS.libchamplain08?= libchamplain08>=0.8.3 +BUILDLINK_PKGSRCDIR.libchamplain08?= ../../geography/libchamplain08 + +.include "../../devel/glib2/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" +.include "../../graphics/clutter-gtk/buildlink3.mk" +.include "../../databases/sqlite3/buildlink3.mk" +.include "../../net/libsoup24/buildlink3.mk" + +#.include "../../geography/memphis/buildlink3.mk" +.endif # LIBCHAMPLAIN08_BUILDLINK3_MK + +BUILDLINK_TREE+= -libchamplain08 diff --git a/geography/libchamplain08/distinfo b/geography/libchamplain08/distinfo new file mode 100644 index 00000000000..005ccbdeb4b --- /dev/null +++ b/geography/libchamplain08/distinfo @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.1.1.1 2011/04/14 15:52:51 drochner Exp $ + +SHA1 (libchamplain-0.8.3.tar.bz2) = da7b335db417574c3d407873c3e86f1263002d3d +RMD160 (libchamplain-0.8.3.tar.bz2) = e5670e2698e0951f60a4168bbc9b2e788461e2a7 +Size (libchamplain-0.8.3.tar.bz2) = 667873 bytes +SHA1 (patch-aa) = cb409caf3babea890beadba6e787eefaf148bcbd +SHA1 (patch-ab) = ccdd82dbffe2ba4313579984f96a1b5b0fb7efbe diff --git a/geography/libchamplain08/patches/patch-aa b/geography/libchamplain08/patches/patch-aa new file mode 100644 index 00000000000..8141fa0e675 --- /dev/null +++ b/geography/libchamplain08/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1.1.1 2011/04/14 15:52:51 drochner Exp $ + +--- Makefile.in.orig 2011-03-30 22:13:37.000000000 +0000 ++++ Makefile.in +@@ -309,7 +309,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + + # Have the demos build at the end as they depend on optional parts +-SUBDIRS = build tidy champlain $(am__append_1) docs demos bindings ++SUBDIRS = build tidy champlain $(am__append_1) demos bindings + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + pcfiles = champlain-@CHAMPLAIN_API_VERSION@.pc $(am__append_2) \ + $(am__append_4) diff --git a/geography/libchamplain08/patches/patch-ab b/geography/libchamplain08/patches/patch-ab new file mode 100644 index 00000000000..ed3fee84bc6 --- /dev/null +++ b/geography/libchamplain08/patches/patch-ab @@ -0,0 +1,24 @@ +$NetBSD: patch-ab,v 1.1.1.1 2011/04/14 15:52:51 drochner Exp $ + +GTimeVal->tv_sec is glong + +--- champlain/champlain-network-tile-source.c.orig 2011-03-30 21:41:54.000000000 +0000 ++++ champlain/champlain-network-tile-source.c +@@ -680,6 +680,7 @@ static gchar * + get_modified_time_string (ChamplainTile *tile) + { + const GTimeVal *time; ++ time_t t; + + g_return_val_if_fail (CHAMPLAIN_TILE (tile), NULL); + +@@ -688,7 +689,8 @@ get_modified_time_string (ChamplainTile + if (time == NULL) + return NULL; + +- struct tm *other_time = gmtime (&time->tv_sec); ++ t = time->tv_sec; ++ struct tm *other_time = gmtime (&t); + char value[100]; + + #ifdef G_OS_WIN32 -- cgit v1.2.3