summaryrefslogtreecommitdiff
path: root/nonprism
diff options
context:
space:
mode:
Diffstat (limited to 'nonprism')
-rw-r--r--nonprism/gnome-settings-daemon/PKGBUILD48
-rw-r--r--nonprism/gnome-settings-daemon/nonprism.patch132
2 files changed, 100 insertions, 80 deletions
diff --git a/nonprism/gnome-settings-daemon/PKGBUILD b/nonprism/gnome-settings-daemon/PKGBUILD
index d9ff56073..7937370c4 100644
--- a/nonprism/gnome-settings-daemon/PKGBUILD
+++ b/nonprism/gnome-settings-daemon/PKGBUILD
@@ -1,31 +1,34 @@
-# $Id$
# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Andreas Grapentin <andreas@grapentin.org>
-# Contributor: André Silva <emulatorman@hyperbola.info>
+# Contributor (Hyperbola): Andreas Grapentin <andreas@grapentin.org>
+# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
# Contributor: Isaac David <isacdaavid@at@isacdaavid.info>
+# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
# parabola changes and rationale:
# - removed geoclue2 support
pkgname=gnome-settings-daemon
-pkgver=3.26.2
-pkgrel=1.nonprism1
+pkgver=3.32.1
+pkgrel=1
+pkgrel+=.nonprism1
pkgdesc="GNOME Settings Daemon, without geoclue2 support"
-url="https://git.gnome.org/browse/gnome-settings-daemon"
-arch=(x86_64 i686 armv7h)
+url="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
+arch=(x86_64)
+arch+=(i686 armv7h)
license=(GPL)
-depends=(dconf gnome-desktop gsettings-desktop-schemas libcanberra-pulse libnotify libsystemd
+depends=(dconf gnome-desktop gsettings-desktop-schemas libcanberra-pulse libnotify systemd-libs
libwacom pulseaudio pulseaudio-alsa upower librsvg libgweather geocode-glib nss
libgudev gtk3-print-backends libnm)
-makedepends=(intltool xf86-input-wacom libxslt docbook-xsl python git gnome-common)
+makedepends=(xf86-input-wacom libxslt docbook-xsl python git meson)
+checkdepends=(python-gobject python-dbusmock)
groups=(gnome)
-_commit=b4a1b1ab4da2be6628811a763376fc39c116cdbe # tags/GNOME_SETTINGS_DAEMON_3_26_2^0
-source=("git+https://git.gnome.org/browse/gnome-settings-daemon#commit=$_commit"
- "git+https://git.gnome.org/browse/libgnome-volume-control"
+_commit=57114085a09e86968e0a0261392c6866352f35fd # tags/GNOME_SETTINGS_DAEMON_3_32_1^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git#commit=$_commit"
+ "git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git"
nonprism.patch)
sha256sums=('SKIP'
'SKIP'
- '6ac18c459d9d2541be9bf9cf94f31c844920dd627f82c159d43490bb6f905ad4')
+ '6619205eb1e4d87caeb8e1673d6c80acf4d30f15ae91c5f6cb728a2e5674bf65')
pkgver() {
cd $pkgname
@@ -36,26 +39,21 @@ prepare() {
cd $pkgname
git submodule init
- git config --local submodule."panels/media-keys/gvc".url "$srcdir/libgnome-volume-control"
+ git config --local submodule.subprojects/gvc.url "$srcdir/libgnome-volume-control"
git submodule update
patch -p1 -i $srcdir/nonprism.patch
- NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd $pkgname
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/$pkgname --disable-static
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ arch-meson $pkgname build
+ ninja -C build
+}
- make
+check() {
+ meson test -C build
}
package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install -C build
}
diff --git a/nonprism/gnome-settings-daemon/nonprism.patch b/nonprism/gnome-settings-daemon/nonprism.patch
index eab945907..05b2c232c 100644
--- a/nonprism/gnome-settings-daemon/nonprism.patch
+++ b/nonprism/gnome-settings-daemon/nonprism.patch
@@ -1,34 +1,20 @@
-diff --git a/configure.ac b/configure.ac
-index 84c8ce234..856eaeb49 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -57,7 +57,6 @@ POLKIT_REQUIRED_VERSION=0.103
- UPOWER_REQUIRED_VERSION=0.99.0
- GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION=3.23.3
- GEOCODE_GLIB_REQUIRED_VERSION=3.10.0
--GEOCLUE_REQUIRED_VERSION=2.3.1
- NM_REQUIRED_VERSION=1.0
- LCMS_REQUIRED_VERSION=2.2
-
-@@ -163,13 +162,11 @@ PKG_CHECK_MODULES(COLOR,
- colord >= 1.0.2
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
- libcanberra-gtk3
-- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
- lcms2 >= $LCMS_REQUIRED_VERSION
- libnotify)
-
- PKG_CHECK_MODULES(DATETIME,
- libnotify >= $LIBNOTIFY_REQUIRED_VERSION
-- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
- geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
- gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+diff --git a/meson.build b/meson.build
+index b03fc403..ade6104e 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')
+ 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 83c06c525..c22191e86 100644
+index 7ff01f68..f4308d89 100644
--- a/plugins/color/gcm-self-test.c
+++ b/plugins/color/gcm-self-test.c
-@@ -70,9 +70,6 @@ gcm_test_night_light (void)
+@@ -80,9 +80,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);
@@ -39,35 +25,34 @@ index 83c06c525..c22191e86 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 67415f1d8..7f5118468 100644
+index 701c7753..d00a78a3 100644
--- a/plugins/color/gsd-night-light.c
+++ b/plugins/color/gsd-night-light.c
-@@ -20,7 +20,6 @@
+@@ -20,8 +20,6 @@
#include "config.h"
-#include <geoclue.h>
-
+-
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include "gnome-datetime-source.h"
-@@ -34,12 +33,9 @@ struct _GsdNightLight {
- GObject parent;
- GSettings *settings;
+
+@@ -36,11 +34,8 @@ struct _GsdNightLight {
+ gboolean forced;
gboolean disabled_until_tmw;
+ GDateTime *disabled_until_tmw_dt;
- gboolean geoclue_enabled;
GSource *source;
guint validate_id;
- gint disabled_day_of_month;
- GClueClient *geoclue_client;
- GClueSimple *geoclue_simple;
GSettings *location_settings;
gdouble cached_sunrise;
gdouble cached_sunset;
-@@ -407,91 +403,6 @@ settings_changed_cb (GSettings *settings, gchar *key, gpointer user_data)
- g_debug ("settings changed");
+@@ -454,91 +449,6 @@ settings_changed_cb (GSettings *settings, gchar *key, gpointer user_data)
night_light_recheck (self);
}
--
+
-static void
-on_location_notify (GClueSimple *simple,
- GParamSpec *pspec,
@@ -152,10 +137,11 @@ index 67415f1d8..7f5118468 100644
- else
- stop_geoclue (self);
-}
-
+-
void
gsd_night_light_set_disabled_until_tmw (GsdNightLight *self, gboolean value)
-@@ -537,12 +448,6 @@ gsd_night_light_get_temperature (GsdNightLight *self)
+ {
+@@ -608,12 +518,6 @@ gsd_night_light_get_temperature (GsdNightLight *self)
return self->cached_temperature;
}
@@ -168,25 +154,27 @@ index 67415f1d8..7f5118468 100644
gboolean
gsd_night_light_start (GsdNightLight *self, GError **error)
{
-@@ -553,9 +458,6 @@
+@@ -624,10 +528,6 @@ gsd_night_light_start (GsdNightLight *self, GError **error)
g_signal_connect (self->settings, "changed",
G_CALLBACK (settings_changed_cb), self);
- g_signal_connect_swapped (self->location_settings, "changed::enabled",
- G_CALLBACK (check_location_settings), self);
- check_location_settings (self);
-
+-
return TRUE;
}
-@@ -565,7 +467,6 @@ gsd_night_light_finalize (GObject *object)
+
+@@ -636,8 +536,6 @@ gsd_night_light_finalize (GObject *object)
{
GsdNightLight *self = GSD_NIGHT_LIGHT (object);
- stop_geoclue (self);
-
+-
poll_timeout_destroy (self);
poll_smooth_destroy (self);
-@@ -697,7 +598,6 @@ gsd_night_light_class_init (GsdNightLightClass *klass)
+
+@@ -783,7 +681,6 @@ gsd_night_light_class_init (GsdNightLightClass *klass)
static void
gsd_night_light_init (GsdNightLight *self)
{
@@ -195,10 +183,10 @@ index 67415f1d8..7f5118468 100644
self->cached_sunrise = -1.f;
self->cached_sunset = -1.f;
diff --git a/plugins/color/gsd-night-light.h b/plugins/color/gsd-night-light.h
-index 4f086dc67..4a63ecfab 100644
+index 8803c338..ec1ae7ac 100644
--- a/plugins/color/gsd-night-light.h
+++ b/plugins/color/gsd-night-light.h
-@@ -42,8 +42,6 @@ void gsd_night_light_set_disabled_until_tmw (GsdNightLight *self,
+@@ -46,8 +46,6 @@ void gsd_night_light_set_forced (GsdNightLight *self,
gboolean value);
/* only for the self test program */
@@ -207,8 +195,20 @@ index 4f086dc67..4a63ecfab 100644
void gsd_night_light_set_date_time_now (GsdNightLight *self,
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
+--- a/plugins/color/meson.build
++++ b/plugins/color/meson.build
+@@ -15,7 +15,6 @@ deps = plugins_deps + [
+ gnome_desktop_dep,
+ lcms_dep,
+ libcanberra_gtk_dep,
+- libgeoclue_dep,
+ libnotify_dep,
+ m_dep,
+ ]
diff --git a/plugins/datetime/gsd-timezone-monitor.c b/plugins/datetime/gsd-timezone-monitor.c
-index 2ac864875..5bc4b2932 100644
+index ca3e6a7f..16493366 100644
--- a/plugins/datetime/gsd-timezone-monitor.c
+++ b/plugins/datetime/gsd-timezone-monitor.c
@@ -25,7 +25,6 @@
@@ -219,17 +219,18 @@ index 2ac864875..5bc4b2932 100644
#include <geocode-glib/geocode-glib.h>
#include <polkit/polkit.h>
-@@ -45,9 +44,6 @@ typedef struct
+@@ -45,10 +44,6 @@ typedef struct
GPermission *permission;
Timedate1 *dtm;
- GClueClient *geoclue_client;
- GClueSimple *geoclue_simple;
- GCancellable *geoclue_cancellable;
-
+-
TzDB *tzdb;
WeatherTzDB *weather_tzdb;
-@@ -246,105 +242,6 @@ start_reverse_geocoding (GsdTimezoneMonitor *self,
+ gchar *current_timezone;
+@@ -255,113 +250,6 @@ on_reverse_geocoding_ready (GObject *source_object,
g_object_unref (place);
}
@@ -270,6 +271,8 @@ index 2ac864875..5bc4b2932 100644
- latitude = gclue_location_get_latitude (location);
- longitude = gclue_location_get_longitude (location);
-
+- g_debug ("Got location %lf,%lf", latitude, longitude);
+-
- start_reverse_geocoding (self, latitude, longitude);
-}
-
@@ -290,6 +293,8 @@ index 2ac864875..5bc4b2932 100644
- return;
- }
-
+- g_debug ("Geoclue now available");
+-
- priv = gsd_timezone_monitor_get_instance_private (user_data);
- priv->geoclue_simple = geoclue_simple;
- priv->geoclue_client = gclue_simple_get_client (priv->geoclue_simple);
@@ -307,6 +312,8 @@ index 2ac864875..5bc4b2932 100644
-{
- GsdTimezoneMonitorPrivate *priv = gsd_timezone_monitor_get_instance_private (self);
-
+- g_debug ("Timezone monitor enabled, starting geoclue");
+-
- priv->geoclue_cancellable = g_cancellable_new ();
- gclue_simple_new (DESKTOP_ID,
- GCLUE_ACCURACY_LEVEL_CITY,
@@ -321,6 +328,8 @@ index 2ac864875..5bc4b2932 100644
-{
- GsdTimezoneMonitorPrivate *priv = gsd_timezone_monitor_get_instance_private (self);
-
+- g_debug ("Timezone monitor disabled, stopping geoclue");
+-
- g_cancellable_cancel (priv->geoclue_cancellable);
- g_clear_object (&priv->geoclue_cancellable);
-
@@ -335,15 +344,16 @@ index 2ac864875..5bc4b2932 100644
GsdTimezoneMonitor *
gsd_timezone_monitor_new (void)
{
-@@ -359,7 +296,6 @@ gsd_timezone_monitor_finalize (GObject *obj)
+@@ -376,8 +264,6 @@ gsd_timezone_monitor_finalize (GObject *obj)
g_debug ("Stopping timezone monitor");
- stop_geoclue (monitor);
-
+-
if (priv->cancellable) {
g_cancellable_cancel (priv->cancellable);
-@@ -394,16 +290,6 @@
+ g_clear_object (&priv->cancellable);
+@@ -411,16 +297,6 @@ gsd_timezone_monitor_class_init (GsdTimezoneMonitorClass *klass)
G_TYPE_NONE, 1, G_TYPE_POINTER);
}
@@ -360,7 +370,7 @@ index 2ac864875..5bc4b2932 100644
static void
gsd_timezone_monitor_init (GsdTimezoneMonitor *self)
{
-@@ -446,7 +382,4 @@ gsd_timezone_monitor_init (GsdTimezoneMonitor *self)
+@@ -463,7 +339,4 @@ gsd_timezone_monitor_init (GsdTimezoneMonitor *self)
priv->weather_tzdb = weather_tz_db_new ();
priv->location_settings = g_settings_new ("org.gnome.system.location");
@@ -368,3 +378,15 @@ index 2ac864875..5bc4b2932 100644
- G_CALLBACK (check_location_settings), self);
- check_location_settings (self);
}
+diff --git a/plugins/datetime/meson.build b/plugins/datetime/meson.build
+index ed2d433f..364b6150 100644
+--- a/plugins/datetime/meson.build
++++ b/plugins/datetime/meson.build
+@@ -20,7 +20,6 @@ sources += gnome.gdbus_codegen(
+ deps = plugins_deps + [
+ geocode_glib_dep,
+ gweather_dep,
+- libgeoclue_dep,
+ libnotify_dep,
+ m_dep,
+ polkit_gobject_dep
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 03:27:21 +0000