[arch-commits] Commit in caja/trunk (3 files)

[Martin Wimpress]

    Date: Tuesday, May 12, 2015 @ 15:06:08
  Author: flexiondotorg
Revision: 133309

Added UI patches.

Added:
  caja/trunk/0001_expand_list_columns_in_file_management_preferences.diff
  caja/trunk/0002_set_default_window_size_for_file_management_preferences.diff
Modified:
  caja/trunk/PKGBUILD

-------------------------------------------------------------------+
 0001_expand_list_columns_in_file_management_preferences.diff      |   21 ++++++++++
 0002_set_default_window_size_for_file_management_preferences.diff |   13 ++++++
 PKGBUILD                                                          |   20 +++++++--
 3 files changed, 50 insertions(+), 4 deletions(-)

Added: 0001_expand_list_columns_in_file_management_preferences.diff
===================================================================
--- 0001_expand_list_columns_in_file_management_preferences.diff	                        (rev 0)
+++ 0001_expand_list_columns_in_file_management_preferences.diff	2015-05-12 13:06:08 UTC (rev 133309)
@@ -0,0 +1,21 @@
+diff --git a/src/caja-file-management-properties.ui b/src/caja-file-management-properties.ui
+index cca1a36..68c9c94 100644
+--- a/src/caja-file-management-properties.ui
++++ b/src/caja-file-management-properties.ui
+@@ -1522,14 +1522,14 @@
+                         </child>
+                       </object>
+                       <packing>
+-                        <property name="expand">False</property>
++                        <property name="expand">True</property>
+                         <property name="fill">True</property>
+                         <property name="position">1</property>
+                       </packing>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="expand">False</property>
++                    <property name="expand">True</property>
+                     <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>

Added: 0002_set_default_window_size_for_file_management_preferences.diff
===================================================================
--- 0002_set_default_window_size_for_file_management_preferences.diff	                        (rev 0)
+++ 0002_set_default_window_size_for_file_management_preferences.diff	2015-05-12 13:06:08 UTC (rev 133309)
@@ -0,0 +1,13 @@
+diff --git a/src/caja-file-management-properties.ui b/src/caja-file-management-properties.ui
+index 68c9c94..05f9446 100644
+--- a/src/caja-file-management-properties.ui
++++ b/src/caja-file-management-properties.ui
+@@ -271,6 +271,8 @@
+     <property name="border_width">5</property>
+     <property name="title" translatable="yes">File Management Preferences</property>
+     <property name="window_position">center</property>
++    <property name="default_width">600</property>
++    <property name="default_height">600</property>
+     <property name="type_hint">dialog</property>
+     <child internal-child="vbox">
+       <object class="GtkVBox" id="dialog-vbox1">

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-12 11:41:51 UTC (rev 133308)
+++ PKGBUILD	2015-05-12 13:06:08 UTC (rev 133309)
@@ -2,9 +2,9 @@
 
 _ver=1.10
 _pkgbase=caja
-pkgname=(${_pkgbase})
+pkgname=${_pkgbase}
 pkgver=${_ver}.0
-pkgrel=2
+pkgrel=3
 pkgdesc="File manager for the MATE desktop (GTK2 version)"
 url="http://mate-desktop.org"
 arch=('i686' 'x86_64')
@@ -17,10 +17,22 @@
             'gvfs-smb: To connect to Samba/Windows shares')
 groups=('mate')
 conflicts=("${_pkgbase}-gtk3")
-source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('a8d9c4a479a2fea7bd2eda707e0fd4025f85f229')
+source=("http://pub.mate-desktop.org/releases/${_ver}/${_pkgbase}-${pkgver}.tar.xz"
+        "0001_expand_list_columns_in_file_management_preferences.diff"
+        "0002_set_default_window_size_for_file_management_preferences.diff")
+sha1sums=('a8d9c4a479a2fea7bd2eda707e0fd4025f85f229'
+          '3ae81639efe4dbbda0b6a41c2e1872996c76705d'
+          'c0c7d0e71c9fb4d5bc448f0d1ee1a0bb4aacbb86')
 install=${_pkgbase}.install
 
+prepare() {
+    # UI fixes for GTK3.
+    #  - https://github.com/mate-desktop/caja/pull/401/commits
+    cd "${srcdir}/${_pkgbase}-${pkgver}"
+    patch -Np1 -i "${srcdir}/0001_expand_list_columns_in_file_management_preferences.diff"
+    patch -Np1 -i "${srcdir}/0002_set_default_window_size_for_file_management_preferences.diff"
+}
+
 build() {
     cd "${srcdir}/${_pkgbase}-${pkgver}"
     ./configure \