[arch-commits] Commit in nautilus/repos/extra-x86_64 (3 files)

Jan Steffens heftig at archlinux.org
Tue Mar 19 21:51:01 UTC 2019


    Date: Tuesday, March 19, 2019 @ 21:51:00
  Author: heftig
Revision: 348740

archrelease: copy trunk to extra-x86_64

Added:
  nautilus/repos/extra-x86_64/PKGBUILD
    (from rev 348739, nautilus/trunk/PKGBUILD)
  nautilus/repos/extra-x86_64/thumbnail-fixes.diff
    (from rev 348739, nautilus/trunk/thumbnail-fixes.diff)
Deleted:
  nautilus/repos/extra-x86_64/PKGBUILD

----------------------+
 PKGBUILD             |  137 +++++++++++++++++++++++++------------------------
 thumbnail-fixes.diff |   37 +++++++++++++
 2 files changed, 108 insertions(+), 66 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-19 21:50:37 UTC (rev 348739)
+++ PKGBUILD	2019-03-19 21:51:00 UTC (rev 348740)
@@ -1,66 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=nautilus
-pkgname=(nautilus libnautilus-extension)
-pkgver=3.32.0
-pkgrel=2
-pkgdesc="Default file manager for GNOME"
-url="https://wiki.gnome.org/Apps/Nautilus"
-arch=(x86_64)
-license=(GPL)
-depends=(libgexiv2 gnome-desktop gvfs dconf tracker nautilus-sendto gnome-autoar
-         gst-plugins-base-libs tracker-miners)
-makedepends=(gobject-introspection git gtk-doc meson appstream-glib)
-options=(!emptydirs)
-_commit=a241f8f6f37220ccec78a40b015967188490b1df  # tags/3.32.0^0
-source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgd.git")
-sha256sums=('SKIP'
-            'SKIP')
-
-prepare() {
-  cd $pkgbase
-
-  git submodule init
-  git config --local submodule.subprojects/libgd.url "$srcdir/libgd"
-  git submodule update
-}
-
-pkgver() {
-  cd $pkgbase
-  git describe --tags | sed 's/-/+/g'
-}
-
-build() {
-  arch-meson $pkgbase build \
-    -D docs=true \
-    -D packagekit=false
-  ninja -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package_nautilus() {
-  depends+=(libnautilus-extension)
-  groups=(gnome)
-
-  DESTDIR="$pkgdir" meson install -C build
-
-### Split libnautilus-extension
-
-  mkdir -p libne/{lib,share}
-  mv "$pkgdir"/usr/include libne
-  mv "$pkgdir"/usr/lib/{girepository-1.0,libnautilus-extension*,pkgconfig} libne/lib
-  mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} libne/share
-}
-
-package_libnautilus-extension() {
-  pkgdesc="Library for extending the $pkgdesc"
-  depends=(gtk3)
-  mv libne "$pkgdir/usr"
-}
-
-# vim:set sw=2 et:

Copied: nautilus/repos/extra-x86_64/PKGBUILD (from rev 348739, nautilus/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-03-19 21:51:00 UTC (rev 348740)
@@ -0,0 +1,71 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=nautilus
+pkgname=(nautilus libnautilus-extension)
+pkgver=3.32.0+5+g73876bdcd
+pkgrel=1
+pkgdesc="Default file manager for GNOME"
+url="https://wiki.gnome.org/Apps/Nautilus"
+arch=(x86_64)
+license=(GPL)
+depends=(libgexiv2 gnome-desktop gvfs dconf tracker nautilus-sendto gnome-autoar
+         gst-plugins-base-libs tracker-miners)
+makedepends=(gobject-introspection git gtk-doc meson appstream-glib)
+options=(!emptydirs)
+_commit=73876bdcdf2d0e5fe3513132770f06eddf9fd606  # master
+source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit"
+        "git+https://gitlab.gnome.org/GNOME/libgd.git"
+        thumbnail-fixes.diff)
+sha256sums=('SKIP'
+            'SKIP'
+            '6777571a8e096d8dc86765405576d4392cddeb4f21c17cf23f0e92b42c63214a')
+
+prepare() {
+  cd $pkgbase
+
+  # Port fixes to thumbnail code from gnome-desktop
+  git apply -3 ../thumbnail-fixes.diff
+
+  git submodule init
+  git config --local submodule.subprojects/libgd.url "$srcdir/libgd"
+  git submodule update
+}
+
+pkgver() {
+  cd $pkgbase
+  git describe --tags | sed 's/-/+/g'
+}
+
+build() {
+  arch-meson $pkgbase build \
+    -D docs=true \
+    -D packagekit=false
+  ninja -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package_nautilus() {
+  depends+=(libnautilus-extension)
+  groups=(gnome)
+
+  DESTDIR="$pkgdir" meson install -C build
+
+### Split libnautilus-extension
+
+  mkdir -p libne/{lib,share}
+  mv "$pkgdir"/usr/include libne
+  mv "$pkgdir"/usr/lib/{girepository-1.0,libnautilus-extension*,pkgconfig} libne/lib
+  mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} libne/share
+}
+
+package_libnautilus-extension() {
+  pkgdesc="Library for extending the $pkgdesc"
+  depends=(gtk3)
+  mv libne "$pkgdir/usr"
+}
+
+# vim:set sw=2 et:

Copied: nautilus/repos/extra-x86_64/thumbnail-fixes.diff (from rev 348739, nautilus/trunk/thumbnail-fixes.diff)
===================================================================
--- thumbnail-fixes.diff	                        (rev 0)
+++ thumbnail-fixes.diff	2019-03-19 21:51:00 UTC (rev 348740)
@@ -0,0 +1,37 @@
+ src/gnome-desktop/gnome-desktop-thumbnail-script.c | 5 +++++
+ src/gnome-desktop/gnome-desktop-thumbnail.c        | 6 ++++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git c/src/gnome-desktop/gnome-desktop-thumbnail-script.c i/src/gnome-desktop/gnome-desktop-thumbnail-script.c
+index 525766388..d51e97ecb 100644
+--- c/src/gnome-desktop/gnome-desktop-thumbnail-script.c
++++ i/src/gnome-desktop/gnome-desktop-thumbnail-script.c
+@@ -565,6 +565,11 @@ add_bwrap (GPtrArray   *array,
+         }
+     }
+ 
++  /* fontconfig cache if necessary */
++#define FONTCONFIG_CACHE_PATH "/var/cache/fontconfig"
++  if (!g_str_has_prefix (FONTCONFIG_CACHE_PATH, "/usr/"))
++    add_args (array, "--ro-bind-try", FONTCONFIG_CACHE_PATH, FONTCONFIG_CACHE_PATH, NULL);
++
+   add_args (array,
+ 	    "--proc", "/proc",
+ 	    "--dev", "/dev",
+diff --git c/src/gnome-desktop/gnome-desktop-thumbnail.c i/src/gnome-desktop/gnome-desktop-thumbnail.c
+index f48fd461a..566fbeb84 100644
+--- c/src/gnome-desktop/gnome-desktop-thumbnail.c
++++ i/src/gnome-desktop/gnome-desktop-thumbnail.c
+@@ -967,8 +967,10 @@ get_preview_thumbnail (const char *uri,
+     if (file_info == NULL)
+       return NULL;
+ 
+-    object = g_object_ref (g_file_info_get_attribute_object (file_info,
+-                                                             G_FILE_ATTRIBUTE_PREVIEW_ICON));
++    object = g_file_info_get_attribute_object (file_info,
++                                               G_FILE_ATTRIBUTE_PREVIEW_ICON);
++    if (object)
++        g_object_ref (object);
+     g_object_unref (file_info);
+ 
+     if (!object)


More information about the arch-commits mailing list