[arch-commits] Commit in gnome-settings-daemon/trunk (PKGBUILD git-fixes.patch)
Date: Friday, July 19, 2013 @ 22:56:35
Author: heftig
Revision: 191200
3.8.4
Modified:
gnome-settings-daemon/trunk/PKGBUILD
Deleted:
gnome-settings-daemon/trunk/git-fixes.patch
-+
PKGBUILD| 20 +---
git-fixes.patch | 258 --
2 files changed, 5 insertions(+), 273 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-07-19 19:58:13 UTC (rev 191199)
+++ PKGBUILD2013-07-19 20:56:35 UTC (rev 191200)
@@ -2,8 +2,8 @@
# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
pkgname=gnome-settings-daemon
-pkgver=3.8.3
-pkgrel=2
+pkgver=3.8.4
+pkgrel=1
pkgdesc=The GNOME Settings daemon
arch=('i686' 'x86_64')
license=('GPL')
@@ -14,24 +14,14 @@
install=gnome-settings-daemon.install
url=http://www.gnome.org;
groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-git-fixes.patch)
-sha256sums=('00e7f46c9a6fb8b148255adfcdd26bc5f2c1d393b8dfbac69da100c8dcfa1b6c'
-'30b0a42df9ea0c6c18ed51cb8f150008e4b5ab624eb420f0251d08ab2503c330')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('03ad56a8d517faf0754efcf2e7e26257e9ddbe32ef2931f3579138659cc178bc')
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i ../git-fixes.patch
-}
-
build() {
cd $pkgname-$pkgver
- aclocal
- autoconf
- automake --add-missing
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/gnome-settings-daemon --disable-static
+ --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
Deleted: git-fixes.patch
===
--- git-fixes.patch 2013-07-19 19:58:13 UTC (rev 191199)
+++ git-fixes.patch 2013-07-19 20:56:35 UTC (rev 191200)
@@ -1,258 +0,0 @@
-diff --git a/data/gnome-settings-daemon.desktop.in.in
b/data/gnome-settings-daemon.desktop.in.in
-index c5a5518..ff71eee 100644
a/data/gnome-settings-daemon.desktop.in.in
-+++ b/data/gnome-settings-daemon.desktop.in.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Type=Application
- _Name=GNOME Settings Daemon
--Exec=@libexecdir@/gnome-settings-daemon
-+Exec=@libexecdir@/gnome-settings-daemon-localeexec
- OnlyShowIn=GNOME;
- NoDisplay=true
- X-GNOME-Autostart-Phase=Initialization
-diff --git a/gnome-settings-daemon/Makefile.am
b/gnome-settings-daemon/Makefile.am
-index 194a7cc..94b3861 100644
a/gnome-settings-daemon/Makefile.am
-+++ b/gnome-settings-daemon/Makefile.am
-@@ -48,6 +48,15 @@ gsddir = $(libexecdir)
- gsd_PROGRAMS = \
- gnome-settings-daemon
-
-+gsd_SCRIPTS = \
-+ gnome-settings-daemon-localeexec
-+
-+EXTRA_DIST = \
-+ gnome-settings-daemon-localeexec.in
-+
-+gnome-settings-daemon-localeexec: gnome-settings-daemon-localeexec.in
-+ $(AM_V_GEN) sed -e s|\@libexecdir\@|$(libexecdir)| -e
s|\@prefix\@|$(prefix)| $ $@.tmp mv $@.tmp $@
-+
- apidir =
$(includedir)/gnome-settings-daemon-$(GSD_API_VERSION)/gnome-settings-daemon
- api_DATA =\
- gnome-settings-plugin.h
-diff --git a/gnome-settings-daemon/gnome-settings-daemon-localeexec.in
b/gnome-settings-daemon/gnome-settings-daemon-localeexec.in
-new file mode 100755
-index 000..eed91a4
/dev/null
-+++ b/gnome-settings-daemon/gnome-settings-daemon-localeexec.in
-@@ -0,0 +1,20 @@
-+#!/bin/sh
-+
-+SETTING=$(gsettings get org.gnome.system.locale region)
-+REGION=${SETTING#\'}
-+REGION=${REGION%\'}
-+
-+if [ -n $REGION ]; then
-+ export LC_TIME=$REGION
-+ export LC_NUMERIC=$REGION
-+ export LC_MONETARY=$REGION
-+ export LC_MEASUREMENT=$REGION
-+ export LC_PAPER=$REGION
-+fi
-+
-+if [ -x @prefix@/bin/ibus-daemon ]; then
-+ export QT_IM_MODULE=ibus
-+ export XMODIFIERS=@im=ibus
-+fi
-+
-+exec @libexecdir@/gnome-settings-daemon
-diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
-index 24c1598..16017df 100644
a/gnome-settings-daemon/main.c
-+++ b/gnome-settings-daemon/main.c
-@@ -279,37 +279,6 @@ set_legacy_ibus_env_vars (GDBusProxy *proxy)
- }
- #endif
-
--/* Keep synchronised with set_locale() and
-- * set_legacy_ibus_env_vars() above */
--static void
--set_locale_env (void)
--{
--GSettings *locale_settings;
--gchar *region;
--
--/* Set locale environment */
--locale_settings = g_settings_new (org.gnome.system.locale);
--region = g_settings_get_string (locale_settings, region);
--if (region[0]) {
--g_setenv (LC_TIME, region, TRUE);
--g_setenv (LC_NUMERIC, region, TRUE);
--g_setenv (LC_MONETARY, region, TRUE);
--g_setenv (LC_MEASUREMENT, region, TRUE);
--g_setenv (LC_PAPER, region, TRUE);
--
[arch-commits] Commit in gnome-settings-daemon/trunk (PKGBUILD git-fixes.patch)
Date: Monday, July 8, 2013 @ 10:15:55
Author: jgc
Revision: 189792
upgpkg: gnome-settings-daemon 3.8.3-2
Add fixes from git, fixes random hangup and dconf segfaults on startup
(FS#36009)
Added:
gnome-settings-daemon/trunk/git-fixes.patch
Modified:
gnome-settings-daemon/trunk/PKGBUILD
-+
PKGBUILD| 16 ++-
git-fixes.patch | 258 ++
2 files changed, 271 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-07-08 08:14:25 UTC (rev 189791)
+++ PKGBUILD2013-07-08 08:15:55 UTC (rev 189792)
@@ -3,7 +3,7 @@
pkgname=gnome-settings-daemon
pkgver=3.8.3
-pkgrel=1
+pkgrel=2
pkgdesc=The GNOME Settings daemon
arch=('i686' 'x86_64')
license=('GPL')
@@ -14,11 +14,21 @@
install=gnome-settings-daemon.install
url=http://www.gnome.org;
groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('00e7f46c9a6fb8b148255adfcdd26bc5f2c1d393b8dfbac69da100c8dcfa1b6c')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+git-fixes.patch)
+sha256sums=('00e7f46c9a6fb8b148255adfcdd26bc5f2c1d393b8dfbac69da100c8dcfa1b6c'
+'30b0a42df9ea0c6c18ed51cb8f150008e4b5ab624eb420f0251d08ab2503c330')
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../git-fixes.patch
+}
+
build() {
cd $pkgname-$pkgver
+ aclocal
+ autoconf
+ automake --add-missing
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib/gnome-settings-daemon --disable-static
Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2013-07-08 08:15:55 UTC (rev 189792)
@@ -0,0 +1,258 @@
+diff --git a/data/gnome-settings-daemon.desktop.in.in
b/data/gnome-settings-daemon.desktop.in.in
+index c5a5518..ff71eee 100644
+--- a/data/gnome-settings-daemon.desktop.in.in
b/data/gnome-settings-daemon.desktop.in.in
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Type=Application
+ _Name=GNOME Settings Daemon
+-Exec=@libexecdir@/gnome-settings-daemon
++Exec=@libexecdir@/gnome-settings-daemon-localeexec
+ OnlyShowIn=GNOME;
+ NoDisplay=true
+ X-GNOME-Autostart-Phase=Initialization
+diff --git a/gnome-settings-daemon/Makefile.am
b/gnome-settings-daemon/Makefile.am
+index 194a7cc..94b3861 100644
+--- a/gnome-settings-daemon/Makefile.am
b/gnome-settings-daemon/Makefile.am
+@@ -48,6 +48,15 @@ gsddir = $(libexecdir)
+ gsd_PROGRAMS = \
+ gnome-settings-daemon
+
++gsd_SCRIPTS = \
++ gnome-settings-daemon-localeexec
++
++EXTRA_DIST = \
++ gnome-settings-daemon-localeexec.in
++
++gnome-settings-daemon-localeexec: gnome-settings-daemon-localeexec.in
++ $(AM_V_GEN) sed -e s|\@libexecdir\@|$(libexecdir)| -e
s|\@prefix\@|$(prefix)| $ $@.tmp mv $@.tmp $@
++
+ apidir =
$(includedir)/gnome-settings-daemon-$(GSD_API_VERSION)/gnome-settings-daemon
+ api_DATA =\
+ gnome-settings-plugin.h
+diff --git a/gnome-settings-daemon/gnome-settings-daemon-localeexec.in
b/gnome-settings-daemon/gnome-settings-daemon-localeexec.in
+new file mode 100755
+index 000..eed91a4
+--- /dev/null
b/gnome-settings-daemon/gnome-settings-daemon-localeexec.in
+@@ -0,0 +1,20 @@
++#!/bin/sh
++
++SETTING=$(gsettings get org.gnome.system.locale region)
++REGION=${SETTING#\'}
++REGION=${REGION%\'}
++
++if [ -n $REGION ]; then
++ export LC_TIME=$REGION
++ export LC_NUMERIC=$REGION
++ export LC_MONETARY=$REGION
++ export LC_MEASUREMENT=$REGION
++ export LC_PAPER=$REGION
++fi
++
++if [ -x @prefix@/bin/ibus-daemon ]; then
++ export QT_IM_MODULE=ibus
++ export XMODIFIERS=@im=ibus
++fi
++
++exec @libexecdir@/gnome-settings-daemon
+diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
+index 24c1598..16017df 100644
+--- a/gnome-settings-daemon/main.c
b/gnome-settings-daemon/main.c
+@@ -279,37 +279,6 @@ set_legacy_ibus_env_vars (GDBusProxy *proxy)
+ }
+ #endif
+
+-/* Keep synchronised with set_locale() and
+- * set_legacy_ibus_env_vars() above */
+-static void
+-set_locale_env (void)
+-{
+-GSettings *locale_settings;
+-gchar *region;
+-
+-/* Set locale environment */
+-locale_settings = g_settings_new (org.gnome.system.locale);
+-region = g_settings_get_string (locale_settings, region);
+-if (region[0]) {
+-g_setenv (LC_TIME, region, TRUE);
+-g_setenv (LC_NUMERIC, region, TRUE);
+-g_setenv (LC_MONETARY, region, TRUE);
+-g_setenv (LC_MEASUREMENT, region, TRUE);
+-g_setenv (LC_PAPER, region, TRUE);
+-}
+-g_free (region);
+-g_object_unref (locale_settings);
+-
+-#ifdef HAVE_IBUS
+-/* Set IBus legacy environment */
+-
