gnome-clocks 3.26.1 master
authorYaakov Selkowitz <yselkowi@redhat.com>
Mon, 19 Feb 2018 18:41:19 +0000 (12:41 -0600)
committerYaakov Selkowitz <yselkowi@redhat.com>
Mon, 19 Feb 2018 18:41:19 +0000 (12:41 -0600)
3.22.1-without-geoclue.patch [deleted file]
3.26.1-without-geoclue.patch [new file with mode: 0644]
gnome-clocks.cygport

diff --git a/3.22.1-without-geoclue.patch b/3.22.1-without-geoclue.patch
deleted file mode 100644 (file)
index 04580ee..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-GeoClue2 is not working yet.  Users will have to enter their own location
-themselves.
-
---- origsrc/gnome-clocks-3.22.1/Makefile.am    2016-10-08 05:34:32.000000000 -0500
-+++ src/gnome-clocks-3.22.1/Makefile.am        2017-03-17 12:10:34.973607700 -0500
-@@ -114,7 +113,6 @@ VALA_SOURCES = \
-       src/timer.vala \
-       src/utils.vala \
-       src/widgets.vala \
--      src/geocoding.vala \
-       src/search-provider.vala \
-       src/main.vala
---- origsrc/gnome-clocks-3.22.1/configure.ac   2016-10-10 01:36:23.000000000 -0500
-+++ src/gnome-clocks-3.22.1/configure.ac       2017-03-17 12:10:01.776782700 -0500
-@@ -56,7 +56,6 @@ PKG_CHECK_MODULES(CLOCKS, [
-     gweather-3.0 >= 3.13.91
-     gnome-desktop-3.0 >= 3.7.90
-     geocode-glib-1.0 >= 0.99.4
--    libgeoclue-2.0 >= 2.3.1
- ])
- YELP_HELP_INIT
---- origsrc/gnome-clocks-3.22.1/src/world.vala 2016-10-10 01:35:22.000000000 -0500
-+++ src/gnome-clocks-3.22.1/src/world.vala     2017-03-17 12:11:21.435021200 -0500
-@@ -301,11 +301,13 @@ public class Face : Gtk.Stack, Clocks.Cl
-         load ();
-         show_all ();
-+#if GEOCLUE
-         if (settings.get_boolean ("geolocation")) {
-             use_geolocation.begin ((obj, res) => {
-                 use_geolocation.end (res);
-             });
-         }
-+#endif
-         locations.items_changed.connect ((position, removed, added) => {
-             save ();
-@@ -361,6 +363,7 @@ public class Face : Gtk.Stack, Clocks.Cl
-         settings.set_value ("world-clocks", locations.serialize ());
-     }
-+#if GEOCLUE
-     private async void use_geolocation () {
-         Geo.Info geo_info = new Geo.Info ();
-@@ -382,6 +385,7 @@ public class Face : Gtk.Stack, Clocks.Cl
-         yield geo_info.seek ();
-     }
-+#endif
-     private void add_location_item (Item item) {
-         locations.add (item);
diff --git a/3.26.1-without-geoclue.patch b/3.26.1-without-geoclue.patch
new file mode 100644 (file)
index 0000000..f230923
--- /dev/null
@@ -0,0 +1,60 @@
+--- origsrc/gnome-clocks-3.26.1/meson.build    2017-10-15 07:22:56.000000000 -0500
++++ src/gnome-clocks-3.26.1/meson.build        2018-02-14 01:22:58.958965500 -0600
+@@ -17,7 +17,6 @@ gsound = dependency('gsound', version: '
+ gweather = dependency('gweather-3.0', version: '>=3.14')
+ gnomedesktop = dependency('gnome-desktop-3.0', version: '>=3.8')
+ geocodeglib = dependency('geocode-glib-1.0', version: '>=1.0')
+-libgeoclue = dependency('libgeoclue-2.0', version: '>=2.4')
+ cc = meson.get_compiler('c')
+ math = cc.find_library('m', required: false)
+--- origsrc/gnome-clocks-3.26.1/src/meson.build        2017-10-15 07:22:56.000000000 -0500
++++ src/gnome-clocks-3.26.1/src/meson.build    2018-02-14 01:23:16.664893400 -0600
+@@ -6,7 +6,6 @@ clocks_vala_sources = [
+   'alarm.vala',
+   'application.vala',
+   'clock.vala',
+-  'geocoding.vala',
+   'main.vala',
+   'search-provider.vala',
+   'stopwatch.vala',
+@@ -49,7 +48,6 @@ clocks_dependencies = [
+   gweather,
+   gnomedesktop,
+   geocodeglib,
+-  libgeoclue,
+   math
+ ]
+--- origsrc/gnome-clocks-3.26.1/src/world.vala 2017-10-15 07:22:56.000000000 -0500
++++ src/gnome-clocks-3.26.1/src/world.vala     2018-02-14 01:23:38.427680000 -0600
+@@ -341,11 +341,13 @@ public class Face : Gtk.Stack, Clocks.Cl
+         load ();
+         show_all ();
++#if GEOCLUE
+         if (settings.get_boolean ("geolocation")) {
+             use_geolocation.begin ((obj, res) => {
+                 use_geolocation.end (res);
+             });
+         }
++#endif
+         locations.items_changed.connect ((position, removed, added) => {
+             save ();
+@@ -401,6 +403,7 @@ public class Face : Gtk.Stack, Clocks.Cl
+         settings.set_value ("world-clocks", locations.serialize ());
+     }
++#if GEOCLUE
+     private async void use_geolocation () {
+         Geo.Info geo_info = new Geo.Info ();
+@@ -421,6 +424,7 @@ public class Face : Gtk.Stack, Clocks.Cl
+         yield geo_info.seek ();
+     }
++#endif
+     private void add_location_item (Item item) {
+         locations.add (item);
index 725cbc4c4279313a41dc5a6a352b00a4f3126d0a..62f6f2891ed67e5f9aa8ffc21b34a90d59598458 100644 (file)
@@ -1,7 +1,7 @@
-inherit gnome2
+inherit gnome.org meson
 
 NAME="gnome-clocks"
-VERSION=3.24.0
+VERSION=3.26.1
 RELEASE=1
 CATEGORY="GNOME"
 SUMMARY="GNOME world clock and timer application"
@@ -9,7 +9,7 @@ DESCRIPTION="A simple clock application for GNOME. It includes world clocks,
 alarms, a stopwatch and a timer."
 HOMEPAGE="http://live.gnome.org/GnomeClocks"
 
-PATCH_URI="3.22.1-without-geoclue.patch"
+PATCH_URI="3.26.1-without-geoclue.patch"
 
 # sources regenerated with valac
 DIFF_EXCLUDES="*.c"
This page took 0.026507 seconds and 5 git commands to generate.