[arch-commits] Commit in nautilus/trunk (PKGBUILD fix-prefs.diff)

[Jan Steffens]

    Date: Monday, October 16, 2017 @ 17:44:58
  Author: heftig
Revision: 308062

3.26.0+7+g9f51ed0ff-1

Added:
  nautilus/trunk/fix-prefs.diff
Modified:
  nautilus/trunk/PKGBUILD

----------------+
 PKGBUILD       |   18 ++++++++++--------
 fix-prefs.diff |   16 ++++++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-16 15:32:55 UTC (rev 308061)
+++ PKGBUILD	2017-10-16 17:44:58 UTC (rev 308062)
@@ -3,25 +3,29 @@
 
 pkgbase=nautilus
 pkgname=(nautilus libnautilus-extension)
-pkgver=3.26.0
+pkgver=3.26.0+7+g9f51ed0ff
 pkgrel=1
 pkgdesc="Default file manager for GNOME"
 url="https://wiki.gnome.org/Apps/Nautilus"
 arch=(i686 x86_64)
 license=(GPL)
-depends=(libexif gnome-desktop exempi gvfs dconf libtracker-sparql nautilus-sendto gnome-autoar)
+depends=(libexif gnome-desktop exempi gvfs dconf tracker nautilus-sendto gnome-autoar)
 makedepends=(gobject-introspection packagekit git gtk-doc meson)
 options=(!emptydirs)
-_commit=69942c754ea4e45ab0d32bcbc9e29f1c08da8990  # tags/3.26.0^0
+_commit=9f51ed0ffaeeac865f535ea63c49c1dfd09357ea  # gnome-3-26
 source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit"
-        "git+https://git.gnome.org/browse/libgd")
+        "git+https://git.gnome.org/browse/libgd" fix-prefs.diff)
 sha256sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            'b3f2dafdc04a405ef8f11017fa86b199c94c139986b98916c3ed2d28cf443d94')
 
 prepare() {
   mkdir -p build libne/usr/{lib,share}
   cd $pkgbase
 
+  # https://gitlab.gnome.org/GNOME/nautilus/issues/25
+  git apply -3 ../fix-prefs.diff
+
   git submodule init
   git config --local submodule.libgd.url "$srcdir/libgd"
   git submodule update
@@ -34,9 +38,7 @@
 
 build() {
   cd build
-  export LANG=en_US.UTF-8
-  meson --prefix=/usr --buildtype=release ../$pkgbase \
-    --sysconfdir=/etc \
+  arch-meson ../$pkgbase  \
     -Denable-exif=true \
     -Denable-xmp=true \
     -Denable-gtk-doc=true \

Added: fix-prefs.diff
===================================================================
--- fix-prefs.diff	                        (rev 0)
+++ fix-prefs.diff	2017-10-16 17:44:58 UTC (rev 308062)
@@ -0,0 +1,16 @@
+ src/resources/ui/nautilus-preferences-window.ui | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/src/resources/ui/nautilus-preferences-window.ui i/src/resources/ui/nautilus-preferences-window.ui
+index fe89e248ef1b25f0..03e3ddf177501c53 100644
+--- c/src/resources/ui/nautilus-preferences-window.ui
++++ i/src/resources/ui/nautilus-preferences-window.ui
+@@ -959,7 +959,7 @@
+                             <property name="can_focus">False</property>
+                             <property name="label" translatable="yes">Onl_y for files smaller than:</property>
+                             <property name="use_underline">True</property>
+-                            <property name="mnemonic_widget">preview_image_size_combobox</property>
++                            <property name="mnemonic_widget">preview_image_size_spinbutton</property>
+                             <property name="xalign">0</property>
+                           </object>
+                           <packing>