[arch-commits] Commit in nautilus/repos (6 files)
Jan Steffens
heftig at archlinux.org
Mon Oct 16 18:05:12 UTC 2017
Date: Monday, October 16, 2017 @ 18:05:12
Author: heftig
Revision: 308068
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
nautilus/repos/extra-i686/PKGBUILD
(from rev 308067, nautilus/trunk/PKGBUILD)
nautilus/repos/extra-i686/fix-prefs.diff
(from rev 308067, nautilus/trunk/fix-prefs.diff)
nautilus/repos/extra-x86_64/PKGBUILD
(from rev 308067, nautilus/trunk/PKGBUILD)
nautilus/repos/extra-x86_64/fix-prefs.diff
(from rev 308067, nautilus/trunk/fix-prefs.diff)
Deleted:
nautilus/repos/extra-i686/PKGBUILD
nautilus/repos/extra-x86_64/PKGBUILD
-----------------------------+
/PKGBUILD | 136 ++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 66 --------------------
extra-i686/fix-prefs.diff | 16 ++++
extra-x86_64/PKGBUILD | 66 --------------------
extra-x86_64/fix-prefs.diff | 16 ++++
5 files changed, 168 insertions(+), 132 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-10-16 18:04:23 UTC (rev 308067)
+++ extra-i686/PKGBUILD 2017-10-16 18:05:12 UTC (rev 308068)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=nautilus
-pkgname=(nautilus libnautilus-extension)
-pkgver=3.26.0
-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)
-makedepends=(gobject-introspection packagekit git gtk-doc meson)
-options=(!emptydirs)
-_commit=69942c754ea4e45ab0d32bcbc9e29f1c08da8990 # tags/3.26.0^0
-source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit"
- "git+https://git.gnome.org/browse/libgd")
-sha256sums=('SKIP'
- 'SKIP')
-
-prepare() {
- mkdir -p build libne/usr/{lib,share}
- cd $pkgbase
-
- git submodule init
- git config --local submodule.libgd.url "$srcdir/libgd"
- git submodule update
-}
-
-pkgver() {
- cd $pkgbase
- git describe --tags | sed 's/-/+/g'
-}
-
-build() {
- cd build
- export LANG=en_US.UTF-8
- meson --prefix=/usr --buildtype=release ../$pkgbase \
- --sysconfdir=/etc \
- -Denable-exif=true \
- -Denable-xmp=true \
- -Denable-gtk-doc=true \
- -Denable-selinux=false
- ninja
-}
-
-package_nautilus() {
- depends+=(libnautilus-extension)
- groups=(gnome)
-
- cd build
- DESTDIR="$pkgdir" ninja install
-
-### Split libnautilus-extension
-
- cd ../libne
- mv "$pkgdir"/usr/include usr
- mv "$pkgdir"/usr/lib/{girepository-1.0,libnautilus-extension*,pkgconfig} usr/lib
- mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} usr/share
-}
-
-package_libnautilus-extension() {
- pkgdesc="Library for extending the $pkgdesc"
- depends=(gtk3)
- mv libne/usr "$pkgdir"
-}
Copied: nautilus/repos/extra-i686/PKGBUILD (from rev 308067, nautilus/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-10-16 18:05:12 UTC (rev 308068)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=nautilus
+pkgname=(nautilus libnautilus-extension)
+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 tracker nautilus-sendto gnome-autoar)
+makedepends=(gobject-introspection packagekit git gtk-doc meson)
+options=(!emptydirs)
+_commit=9f51ed0ffaeeac865f535ea63c49c1dfd09357ea # gnome-3-26
+source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit"
+ "git+https://git.gnome.org/browse/libgd" fix-prefs.diff)
+sha256sums=('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
+}
+
+pkgver() {
+ cd $pkgbase
+ git describe --tags | sed 's/-/+/g'
+}
+
+build() {
+ cd build
+ arch-meson ../$pkgbase \
+ -Denable-exif=true \
+ -Denable-xmp=true \
+ -Denable-gtk-doc=true \
+ -Denable-selinux=false
+ ninja
+}
+
+package_nautilus() {
+ depends+=(libnautilus-extension)
+ groups=(gnome)
+
+ cd build
+ DESTDIR="$pkgdir" ninja install
+
+### Split libnautilus-extension
+
+ cd ../libne
+ mv "$pkgdir"/usr/include usr
+ mv "$pkgdir"/usr/lib/{girepository-1.0,libnautilus-extension*,pkgconfig} usr/lib
+ mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} usr/share
+}
+
+package_libnautilus-extension() {
+ pkgdesc="Library for extending the $pkgdesc"
+ depends=(gtk3)
+ mv libne/usr "$pkgdir"
+}
Copied: nautilus/repos/extra-i686/fix-prefs.diff (from rev 308067, nautilus/trunk/fix-prefs.diff)
===================================================================
--- extra-i686/fix-prefs.diff (rev 0)
+++ extra-i686/fix-prefs.diff 2017-10-16 18:05:12 UTC (rev 308068)
@@ -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>
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-10-16 18:04:23 UTC (rev 308067)
+++ extra-x86_64/PKGBUILD 2017-10-16 18:05:12 UTC (rev 308068)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=nautilus
-pkgname=(nautilus libnautilus-extension)
-pkgver=3.26.0
-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)
-makedepends=(gobject-introspection packagekit git gtk-doc meson)
-options=(!emptydirs)
-_commit=69942c754ea4e45ab0d32bcbc9e29f1c08da8990 # tags/3.26.0^0
-source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit"
- "git+https://git.gnome.org/browse/libgd")
-sha256sums=('SKIP'
- 'SKIP')
-
-prepare() {
- mkdir -p build libne/usr/{lib,share}
- cd $pkgbase
-
- git submodule init
- git config --local submodule.libgd.url "$srcdir/libgd"
- git submodule update
-}
-
-pkgver() {
- cd $pkgbase
- git describe --tags | sed 's/-/+/g'
-}
-
-build() {
- cd build
- export LANG=en_US.UTF-8
- meson --prefix=/usr --buildtype=release ../$pkgbase \
- --sysconfdir=/etc \
- -Denable-exif=true \
- -Denable-xmp=true \
- -Denable-gtk-doc=true \
- -Denable-selinux=false
- ninja
-}
-
-package_nautilus() {
- depends+=(libnautilus-extension)
- groups=(gnome)
-
- cd build
- DESTDIR="$pkgdir" ninja install
-
-### Split libnautilus-extension
-
- cd ../libne
- mv "$pkgdir"/usr/include usr
- mv "$pkgdir"/usr/lib/{girepository-1.0,libnautilus-extension*,pkgconfig} usr/lib
- mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} usr/share
-}
-
-package_libnautilus-extension() {
- pkgdesc="Library for extending the $pkgdesc"
- depends=(gtk3)
- mv libne/usr "$pkgdir"
-}
Copied: nautilus/repos/extra-x86_64/PKGBUILD (from rev 308067, nautilus/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-10-16 18:05:12 UTC (rev 308068)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=nautilus
+pkgname=(nautilus libnautilus-extension)
+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 tracker nautilus-sendto gnome-autoar)
+makedepends=(gobject-introspection packagekit git gtk-doc meson)
+options=(!emptydirs)
+_commit=9f51ed0ffaeeac865f535ea63c49c1dfd09357ea # gnome-3-26
+source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit"
+ "git+https://git.gnome.org/browse/libgd" fix-prefs.diff)
+sha256sums=('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
+}
+
+pkgver() {
+ cd $pkgbase
+ git describe --tags | sed 's/-/+/g'
+}
+
+build() {
+ cd build
+ arch-meson ../$pkgbase \
+ -Denable-exif=true \
+ -Denable-xmp=true \
+ -Denable-gtk-doc=true \
+ -Denable-selinux=false
+ ninja
+}
+
+package_nautilus() {
+ depends+=(libnautilus-extension)
+ groups=(gnome)
+
+ cd build
+ DESTDIR="$pkgdir" ninja install
+
+### Split libnautilus-extension
+
+ cd ../libne
+ mv "$pkgdir"/usr/include usr
+ mv "$pkgdir"/usr/lib/{girepository-1.0,libnautilus-extension*,pkgconfig} usr/lib
+ mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} usr/share
+}
+
+package_libnautilus-extension() {
+ pkgdesc="Library for extending the $pkgdesc"
+ depends=(gtk3)
+ mv libne/usr "$pkgdir"
+}
Copied: nautilus/repos/extra-x86_64/fix-prefs.diff (from rev 308067, nautilus/trunk/fix-prefs.diff)
===================================================================
--- extra-x86_64/fix-prefs.diff (rev 0)
+++ extra-x86_64/fix-prefs.diff 2017-10-16 18:05:12 UTC (rev 308068)
@@ -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>
More information about the arch-commits
mailing list