summaryrefslogtreecommitdiff
path: root/nonprism/gnome-settings-daemon
diff options
context:
space:
mode:
Diffstat (limited to 'nonprism/gnome-settings-daemon')
-rw-r--r--nonprism/gnome-settings-daemon/PKGBUILD45
-rw-r--r--nonprism/gnome-settings-daemon/gnome-settings-daemon.install12
-rw-r--r--nonprism/gnome-settings-daemon/nonprism.patch211
3 files changed, 268 insertions, 0 deletions
diff --git a/nonprism/gnome-settings-daemon/PKGBUILD b/nonprism/gnome-settings-daemon/PKGBUILD
new file mode 100644
index 000000000..dabbdf0fb
--- /dev/null
+++ b/nonprism/gnome-settings-daemon/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 264838 2016-04-13 20:22:06Z heftig $
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+pkgname=gnome-settings-daemon
+pkgver=3.20.1
+pkgrel=1.nonprism1
+pkgdesc="The GNOME Settings daemon, without geoclue2 support"
+arch=(i686 x86_64)
+license=(GPL)
+depends=(dconf gnome-desktop gsettings-desktop-schemas libcanberra-pulse
+ libnotify libsystemd libwacom pulseaudio pulseaudio-alsa upower librsvg libgweather
+ geocode-glib nss libgudev libnm-glib)
+makedepends=(intltool xf86-input-wacom libxslt docbook-xsl python2)
+options=('!emptydirs')
+install=gnome-settings-daemon.install
+url="http://www.gnome.org"
+groups=(gnome)
+source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ nonprism.patch)
+sha256sums=('e84a075d895ca3baeefb8508e0a901027b66f7d5a7ee8c966e31d301b38e78e7'
+ '27fba52c36ee9d072e9602e843af55d970f128eb7ede1a828e86ea874765b1a6')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -p1 -i $srcdir/nonprism.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./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
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
diff --git a/nonprism/gnome-settings-daemon/gnome-settings-daemon.install b/nonprism/gnome-settings-daemon/gnome-settings-daemon.install
new file mode 100644
index 000000000..f7e8c46ac
--- /dev/null
+++ b/nonprism/gnome-settings-daemon/gnome-settings-daemon.install
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/nonprism/gnome-settings-daemon/nonprism.patch b/nonprism/gnome-settings-daemon/nonprism.patch
new file mode 100644
index 000000000..1604431d9
--- /dev/null
+++ b/nonprism/gnome-settings-daemon/nonprism.patch
@@ -0,0 +1,211 @@
+diff --git a/configure b/configure
+index 3a9699a..045264f 100755
+--- a/configure
++++ b/configure
+@@ -17691,7 +17691,6 @@ POLKIT_REQUIRED_VERSION=0.103
+ UPOWER_REQUIRED_VERSION=0.99.0
+ GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION=3.19.3
+ GEOCODE_GLIB_REQUIRED_VERSION=3.10.0
+-GEOCLUE_REQUIRED_VERSION=2.3.1
+ NM_REQUIRED_VERSION=1.0
+
+
+@@ -20529,12 +20528,12 @@ if test -n "$DATETIME_CFLAGS"; then
+ pkg_cv_DATETIME_CFLAGS="$DATETIME_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgeoclue-2.0 >= \$GEOCLUE_REQUIRED_VERSION
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+ geocode-glib-1.0 >= \$GEOCODE_GLIB_REQUIRED_VERSION
+ gweather-3.0 >= \$LIBGWEATHER_REQUIRED_VERSION
+ polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION
+ \""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
++ ($PKG_CONFIG --exists --print-errors "
+ geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
+ gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -20542,7 +20541,7 @@ if test -n "$DATETIME_CFLAGS"; then
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_DATETIME_CFLAGS=`$PKG_CONFIG --cflags "libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
++ pkg_cv_DATETIME_CFLAGS=`$PKG_CONFIG --cflags "
+ geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
+ gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -20558,12 +20557,12 @@ if test -n "$DATETIME_LIBS"; then
+ pkg_cv_DATETIME_LIBS="$DATETIME_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgeoclue-2.0 >= \$GEOCLUE_REQUIRED_VERSION
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+ geocode-glib-1.0 >= \$GEOCODE_GLIB_REQUIRED_VERSION
+ gweather-3.0 >= \$LIBGWEATHER_REQUIRED_VERSION
+ polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION
+ \""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
++ ($PKG_CONFIG --exists --print-errors "
+ geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
+ gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -20571,7 +20570,7 @@ if test -n "$DATETIME_LIBS"; then
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_DATETIME_LIBS=`$PKG_CONFIG --libs "libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
++ pkg_cv_DATETIME_LIBS=`$PKG_CONFIG --libs "
+ geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
+ gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -20596,13 +20595,13 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DATETIME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
++ DATETIME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
+ geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
+ gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+ " 2>&1`
+ else
+- DATETIME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
++ DATETIME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
+ geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
+ gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -20611,7 +20610,7 @@ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DATETIME_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
++ as_fn_error $? "Package requirements (
+ geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
+ gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+diff --git a/configure.ac b/configure.ac
+index e239a76..3427700 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,7 +58,6 @@ POLKIT_REQUIRED_VERSION=0.103
+ UPOWER_REQUIRED_VERSION=0.99.0
+ GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION=3.19.3
+ GEOCODE_GLIB_REQUIRED_VERSION=3.10.0
+-GEOCLUE_REQUIRED_VERSION=2.3.1
+ NM_REQUIRED_VERSION=1.0
+
+ EXTRA_COMPILE_WARNINGS(yes)
+@@ -264,7 +263,6 @@ AC_CHECK_LIBM
+ AC_SUBST(LIBM)
+
+ PKG_CHECK_MODULES(DATETIME,
+- 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/plugins/datetime/gsd-timezone-monitor.c b/plugins/datetime/gsd-timezone-monitor.c
+index 2ac8648..534f815 100644
+--- a/plugins/datetime/gsd-timezone-monitor.c
++++ b/plugins/datetime/gsd-timezone-monitor.c
+@@ -25,7 +25,6 @@
+ #include "tz.h"
+ #include "weather-tz.h"
+
+-#include <geoclue.h>
+ #include <geocode-glib/geocode-glib.h>
+ #include <polkit/polkit.h>
+
+@@ -43,8 +42,6 @@ typedef struct
+ {
+ GCancellable *cancellable;
+ GPermission *permission;
+- GClueClient *geoclue_client;
+- GClueSimple *geoclue_simple;
+ Timedate1 *dtm;
+
+ TzDB *tzdb;
+@@ -265,65 +262,6 @@ start_reverse_geocoding (GsdTimezoneMonitor *self,
+ g_object_unref (reverse);
+ }
+
+-static void
+-on_location_notify (GClueSimple *simple,
+- GParamSpec *pspec,
+- gpointer user_data)
+-{
+- GsdTimezoneMonitor *self = user_data;
+- GClueLocation *location;
+- gdouble latitude, longitude;
+-
+- location = gclue_simple_get_location (simple);
+-
+- latitude = gclue_location_get_latitude (location);
+- longitude = gclue_location_get_longitude (location);
+-
+- start_reverse_geocoding (self, latitude, longitude);
+-}
+-
+-static void
+-on_geoclue_simple_ready (GObject *source_object,
+- GAsyncResult *res,
+- gpointer user_data)
+-{
+- GError *error = NULL;
+- GsdTimezoneMonitorPrivate *priv;
+- GClueSimple *geoclue_simple;
+-
+- geoclue_simple = gclue_simple_new_finish (res, &error);
+- if (geoclue_simple == NULL) {
+- if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+- g_warning ("Failed to connect to GeoClue2 service: %s", error->message);
+- g_error_free (error);
+- return;
+- }
+-
+- priv = gsd_timezone_monitor_get_instance_private (user_data);
+- priv->geoclue_simple = geoclue_simple;
+- priv->geoclue_client = gclue_simple_get_client (priv->geoclue_simple);
+- gclue_client_set_distance_threshold (priv->geoclue_client,
+- GEOCODE_LOCATION_ACCURACY_CITY);
+-
+- g_signal_connect (priv->geoclue_simple, "notify::location",
+- G_CALLBACK (on_location_notify), user_data);
+-
+- on_location_notify (priv->geoclue_simple, NULL, user_data);
+-}
+-
+-static void
+-register_geoclue (GsdTimezoneMonitor *self)
+-{
+- GsdTimezoneMonitorPrivate *priv = gsd_timezone_monitor_get_instance_private (self);
+-
+- gclue_simple_new (DESKTOP_ID,
+- GCLUE_ACCURACY_LEVEL_CITY,
+- priv->cancellable,
+- on_geoclue_simple_ready,
+- self);
+-
+-}
+-
+ GsdTimezoneMonitor *
+ gsd_timezone_monitor_new (void)
+ {
+@@ -343,11 +281,7 @@ gsd_timezone_monitor_finalize (GObject *obj)
+ g_clear_object (&priv->cancellable);
+ }
+
+- if (priv->geoclue_client)
+- gclue_client_call_stop (priv->geoclue_client, NULL, NULL, NULL);
+-
+ g_clear_object (&priv->dtm);
+- g_clear_object (&priv->geoclue_simple);
+ g_clear_object (&priv->permission);
+ g_clear_pointer (&priv->current_timezone, g_free);
+ g_clear_pointer (&priv->tzdb, tz_db_free);
+@@ -413,6 +347,4 @@ gsd_timezone_monitor_init (GsdTimezoneMonitor *self)
+ priv->current_timezone = timedate1_dup_timezone (priv->dtm);
+ priv->tzdb = tz_load_db ();
+ priv->weather_tzdb = weather_tz_db_new ();
+-
+- register_geoclue (self);
+ }
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 05:47:03 +0000