Browse Source

nautilus package update

Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>
master
guibuilder_pel7x64builder0 6 years ago
parent
commit
1e34d4c95f
  1. 50
      SOURCES/0001-Meson-Make-sure-__GNU_SOURCE-is-set.patch
  2. 29
      SOURCES/0001-file-Make-sure-we-include-necessary-headers.patch
  3. 2933
      SOURCES/0001-general-remove-gnome-autoar.patch
  4. 22
      SOURCES/0001-meson-Request-c11-when-possible.patch
  5. 46
      SOURCES/0001-meson-Use-python2-for-postinstall.patch
  6. 1840
      SPECS/nautilus.spec

50
SOURCES/0001-Meson-Make-sure-__GNU_SOURCE-is-set.patch

@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
From 0cc6b39e0447560668370832e10090f6f9068473 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@gnome.org>
Date: Fri, 8 Jun 2018 19:03:09 +0200
Subject: [PATCH] Meson: Make sure __GNU_SOURCE is set

Otherwise the build fails in some systems like RHEL.
---
meson.build | 3 +++
src/nautilus-file.c | 4 ++++
2 files changed, 7 insertions(+)

diff --git a/meson.build b/meson.build
index e3e6875d7..db648eb50 100644
--- a/meson.build
+++ b/meson.build
@@ -5,6 +5,7 @@ project ('nautilus', 'c',
license: 'GPL3+')
add_global_arguments ('-Wno-deprecated-declarations', language:'c')
+add_project_arguments('-D_GNU_SOURCE', language: 'c')
bindir = get_option ('bindir')
datadir = get_option ('datadir')
@@ -80,6 +81,8 @@ if get_option ('enable-selinux')
conf.set10 ('HAVE_SELINUX', true)
endif
+conf.set10('_GNU_SOURCE', true)
+
tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
if not tracker_sparql.found()
tracker_sparql = dependency ('tracker-sparql-1.0')
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index 053158cb6..1968bf277 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -19,6 +19,10 @@
* Author: Darin Adler <darin@bentspoon.com>
*/
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
#include <config.h>
#include "nautilus-file.h"
--
2.17.1

29
SOURCES/0001-file-Make-sure-we-include-necessary-headers.patch

@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
From 408e968d8a3382284909ffe66c0d5a62c9e5f1c0 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@gnome.org>
Date: Fri, 8 Jun 2018 17:22:23 +0200
Subject: [PATCH 1/2] file: Make sure we include necessary headers

setpwent is used but we didn't include the necessary headers.

It was building in Fedora because some other header included it,
but that's not the case in RHEL.
---
src/nautilus-file.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index cff660f1f..053158cb6 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -55,6 +55,8 @@
#include <libnautilus-extension/nautilus-file-info.h>
#include <libnautilus-extension/nautilus-extension-private.h>
#include <libxml/parser.h>
+#include <sys/types.h>
+#include <limits.h>
#include <pwd.h>
#include <stdlib.h>
#include <sys/time.h>
--
2.17.1

2933
SOURCES/0001-general-remove-gnome-autoar.patch

File diff suppressed because it is too large Load Diff

22
SOURCES/0001-meson-Request-c11-when-possible.patch

@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
From 6b58c14e82f80c2318513dae8f2646a18d5b60d3 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@gnome.org>
Date: Fri, 8 Jun 2018 17:22:08 +0200
Subject: [PATCH 1/2] meson: Request c11 when possible

---
meson.build | 1 +
1 file changed, 1 insertion(+)

diff --git a/meson.build b/meson.build
index 7a450292d..e3e6875d7 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,5 @@
project ('nautilus', 'c',
+ default_options: ['c_std=c11'],
version: '3.26.3.1',
meson_version: '>=0.40.0',
license: 'GPL3+')
--
2.17.1

46
SOURCES/0001-meson-Use-python2-for-postinstall.patch

@ -0,0 +1,46 @@ @@ -0,0 +1,46 @@
From 268b8d7343591b9c1cb379f6e65f061a4da461e8 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <csoriano@gnome.org>
Date: Fri, 8 Jun 2018 19:53:02 +0200
Subject: [PATCH] meson: Use python2 for postinstall

RHEL 7 doesn't have python3...
---
build-aux/meson/postinstall.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-aux/meson/postinstall.py b/build-aux/meson/postinstall.py
index 81afb18b7..04c6464d7 100755
--- a/build-aux/meson/postinstall.py
+++ b/build-aux/meson/postinstall.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
import os
import subprocess
@@ -8,19 +8,19 @@ datadir = os.path.join(prefix, 'share')
# Packaging tools define DESTDIR and this isn't needed for them
if 'DESTDIR' not in os.environ:
- print('Updating icon cache...')
+ print 'Updating icon cache...'
icon_cache_dir = os.path.join(datadir, 'icons', 'hicolor')
if not os.path.exists(icon_cache_dir):
os.makedirs(icon_cache_dir)
subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir])
- print('Updating desktop database...')
+ print 'Updating desktop database...'
desktop_database_dir = os.path.join(datadir, 'applications')
if not os.path.exists(desktop_database_dir):
os.makedirs(desktop_database_dir)
subprocess.call(['update-desktop-database', '-q', desktop_database_dir])
- print('Compiling GSettings schemas...')
+ print 'Compiling GSettings schemas...'
schemas_dir = os.path.join(datadir, 'glib-2.0', 'schemas')
if not os.path.exists(schemas_dir):
os.makedirs(schemas_dir)
--
2.17.1

1840
SPECS/nautilus.spec

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save