kalev pushed to gnome-builder (f22). "Backport a patch to fix the build on arm"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 14 21:30:49 UTC 2015
>From 68e4772c9550830996d2c101e5e1593d645e8301 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember at gmail.com>
Date: Tue, 14 Apr 2015 23:26:52 +0200
Subject: Backport a patch to fix the build on arm
diff --git a/0001-portability-use-sysconf-3-to-get-PAGE_SIZE.patch b/0001-portability-use-sysconf-3-to-get-PAGE_SIZE.patch
new file mode 100644
index 0000000..23d5ad1
--- /dev/null
+++ b/0001-portability-use-sysconf-3-to-get-PAGE_SIZE.patch
@@ -0,0 +1,34 @@
+From a7508c8c8b61d1f9c4735021a4e3dcd952dd7fef Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot at gnome.org>
+Date: Tue, 14 Apr 2015 09:43:14 +0200
+Subject: [PATCH] portability: use sysconf(3) to get PAGE_SIZE
+
+https://bugzilla.gnome.org/show_bug.cgi?id=747826
+---
+ libide/ide-highlight-index.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libide/ide-highlight-index.c b/libide/ide-highlight-index.c
+index 1c92119..6ed2770 100644
+--- a/libide/ide-highlight-index.c
++++ b/libide/ide-highlight-index.c
+@@ -21,6 +21,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/user.h>
++#include <unistd.h>
+
+ #include "ide-debug.h"
+ #include "ide-highlight-index.h"
+@@ -47,7 +48,7 @@ ide_highlight_index_new (void)
+
+ ret = g_new0 (IdeHighlightIndex, 1);
+ ret->ref_count = 1;
+- ret->strings = g_string_chunk_new (PAGE_SIZE);
++ ret->strings = g_string_chunk_new (sysconf (_SC_PAGE_SIZE));
+ ret->index = g_hash_table_new (g_str_hash, g_str_equal);
+
+ return ret;
+--
+2.3.5
+
diff --git a/gnome-builder.spec b/gnome-builder.spec
index 4488ecb..ca37217 100644
--- a/gnome-builder.spec
+++ b/gnome-builder.spec
@@ -58,6 +58,8 @@ License: GPLv3+ and GPLv2+ and LGPLv3+ and LGPLv2+ and MIT and CC-BY-SA and CC0
URL: https://wiki.gnome.org/Apps/Builder
#VCS: git:git://git.gnome.org/gnome-builder
Source0: https://download.gnome.org/sources/%{name}/3.16/%{name}-%{version}.tar.xz
+# Backported upstream patch
+Patch0: 0001-portability-use-sysconf-3-to-get-PAGE_SIZE.patch
BuildRequires: desktop-file-utils
BuildRequires: intltool
@@ -89,7 +91,8 @@ developing applications that use %{name}.
%prep
-%autosetup
+%setup -q
+%patch0 -p1
%build
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/gnome-builder.git/commit/?h=f22&id=68e4772c9550830996d2c101e5e1593d645e8301
More information about the scm-commits
mailing list