[arch-commits] Commit in gnome-settings-daemon/repos (4 files)
Jan de Groot
jgc at archlinux.org
Sun Apr 19 20:03:59 UTC 2009
Date: Sunday, April 19, 2009 @ 16:03:59
Author: jgc
Revision: 36056
Merged revisions 36055 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/gnome-settings-daemon/trunk
........
r36055 | jgc | 2009-04-19 20:03:41 +0000 (Sun, 19 Apr 2009) | 1 line
upgpkg: gnome-settings-daemon 2.26.1-1
........
Modified:
gnome-settings-daemon/repos/extra-i686/ (properties)
gnome-settings-daemon/repos/extra-i686/07_use_gstreamer_volume.patch
gnome-settings-daemon/repos/extra-i686/PKGBUILD
Deleted:
gnome-settings-daemon/repos/extra-i686/06_undo_build_change.patch
-------------------------------+
06_undo_build_change.patch | 257 ----------------------------------------
07_use_gstreamer_volume.patch | 12 +
PKGBUILD | 11 -
3 files changed, 16 insertions(+), 264 deletions(-)
Property changes on: gnome-settings-daemon/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /gnome-settings-daemon/trunk:1-32019
+ /gnome-settings-daemon/trunk:1-36055
Deleted: extra-i686/06_undo_build_change.patch
===================================================================
--- extra-i686/06_undo_build_change.patch 2009-04-19 20:03:41 UTC (rev 36055)
+++ extra-i686/06_undo_build_change.patch 2009-04-19 20:03:59 UTC (rev 36056)
@@ -1,257 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/gnome-settings-daemon/Makefile.am gnome-settings-daemon-2.26.0.new/gnome-settings-daemon/Makefile.am
---- gnome-settings-daemon-2.26.0/gnome-settings-daemon/Makefile.am 2009-03-16 15:35:39.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/gnome-settings-daemon/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -11,28 +11,27 @@
- $(NULL)
-
- noinst_LTLIBRARIES = \
-- libgsd-plugins.la \
-+ libgsd-profile.la \
- $(NULL)
-
--libgsd_plugins_la_SOURCES = \
-- gnome-settings-plugin.c \
-- gnome-settings-plugin.h \
-+libgsd_profile_la_SOURCES = \
- gnome-settings-profile.c \
- gnome-settings-profile.h \
- $(NULL)
-
--libgsd_plugins_la_CPPFLAGS = \
-+libgsd_profile_la_CPPFLAGS = \
- $(DISABLE_DEPRECATED_CFLAGS) \
- $(NULL)
-
--libgsd_plugins_la_CFLAGS = \
-+libgsd_profile_la_CFLAGS = \
-+ $(SIMPLE_GREETER_CFLAGS) \
- $(NULL)
-
--libgsd_plugins_la_LIBADD = \
-+libgsd_profile_la_LIBADD = \
- $(NULL)
-
--libgsd_plugins_la_LDFLAGS = \
-- -export-dynamic \
-+libgsd_profile_la_LDFLAGS = \
-+ -export-dynamic \
- $(NULL)
-
- gsddir = $(libexecdir)
-@@ -60,6 +59,8 @@
- main.c \
- gnome-settings-manager.c \
- gnome-settings-manager.h \
-+ gnome-settings-plugin.c \
-+ gnome-settings-plugin.h \
- gnome-settings-plugin-info.c \
- gnome-settings-plugin-info.h \
- gnome-settings-module.c \
-@@ -76,7 +77,7 @@
- $(AM_LDFLAGS)
-
- gnome_settings_daemon_LDADD = \
-- libgsd-plugins.la \
-+ libgsd-profile.la \
- $(SETTINGS_DAEMON_LIBS)
-
- EXTRA_DIST = \
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/a11y-keyboard/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/a11y-keyboard/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/a11y-keyboard/Makefile.am 2009-03-16 15:35:39.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/a11y-keyboard/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -60,7 +60,6 @@
- $(NULL)
-
- liba11y_keyboard_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(XF86MISC_LIBS) \
- $(LIBNOTIFY_LIBS) \
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/background/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/background/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/background/Makefile.am 2009-03-16 15:35:38.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/background/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -20,7 +20,7 @@
- $(AM_CFLAGS)
-
- test_background_LDADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
-+ $(top_builddir)/gnome-settings-daemon/libgsd-profile.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(NULL)
-
-@@ -50,7 +50,6 @@
- $(NULL)
-
- libbackground_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(NULL)
-
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/clipboard/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/clipboard/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/clipboard/Makefile.am 2009-03-16 15:35:39.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/clipboard/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -29,7 +29,6 @@
- $(NULL)
-
- libclipboard_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(NULL)
-
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/dummy/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/dummy/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/dummy/Makefile.am 2009-03-16 15:35:39.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/dummy/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -20,7 +20,6 @@
- $(GSD_PLUGIN_LDFLAGS)
-
- libdummy_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(SETTINGS_PLUGIN_LIBS)
-
- plugin_in_files = \
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/font/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/font/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/font/Makefile.am 2009-03-16 15:35:39.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/font/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -23,7 +23,6 @@
- $(AM_CFLAGS)
-
- libfont_la_LDFLAGS = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(GSD_PLUGIN_LDFLAGS) \
- $(NULL)
-
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/housekeeping/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/housekeeping/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/housekeeping/Makefile.am 2009-03-16 15:35:38.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/housekeeping/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -21,11 +21,7 @@
-
- libhousekeeping_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS)
-
--libhousekeeping_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
-- $(SETTINGS_PLUGIN_LIBS) \
-- $(GIOUNIX_LIBS) \
-- $(LIBNOTIFY_LIBS)
-+libhousekeeping_la_LIBADD = $(SETTINGS_PLUGIN_LIBS) $(GIOUNIX_LIBS) $(LIBNOTIFY_LIBS)
-
- plugin_in_files = housekeeping.gnome-settings-plugin.in
-
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/keybindings/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/keybindings/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/keybindings/Makefile.am 2009-03-16 15:35:39.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/keybindings/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -26,7 +26,6 @@
- $(NULL)
-
- libkeybindings_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(top_builddir)/plugins/common/libcommon.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(NULL)
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/keyboard/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/keyboard/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/keyboard/Makefile.am 2009-03-16 15:35:39.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/keyboard/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -36,7 +36,6 @@
- $(NULL)
-
- libkeyboard_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(XF86MISC_LIBS) \
- $(LIBGNOMEKBD_LIBS) \
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/media-keys/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/media-keys/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/media-keys/Makefile.am 2009-03-16 15:35:38.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/media-keys/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -53,7 +53,6 @@
- $(GSD_PLUGIN_LDFLAGS)
-
- libmedia_keys_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(top_builddir)/plugins/common/libcommon.la \
- $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la \
- $(SETTINGS_PLUGIN_LIBS) \
-@@ -116,7 +115,7 @@
- $(AM_CFLAGS)
-
- test_media_keys_LDADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
-+ $(top_builddir)/gnome-settings-daemon/libgsd-profile.la \
- $(top_builddir)/plugins/common/libcommon.la \
- $(SETTINGS_DAEMON_LIBS) \
- $(SETTINGS_PLUGIN_LIBS) \
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/mouse/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/mouse/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/mouse/Makefile.am 2009-03-16 15:35:38.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/mouse/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -23,7 +23,6 @@
- $(GSD_PLUGIN_LDFLAGS)
-
- libmouse_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(XINPUT_LIBS)
-
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/screensaver/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/screensaver/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/screensaver/Makefile.am 2009-03-16 15:35:38.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/screensaver/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -25,7 +25,6 @@
- $(NULL)
-
- libscreensaver_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(NULL)
-
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/sound/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/sound/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/sound/Makefile.am 2009-03-16 15:35:38.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/sound/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -22,7 +22,6 @@
- $(GSD_PLUGIN_LDFLAGS)
-
- libsound_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(PULSE_LIBS)
-
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/typing-break/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/typing-break/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/typing-break/Makefile.am 2009-03-16 15:35:39.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/typing-break/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -25,7 +25,6 @@
- $(NULL)
-
- libtyping_break_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(NULL)
-
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/xrandr/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/xrandr/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/xrandr/Makefile.am 2009-03-16 15:35:39.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/xrandr/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -59,7 +59,6 @@
- $(GSD_PLUGIN_LDFLAGS)
-
- libxrandr_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(LIBNOTIFY_LIBS) \
- $(RANDR_LIBS)
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/xrdb/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/xrdb/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/xrdb/Makefile.am 2009-03-16 15:35:39.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/xrdb/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -30,7 +30,6 @@
- $(NULL)
-
- libxrdb_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(NULL)
-
-diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/xsettings/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/xsettings/Makefile.am
---- gnome-settings-daemon-2.26.0/plugins/xsettings/Makefile.am 2009-03-16 15:35:38.000000000 +0100
-+++ gnome-settings-daemon-2.26.0.new/plugins/xsettings/Makefile.am 2009-03-18 15:34:43.000000000 +0100
-@@ -29,7 +29,6 @@
- $(NULL)
-
- libxsettings_la_LIBADD = \
-- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(NULL)
-
Modified: extra-i686/07_use_gstreamer_volume.patch
===================================================================
--- extra-i686/07_use_gstreamer_volume.patch 2009-04-19 20:03:41 UTC (rev 36055)
+++ extra-i686/07_use_gstreamer_volume.patch 2009-04-19 20:03:59 UTC (rev 36056)
@@ -2370,3 +2370,15 @@
CLEANFILES = \
$(BUILT_SOURCES) \
+--- gnome-settings-daemon-2.26.0/plugins/media-keys/Makefile.am 2009-03-16 09:35:38.000000000 -0500
++++ gnome-settings-daemon-2.26.0/plugins/media-keys/Makefile.am 2009-04-03 02:36:09.743750000 -0500
+@@ -62,9 +62,7 @@ libmedia_keys_la_LIBADD = \
+ plugin_in_files = \
+ media-keys.gnome-settings-plugin.in
+
+-if HAVE_PULSE
+ plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
+-endif
+
+ noinst_PROGRAMS = \
+ test-media-keys \
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-04-19 20:03:41 UTC (rev 36055)
+++ extra-i686/PKGBUILD 2009-04-19 20:03:59 UTC (rev 36056)
@@ -2,12 +2,12 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gnome-settings-daemon
-pkgver=2.26.0
+pkgver=2.26.1
pkgrel=1
pkgdesc="The GNOME Settings daemon"
arch=(i686 x86_64)
license=('GPL')
-depends=('libgnomekbd>=2.26.0' 'gnome-desktop>=2.26.0' 'libnotify>=0.4.5' 'libxxf86misc' 'gstreamer0.10-base')
+depends=('libgnomekbd>=2.26.0' 'gnome-desktop>=2.26.1' 'libnotify>=0.4.5' 'libxxf86misc' 'gstreamer0.10-base>=0.10.22')
makedepends=('intltool' 'pkgconfig')
conflicts=('gnome-control-center<2.22.0')
options=(!emptydirs !libtool)
@@ -15,15 +15,12 @@
url="http://www.gnome.org"
groups=('gnome')
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2
- 06_undo_build_change.patch
07_use_gstreamer_volume.patch)
-md5sums=('c3a2934deccfcf13de15507d4be802d3'
- 'b4db0c34d4bc9b332a26093e4ff1f829'
- 'caecfacf113f758a5a8cc2224685ee94')
+md5sums=('7be383de54c0707c64843ae51563c43a'
+ 'fb186df7c9b31fd8ab03e93aa3af7c78')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/06_undo_build_change.patch" || return 1
patch -Np1 -i "${srcdir}/07_use_gstreamer_volume.patch" || return 1
libtoolize --force || return 1
aclocal || return 1
More information about the arch-commits
mailing list