gnome-clocks 3.22.1
authorYaakov Selkowitz <yselkowi@redhat.com>
Tue, 5 Sep 2017 01:45:13 +0000 (20:45 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Tue, 5 Sep 2017 01:45:13 +0000 (20:45 -0500)
3.18.0-vpath.patch [deleted file]
3.22.1-without-geoclue.patch [new file with mode: 0644]
3.8.2-glib-gettext.patch [deleted file]
gnome-clocks.cygport

diff --git a/3.18.0-vpath.patch b/3.18.0-vpath.patch
deleted file mode 100644 (file)
index 1098c88..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- origsrc/gnome-clocks-3.18.0/Makefile.am    2015-09-21 10:14:51.000000000 -0500
-+++ src/gnome-clocks-3.18.0/Makefile.am        2015-11-13 12:42:05.158588000 -0600
-@@ -22,7 +22,9 @@ data/org.gnome.clocks.service: data/org.
- appdatadir = $(datadir)/appdata
- appdata_DATA = $(appdata_in_files:.xml.in=.xml)
- appdata_in_files = data/appdata/org.gnome.clocks.appdata.xml.in
--@INTLTOOL_XML_RULE@
-+# (we can't use INTLTOOL_DESKTOP_RULE here due to lp#605826)
-+%.xml: %.xml.in
-+      $(MKDIR_P) $(dir $@); LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
- # gnome-shell search provider
- searchproviderdir = $(datadir)/gnome-shell/search-providers
diff --git a/3.22.1-without-geoclue.patch b/3.22.1-without-geoclue.patch
new file mode 100644 (file)
index 0000000..96ad350
--- /dev/null
@@ -0,0 +1,63 @@
+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
+@@ -92,7 +92,6 @@ AM_VALAFLAGS = \
+       --pkg gweather-3.0 \
+       --pkg gsound \
+       --pkg geocode-glib-1.0 \
+-      --pkg Geoclue-2.0 \
+       --gresources  $(top_srcdir)/data/gnome-clocks.gresource.xml
+ bin_PROGRAMS = gnome-clocks
+@@ -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.8.2-glib-gettext.patch b/3.8.2-glib-gettext.patch
deleted file mode 100644 (file)
index 0693ea8..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- origsrc/gnome-clocks-3.8.2/configure.ac    2013-05-14 03:52:26.000000000 -0500
-+++ src/gnome-clocks-3.8.2/configure.ac        2014-03-25 09:40:39.640261800 -0500
-@@ -17,8 +17,7 @@ AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
- IT_PROG_INTLTOOL([0.50.1])
--AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.17])
-+AM_GLIB_GNU_GETTEXT
- GETTEXT_PACKAGE=AC_PACKAGE_NAME
- AC_SUBST([GETTEXT_PACKAGE])
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])
index 2110dcc9a24c9526148575ba91a4da6cb63f5093..c1f04f4e0a19680e27f850d683a966b1c3ef043b 100644 (file)
@@ -1,7 +1,7 @@
 inherit gnome2
 
 NAME="gnome-clocks"
-VERSION=3.18.0
+VERSION=3.22.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.8.2-glib-gettext.patch
-       3.18.0-vpath.patch
-"
+PATCH_URI="3.22.1-without-geoclue.patch"
+
+# sources regenerated with valac
+DIFF_EXCLUDES="*.c"
This page took 0.028715 seconds and 5 git commands to generate.