GNOME.org
 

[libchamplain] Don't use memphis for distcheck

commit 0bd28ea1cc6aac6954185fc6e884162a15eda733
Author: Jiří Techet <techet gmail com>
Date:   Mon Sep 30 00:19:51 2013 +0200

    Don't use memphis for distcheck
    
    libmemphis support is currently not actively maintained and the local
    rendering is experimental (mostly due to missing vector tile service
    and not 100% perfect output of libmemphis). For this reason it's not
    production-ready and there's no reason to depend on it for distcheck.

 Makefile.am                              |    9 +-----
 champlain-memphis-uninstalled.pc.in      |   11 -------
 champlain-memphis.pc.in                  |   11 -------
 champlain/champlain-0.12.vapi            |   47 ------------------------------
 configure.ac                             |   10 ++----
 docs/reference/libchamplain-docs.sgml    |    1 -
 docs/reference/libchamplain-sections.txt |   34 ---------------------
 docs/reference/libchamplain.types        |    1 -
 make_dist.sh                             |    2 +-
 9 files changed, 5 insertions(+), 121 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 011a2ad..876e4d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,21 +11,14 @@ pcfiles += champlain-gtk- CHAMPLAIN_API_VERSION@.pc
 other_pcfiles += champlain-gtk- CHAMPLAIN_API_VERSION@-uninstalled.pc
 endif
 
-if ENABLE_MEMPHIS
-pcfiles += champlain-memphis- CHAMPLAIN_API_VERSION@.pc
-other_pcfiles += champlain-memphis- CHAMPLAIN_API_VERSION@-uninstalled.pc
-endif
-
 pkgconfig_DATA = $(pcfiles)
 pkgconfigdir = $(libdir)/pkgconfig
 
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-gtk --enable-introspection --enable-vala-demos 
--enable-memphis
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-gtk --enable-introspection --enable-vala-demos 
--disable-memphis
 
 EXTRA_DIST = \
        champlain-gtk.pc.in \
        champlain-gtk-uninstalled.pc.in \
-       champlain-memphis.pc.in \
-       champlain-memphis-uninstalled.pc.in \
        champlain.pc.in \
        champlain-uninstalled.pc.in
 
diff --git a/champlain/champlain-0.12.vapi b/champlain/champlain-0.12.vapi
index 349cc5c..f1ba656 100644
--- a/champlain/champlain-0.12.vapi
+++ b/champlain/champlain-0.12.vapi
@@ -303,25 +303,6 @@ namespace Champlain {
                public void set_size_limit (uint size_limit);
                public uint size_limit { get; set construct; }
        }
-       [CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_memphis_renderer_get_type 
()")]
-       public class MemphisRenderer : Champlain.Renderer {
-               [CCode (has_construct_function = false)]
-               protected MemphisRenderer ();
-               [CCode (has_construct_function = false)]
-               public MemphisRenderer.full (uint tile_size);
-               public Clutter.Color get_background_color ();
-               public Champlain.BoundingBox get_bounding_box ();
-               public GLib.List<string> get_rule_ids ();
-               public uint get_tile_size ();
-               public void load_rules (string rules_path);
-               public void remove_rule (string id);
-               public void set_background_color (Clutter.Color color);
-               public void set_rule (Champlain.MemphisRule rule);
-               public void set_tile_size (uint size);
-               [NoAccessorMethod]
-               public Champlain.BoundingBox bounding_box { owned get; set; }
-               public uint tile_size { get; set; }
-       }
        [CCode (cheader_filename = "champlain/champlain.h", type_id = 
"champlain_network_bbox_tile_source_get_type ()")]
        public class NetworkBboxTileSource : Champlain.TileSource {
                [CCode (has_construct_function = false)]
@@ -597,39 +578,11 @@ namespace Champlain {
                [NoAccessorMethod]
                public abstract double longitude { get; set; }
        }
-       [CCode (cheader_filename = "champlain/champlain.h", has_type_id = false)]
-       public struct MemphisRule {
-               public weak string keys;
-               public weak string values;
-               public Champlain.MemphisRuleType type;
-               public Champlain.MemphisRuleAttr polygon;
-               public Champlain.MemphisRuleAttr line;
-               public Champlain.MemphisRuleAttr border;
-               public Champlain.MemphisRuleAttr text;
-       }
-       [CCode (cheader_filename = "champlain/champlain.h", has_type_id = false)]
-       public struct MemphisRuleAttr {
-               public uint8 z_min;
-               public uint8 z_max;
-               public uint8 color_red;
-               public uint8 color_green;
-               public uint8 color_blue;
-               public uint8 color_alpha;
-               public weak string style;
-               public double size;
-       }
        [CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_MAP_PROJECTION_", 
has_type_id = false)]
        public enum MapProjection {
                [CCode (cname = "CHAMPLAIN_MAP_PROJECTION_MERCATOR")]
                MAP_PROJECTION_MERCATOR
        }
-       [CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_MEMPHIS_RULE_TYPE_", 
has_type_id = false)]
-       public enum MemphisRuleType {
-               UNKNOWN,
-               NODE,
-               WAY,
-               RELATION
-       }
        [CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_SELECTION_", has_type_id = 
false)]
        public enum SelectionMode {
                NONE,
diff --git a/configure.ac b/configure.ac
index 4f3e69c..10e44fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,11 +153,9 @@ AM_CONDITIONAL(ENABLE_GTK, test "x$enable_gtk" = "xyes")
 
 AC_ARG_ENABLE(memphis,
   AS_HELP_STRING([--disable-memphis],[Disable support of local rendering using libmemphis]),
-    enable_memphis=$enableval, enable_memphis="auto")
+    enable_memphis=$enableval, enable_memphis=no)
 
-if test "x$enable_memphis" = "xauto"; then
-  PKG_CHECK_MODULES(MEMPHIS, [memphis-0.2 >= 0.2.1], enable_memphis="yes", enable_memphis="no")
-elif test "x$enable_memphis" = "xyes"; then
+if test "x$enable_memphis" = "xyes"; then
   PKG_CHECK_MODULES(MEMPHIS, [memphis-0.2 >= 0.2.1])
 fi
 
@@ -244,9 +242,7 @@ AC_CONFIG_FILES([Makefile
                  champlain-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-uninstalled.pc.in
                  champlain-gtk-$CHAMPLAIN_API_VERSION.pc:champlain-gtk.pc.in
                  champlain-gtk-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-gtk-uninstalled.pc.in
-                 champlain-gtk/Makefile
-                 champlain-memphis-$CHAMPLAIN_API_VERSION.pc:champlain-memphis.pc.in
-                 
champlain-memphis-$CHAMPLAIN_API_VERSION-uninstalled.pc:champlain-memphis-uninstalled.pc.in])
+                 champlain-gtk/Makefile])
 AC_OUTPUT
 
 echo ""
diff --git a/docs/reference/libchamplain-docs.sgml b/docs/reference/libchamplain-docs.sgml
index 9fb7765..23c2adb 100644
--- a/docs/reference/libchamplain-docs.sgml
+++ b/docs/reference/libchamplain-docs.sgml
@@ -98,7 +98,6 @@
     <title>Renderer API</title>
     <xi:include href="xml/champlain-renderer.xml"/>
     <xi:include href="xml/champlain-image-renderer.xml"/>
-    <xi:include href="xml/champlain-memphis-renderer.xml"/>
     <xi:include href="xml/champlain-error-tile-renderer.xml"/>
   </part>
   <part>
diff --git a/docs/reference/libchamplain-sections.txt b/docs/reference/libchamplain-sections.txt
index 88a946b..6154967 100644
--- a/docs/reference/libchamplain-sections.txt
+++ b/docs/reference/libchamplain-sections.txt
@@ -456,8 +456,6 @@ CHAMPLAIN_MAP_SOURCE_OWM_PRECIPITATION
 CHAMPLAIN_MAP_SOURCE_OWM_PRESSURE
 CHAMPLAIN_MAP_SOURCE_OWM_TEMPERATURE
 CHAMPLAIN_MAP_SOURCE_OWM_WIND
-CHAMPLAIN_MAP_SOURCE_MEMPHIS_LOCAL
-CHAMPLAIN_MAP_SOURCE_MEMPHIS_NETWORK
 <SUBSECTION Standard>
 CHAMPLAIN_MAP_SOURCE_FACTORY
 CHAMPLAIN_IS_MAP_SOURCE_FACTORY
@@ -692,38 +690,6 @@ ChamplainMapSourceDescPrivate
 </SECTION>
 
 <SECTION>
-<FILE>champlain-memphis-renderer</FILE>
-<TITLE>ChamplainMemphisRenderer</TITLE>
-ChamplainMemphisRenderer
-ChamplainMemphisRule
-ChamplainMemphisRuleAttr
-ChamplainMemphisRuleType
-champlain_memphis_renderer_new_full
-champlain_memphis_renderer_load_rules
-champlain_memphis_renderer_get_background_color
-champlain_memphis_renderer_set_background_color
-champlain_memphis_renderer_get_rule_ids
-champlain_memphis_renderer_set_rule
-champlain_memphis_renderer_get_rule
-champlain_memphis_renderer_remove_rule
-champlain_memphis_renderer_get_bounding_box
-champlain_memphis_renderer_set_tile_size
-champlain_memphis_renderer_get_tile_size
-<SUBSECTION Standard>
-CHAMPLAIN_MEMPHIS_RENDERER
-CHAMPLAIN_IS_MEMPHIS_RENDERER
-CHAMPLAIN_TYPE_MEMPHIS_RENDERER
-champlain_memphis_renderer_get_type
-CHAMPLAIN_MEMPHIS_RENDERER_CLASS
-CHAMPLAIN_IS_MEMPHIS_RENDERER_CLASS
-CHAMPLAIN_MEMPHIS_RENDERER_GET_CLASS
-<SUBSECTION Private>
-ChamplainMemphisRendererClass
-ChamplainMemphisRendererPrivate
-</SECTION>
-
-
-<SECTION>
 <FILE>champlain-custom-marker</FILE>
 <TITLE>ChamplainCustomMarker</TITLE>
 ChamplainCustomMarker
diff --git a/docs/reference/libchamplain.types b/docs/reference/libchamplain.types
index 6b579ab..617b049 100644
--- a/docs/reference/libchamplain.types
+++ b/docs/reference/libchamplain.types
@@ -16,7 +16,6 @@ champlain_map_source_get_type
 champlain_marker_get_type
 champlain_marker_layer_get_type
 champlain_memory_cache_get_type
-champlain_memphis_renderer_get_type
 champlain_network_bbox_tile_source_get_type
 champlain_network_tile_source_get_type
 champlain_null_tile_source_get_type
diff --git a/make_dist.sh b/make_dist.sh
index c37fc0f..4c7e054 100755
--- a/make_dist.sh
+++ b/make_dist.sh
@@ -1,4 +1,4 @@
-./autogen.sh --enable-gtk --enable-memphis --enable-gtk-doc --enable-introspection --enable-vala 
--enable-vala-demos
+./autogen.sh --enable-gtk --disable-memphis --enable-gtk-doc --enable-introspection --enable-vala 
--enable-vala-demos
 make -j4
 make distcheck
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]