diff --git a/commit_rollup.patch b/commit_rollup.patch index 72bcb79..6fb60f8 100644 --- a/commit_rollup.patch +++ b/commit_rollup.patch @@ -10,75 +10,6 @@ diff -uNrp a/configure.ac b/configure.ac AC_SUBST([plugindir]) dnl --------------------------------------------------------------------------- -diff -uNrp a/distro/archlinux/mate-settings-daemon.install b/distro/archlinux/mate-settings-daemon.install ---- a/distro/archlinux/mate-settings-daemon.install 1969-12-31 16:00:00.000000000 -0800 -+++ b/distro/archlinux/mate-settings-daemon.install 2012-11-23 16:26:42.389326115 -0800 -@@ -0,0 +1,22 @@ -+pkgname=mate-settings-daemon -+ -+post_install() { -+ usr/sbin/mateconfpkg --install ${pkgname} -+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -+} -+ -+pre_upgrade() { -+ pre_remove $1 -+} -+ -+post_upgrade() { -+ post_install $1 -+} -+ -+pre_remove() { -+ usr/sbin/mateconfpkg --uninstall ${pkgname} -+} -+ -+post_remove() { -+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -+} -diff -uNrp a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD ---- a/distro/archlinux/PKGBUILD 1969-12-31 16:00:00.000000000 -0800 -+++ b/distro/archlinux/PKGBUILD 2012-11-23 16:26:42.389326115 -0800 -@@ -0,0 +1,39 @@ -+pkgname=mate-settings-daemon -+pkgver=1.1.1 -+pkgrel=2 -+pkgdesc="The MATE Settings daemon" -+arch=('i686' 'x86_64') -+license=('GPL') -+depends=('libmatekbd' 'mate-desktop' 'libmatenotify' 'gstreamer0.10-base' 'hicolor-icon-theme') -+makedepends=('intltool' 'pkgconfig') -+options=('!libtool') -+url="http://matsusoft.com.ar/projects/mate/" -+install=mate-settings-daemon.install -+groups=('mate') -+source=() -+sha256sums=() -+ -+build() { -+ cd "$srcdir/../../../" -+ # Remove --disable-pulse if you want pulseaudio support -+ ./autogen.sh \ -+ --prefix=/usr \ -+ --sysconfdir=/etc \ -+ --localstatedir=/var \ -+ --libexecdir=/usr/lib/mate-settings-daemon \ -+ --disable-static \ -+ --disable-pulse \ -+ --disable-schemas-install \ -+ --enable-polkit || return 1 -+ make || return 1 -+} -+ -+package() { -+ cd "${srcdir}/../../../" -+ -+ make DESTDIR="${pkgdir}" MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install || return 1 -+ -+ install -d -m755 "${pkgdir}/usr/share/mateconf/schemas" -+ mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1 -+ rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas -+} diff -uNrp a/plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf b/plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf --- a/plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf 2012-10-27 07:58:43.000000000 -0700 +++ b/plugins/datetime/org.mate.SettingsDaemon.DateTimeMechanism.conf 2012-11-23 16:28:12.241937824 -0800