[arch-commits] Commit in nautilus/trunk (PKGBUILD thumbnail-fixes.diff)
Date: Sunday, May 5, 2019 @ 19:36:02
Author: heftig
Revision: 352541
3.32.1-1
Modified:
nautilus/trunk/PKGBUILD
Deleted:
nautilus/trunk/thumbnail-fixes.diff
--+
PKGBUILD | 13 -
thumbnail-fixes.diff | 37 -
2 files changed, 4 insertions(+), 46 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-05-05 19:12:22 UTC (rev 352540)
+++ PKGBUILD2019-05-05 19:36:02 UTC (rev 352541)
@@ -3,7 +3,7 @@
pkgbase=nautilus
pkgname=(nautilus libnautilus-extension)
-pkgver=3.32.0+5+g73876bdcd
+pkgver=3.32.1
pkgrel=1
pkgdesc="Default file manager for GNOME"
url="https://wiki.gnome.org/Apps/Nautilus";
@@ -13,20 +13,15 @@
gst-plugins-base-libs tracker-miners)
makedepends=(gobject-introspection git gtk-doc meson appstream-glib)
options=(!emptydirs)
-_commit=73876bdcdf2d0e5fe3513132770f06eddf9fd606 # master
+_commit=628fc3c43d1238d09de820e8ff0a2259c21f42d0 # tags/3.32.1^0
source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit";
-"git+https://gitlab.gnome.org/GNOME/libgd.git";
-thumbnail-fixes.diff)
+"git+https://gitlab.gnome.org/GNOME/libgd.git";)
sha256sums=('SKIP'
-'SKIP'
-'6777571a8e096d8dc86765405576d4392cddeb4f21c17cf23f0e92b42c63214a')
+'SKIP')
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
Deleted: thumbnail-fixes.diff
===
--- thumbnail-fixes.diff2019-05-05 19:12:22 UTC (rev 352540)
+++ thumbnail-fixes.diff2019-05-05 19:36:02 UTC (rev 352541)
@@ -1,37 +0,0 @@
- 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)
[arch-commits] Commit in nautilus/trunk (PKGBUILD thumbnail-fixes.diff)
Date: Tuesday, March 19, 2019 @ 21:50:37
Author: heftig
Revision: 348739
3.32.0+5+g73876bdcd-1
Added:
nautilus/trunk/thumbnail-fixes.diff
Modified:
nautilus/trunk/PKGBUILD
--+
PKGBUILD | 15 ++-
thumbnail-fixes.diff | 37 +
2 files changed, 47 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-03-19 21:49:34 UTC (rev 348738)
+++ PKGBUILD2019-03-19 21:50:37 UTC (rev 348739)
@@ -3,8 +3,8 @@
pkgbase=nautilus
pkgname=(nautilus libnautilus-extension)
-pkgver=3.32.0
-pkgrel=2
+pkgver=3.32.0+5+g73876bdcd
+pkgrel=1
pkgdesc="Default file manager for GNOME"
url="https://wiki.gnome.org/Apps/Nautilus";
arch=(x86_64)
@@ -13,15 +13,20 @@
gst-plugins-base-libs tracker-miners)
makedepends=(gobject-introspection git gtk-doc meson appstream-glib)
options=(!emptydirs)
-_commit=a241f8f6f37220ccec78a40b015967188490b1df # tags/3.32.0^0
+_commit=73876bdcdf2d0e5fe3513132770f06eddf9fd606 # master
source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit";
-"git+https://gitlab.gnome.org/GNOME/libgd.git";)
+"git+https://gitlab.gnome.org/GNOME/libgd.git";
+thumbnail-fixes.diff)
sha256sums=('SKIP'
-'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
Added: thumbnail-fixes.diff
===
--- thumbnail-fixes.diff(rev 0)
+++ thumbnail-fixes.diff2019-03-19 21:50:37 UTC (rev 348739)
@@ -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)
