[arch-commits] Commit in mate-control-center/repos (12 files)

Martin Wimpress flexiondotorg at archlinux.org
Tue May 12 13:30:47 UTC 2015


    Date: Tuesday, May 12, 2015 @ 15:30:47
  Author: flexiondotorg
Revision: 133316

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  mate-control-center/repos/community-staging-i686/0001_fix_keyboard_and_mouse_properties_windows.diff
    (from rev 133315, mate-control-center/trunk/0001_fix_keyboard_and_mouse_properties_windows.diff)
  mate-control-center/repos/community-staging-i686/0002_adjust_mate-about-me_dialog_window.diff
    (from rev 133315, mate-control-center/trunk/0002_adjust_mate-about-me_dialog_window.diff)
  mate-control-center/repos/community-staging-i686/PKGBUILD
    (from rev 133315, mate-control-center/trunk/PKGBUILD)
  mate-control-center/repos/community-staging-i686/mate-control-center.install
    (from rev 133315, mate-control-center/trunk/mate-control-center.install)
  mate-control-center/repos/community-staging-x86_64/0001_fix_keyboard_and_mouse_properties_windows.diff
    (from rev 133315, mate-control-center/trunk/0001_fix_keyboard_and_mouse_properties_windows.diff)
  mate-control-center/repos/community-staging-x86_64/0002_adjust_mate-about-me_dialog_window.diff
    (from rev 133315, mate-control-center/trunk/0002_adjust_mate-about-me_dialog_window.diff)
  mate-control-center/repos/community-staging-x86_64/PKGBUILD
    (from rev 133315, mate-control-center/trunk/PKGBUILD)
  mate-control-center/repos/community-staging-x86_64/mate-control-center.install
    (from rev 133315, mate-control-center/trunk/mate-control-center.install)
Deleted:
  mate-control-center/repos/community-staging-i686/PKGBUILD
  mate-control-center/repos/community-staging-i686/mate-control-center.install
  mate-control-center/repos/community-staging-x86_64/PKGBUILD
  mate-control-center/repos/community-staging-x86_64/mate-control-center.install

------------------------------------------------------------------------------+
 /PKGBUILD                                                                    |  106 +++++++++
 /mate-control-center.install                                                 |   28 ++
 community-staging-i686/0001_fix_keyboard_and_mouse_properties_windows.diff   |  108 ++++++++++
 community-staging-i686/0002_adjust_mate-about-me_dialog_window.diff          |   13 +
 community-staging-i686/PKGBUILD                                              |   41 ---
 community-staging-i686/mate-control-center.install                           |   14 -
 community-staging-x86_64/0001_fix_keyboard_and_mouse_properties_windows.diff |  108 ++++++++++
 community-staging-x86_64/0002_adjust_mate-about-me_dialog_window.diff        |   13 +
 community-staging-x86_64/PKGBUILD                                            |   41 ---
 community-staging-x86_64/mate-control-center.install                         |   14 -
 10 files changed, 376 insertions(+), 110 deletions(-)

Copied: mate-control-center/repos/community-staging-i686/0001_fix_keyboard_and_mouse_properties_windows.diff (from rev 133315, mate-control-center/trunk/0001_fix_keyboard_and_mouse_properties_windows.diff)
===================================================================
--- community-staging-i686/0001_fix_keyboard_and_mouse_properties_windows.diff	                        (rev 0)
+++ community-staging-i686/0001_fix_keyboard_and_mouse_properties_windows.diff	2015-05-12 13:30:47 UTC (rev 133316)
@@ -0,0 +1,108 @@
+diff --git a/capplets/keyboard/mate-keyboard-properties-layout-chooser.ui b/capplets/keyboard/mate-keyboard-properties-layout-chooser.ui
+index 2de4c9b..1df1fa7 100644
+--- a/capplets/keyboard/mate-keyboard-properties-layout-chooser.ui
++++ b/capplets/keyboard/mate-keyboard-properties-layout-chooser.ui
+@@ -6,7 +6,7 @@
+     <property name="visible">True</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Choose a Layout</property>
+-    <property name="default_width">670</property>
++    <property name="default_width">900</property>
+     <property name="default_height">350</property>
+     <property name="type_hint">dialog</property>
+     <child internal-child="vbox">
+@@ -27,9 +27,9 @@
+                 <child>
+                   <object class="GtkAlignment" id="alignment1">
+                     <property name="visible">True</property>
+-                    <property name="top_padding">3</property>
+-                    <property name="bottom_padding">3</property>
+-                    <property name="left_padding">3</property>
++                    <property name="top_padding">6</property>
++                    <property name="bottom_padding">6</property>
++                    <property name="left_padding">10</property>
+                     <property name="right_padding">6</property>
+                     <child>
+                       <object class="GtkTable" id="table1">
+@@ -107,10 +107,10 @@
+                 <child>
+                   <object class="GtkAlignment" id="alignment2">
+                     <property name="visible">True</property>
+-                    <property name="top_padding">3</property>
+-                    <property name="bottom_padding">3</property>
+-                    <property name="left_padding">3</property>
+-                    <property name="right_padding">3</property>
++                    <property name="top_padding">6</property>
++                    <property name="bottom_padding">6</property>
++                    <property name="left_padding">10</property>
++                    <property name="right_padding">6</property>
+                     <child>
+                       <object class="GtkTable" id="table3">
+                         <property name="visible">True</property>
+@@ -200,6 +200,8 @@
+                 <property name="visible">True</property>
+                 <property name="orientation">vertical</property>
+                 <property name="spacing">6</property>
++                <property name="width_request">900</property>
++                <property name="height_request">400</property>
+                 <child>
+                   <object class="GtkHBox" id="hbox1">
+                     <property name="visible">True</property>
+diff --git a/capplets/keyboard/mate-keyboard-properties-model-chooser.ui b/capplets/keyboard/mate-keyboard-properties-model-chooser.ui
+index a89cfc9..07f4f68 100644
+--- a/capplets/keyboard/mate-keyboard-properties-model-chooser.ui
++++ b/capplets/keyboard/mate-keyboard-properties-model-chooser.ui
+@@ -8,7 +8,7 @@
+     <property name="title" translatable="yes">Choose a Keyboard Model</property>
+     <property name="modal">True</property>
+     <property name="default_width">450</property>
+-    <property name="default_height">400</property>
++    <property name="default_height">380</property>
+     <property name="type_hint">dialog</property>
+     <child internal-child="vbox">
+       <object class="GtkVBox" id="dialog-vbox2">
+@@ -40,6 +40,7 @@
+                 <property name="can_focus">True</property>
+                 <property name="hscrollbar_policy">automatic</property>
+                 <property name="vscrollbar_policy">automatic</property>
++                <property name="height_request">130</property>
+                 <property name="shadow_type">in</property>
+                 <child>
+                   <object class="GtkTreeView" id="vendors_list">
+@@ -70,9 +71,10 @@
+               <object class="GtkScrolledWindow" id="scrolledwindow3">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+-                <property name="hscrollbar_policy">automatic</property>
++                <property name="hscrollbar_policy">never</property>
+                 <property name="vscrollbar_policy">automatic</property>
+                 <property name="shadow_type">in</property>
++                <property name="height_request">130</property>
+                 <child>
+                   <object class="GtkTreeView" id="models_list">
+                     <property name="visible">True</property>
+diff --git a/capplets/keyboard/mate-keyboard-properties-options-dialog.ui b/capplets/keyboard/mate-keyboard-properties-options-dialog.ui
+index 0691444..419004e 100644
+--- a/capplets/keyboard/mate-keyboard-properties-options-dialog.ui
++++ b/capplets/keyboard/mate-keyboard-properties-options-dialog.ui
+@@ -24,6 +24,7 @@
+             <property name="hscrollbar_policy">automatic</property>
+             <property name="vscrollbar_policy">automatic</property>
+             <property name="shadow_type">out</property>
++            <property name="height_request">300</property>
+             <child>
+               <object class="GtkViewport" id="viewport1">
+                 <property name="visible">True</property>
+diff --git a/capplets/mouse/mate-mouse-properties.ui b/capplets/mouse/mate-mouse-properties.ui
+index d6ad245..19314bf 100644
+--- a/capplets/mouse/mate-mouse-properties.ui
++++ b/capplets/mouse/mate-mouse-properties.ui
+@@ -62,6 +62,8 @@
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Mouse Preferences</property>
+     <property name="type_hint">dialog</property>
++    <property name="default_width">500</property>
++    <property name="default_height">550</property>
+     <child internal-child="vbox">
+       <object class="GtkVBox" id="dialog-vbox1">
+         <property name="visible">True</property>

Copied: mate-control-center/repos/community-staging-i686/0002_adjust_mate-about-me_dialog_window.diff (from rev 133315, mate-control-center/trunk/0002_adjust_mate-about-me_dialog_window.diff)
===================================================================
--- community-staging-i686/0002_adjust_mate-about-me_dialog_window.diff	                        (rev 0)
+++ community-staging-i686/0002_adjust_mate-about-me_dialog_window.diff	2015-05-12 13:30:47 UTC (rev 133316)
@@ -0,0 +1,13 @@
+diff --git a/capplets/about-me/mate-about-me-dialog.ui b/capplets/about-me/mate-about-me-dialog.ui
+index c57f267..fc22a13 100644
+--- a/capplets/about-me/mate-about-me-dialog.ui
++++ b/capplets/about-me/mate-about-me-dialog.ui
+@@ -6,6 +6,8 @@
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">About Me</property>
+     <property name="type_hint">dialog</property>
++    <property name="width_request">400</property>
++    <property name="height_request">200</property>
+     <child internal-child="vbox">
+       <object class="GtkBox" id="dialog-vbox2">
+         <property name="visible">True</property>

Deleted: community-staging-i686/PKGBUILD
===================================================================
--- community-staging-i686/PKGBUILD	2015-05-12 13:30:07 UTC (rev 133315)
+++ community-staging-i686/PKGBUILD	2015-05-12 13:30:47 UTC (rev 133316)
@@ -1,41 +0,0 @@
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-_ver=1.10
-_pkgbase=mate-control-center
-pkgname=(${_pkgbase})
-pkgver=${_ver}.0
-pkgrel=1
-pkgdesc="The Control Center for MATE (GTK2 version)"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('caja>=1.10' 'dbus-glib' 'dconf' 'desktop-file-utils' 'gsettings-desktop-schemas'
-         'gtk2' 'mate-desktop>=1.10' 'mate-icon-theme' 'mate-menus>=1.10' 'mate-settings-daemon>=1.10'
-         'marco>=1.10' 'libgtop' 'libmatekbd>=1.10' 'libunique' 'librsvg' 'libxss'
-         'libxt' 'startup-notification')
-makedepends=('docbook2x' 'mate-common' 'yelp-tools')
-optdepends=('yelp: for reading MATE help documents')
-groups=('mate')
-conflicts=("${_pkgbase}-gtk3")
-source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('b720314054e8c417f32eeac8385b82d3849dace0')
-install=${_pkgbase}.install
-
-build() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --sbindir=/usr/bin \
-        --localstatedir=/var \
-        --with-gtk=2.0 \
-        --disable-static \
-        --disable-update-mimedb
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-    rm -f "${pkgdir}/usr/share/applications/mimeinfo.cache"
-}

Copied: mate-control-center/repos/community-staging-i686/PKGBUILD (from rev 133315, mate-control-center/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2015-05-12 13:30:47 UTC (rev 133316)
@@ -0,0 +1,53 @@
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+_ver=1.10
+_pkgbase=mate-control-center
+pkgname=(${_pkgbase})
+pkgver=${_ver}.0
+pkgrel=2
+pkgdesc="The Control Center for MATE (GTK2 version)"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('caja>=1.10' 'dbus-glib' 'dconf' 'desktop-file-utils' 'gsettings-desktop-schemas'
+         'gtk2' 'mate-desktop>=1.10' 'mate-icon-theme' 'mate-menus>=1.10' 'mate-settings-daemon>=1.10'
+         'marco>=1.10' 'libgtop' 'libmatekbd>=1.10' 'libunique' 'librsvg' 'libxss'
+         'libxt' 'startup-notification')
+makedepends=('docbook2x' 'mate-common' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
+groups=('mate')
+conflicts=("${_pkgbase}-gtk3")
+source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz"
+        "0001_fix_keyboard_and_mouse_properties_windows.diff"
+        "0002_adjust_mate-about-me_dialog_window.diff")
+sha1sums=('b720314054e8c417f32eeac8385b82d3849dace0'
+          'd0fae2cd19ef20cb8eaae42ea7e0b9860dcf9ffe'
+          'bf845bd8f0cda2fad6a3726b7cee40b31321e066')
+install=${_pkgbase}.install
+
+prepare() {
+    # UI fixes.
+    #  - https://github.com/mate-desktop/mate-control-center/pull/157
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    patch -Np1 -i "${srcdir}/0001_fix_keyboard_and_mouse_properties_windows.diff"
+    patch -Np1 -i "${srcdir}/0002_adjust_mate-about-me_dialog_window.diff"
+}
+
+build() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --sbindir=/usr/bin \
+        --localstatedir=/var \
+        --with-gtk=2.0 \
+        --disable-static \
+        --disable-update-mimedb
+    make
+}
+
+package() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+    rm -f "${pkgdir}/usr/share/applications/mimeinfo.cache"
+}

Deleted: community-staging-i686/mate-control-center.install
===================================================================
--- community-staging-i686/mate-control-center.install	2015-05-12 13:30:07 UTC (rev 133315)
+++ community-staging-i686/mate-control-center.install	2015-05-12 13:30:47 UTC (rev 133316)
@@ -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-staging-i686/mate-control-center.install (from rev 133315, mate-control-center/trunk/mate-control-center.install)
===================================================================
--- community-staging-i686/mate-control-center.install	                        (rev 0)
+++ community-staging-i686/mate-control-center.install	2015-05-12 13:30:47 UTC (rev 133316)
@@ -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-staging-x86_64/0001_fix_keyboard_and_mouse_properties_windows.diff (from rev 133315, mate-control-center/trunk/0001_fix_keyboard_and_mouse_properties_windows.diff)
===================================================================
--- community-staging-x86_64/0001_fix_keyboard_and_mouse_properties_windows.diff	                        (rev 0)
+++ community-staging-x86_64/0001_fix_keyboard_and_mouse_properties_windows.diff	2015-05-12 13:30:47 UTC (rev 133316)
@@ -0,0 +1,108 @@
+diff --git a/capplets/keyboard/mate-keyboard-properties-layout-chooser.ui b/capplets/keyboard/mate-keyboard-properties-layout-chooser.ui
+index 2de4c9b..1df1fa7 100644
+--- a/capplets/keyboard/mate-keyboard-properties-layout-chooser.ui
++++ b/capplets/keyboard/mate-keyboard-properties-layout-chooser.ui
+@@ -6,7 +6,7 @@
+     <property name="visible">True</property>
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Choose a Layout</property>
+-    <property name="default_width">670</property>
++    <property name="default_width">900</property>
+     <property name="default_height">350</property>
+     <property name="type_hint">dialog</property>
+     <child internal-child="vbox">
+@@ -27,9 +27,9 @@
+                 <child>
+                   <object class="GtkAlignment" id="alignment1">
+                     <property name="visible">True</property>
+-                    <property name="top_padding">3</property>
+-                    <property name="bottom_padding">3</property>
+-                    <property name="left_padding">3</property>
++                    <property name="top_padding">6</property>
++                    <property name="bottom_padding">6</property>
++                    <property name="left_padding">10</property>
+                     <property name="right_padding">6</property>
+                     <child>
+                       <object class="GtkTable" id="table1">
+@@ -107,10 +107,10 @@
+                 <child>
+                   <object class="GtkAlignment" id="alignment2">
+                     <property name="visible">True</property>
+-                    <property name="top_padding">3</property>
+-                    <property name="bottom_padding">3</property>
+-                    <property name="left_padding">3</property>
+-                    <property name="right_padding">3</property>
++                    <property name="top_padding">6</property>
++                    <property name="bottom_padding">6</property>
++                    <property name="left_padding">10</property>
++                    <property name="right_padding">6</property>
+                     <child>
+                       <object class="GtkTable" id="table3">
+                         <property name="visible">True</property>
+@@ -200,6 +200,8 @@
+                 <property name="visible">True</property>
+                 <property name="orientation">vertical</property>
+                 <property name="spacing">6</property>
++                <property name="width_request">900</property>
++                <property name="height_request">400</property>
+                 <child>
+                   <object class="GtkHBox" id="hbox1">
+                     <property name="visible">True</property>
+diff --git a/capplets/keyboard/mate-keyboard-properties-model-chooser.ui b/capplets/keyboard/mate-keyboard-properties-model-chooser.ui
+index a89cfc9..07f4f68 100644
+--- a/capplets/keyboard/mate-keyboard-properties-model-chooser.ui
++++ b/capplets/keyboard/mate-keyboard-properties-model-chooser.ui
+@@ -8,7 +8,7 @@
+     <property name="title" translatable="yes">Choose a Keyboard Model</property>
+     <property name="modal">True</property>
+     <property name="default_width">450</property>
+-    <property name="default_height">400</property>
++    <property name="default_height">380</property>
+     <property name="type_hint">dialog</property>
+     <child internal-child="vbox">
+       <object class="GtkVBox" id="dialog-vbox2">
+@@ -40,6 +40,7 @@
+                 <property name="can_focus">True</property>
+                 <property name="hscrollbar_policy">automatic</property>
+                 <property name="vscrollbar_policy">automatic</property>
++                <property name="height_request">130</property>
+                 <property name="shadow_type">in</property>
+                 <child>
+                   <object class="GtkTreeView" id="vendors_list">
+@@ -70,9 +71,10 @@
+               <object class="GtkScrolledWindow" id="scrolledwindow3">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+-                <property name="hscrollbar_policy">automatic</property>
++                <property name="hscrollbar_policy">never</property>
+                 <property name="vscrollbar_policy">automatic</property>
+                 <property name="shadow_type">in</property>
++                <property name="height_request">130</property>
+                 <child>
+                   <object class="GtkTreeView" id="models_list">
+                     <property name="visible">True</property>
+diff --git a/capplets/keyboard/mate-keyboard-properties-options-dialog.ui b/capplets/keyboard/mate-keyboard-properties-options-dialog.ui
+index 0691444..419004e 100644
+--- a/capplets/keyboard/mate-keyboard-properties-options-dialog.ui
++++ b/capplets/keyboard/mate-keyboard-properties-options-dialog.ui
+@@ -24,6 +24,7 @@
+             <property name="hscrollbar_policy">automatic</property>
+             <property name="vscrollbar_policy">automatic</property>
+             <property name="shadow_type">out</property>
++            <property name="height_request">300</property>
+             <child>
+               <object class="GtkViewport" id="viewport1">
+                 <property name="visible">True</property>
+diff --git a/capplets/mouse/mate-mouse-properties.ui b/capplets/mouse/mate-mouse-properties.ui
+index d6ad245..19314bf 100644
+--- a/capplets/mouse/mate-mouse-properties.ui
++++ b/capplets/mouse/mate-mouse-properties.ui
+@@ -62,6 +62,8 @@
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">Mouse Preferences</property>
+     <property name="type_hint">dialog</property>
++    <property name="default_width">500</property>
++    <property name="default_height">550</property>
+     <child internal-child="vbox">
+       <object class="GtkVBox" id="dialog-vbox1">
+         <property name="visible">True</property>

Copied: mate-control-center/repos/community-staging-x86_64/0002_adjust_mate-about-me_dialog_window.diff (from rev 133315, mate-control-center/trunk/0002_adjust_mate-about-me_dialog_window.diff)
===================================================================
--- community-staging-x86_64/0002_adjust_mate-about-me_dialog_window.diff	                        (rev 0)
+++ community-staging-x86_64/0002_adjust_mate-about-me_dialog_window.diff	2015-05-12 13:30:47 UTC (rev 133316)
@@ -0,0 +1,13 @@
+diff --git a/capplets/about-me/mate-about-me-dialog.ui b/capplets/about-me/mate-about-me-dialog.ui
+index c57f267..fc22a13 100644
+--- a/capplets/about-me/mate-about-me-dialog.ui
++++ b/capplets/about-me/mate-about-me-dialog.ui
+@@ -6,6 +6,8 @@
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">About Me</property>
+     <property name="type_hint">dialog</property>
++    <property name="width_request">400</property>
++    <property name="height_request">200</property>
+     <child internal-child="vbox">
+       <object class="GtkBox" id="dialog-vbox2">
+         <property name="visible">True</property>

Deleted: community-staging-x86_64/PKGBUILD
===================================================================
--- community-staging-x86_64/PKGBUILD	2015-05-12 13:30:07 UTC (rev 133315)
+++ community-staging-x86_64/PKGBUILD	2015-05-12 13:30:47 UTC (rev 133316)
@@ -1,41 +0,0 @@
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-_ver=1.10
-_pkgbase=mate-control-center
-pkgname=(${_pkgbase})
-pkgver=${_ver}.0
-pkgrel=1
-pkgdesc="The Control Center for MATE (GTK2 version)"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('caja>=1.10' 'dbus-glib' 'dconf' 'desktop-file-utils' 'gsettings-desktop-schemas'
-         'gtk2' 'mate-desktop>=1.10' 'mate-icon-theme' 'mate-menus>=1.10' 'mate-settings-daemon>=1.10'
-         'marco>=1.10' 'libgtop' 'libmatekbd>=1.10' 'libunique' 'librsvg' 'libxss'
-         'libxt' 'startup-notification')
-makedepends=('docbook2x' 'mate-common' 'yelp-tools')
-optdepends=('yelp: for reading MATE help documents')
-groups=('mate')
-conflicts=("${_pkgbase}-gtk3")
-source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('b720314054e8c417f32eeac8385b82d3849dace0')
-install=${_pkgbase}.install
-
-build() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --sbindir=/usr/bin \
-        --localstatedir=/var \
-        --with-gtk=2.0 \
-        --disable-static \
-        --disable-update-mimedb
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgbase}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-    rm -f "${pkgdir}/usr/share/applications/mimeinfo.cache"
-}

Copied: mate-control-center/repos/community-staging-x86_64/PKGBUILD (from rev 133315, mate-control-center/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2015-05-12 13:30:47 UTC (rev 133316)
@@ -0,0 +1,53 @@
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+_ver=1.10
+_pkgbase=mate-control-center
+pkgname=(${_pkgbase})
+pkgver=${_ver}.0
+pkgrel=2
+pkgdesc="The Control Center for MATE (GTK2 version)"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('caja>=1.10' 'dbus-glib' 'dconf' 'desktop-file-utils' 'gsettings-desktop-schemas'
+         'gtk2' 'mate-desktop>=1.10' 'mate-icon-theme' 'mate-menus>=1.10' 'mate-settings-daemon>=1.10'
+         'marco>=1.10' 'libgtop' 'libmatekbd>=1.10' 'libunique' 'librsvg' 'libxss'
+         'libxt' 'startup-notification')
+makedepends=('docbook2x' 'mate-common' 'yelp-tools')
+optdepends=('yelp: for reading MATE help documents')
+groups=('mate')
+conflicts=("${_pkgbase}-gtk3")
+source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz"
+        "0001_fix_keyboard_and_mouse_properties_windows.diff"
+        "0002_adjust_mate-about-me_dialog_window.diff")
+sha1sums=('b720314054e8c417f32eeac8385b82d3849dace0'
+          'd0fae2cd19ef20cb8eaae42ea7e0b9860dcf9ffe'
+          'bf845bd8f0cda2fad6a3726b7cee40b31321e066')
+install=${_pkgbase}.install
+
+prepare() {
+    # UI fixes.
+    #  - https://github.com/mate-desktop/mate-control-center/pull/157
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    patch -Np1 -i "${srcdir}/0001_fix_keyboard_and_mouse_properties_windows.diff"
+    patch -Np1 -i "${srcdir}/0002_adjust_mate-about-me_dialog_window.diff"
+}
+
+build() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    ./configure \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --sbindir=/usr/bin \
+        --localstatedir=/var \
+        --with-gtk=2.0 \
+        --disable-static \
+        --disable-update-mimedb
+    make
+}
+
+package() {
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
+    rm -f "${pkgdir}/usr/share/applications/mimeinfo.cache"
+}

Deleted: community-staging-x86_64/mate-control-center.install
===================================================================
--- community-staging-x86_64/mate-control-center.install	2015-05-12 13:30:07 UTC (rev 133315)
+++ community-staging-x86_64/mate-control-center.install	2015-05-12 13:30:47 UTC (rev 133316)
@@ -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-staging-x86_64/mate-control-center.install (from rev 133315, mate-control-center/trunk/mate-control-center.install)
===================================================================
--- community-staging-x86_64/mate-control-center.install	                        (rev 0)
+++ community-staging-x86_64/mate-control-center.install	2015-05-12 13:30:47 UTC (rev 133316)
@@ -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
+}



More information about the arch-commits mailing list