From f484eb23cc5e8b13e5f58206036f76ed3fa4c02c Mon Sep 17 00:00:00 2001
From: fritzkink <96341974+fritzkink@users.noreply.github.com>
Date: Wed, 29 Nov 2023 19:05:17 +0100
Subject: [PATCH] libchamplain - update to version 0.12.21
---
/dev/null | 62 -------
components/library/libchamplain/libchamplain.p5m | 181 +++++++--------------
components/library/libchamplain/pkg5 | 10
components/library/libchamplain/manifests/sample-manifest.p5m | 174 +++++++--------------
components/library/libchamplain/Makefile | 23 +-
5 files changed, 139 insertions(+), 311 deletions(-)
diff --git a/components/library/libchamplain/Makefile b/components/library/libchamplain/Makefile
index d48fcb5..5002cfd 100644
--- a/components/library/libchamplain/Makefile
+++ b/components/library/libchamplain/Makefile
@@ -10,42 +10,41 @@
#
# Copyright (c) 2014 Alexander Pyhalov
+# Copyright (c) 2023 Friedrich Kink
#
-BUILD_STYLE=configure
+BUILD_STYLE=meson
BUILD_BITS=64
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= libchamplain
-COMPONENT_VERSION= 0.8.3
-COMPONENT_REVISION= 3
+COMPONENT_VERSION= 0.12.21
+COMPONENT_FMRI= library/desktop/libchamplain
COMPONENT_PROJECT_URL= http://projects.gnome.org/libchamplain/
COMPONENT_SUMMARY= libchamplain - a Clutter based widget to display rich, eye-candy and interactive maps
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
+COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= \
- sha256:70d533be213a1586d6725d82afb128d1e57ccc262681dfda193af60507ad42e3
-COMPONENT_ARCHIVE_URL= https://download.gnome.org/sources/$(COMPONENT_NAME)/0.8/$(COMPONENT_ARCHIVE)
+ sha256:a915cd172a0c52944c5579fcb4683f8a878c571bf5e928254b5dafefc727e5a7
+COMPONENT_ARCHIVE_URL= https://download.gnome.org/sources/$(COMPONENT_NAME)/0.12/$(COMPONENT_ARCHIVE)
TEST_TARGET=$(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk
PATH=$(PATH.gnu)
-COMPONENT_PREP_ACTION = ( cd $(@D) && autoreconf -f)
-
CONFIGURE_OPTIONS+= --sysconfdir=/etc
-CONFIGURE_OPTIONS+= --enable-introspection=no
-CONFIGURE_OPTIONS+= --disable-static
# Auto-generated dependencies
REQUIRED_PACKAGES += database/sqlite-3
REQUIRED_PACKAGES += library/desktop/cairo
REQUIRED_PACKAGES += library/desktop/clutter
REQUIRED_PACKAGES += library/desktop/clutter/clutter-gtk
+REQUIRED_PACKAGES += library/desktop/cogl
REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
-REQUIRED_PACKAGES += library/desktop/gtk2
+REQUIRED_PACKAGES += library/desktop/gtk3
REQUIRED_PACKAGES += library/desktop/pango
REQUIRED_PACKAGES += library/glib2
-REQUIRED_PACKAGES += library/libsoup
+REQUIRED_PACKAGES += library/libsoup3
REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
diff --git a/components/library/libchamplain/libchamplain.p5m b/components/library/libchamplain/libchamplain.p5m
index d094c10..4b23024 100644
--- a/components/library/libchamplain/libchamplain.p5m
+++ b/components/library/libchamplain/libchamplain.p5m
@@ -10,130 +10,75 @@
#
# Copyright 2014 Alexander Pyhalov. All rights reserved.
+# Copyright 2023 Friedrich Kink. All rights reserved.
#
-set name=pkg.fmri value=pkg:/library/desktop/libchamplain@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
-set name=info.classification value="org.opensolaris.category.2008:System/Multimedia Libraries"
+set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
license COPYING license='LGPLv2.1'
-<transform file path=usr/share/gtk-doc/.* -> default facet.doc true>
-<transform file path=usr/share/gtk-doc/html/.* -> default facet.doc.html true>
-
-file path=usr/include/libchamplain-0.8/champlain/champlain-base-marker.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-bounding-box.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-defines.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-enum-types.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-error-tile-renderer.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-features.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-file-cache.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-file-tile-source.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-image-renderer.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-layer.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-map-source-chain.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-map-source-desc.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-map-source-factory.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-map-source.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-marker.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-marshal.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-memory-cache.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-network-bbox-tile-source.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-network-tile-source.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-null-tile-source.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-point.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-polygon.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-renderer.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-selection-layer.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-tile-cache.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-tile-source.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-tile.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-version.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-view.h
-file path=usr/include/libchamplain-0.8/champlain/champlain.h
-file path=usr/include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk-enum-types.h
-file path=usr/include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk-marshal.h
-file path=usr/include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk.h
-file path=usr/include/libchamplain-gtk-0.8/champlain-gtk/gtk-champlain-embed.h
-link path=usr/lib/$(MACH64)/libchamplain-0.8.so target=libchamplain-0.8.so.1.1.4
-link path=usr/lib/$(MACH64)/libchamplain-0.8.so.1 \
- target=libchamplain-0.8.so.1.1.4
-file path=usr/lib/$(MACH64)/libchamplain-0.8.so.1.1.4
-link path=usr/lib/$(MACH64)/libchamplain-gtk-0.8.so \
- target=libchamplain-gtk-0.8.so.1.1.4
-link path=usr/lib/$(MACH64)/libchamplain-gtk-0.8.so.1 \
- target=libchamplain-gtk-0.8.so.1.1.4
-file path=usr/lib/$(MACH64)/libchamplain-gtk-0.8.so.1.1.4
-file path=usr/lib/$(MACH64)/pkgconfig/champlain-0.8.pc
-file path=usr/lib/$(MACH64)/pkgconfig/champlain-gtk-0.8.pc
-file path=usr/share/gtk-doc/html/libchamplain-gtk/GtkChamplainEmbed.html
-file path=usr/share/gtk-doc/html/libchamplain-gtk/home.png
-file path=usr/share/gtk-doc/html/libchamplain-gtk/index.html
-file path=usr/share/gtk-doc/html/libchamplain-gtk/index.sgml
-file path=usr/share/gtk-doc/html/libchamplain-gtk/left.png
-file path=usr/share/gtk-doc/html/libchamplain-gtk/libchamplain-gtk.devhelp
-file path=usr/share/gtk-doc/html/libchamplain-gtk/libchamplain-gtk.devhelp2
-file path=usr/share/gtk-doc/html/libchamplain-gtk/pt01.html
-file path=usr/share/gtk-doc/html/libchamplain-gtk/right.png
-file path=usr/share/gtk-doc/html/libchamplain-gtk/style.css
-file path=usr/share/gtk-doc/html/libchamplain-gtk/up.png
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainBaseMarker.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainBoundingBox.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainErrorTileRenderer.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainFileCache.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainFileTileSource.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainImageRenderer.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainLayer.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMapSource.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMapSourceChain.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMapSourceDesc.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMapSourceFactory.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMarker.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMemoryCache.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMemphisRenderer.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainNetworkBboxTileSource.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainNetworkTileSource.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainNullTileSource.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainPoint.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainPolygon.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainRenderer.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainSelectionLayer.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainTile.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainTileCache.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainTileSource.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainView.html
-file path=usr/share/gtk-doc/html/libchamplain/ch01.html
-file path=usr/share/gtk-doc/html/libchamplain/ch02.html
-file path=usr/share/gtk-doc/html/libchamplain/ch03.html
-file path=usr/share/gtk-doc/html/libchamplain/ch04.html
-file path=usr/share/gtk-doc/html/libchamplain/ch05.html
-file path=usr/share/gtk-doc/html/libchamplain/ch06.html
-file path=usr/share/gtk-doc/html/libchamplain/home.png
-file path=usr/share/gtk-doc/html/libchamplain/index.html
-file path=usr/share/gtk-doc/html/libchamplain/index.sgml
-file path=usr/share/gtk-doc/html/libchamplain/ix01.html
-file path=usr/share/gtk-doc/html/libchamplain/ix02.html
-file path=usr/share/gtk-doc/html/libchamplain/ix03.html
-file path=usr/share/gtk-doc/html/libchamplain/ix04.html
-file path=usr/share/gtk-doc/html/libchamplain/ix05.html
-file path=usr/share/gtk-doc/html/libchamplain/ix06.html
-file path=usr/share/gtk-doc/html/libchamplain/ix07.html
-file path=usr/share/gtk-doc/html/libchamplain/left.png
-file path=usr/share/gtk-doc/html/libchamplain/libchamplain-ChamplainVersion.html
-file path=usr/share/gtk-doc/html/libchamplain/libchamplain.devhelp
-file path=usr/share/gtk-doc/html/libchamplain/libchamplain.devhelp2
-file path=usr/share/gtk-doc/html/libchamplain/pt01.html
-file path=usr/share/gtk-doc/html/libchamplain/pt02.html
-file path=usr/share/gtk-doc/html/libchamplain/pt03.html
-file path=usr/share/gtk-doc/html/libchamplain/pt04.html
-file path=usr/share/gtk-doc/html/libchamplain/pt05.html
-file path=usr/share/gtk-doc/html/libchamplain/right.png
-file path=usr/share/gtk-doc/html/libchamplain/style.css
-file path=usr/share/gtk-doc/html/libchamplain/up.png
-file path=usr/share/vala/vapi/champlain-0.8.deps
-file path=usr/share/vala/vapi/champlain-0.8.vapi
-file path=usr/share/vala/vapi/champlain-gtk-0.8.deps
-file path=usr/share/vala/vapi/champlain-gtk-0.8.vapi
+file path=usr/include/champlain-0.12/champlain-gtk/champlain-gtk.h
+file path=usr/include/champlain-0.12/champlain-gtk/gtk-champlain-embed.h
+file path=usr/include/champlain-0.12/champlain/champlain-adjustment.h
+file path=usr/include/champlain-0.12/champlain/champlain-bounding-box.h
+file path=usr/include/champlain-0.12/champlain/champlain-coordinate.h
+file path=usr/include/champlain-0.12/champlain/champlain-custom-marker.h
+file path=usr/include/champlain-0.12/champlain/champlain-defines.h
+file path=usr/include/champlain-0.12/champlain/champlain-enum-types.h
+file path=usr/include/champlain-0.12/champlain/champlain-error-tile-renderer.h
+file path=usr/include/champlain-0.12/champlain/champlain-exportable.h
+file path=usr/include/champlain-0.12/champlain/champlain-features.h
+file path=usr/include/champlain-0.12/champlain/champlain-file-cache.h
+file path=usr/include/champlain-0.12/champlain/champlain-file-tile-source.h
+file path=usr/include/champlain-0.12/champlain/champlain-image-renderer.h
+file path=usr/include/champlain-0.12/champlain/champlain-kinetic-scroll-view.h
+file path=usr/include/champlain-0.12/champlain/champlain-label.h
+file path=usr/include/champlain-0.12/champlain/champlain-layer.h
+file path=usr/include/champlain-0.12/champlain/champlain-license.h
+file path=usr/include/champlain-0.12/champlain/champlain-location.h
+file path=usr/include/champlain-0.12/champlain/champlain-map-source-chain.h
+file path=usr/include/champlain-0.12/champlain/champlain-map-source-desc.h
+file path=usr/include/champlain-0.12/champlain/champlain-map-source-factory.h
+file path=usr/include/champlain-0.12/champlain/champlain-map-source.h
+file path=usr/include/champlain-0.12/champlain/champlain-marker-layer.h
+file path=usr/include/champlain-0.12/champlain/champlain-marker.h
+file path=usr/include/champlain-0.12/champlain/champlain-memory-cache.h
+file path=usr/include/champlain-0.12/champlain/champlain-network-bbox-tile-source.h
+file path=usr/include/champlain-0.12/champlain/champlain-network-tile-source.h
+file path=usr/include/champlain-0.12/champlain/champlain-null-tile-source.h
+file path=usr/include/champlain-0.12/champlain/champlain-path-layer.h
+file path=usr/include/champlain-0.12/champlain/champlain-point.h
+file path=usr/include/champlain-0.12/champlain/champlain-renderer.h
+file path=usr/include/champlain-0.12/champlain/champlain-scale.h
+file path=usr/include/champlain-0.12/champlain/champlain-tile-cache.h
+file path=usr/include/champlain-0.12/champlain/champlain-tile-source.h
+file path=usr/include/champlain-0.12/champlain/champlain-tile.h
+file path=usr/include/champlain-0.12/champlain/champlain-version.h
+file path=usr/include/champlain-0.12/champlain/champlain-view.h
+file path=usr/include/champlain-0.12/champlain/champlain-viewport.h
+file path=usr/include/champlain-0.12/champlain/champlain.h
+file path=usr/lib/$(MACH64)/girepository-1.0/Champlain-0.12.typelib
+file path=usr/lib/$(MACH64)/girepository-1.0/GtkChamplain-0.12.typelib
+link path=usr/lib/$(MACH64)/libchamplain-0.12.so target=libchamplain-0.12.so.0
+link path=usr/lib/$(MACH64)/libchamplain-0.12.so.0 \
+ target=libchamplain-0.12.so.0.11.10
+file path=usr/lib/$(MACH64)/libchamplain-0.12.so.0.11.10
+link path=usr/lib/$(MACH64)/libchamplain-gtk-0.12.so \
+ target=libchamplain-gtk-0.12.so.0
+link path=usr/lib/$(MACH64)/libchamplain-gtk-0.12.so.0 \
+ target=libchamplain-gtk-0.12.so.0.11.10
+file path=usr/lib/$(MACH64)/libchamplain-gtk-0.12.so.0.11.10
+file path=usr/lib/$(MACH64)/pkgconfig/champlain-0.12.pc
+file path=usr/lib/$(MACH64)/pkgconfig/champlain-gtk-0.12.pc
+file path=usr/share/gir-1.0/Champlain-0.12.gir
+file path=usr/share/gir-1.0/GtkChamplain-0.12.gir
+file path=usr/share/vala/vapi/champlain-0.12.deps
+file path=usr/share/vala/vapi/champlain-0.12.vapi
+file path=usr/share/vala/vapi/champlain-gtk-0.12.deps
+file path=usr/share/vala/vapi/champlain-gtk-0.12.vapi
diff --git a/components/library/libchamplain/manifests/sample-manifest.p5m b/components/library/libchamplain/manifests/sample-manifest.p5m
index d91b216..ad8cff8 100644
--- a/components/library/libchamplain/manifests/sample-manifest.p5m
+++ b/components/library/libchamplain/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2022 <contributor>
+# Copyright 2023 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -23,116 +23,62 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-file path=usr/include/libchamplain-0.8/champlain/champlain-base-marker.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-bounding-box.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-defines.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-enum-types.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-error-tile-renderer.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-features.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-file-cache.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-file-tile-source.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-image-renderer.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-layer.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-map-source-chain.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-map-source-desc.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-map-source-factory.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-map-source.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-marker.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-marshal.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-memory-cache.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-network-bbox-tile-source.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-network-tile-source.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-null-tile-source.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-point.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-polygon.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-renderer.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-selection-layer.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-tile-cache.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-tile-source.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-tile.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-version.h
-file path=usr/include/libchamplain-0.8/champlain/champlain-view.h
-file path=usr/include/libchamplain-0.8/champlain/champlain.h
-file path=usr/include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk-enum-types.h
-file path=usr/include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk-marshal.h
-file path=usr/include/libchamplain-gtk-0.8/champlain-gtk/champlain-gtk.h
-file path=usr/include/libchamplain-gtk-0.8/champlain-gtk/gtk-champlain-embed.h
-link path=usr/lib/$(MACH64)/libchamplain-0.8.so target=libchamplain-0.8.so.1.1.4
-link path=usr/lib/$(MACH64)/libchamplain-0.8.so.1 \
- target=libchamplain-0.8.so.1.1.4
-file path=usr/lib/$(MACH64)/libchamplain-0.8.so.1.1.4
-link path=usr/lib/$(MACH64)/libchamplain-gtk-0.8.so \
- target=libchamplain-gtk-0.8.so.1.1.4
-link path=usr/lib/$(MACH64)/libchamplain-gtk-0.8.so.1 \
- target=libchamplain-gtk-0.8.so.1.1.4
-file path=usr/lib/$(MACH64)/libchamplain-gtk-0.8.so.1.1.4
-file path=usr/lib/$(MACH64)/pkgconfig/champlain-0.8.pc
-file path=usr/lib/$(MACH64)/pkgconfig/champlain-gtk-0.8.pc
-file path=usr/share/gtk-doc/html/libchamplain-gtk/GtkChamplainEmbed.html
-file path=usr/share/gtk-doc/html/libchamplain-gtk/home.png
-file path=usr/share/gtk-doc/html/libchamplain-gtk/index.html
-file path=usr/share/gtk-doc/html/libchamplain-gtk/index.sgml
-file path=usr/share/gtk-doc/html/libchamplain-gtk/left.png
-file path=usr/share/gtk-doc/html/libchamplain-gtk/libchamplain-gtk.devhelp
-file path=usr/share/gtk-doc/html/libchamplain-gtk/libchamplain-gtk.devhelp2
-file path=usr/share/gtk-doc/html/libchamplain-gtk/pt01.html
-file path=usr/share/gtk-doc/html/libchamplain-gtk/right.png
-file path=usr/share/gtk-doc/html/libchamplain-gtk/style.css
-file path=usr/share/gtk-doc/html/libchamplain-gtk/up.png
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainBaseMarker.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainBoundingBox.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainErrorTileRenderer.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainFileCache.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainFileTileSource.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainImageRenderer.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainLayer.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMapSource.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMapSourceChain.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMapSourceDesc.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMapSourceFactory.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMarker.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMemoryCache.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainMemphisRenderer.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainNetworkBboxTileSource.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainNetworkTileSource.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainNullTileSource.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainPoint.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainPolygon.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainRenderer.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainSelectionLayer.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainTile.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainTileCache.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainTileSource.html
-file path=usr/share/gtk-doc/html/libchamplain/ChamplainView.html
-file path=usr/share/gtk-doc/html/libchamplain/ch01.html
-file path=usr/share/gtk-doc/html/libchamplain/ch02.html
-file path=usr/share/gtk-doc/html/libchamplain/ch03.html
-file path=usr/share/gtk-doc/html/libchamplain/ch04.html
-file path=usr/share/gtk-doc/html/libchamplain/ch05.html
-file path=usr/share/gtk-doc/html/libchamplain/ch06.html
-file path=usr/share/gtk-doc/html/libchamplain/home.png
-file path=usr/share/gtk-doc/html/libchamplain/index.html
-file path=usr/share/gtk-doc/html/libchamplain/index.sgml
-file path=usr/share/gtk-doc/html/libchamplain/ix01.html
-file path=usr/share/gtk-doc/html/libchamplain/ix02.html
-file path=usr/share/gtk-doc/html/libchamplain/ix03.html
-file path=usr/share/gtk-doc/html/libchamplain/ix04.html
-file path=usr/share/gtk-doc/html/libchamplain/ix05.html
-file path=usr/share/gtk-doc/html/libchamplain/ix06.html
-file path=usr/share/gtk-doc/html/libchamplain/ix07.html
-file path=usr/share/gtk-doc/html/libchamplain/left.png
-file path=usr/share/gtk-doc/html/libchamplain/libchamplain-ChamplainVersion.html
-file path=usr/share/gtk-doc/html/libchamplain/libchamplain.devhelp
-file path=usr/share/gtk-doc/html/libchamplain/libchamplain.devhelp2
-file path=usr/share/gtk-doc/html/libchamplain/pt01.html
-file path=usr/share/gtk-doc/html/libchamplain/pt02.html
-file path=usr/share/gtk-doc/html/libchamplain/pt03.html
-file path=usr/share/gtk-doc/html/libchamplain/pt04.html
-file path=usr/share/gtk-doc/html/libchamplain/pt05.html
-file path=usr/share/gtk-doc/html/libchamplain/right.png
-file path=usr/share/gtk-doc/html/libchamplain/style.css
-file path=usr/share/gtk-doc/html/libchamplain/up.png
-file path=usr/share/vala/vapi/champlain-0.8.deps
-file path=usr/share/vala/vapi/champlain-0.8.vapi
-file path=usr/share/vala/vapi/champlain-gtk-0.8.deps
-file path=usr/share/vala/vapi/champlain-gtk-0.8.vapi
+file path=usr/include/champlain-0.12/champlain-gtk/champlain-gtk.h
+file path=usr/include/champlain-0.12/champlain-gtk/gtk-champlain-embed.h
+file path=usr/include/champlain-0.12/champlain/champlain-adjustment.h
+file path=usr/include/champlain-0.12/champlain/champlain-bounding-box.h
+file path=usr/include/champlain-0.12/champlain/champlain-coordinate.h
+file path=usr/include/champlain-0.12/champlain/champlain-custom-marker.h
+file path=usr/include/champlain-0.12/champlain/champlain-defines.h
+file path=usr/include/champlain-0.12/champlain/champlain-enum-types.h
+file path=usr/include/champlain-0.12/champlain/champlain-error-tile-renderer.h
+file path=usr/include/champlain-0.12/champlain/champlain-exportable.h
+file path=usr/include/champlain-0.12/champlain/champlain-features.h
+file path=usr/include/champlain-0.12/champlain/champlain-file-cache.h
+file path=usr/include/champlain-0.12/champlain/champlain-file-tile-source.h
+file path=usr/include/champlain-0.12/champlain/champlain-image-renderer.h
+file path=usr/include/champlain-0.12/champlain/champlain-kinetic-scroll-view.h
+file path=usr/include/champlain-0.12/champlain/champlain-label.h
+file path=usr/include/champlain-0.12/champlain/champlain-layer.h
+file path=usr/include/champlain-0.12/champlain/champlain-license.h
+file path=usr/include/champlain-0.12/champlain/champlain-location.h
+file path=usr/include/champlain-0.12/champlain/champlain-map-source-chain.h
+file path=usr/include/champlain-0.12/champlain/champlain-map-source-desc.h
+file path=usr/include/champlain-0.12/champlain/champlain-map-source-factory.h
+file path=usr/include/champlain-0.12/champlain/champlain-map-source.h
+file path=usr/include/champlain-0.12/champlain/champlain-marker-layer.h
+file path=usr/include/champlain-0.12/champlain/champlain-marker.h
+file path=usr/include/champlain-0.12/champlain/champlain-memory-cache.h
+file path=usr/include/champlain-0.12/champlain/champlain-network-bbox-tile-source.h
+file path=usr/include/champlain-0.12/champlain/champlain-network-tile-source.h
+file path=usr/include/champlain-0.12/champlain/champlain-null-tile-source.h
+file path=usr/include/champlain-0.12/champlain/champlain-path-layer.h
+file path=usr/include/champlain-0.12/champlain/champlain-point.h
+file path=usr/include/champlain-0.12/champlain/champlain-renderer.h
+file path=usr/include/champlain-0.12/champlain/champlain-scale.h
+file path=usr/include/champlain-0.12/champlain/champlain-tile-cache.h
+file path=usr/include/champlain-0.12/champlain/champlain-tile-source.h
+file path=usr/include/champlain-0.12/champlain/champlain-tile.h
+file path=usr/include/champlain-0.12/champlain/champlain-version.h
+file path=usr/include/champlain-0.12/champlain/champlain-view.h
+file path=usr/include/champlain-0.12/champlain/champlain-viewport.h
+file path=usr/include/champlain-0.12/champlain/champlain.h
+file path=usr/lib/$(MACH64)/girepository-1.0/Champlain-0.12.typelib
+file path=usr/lib/$(MACH64)/girepository-1.0/GtkChamplain-0.12.typelib
+link path=usr/lib/$(MACH64)/libchamplain-0.12.so target=libchamplain-0.12.so.0
+link path=usr/lib/$(MACH64)/libchamplain-0.12.so.0 \
+ target=libchamplain-0.12.so.0.11.10
+file path=usr/lib/$(MACH64)/libchamplain-0.12.so.0.11.10
+link path=usr/lib/$(MACH64)/libchamplain-gtk-0.12.so \
+ target=libchamplain-gtk-0.12.so.0
+link path=usr/lib/$(MACH64)/libchamplain-gtk-0.12.so.0 \
+ target=libchamplain-gtk-0.12.so.0.11.10
+file path=usr/lib/$(MACH64)/libchamplain-gtk-0.12.so.0.11.10
+file path=usr/lib/$(MACH64)/pkgconfig/champlain-0.12.pc
+file path=usr/lib/$(MACH64)/pkgconfig/champlain-gtk-0.12.pc
+file path=usr/share/gir-1.0/Champlain-0.12.gir
+file path=usr/share/gir-1.0/GtkChamplain-0.12.gir
+file path=usr/share/vala/vapi/champlain-0.12.deps
+file path=usr/share/vala/vapi/champlain-0.12.vapi
+file path=usr/share/vala/vapi/champlain-gtk-0.12.deps
+file path=usr/share/vala/vapi/champlain-gtk-0.12.vapi
diff --git a/components/library/libchamplain/patches/01-build-issue.patch b/components/library/libchamplain/patches/01-build-issue.patch
deleted file mode 100644
index 91cb2de..0000000
--- a/components/library/libchamplain/patches/01-build-issue.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- libchamplain-0.6.0/tidy/Makefile.am.orig 2013-09-10 12:08:13.376347300 +0530
-+++ libchamplain-0.6.0/tidy/Makefile.am 2013-09-10 12:08:30.052790241 +0530
-@@ -4,7 +4,6 @@ INCLUDES = \
- -I$(top_srcdir) \
- -DPREFIX=\""$(prefix)"\" \
- -DLIBDIR=\""$(libdir)"\" \
-- -DG_DISABLE_DEPRECATED \
- -DG_LOG_DOMAIN=\"Tidy\" \
- $(DEPS_CFLAGS) \
- $(TIDY_DEBUG_CFLAGS) \
---- libchamplain-0.8.3/demos/Makefile.am.~1~ 2011-03-31 01:41:54.000000000 +0400
-+++ libchamplain-0.8.3/demos/Makefile.am 2015-03-24 16:01:12.615388131 +0300
-@@ -6,33 +6,33 @@
- AM_LDFLAGS = $(DEPS_LIBS)
-
- minimal_SOURCES = minimal.c
--minimal_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-+minimal_LDADD = $(DEPS_LIBS) -lgthread-2.0 ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-
- launcher_SOURCES = launcher.c markers.c
--launcher_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-+launcher_LDADD = $(DEPS_LIBS) -lgthread-2.0 ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-
- animated_marker_SOURCES = animated-marker.c
--animated_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-+animated_marker_LDADD = $(DEPS_LIBS) -lgthread-2.0 ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-
- polygons_SOURCES = polygons.c
--polygons_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-+polygons_LDADD = $(DEPS_LIBS) -lgthread-2.0 ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-
- url_marker_SOURCES = url-marker.c
- url_marker_CPPFLAGS = $(DEPS_CFLAGS) $(SOUP_CFLAGS)
--url_marker_LDADD = $(SOUP_LIBS) $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-+url_marker_LDADD = $(SOUP_LIBS) -lgthread-2.0 $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-
- if ENABLE_GTK
- noinst_PROGRAMS += minimal-gtk
- minimal_gtk_SOURCES = minimal-gtk.c
- minimal_gtk_CPPFLAGS = $(GTK_CFLAGS)
--minimal_gtk_LDADD = $(GTK_LIBS) $(DEPS_LIBS) \
-+minimal_gtk_LDADD = $(GTK_LIBS) -lgthread-2.0 $(DEPS_LIBS) \
- ../champlain-gtk/libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la \
- ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-
- noinst_PROGRAMS += launcher-gtk
- launcher_gtk_SOURCES = launcher-gtk.c markers.c
- launcher_gtk_CPPFLAGS = $(GTK_CFLAGS)
--launcher_gtk_LDADD = $(GTK_LIBS) $(DEPS_LIBS) \
-+launcher_gtk_LDADD = $(GTK_LIBS) -lgthread-2.0 $(DEPS_LIBS) \
- ../champlain-gtk/libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la \
- ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
-
-@@ -40,7 +40,7 @@
- noinst_PROGRAMS += local-rendering
- local_rendering_SOURCES = local-rendering.c
- local_rendering_CPPFLAGS = $(GTK_CFLAGS) $(MEMPHIS_CFLAGS)
--local_rendering_LDADD = $(GTK_LIBS) $(MEMPHIS_LIBS) $(DEPS_LIBS) \
-+local_rendering_LDADD = $(GTK_LIBS) -lgthread-2.0 $(MEMPHIS_LIBS) $(DEPS_LIBS) \
- ../champlain-gtk/libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la \
- ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
- endif
diff --git a/components/library/libchamplain/pkg5 b/components/library/libchamplain/pkg5
index 146b920..559f8db 100644
--- a/components/library/libchamplain/pkg5
+++ b/components/library/libchamplain/pkg5
@@ -1,17 +1,17 @@
{
"dependencies": [
- "SUNWcs",
"database/sqlite-3",
"library/desktop/cairo",
"library/desktop/clutter",
"library/desktop/clutter/clutter-gtk",
+ "library/desktop/cogl",
"library/desktop/gdk-pixbuf",
- "library/desktop/gtk2",
+ "library/desktop/gtk3",
"library/desktop/pango",
"library/glib2",
- "library/libsoup",
- "shell/ksh93",
- "system/library"
+ "library/libsoup3",
+ "system/library",
+ "system/library/math"
],
"fmris": [
"library/desktop/libchamplain"
--
Gitblit v1.9.3