pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/gnome-desktop3 Solaris build fix



details:   https://anonhg.NetBSD.org/pkgsrc/rev/15a361a9ccff
branches:  trunk
changeset: 639793:15a361a9ccff
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Thu Sep 25 15:10:21 2014 +0000

description:
Solaris build fix

diffstat:

 x11/gnome-desktop3/distinfo                                                       |   4 +-
 x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-file-utils.c |  18 ++++++++++
 x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-shutil.c     |  18 ++++++++++
 3 files changed, 39 insertions(+), 1 deletions(-)

diffs (59 lines):

diff -r 2f39635fa337 -r 15a361a9ccff x11/gnome-desktop3/distinfo
--- a/x11/gnome-desktop3/distinfo       Thu Sep 25 15:08:29 2014 +0000
+++ b/x11/gnome-desktop3/distinfo       Thu Sep 25 15:10:21 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2014/09/21 04:43:51 prlw1 Exp $
+$NetBSD: distinfo,v 1.9 2014/09/25 15:10:21 prlw1 Exp $
 
 SHA1 (gnome-desktop-3.10.2.tar.xz) = fd13640ad7f096f29267366bcdf4cf8dc95af07a
 RMD160 (gnome-desktop-3.10.2.tar.xz) = 9d59c58c497eafa75a5ae7a38edaa740c8c77726
@@ -6,3 +6,5 @@
 SHA1 (patch-aa) = 26bd3513ac6757ab1a406a8c40be37aa25c98ad4
 SHA1 (patch-configure) = febb8117f7d3b658d813679f0a95d46661e02147
 SHA1 (patch-libgnome-desktop_Makefile.in) = c8ff8fe775102aed193652f5569779a561bc3897
+SHA1 (patch-libgnome-desktop_libgsystem_gsystem-file-utils.c) = a67d29c3a5693cdc305e7826159fe29a21d12c0b
+SHA1 (patch-libgnome-desktop_libgsystem_gsystem-shutil.c) = ae279d6a60909284226853589470dc2e2c8363a9
diff -r 2f39635fa337 -r 15a361a9ccff x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-file-utils.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-file-utils.c Thu Sep 25 15:10:21 2014 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-libgnome-desktop_libgsystem_gsystem-file-utils.c,v 1.3 2014/09/25 15:10:21 prlw1 Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=737369
+
+--- libgnome-desktop/libgsystem/gsystem-file-utils.c.orig      2013-10-04 22:18:43.000000000 +0000
++++ libgnome-desktop/libgsystem/gsystem-file-utils.c
+@@ -444,7 +444,11 @@ gs_file_open_dir_fd (GFile         *path
+                      GError       **error)
+ {
+   /* Linux specific probably */
++#ifdef O_DIRECTORY
+   *out_fd = open (gs_file_get_path_cached (path), O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC);
++#else
++  *out_fd = open (gs_file_get_path_cached (path), O_RDONLY | O_NONBLOCK | O_CLOEXEC);
++#endif
+   if (*out_fd == -1)
+     {
+       _set_error_from_errno (error);
diff -r 2f39635fa337 -r 15a361a9ccff x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-shutil.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-desktop3/patches/patch-libgnome-desktop_libgsystem_gsystem-shutil.c     Thu Sep 25 15:10:21 2014 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-libgnome-desktop_libgsystem_gsystem-shutil.c,v 1.1 2014/09/25 15:10:21 prlw1 Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=737369
+
+--- libgnome-desktop/libgsystem/gsystem-shutil.c.orig  2013-10-04 22:18:43.000000000 +0000
++++ libgnome-desktop/libgsystem/gsystem-shutil.c
+@@ -271,7 +271,11 @@ gs_shutil_rm_rf_children (DIR           
+           
+       if (dent->d_type == DT_DIR)
+         {
++#ifdef O_DIRECTORY
+           int child_dfd = openat (dfd, dent->d_name, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
++#else
++          int child_dfd = openat (dfd, dent->d_name, O_RDONLY | O_NONBLOCK | O_CLOEXEC | O_NOFOLLOW);
++#endif
+ 
+           if (child_dfd == -1)
+             {



Home | Main Index | Thread Index | Old Index