Date: Friday, January 5, 2018 @ 12:28:54 Author: heftig Revision: 314084
3.26.2-2 Modified: nautilus/trunk/PKGBUILD Deleted: nautilus/trunk/fix-prefs.diff ----------------+ PKGBUILD | 9 ++++----- fix-prefs.diff | 16 ---------------- 2 files changed, 4 insertions(+), 21 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-05 11:29:16 UTC (rev 314083) +++ PKGBUILD 2018-01-05 12:28:54 UTC (rev 314084) @@ -4,7 +4,7 @@ pkgbase=nautilus pkgname=(nautilus libnautilus-extension) pkgver=3.26.2 -pkgrel=1 +pkgrel=2 pkgdesc="Default file manager for GNOME" url="https://wiki.gnome.org/Apps/Nautilus" arch=(x86_64) @@ -14,10 +14,9 @@ options=(!emptydirs) _commit=51637bc0960002b811e1c0c7be8671cf9a1cc5be # tags/3.26.2^0 source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit" - "git+https://git.gnome.org/browse/libgd" fix-prefs.diff) + "git+https://git.gnome.org/browse/libgd") sha256sums=('SKIP' - 'SKIP' - 'b3f2dafdc04a405ef8f11017fa86b199c94c139986b98916c3ed2d28cf443d94') + 'SKIP') prepare() { mkdir -p build libne/usr/{lib,share} @@ -24,7 +23,7 @@ cd $pkgbase # https://gitlab.gnome.org/GNOME/nautilus/issues/25 - git apply -3 ../fix-prefs.diff + git cherry-pick -n d74e1a3d 9238456b git submodule init git config --local submodule.libgd.url "$srcdir/libgd" Deleted: fix-prefs.diff =================================================================== --- fix-prefs.diff 2018-01-05 11:29:16 UTC (rev 314083) +++ fix-prefs.diff 2018-01-05 12:28:54 UTC (rev 314084) @@ -1,16 +0,0 @@ - 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>