summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-06-03 19:45:56 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-06-04 01:11:23 -0500
commit3fbfc78a072a83877ba156d68246e6956eb776b3 (patch)
tree8034a5574799b76abc972ea3bb8f45e148855644
parent1cc2be705dae61dd8e6a5c6ce41f62240f3202e6 (diff)
downloadslackbuilds-3fbfc78a072a83877ba156d68246e6956eb776b3.tar.gz
office/evince: Fixed segfault due to missing configdir
If $HOME/.gnome2/evince/ is not already present, then evince segfaults because it is unable to write last_settings inside that directory. The included patch should fix that up. Thanks to Morten Juhl-Johansen Zölde-Fejéfor the report. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--office/evince/evince-2.30.1-create_dotdir_on_startup.patch12
-rw-r--r--[-rwxr-xr-x]office/evince/evince.SlackBuild5
2 files changed, 16 insertions, 1 deletions
diff --git a/office/evince/evince-2.30.1-create_dotdir_on_startup.patch b/office/evince/evince-2.30.1-create_dotdir_on_startup.patch
new file mode 100644
index 0000000000..0fa743e460
--- /dev/null
+++ b/office/evince/evince-2.30.1-create_dotdir_on_startup.patch
@@ -0,0 +1,12 @@
+diff -Nur evince-2.30.1.orig//shell/ev-window.c evince-2.30.1/shell/ev-window.c
+--- evince-2.30.1.orig//shell/ev-window.c 2010-04-26 09:58:15.000000000 -0500
++++ evince-2.30.1/shell/ev-window.c 2010-06-03 16:54:29.974562518 -0500
+@@ -6107,7 +6107,7 @@
+ GFile *file;
+ gchar *path;
+
+- path = g_build_filename (ev_application_get_dot_dir (EV_APP, FALSE), "last_settings", NULL);
++ path = g_build_filename (ev_application_get_dot_dir (EV_APP, TRUE), "last_settings", NULL);
+ file = g_file_new_for_path (path);
+ g_free (path);
+
diff --git a/office/evince/evince.SlackBuild b/office/evince/evince.SlackBuild
index 89c88ad705..b07da5cc10 100755..100644
--- a/office/evince/evince.SlackBuild
+++ b/office/evince/evince.SlackBuild
@@ -25,7 +25,7 @@
PRGNAM=evince
VERSION=${VERSION:-2.30.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG=_SBo}
# Automatically determine the architecture we're building on:
@@ -81,6 +81,9 @@ if [ "$NLS" != "YES" ]; then
-e 's/ENABLE_NLS 1/ENABLE_NLS 0/g' configure
fi
+# Create the $HOME/.gnome2/evince/ directory before trying to write files there
+patch -p1 < $CWD/evince-2.30.1-create_dotdir_on_startup.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \