[arch-commits] Commit in caja/repos (12 files)
Martin Wimpress
flexiondotorg at archlinux.org
Tue May 12 13:07:19 UTC 2015
Date: Tuesday, May 12, 2015 @ 15:07:18
Author: flexiondotorg
Revision: 133310
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
caja/repos/community-staging-i686/0001_expand_list_columns_in_file_management_preferences.diff
(from rev 133309, caja/trunk/0001_expand_list_columns_in_file_management_preferences.diff)
caja/repos/community-staging-i686/0002_set_default_window_size_for_file_management_preferences.diff
(from rev 133309, caja/trunk/0002_set_default_window_size_for_file_management_preferences.diff)
caja/repos/community-staging-i686/PKGBUILD
(from rev 133309, caja/trunk/PKGBUILD)
caja/repos/community-staging-i686/caja.install
(from rev 133309, caja/trunk/caja.install)
caja/repos/community-staging-x86_64/0001_expand_list_columns_in_file_management_preferences.diff
(from rev 133309, caja/trunk/0001_expand_list_columns_in_file_management_preferences.diff)
caja/repos/community-staging-x86_64/0002_set_default_window_size_for_file_management_preferences.diff
(from rev 133309, caja/trunk/0002_set_default_window_size_for_file_management_preferences.diff)
caja/repos/community-staging-x86_64/PKGBUILD
(from rev 133309, caja/trunk/PKGBUILD)
caja/repos/community-staging-x86_64/caja.install
(from rev 133309, caja/trunk/caja.install)
Deleted:
caja/repos/community-staging-i686/PKGBUILD
caja/repos/community-staging-i686/caja.install
caja/repos/community-staging-x86_64/PKGBUILD
caja/repos/community-staging-x86_64/caja.install
--------------------------------------------------------------------------------------------+
/PKGBUILD | 104 ++++++++++
/caja.install | 28 ++
community-staging-i686/0001_expand_list_columns_in_file_management_preferences.diff | 21 ++
community-staging-i686/0002_set_default_window_size_for_file_management_preferences.diff | 13 +
community-staging-i686/PKGBUILD | 40 ---
community-staging-i686/caja.install | 14 -
community-staging-x86_64/0001_expand_list_columns_in_file_management_preferences.diff | 21 ++
community-staging-x86_64/0002_set_default_window_size_for_file_management_preferences.diff | 13 +
community-staging-x86_64/PKGBUILD | 40 ---
community-staging-x86_64/caja.install | 14 -
10 files changed, 200 insertions(+), 108 deletions(-)
Copied: caja/repos/community-staging-i686/0001_expand_list_columns_in_file_management_preferences.diff (from rev 133309, caja/trunk/0001_expand_list_columns_in_file_management_preferences.diff)
===================================================================
--- community-staging-i686/0001_expand_list_columns_in_file_management_preferences.diff (rev 0)
+++ community-staging-i686/0001_expand_list_columns_in_file_management_preferences.diff 2015-05-12 13:07:18 UTC (rev 133310)
@@ -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>
Copied: caja/repos/community-staging-i686/0002_set_default_window_size_for_file_management_preferences.diff (from rev 133309, caja/trunk/0002_set_default_window_size_for_file_management_preferences.diff)
===================================================================
--- community-staging-i686/0002_set_default_window_size_for_file_management_preferences.diff (rev 0)
+++ community-staging-i686/0002_set_default_window_size_for_file_management_preferences.diff 2015-05-12 13:07:18 UTC (rev 133310)
@@ -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">
Deleted: community-staging-i686/PKGBUILD
===================================================================
--- community-staging-i686/PKGBUILD 2015-05-12 13:06:08 UTC (rev 133309)
+++ community-staging-i686/PKGBUILD 2015-05-12 13:07:18 UTC (rev 133310)
@@ -1,40 +0,0 @@
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-_ver=1.10
-_pkgbase=caja
-pkgname=(${_pkgbase})
-pkgver=${_ver}.0
-pkgrel=2
-pkgdesc="File manager for the MATE desktop (GTK2 version)"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('dbus' 'desktop-file-utils' 'exempi' 'gtk2' 'gvfs' 'libexif'
- 'libunique' 'libxt' 'mate-desktop>=1.10' 'mate-icon-theme'
- 'startup-notification')
-makedepends=('gobject-introspection' 'mate-common' 'pangox-compat')
-optdepends=('gstreamer: automatic media playback when mouseover'
- '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')
-install=${_pkgbase}.install
-
-build() {
- cd "${srcdir}/${_pkgbase}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib/${_pkgbase} \
- --with-gtk=2.0 \
- --enable-unique \
- --enable-introspection \
- --disable-static \
- --disable-update-mimedb
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: caja/repos/community-staging-i686/PKGBUILD (from rev 133309, caja/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-05-12 13:07:18 UTC (rev 133310)
@@ -0,0 +1,52 @@
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+_ver=1.10
+_pkgbase=caja
+pkgname=${_pkgbase}
+pkgver=${_ver}.0
+pkgrel=3
+pkgdesc="File manager for the MATE desktop (GTK2 version)"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus' 'desktop-file-utils' 'exempi' 'gtk2' 'gvfs' 'libexif'
+ 'libunique' 'libxt' 'mate-desktop>=1.10' 'mate-icon-theme'
+ 'startup-notification')
+makedepends=('gobject-introspection' 'mate-common' 'pangox-compat')
+optdepends=('gstreamer: automatic media playback when mouseover'
+ '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"
+ "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 \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/${_pkgbase} \
+ --with-gtk=2.0 \
+ --enable-unique \
+ --enable-introspection \
+ --disable-static \
+ --disable-update-mimedb
+ make
+}
+
+package() {
+ cd "${srcdir}/${_pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-staging-i686/caja.install
===================================================================
--- community-staging-i686/caja.install 2015-05-12 13:06:08 UTC (rev 133309)
+++ community-staging-i686/caja.install 2015-05-12 13:07:18 UTC (rev 133310)
@@ -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: caja/repos/community-staging-i686/caja.install (from rev 133309, caja/trunk/caja.install)
===================================================================
--- community-staging-i686/caja.install (rev 0)
+++ community-staging-i686/caja.install 2015-05-12 13:07:18 UTC (rev 133310)
@@ -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: caja/repos/community-staging-x86_64/0001_expand_list_columns_in_file_management_preferences.diff (from rev 133309, caja/trunk/0001_expand_list_columns_in_file_management_preferences.diff)
===================================================================
--- community-staging-x86_64/0001_expand_list_columns_in_file_management_preferences.diff (rev 0)
+++ community-staging-x86_64/0001_expand_list_columns_in_file_management_preferences.diff 2015-05-12 13:07:18 UTC (rev 133310)
@@ -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>
Copied: caja/repos/community-staging-x86_64/0002_set_default_window_size_for_file_management_preferences.diff (from rev 133309, caja/trunk/0002_set_default_window_size_for_file_management_preferences.diff)
===================================================================
--- community-staging-x86_64/0002_set_default_window_size_for_file_management_preferences.diff (rev 0)
+++ community-staging-x86_64/0002_set_default_window_size_for_file_management_preferences.diff 2015-05-12 13:07:18 UTC (rev 133310)
@@ -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">
Deleted: community-staging-x86_64/PKGBUILD
===================================================================
--- community-staging-x86_64/PKGBUILD 2015-05-12 13:06:08 UTC (rev 133309)
+++ community-staging-x86_64/PKGBUILD 2015-05-12 13:07:18 UTC (rev 133310)
@@ -1,40 +0,0 @@
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-_ver=1.10
-_pkgbase=caja
-pkgname=(${_pkgbase})
-pkgver=${_ver}.0
-pkgrel=2
-pkgdesc="File manager for the MATE desktop (GTK2 version)"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('dbus' 'desktop-file-utils' 'exempi' 'gtk2' 'gvfs' 'libexif'
- 'libunique' 'libxt' 'mate-desktop>=1.10' 'mate-icon-theme'
- 'startup-notification')
-makedepends=('gobject-introspection' 'mate-common' 'pangox-compat')
-optdepends=('gstreamer: automatic media playback when mouseover'
- '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')
-install=${_pkgbase}.install
-
-build() {
- cd "${srcdir}/${_pkgbase}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib/${_pkgbase} \
- --with-gtk=2.0 \
- --enable-unique \
- --enable-introspection \
- --disable-static \
- --disable-update-mimedb
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: caja/repos/community-staging-x86_64/PKGBUILD (from rev 133309, caja/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-05-12 13:07:18 UTC (rev 133310)
@@ -0,0 +1,52 @@
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+_ver=1.10
+_pkgbase=caja
+pkgname=${_pkgbase}
+pkgver=${_ver}.0
+pkgrel=3
+pkgdesc="File manager for the MATE desktop (GTK2 version)"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus' 'desktop-file-utils' 'exempi' 'gtk2' 'gvfs' 'libexif'
+ 'libunique' 'libxt' 'mate-desktop>=1.10' 'mate-icon-theme'
+ 'startup-notification')
+makedepends=('gobject-introspection' 'mate-common' 'pangox-compat')
+optdepends=('gstreamer: automatic media playback when mouseover'
+ '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"
+ "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 \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/${_pkgbase} \
+ --with-gtk=2.0 \
+ --enable-unique \
+ --enable-introspection \
+ --disable-static \
+ --disable-update-mimedb
+ make
+}
+
+package() {
+ cd "${srcdir}/${_pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-staging-x86_64/caja.install
===================================================================
--- community-staging-x86_64/caja.install 2015-05-12 13:06:08 UTC (rev 133309)
+++ community-staging-x86_64/caja.install 2015-05-12 13:07:18 UTC (rev 133310)
@@ -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: caja/repos/community-staging-x86_64/caja.install (from rev 133309, caja/trunk/caja.install)
===================================================================
--- community-staging-x86_64/caja.install (rev 0)
+++ community-staging-x86_64/caja.install 2015-05-12 13:07:18 UTC (rev 133310)
@@ -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