Date: Tuesday, September 23, 2014 @ 18:19:55
Author: flexiondotorg
Revision: 119519
archrelease: copy trunk to community-i686, community-x86_64
Added:
mate-control-center/repos/community-i686/PKGBUILD
(from rev 119518, mate-control-center/trunk/PKGBUILD)
mate-control-center/repos/community-i686/mate-control-center.install
(from rev 119518, mate-control-center/trunk/mate-control-center.install)
mate-control-center/repos/community-i686/remove-segfault-when-more-custom-keybindings-configured.diff
(from rev 119518,
mate-control-center/trunk/remove-segfault-when-more-custom-keybindings-configured.diff)
mate-control-center/repos/community-x86_64/PKGBUILD
(from rev 119518, mate-control-center/trunk/PKGBUILD)
mate-control-center/repos/community-x86_64/mate-control-center.install
(from rev 119518, mate-control-center/trunk/mate-control-center.install)
mate-control-center/repos/community-x86_64/remove-segfault-when-more-custom-keybindings-configured.diff
(from rev 119518,
mate-control-center/trunk/remove-segfault-when-more-custom-keybindings-configured.diff)
Deleted:
mate-control-center/repos/community-i686/PKGBUILD
mate-control-center/repos/community-i686/mate-control-center.install
mate-control-center/repos/community-x86_64/PKGBUILD
mate-control-center/repos/community-x86_64/mate-control-center.install
-------------------------------------------------------------------------------+
/PKGBUILD
| 92 ++++++++++
/mate-control-center.install
| 28 +++
community-i686/PKGBUILD
| 38 ----
community-i686/mate-control-center.install
| 14 -
community-i686/remove-segfault-when-more-custom-keybindings-configured.diff
| 12 +
community-x86_64/PKGBUILD
| 38 ----
community-x86_64/mate-control-center.install
| 14 -
community-x86_64/remove-segfault-when-more-custom-keybindings-configured.diff
| 12 +
8 files changed, 144 insertions(+), 104 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-09-23 16:19:43 UTC (rev 119518)
+++ community-i686/PKGBUILD 2014-09-23 16:19:55 UTC (rev 119519)
@@ -1,38 +0,0 @@
-# Maintainer : Martin Wimpress <[email protected]>
-
-pkgname=mate-control-center
-pkgver=1.8.2
-pkgrel=1
-pkgdesc="The Control Center for MATE"
-url="http://mate-desktop.org";
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('caja' 'dbus-glib' 'dconf' 'desktop-file-utils'
'gsettings-desktop-schemas'
- 'gtk2' 'mate-desktop' 'mate-icon-theme' 'mate-menus'
'mate-settings-daemon'
- 'marco' 'libgtop' 'libmatekbd' 'libunique' 'librsvg' 'libxss'
- 'libxt' 'startup-notification')
-makedepends=('docbook2x' 'mate-common' 'perl-xml-parser' 'yelp-tools')
-optdepends=('yelp: for reading MATE help documents')
-groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz";)
-sha1sums=('581439b1e9d042f6cf5707e041fc521fa3fe63f8')
-install=${pkgname}.install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --sbindir=/usr/bin \
- --localstatedir=/var \
- --with-gtk=2.0 \
- --disable-static \
- --disable-update-mimedb
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- rm -f "${pkgdir}/usr/share/applications/mimeinfo.cache"
-}
Copied: mate-control-center/repos/community-i686/PKGBUILD (from rev 119518,
mate-control-center/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-09-23 16:19:55 UTC (rev 119519)
@@ -0,0 +1,46 @@
+# Maintainer : Martin Wimpress <[email protected]>
+
+pkgname=mate-control-center
+pkgver=1.8.2
+pkgrel=2
+pkgdesc="The Control Center for MATE"
+url="http://mate-desktop.org";
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('caja' 'dbus-glib' 'dconf' 'desktop-file-utils'
'gsettings-desktop-schemas'
+ 'gtk2' 'mate-desktop' 'mate-icon-theme' 'mate-menus'
'mate-settings-daemon'
+ 'marco' 'libgtop' 'libmatekbd' 'libunique' 'librsvg' 'libxss'
+ 'libxt' 'startup-notification')
+makedepends=('docbook2x' 'mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz";
+ 'remove-segfault-when-more-custom-keybindings-configured.diff')
+sha1sums=('581439b1e9d042f6cf5707e041fc521fa3fe63f8'
+ 'f94b3c5e42b0cc8404c59231389ece3e6d93ca0d')
+install=${pkgname}.install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # https://github.com/mate-desktop/mate-control-center/issues/80
+ patch -Np1 -i
"${srcdir}/remove-segfault-when-more-custom-keybindings-configured.diff"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --sbindir=/usr/bin \
+ --localstatedir=/var \
+ --with-gtk=2.0 \
+ --disable-static \
+ --disable-update-mimedb
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ rm -f "${pkgdir}/usr/share/applications/mimeinfo.cache"
+}
Deleted: community-i686/mate-control-center.install
===================================================================
--- community-i686/mate-control-center.install 2014-09-23 16:19:43 UTC (rev
119518)
+++ community-i686/mate-control-center.install 2014-09-23 16:19:55 UTC (rev
119519)
@@ -1,14 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas/
- update-mime-database /usr/share/mime/ > /dev/null
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mate-control-center/repos/community-i686/mate-control-center.install
(from rev 119518, mate-control-center/trunk/mate-control-center.install)
===================================================================
--- community-i686/mate-control-center.install (rev 0)
+++ community-i686/mate-control-center.install 2014-09-23 16:19:55 UTC (rev
119519)
@@ -0,0 +1,14 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas/
+ update-mime-database /usr/share/mime/ > /dev/null
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied:
mate-control-center/repos/community-i686/remove-segfault-when-more-custom-keybindings-configured.diff
(from rev 119518,
mate-control-center/trunk/remove-segfault-when-more-custom-keybindings-configured.diff)
===================================================================
--- community-i686/remove-segfault-when-more-custom-keybindings-configured.diff
(rev 0)
+++ community-i686/remove-segfault-when-more-custom-keybindings-configured.diff
2014-09-23 16:19:55 UTC (rev 119519)
@@ -0,0 +1,12 @@
+diff --git a/capplets/keybindings/mate-keybinding-properties.c
b/capplets/keybindings/mate-keybinding-properties.c
+index 6e44255..ae9bee9 100644
+--- a/capplets/keybindings/mate-keybinding-properties.c
++++ b/capplets/keybindings/mate-keybinding-properties.c
+@@ -1000,6 +1000,7 @@ append_keys_to_tree_from_gsettings (GtkBuilder *builder,
const gchar *gsettings_
+ key.name = g_strdup("binding");
+ key.cmd_key = g_strdup("action");
+ key.description_key = g_strdup("name");
++ key.schema = NULL;
+ g_array_append_val (entries, key);
+ }
+ }
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-09-23 16:19:43 UTC (rev 119518)
+++ community-x86_64/PKGBUILD 2014-09-23 16:19:55 UTC (rev 119519)
@@ -1,38 +0,0 @@
-# Maintainer : Martin Wimpress <[email protected]>
-
-pkgname=mate-control-center
-pkgver=1.8.2
-pkgrel=1
-pkgdesc="The Control Center for MATE"
-url="http://mate-desktop.org";
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('caja' 'dbus-glib' 'dconf' 'desktop-file-utils'
'gsettings-desktop-schemas'
- 'gtk2' 'mate-desktop' 'mate-icon-theme' 'mate-menus'
'mate-settings-daemon'
- 'marco' 'libgtop' 'libmatekbd' 'libunique' 'librsvg' 'libxss'
- 'libxt' 'startup-notification')
-makedepends=('docbook2x' 'mate-common' 'perl-xml-parser' 'yelp-tools')
-optdepends=('yelp: for reading MATE help documents')
-groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz";)
-sha1sums=('581439b1e9d042f6cf5707e041fc521fa3fe63f8')
-install=${pkgname}.install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --sbindir=/usr/bin \
- --localstatedir=/var \
- --with-gtk=2.0 \
- --disable-static \
- --disable-update-mimedb
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- rm -f "${pkgdir}/usr/share/applications/mimeinfo.cache"
-}
Copied: mate-control-center/repos/community-x86_64/PKGBUILD (from rev 119518,
mate-control-center/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-09-23 16:19:55 UTC (rev 119519)
@@ -0,0 +1,46 @@
+# Maintainer : Martin Wimpress <[email protected]>
+
+pkgname=mate-control-center
+pkgver=1.8.2
+pkgrel=2
+pkgdesc="The Control Center for MATE"
+url="http://mate-desktop.org";
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('caja' 'dbus-glib' 'dconf' 'desktop-file-utils'
'gsettings-desktop-schemas'
+ 'gtk2' 'mate-desktop' 'mate-icon-theme' 'mate-menus'
'mate-settings-daemon'
+ 'marco' 'libgtop' 'libmatekbd' 'libunique' 'librsvg' 'libxss'
+ 'libxt' 'startup-notification')
+makedepends=('docbook2x' 'mate-common' 'perl-xml-parser' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz";
+ 'remove-segfault-when-more-custom-keybindings-configured.diff')
+sha1sums=('581439b1e9d042f6cf5707e041fc521fa3fe63f8'
+ 'f94b3c5e42b0cc8404c59231389ece3e6d93ca0d')
+install=${pkgname}.install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # https://github.com/mate-desktop/mate-control-center/issues/80
+ patch -Np1 -i
"${srcdir}/remove-segfault-when-more-custom-keybindings-configured.diff"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --sbindir=/usr/bin \
+ --localstatedir=/var \
+ --with-gtk=2.0 \
+ --disable-static \
+ --disable-update-mimedb
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ rm -f "${pkgdir}/usr/share/applications/mimeinfo.cache"
+}
Deleted: community-x86_64/mate-control-center.install
===================================================================
--- community-x86_64/mate-control-center.install 2014-09-23 16:19:43 UTC
(rev 119518)
+++ community-x86_64/mate-control-center.install 2014-09-23 16:19:55 UTC
(rev 119519)
@@ -1,14 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas/
- update-mime-database /usr/share/mime/ > /dev/null
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mate-control-center/repos/community-x86_64/mate-control-center.install
(from rev 119518, mate-control-center/trunk/mate-control-center.install)
===================================================================
--- community-x86_64/mate-control-center.install
(rev 0)
+++ community-x86_64/mate-control-center.install 2014-09-23 16:19:55 UTC
(rev 119519)
@@ -0,0 +1,14 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas/
+ update-mime-database /usr/share/mime/ > /dev/null
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied:
mate-control-center/repos/community-x86_64/remove-segfault-when-more-custom-keybindings-configured.diff
(from rev 119518,
mate-control-center/trunk/remove-segfault-when-more-custom-keybindings-configured.diff)
===================================================================
---
community-x86_64/remove-segfault-when-more-custom-keybindings-configured.diff
(rev 0)
+++
community-x86_64/remove-segfault-when-more-custom-keybindings-configured.diff
2014-09-23 16:19:55 UTC (rev 119519)
@@ -0,0 +1,12 @@
+diff --git a/capplets/keybindings/mate-keybinding-properties.c
b/capplets/keybindings/mate-keybinding-properties.c
+index 6e44255..ae9bee9 100644
+--- a/capplets/keybindings/mate-keybinding-properties.c
++++ b/capplets/keybindings/mate-keybinding-properties.c
+@@ -1000,6 +1000,7 @@ append_keys_to_tree_from_gsettings (GtkBuilder *builder,
const gchar *gsettings_
+ key.name = g_strdup("binding");
+ key.cmd_key = g_strdup("action");
+ key.description_key = g_strdup("name");
++ key.schema = NULL;
+ g_array_append_val (entries, key);
+ }
+ }
