diff options
Diffstat (limited to 'nonprism/gnome-settings-daemon/nonprism.patch')
| -rw-r--r-- | nonprism/gnome-settings-daemon/nonprism.patch | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/nonprism/gnome-settings-daemon/nonprism.patch b/nonprism/gnome-settings-daemon/nonprism.patch index 05b2c232c..94ccf8812 100644 --- a/nonprism/gnome-settings-daemon/nonprism.patch +++ b/nonprism/gnome-settings-daemon/nonprism.patch @@ -1,20 +1,20 @@ diff --git a/meson.build b/meson.build -index b03fc403..ade6104e 100644 +index ee121983..3493febd 100644 --- a/meson.build +++ b/meson.build -@@ -94,7 +94,6 @@ gtk_x11_dep = dependency('gtk+-x11-3.0') - gweather_dep = dependency('gweather-3.0', version: '>= 3.9.5') - lcms_dep = dependency('lcms2', version: '>= 2.2') +@@ -101,7 +101,6 @@ gtk_dep = dependency('gtk+-3.0', version: '>= 3.15.3') + gtk_x11_dep = dependency('gtk+-x11-3.0') + gweather_dep = dependency('gweather4') libcanberra_gtk_dep = dependency('libcanberra-gtk3') -libgeoclue_dep = dependency('libgeoclue-2.0', version: '>= 2.3.1') libnotify_dep = dependency('libnotify', version: '>= 0.7.3') libpulse_mainloop_glib_dep = dependency('libpulse-mainloop-glib', version: '>= 2.0') pango_dep = dependency('pango', version: '>= 1.20.0') diff --git a/plugins/color/gcm-self-test.c b/plugins/color/gcm-self-test.c -index 7ff01f68..f4308d89 100644 +index e2938614..9c73f152 100644 --- a/plugins/color/gcm-self-test.c +++ b/plugins/color/gcm-self-test.c -@@ -80,9 +80,6 @@ gcm_test_night_light (void) +@@ -79,9 +79,6 @@ gcm_test_night_light (void) datetime_override = g_date_time_new_utc (2017, 2, 8, 20, 0, 0); gsd_night_light_set_date_time_now (nlight, datetime_override); @@ -25,7 +25,7 @@ index 7ff01f68..f4308d89 100644 gsd_night_light_set_smooth_enabled (nlight, FALSE); diff --git a/plugins/color/gsd-night-light.c b/plugins/color/gsd-night-light.c -index 701c7753..d00a78a3 100644 +index b11f0755..2d21900a 100644 --- a/plugins/color/gsd-night-light.c +++ b/plugins/color/gsd-night-light.c @@ -20,8 +20,6 @@ @@ -49,7 +49,7 @@ index 701c7753..d00a78a3 100644 GSettings *location_settings; gdouble cached_sunrise; gdouble cached_sunset; -@@ -454,91 +449,6 @@ settings_changed_cb (GSettings *settings, gchar *key, gpointer user_data) +@@ -462,91 +457,6 @@ settings_changed_cb (GSettings *settings, gchar *key, gpointer user_data) night_light_recheck (self); } @@ -141,7 +141,7 @@ index 701c7753..d00a78a3 100644 void gsd_night_light_set_disabled_until_tmw (GsdNightLight *self, gboolean value) { -@@ -608,12 +518,6 @@ gsd_night_light_get_temperature (GsdNightLight *self) +@@ -616,12 +526,6 @@ gsd_night_light_get_temperature (GsdNightLight *self) return self->cached_temperature; } @@ -154,7 +154,7 @@ index 701c7753..d00a78a3 100644 gboolean gsd_night_light_start (GsdNightLight *self, GError **error) { -@@ -624,10 +528,6 @@ gsd_night_light_start (GsdNightLight *self, GError **error) +@@ -632,10 +536,6 @@ gsd_night_light_start (GsdNightLight *self, GError **error) g_signal_connect (self->settings, "changed", G_CALLBACK (settings_changed_cb), self); @@ -165,7 +165,7 @@ index 701c7753..d00a78a3 100644 return TRUE; } -@@ -636,8 +536,6 @@ gsd_night_light_finalize (GObject *object) +@@ -644,8 +544,6 @@ gsd_night_light_finalize (GObject *object) { GsdNightLight *self = GSD_NIGHT_LIGHT (object); @@ -174,7 +174,7 @@ index 701c7753..d00a78a3 100644 poll_timeout_destroy (self); poll_smooth_destroy (self); -@@ -783,7 +681,6 @@ gsd_night_light_class_init (GsdNightLightClass *klass) +@@ -791,7 +689,6 @@ gsd_night_light_class_init (GsdNightLightClass *klass) static void gsd_night_light_init (GsdNightLight *self) { @@ -196,19 +196,19 @@ index 8803c338..ec1ae7ac 100644 GDateTime *datetime); void gsd_night_light_set_smooth_enabled (GsdNightLight *self, diff --git a/plugins/color/meson.build b/plugins/color/meson.build -index 2ae1740a..45688712 100644 +index bb05f72f..10379adf 100644 --- a/plugins/color/meson.build +++ b/plugins/color/meson.build -@@ -15,7 +15,6 @@ deps = plugins_deps + [ - gnome_desktop_dep, - lcms_dep, +@@ -11,7 +11,6 @@ sources = files( + deps = plugins_deps + [ + colord_dep, libcanberra_gtk_dep, - libgeoclue_dep, libnotify_dep, + libcommon_dep, m_dep, - ] diff --git a/plugins/datetime/gsd-timezone-monitor.c b/plugins/datetime/gsd-timezone-monitor.c -index ca3e6a7f..16493366 100644 +index a6e8a48d..52320819 100644 --- a/plugins/datetime/gsd-timezone-monitor.c +++ b/plugins/datetime/gsd-timezone-monitor.c @@ -25,7 +25,6 @@ @@ -227,10 +227,10 @@ index ca3e6a7f..16493366 100644 - GClueSimple *geoclue_simple; - GCancellable *geoclue_cancellable; - - TzDB *tzdb; - WeatherTzDB *weather_tzdb; gchar *current_timezone; -@@ -255,113 +250,6 @@ on_reverse_geocoding_ready (GObject *source_object, + + GSettings *location_settings; +@@ -262,113 +257,6 @@ on_reverse_geocoding_ready (GObject *source_object, g_object_unref (place); } @@ -344,7 +344,7 @@ index ca3e6a7f..16493366 100644 GsdTimezoneMonitor * gsd_timezone_monitor_new (void) { -@@ -376,8 +264,6 @@ gsd_timezone_monitor_finalize (GObject *obj) +@@ -383,8 +271,6 @@ gsd_timezone_monitor_finalize (GObject *obj) g_debug ("Stopping timezone monitor"); @@ -353,7 +353,7 @@ index ca3e6a7f..16493366 100644 if (priv->cancellable) { g_cancellable_cancel (priv->cancellable); g_clear_object (&priv->cancellable); -@@ -411,16 +297,6 @@ gsd_timezone_monitor_class_init (GsdTimezoneMonitorClass *klass) +@@ -416,16 +302,6 @@ gsd_timezone_monitor_class_init (GsdTimezoneMonitorClass *klass) G_TYPE_NONE, 1, G_TYPE_POINTER); } @@ -370,8 +370,8 @@ index ca3e6a7f..16493366 100644 static void gsd_timezone_monitor_init (GsdTimezoneMonitor *self) { -@@ -463,7 +339,4 @@ gsd_timezone_monitor_init (GsdTimezoneMonitor *self) - priv->weather_tzdb = weather_tz_db_new (); +@@ -466,7 +342,4 @@ gsd_timezone_monitor_init (GsdTimezoneMonitor *self) + priv->current_timezone = timedate1_dup_timezone (priv->dtm); priv->location_settings = g_settings_new ("org.gnome.system.location"); - g_signal_connect_swapped (priv->location_settings, "changed::enabled", |