osm-gps-map: update to 1.2.0

Fixes: https://trac.macports.org/ticket/63135
mrkooll · Jul 30, 2021 · bb8844b · bb8844b
1 parent acc4451
commit bb8844b
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/graphics/osm-gps-map/Portfile b/graphics/osm-gps-map/Portfile
@@ -4,12 +4,15 @@ PortSystem      1.0
 PortGroup       github 1.0
 PortGroup       gobject_introspection 1.0
 
-github.setup    nzjrs osm-gps-map 1.1.0
-revision        1
+github.setup    nzjrs osm-gps-map 1.2.0
 license         GPL-2+
 categories      graphics
 maintainers     {devans @dbevans} openmaintainer
 platforms       darwin
+<<<<<<< HEAD
+=======
+homepage        https://nzjrs.github.io/${name}/
+>>>>>>> b30c2e96ae6 (osm-gps-map: update to 1.2.0)
 
 description     A GTK+ 3 widget for displaying OpenStreetMap tiles.
 
@@ -18,16 +21,20 @@ long_description \
                 draws a GPS track, and points of interest on a moving map display. \
                 Downloads map data from a number of websites, including openstreetmap.org.
 
+<<<<<<< HEAD
 homepage        https://nzjrs.github.io/${name}/
 
 checksums           rmd160  4ad32044e7ead6557e5bdd640e30e8a8a6ba5c56 \
                     sha256  817935920d5e50938a5bbb196f33f4fd05a007306bdf375ffdb3cc30216d82a6
+=======
+checksums           rmd160  cc7eb9da9b2123aaad5b53fa2441521e35780b2c \
+                    sha256  14f6f247b824b78c018de784c3303543653dd3558e0e18019d90895695b6b01a
+>>>>>>> b30c2e96ae6 (osm-gps-map: update to 1.2.0)
 
 depends_build   port:pkgconfig \
                 port:autoconf \
                 port:automake \
                 port:libtool \
-                port:gnome-common \
                 port:gtk-doc
 
 depends_lib     port:gtk3 \