Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated GRAMPS shell script to build LD_PRELOAD variable correctly

Browse Source 
svn: r1100
This commit is contained in:
Don Allingham 2002-07-27 13:54:56 +00:00
parent 4bb7d8cef6
commit 6df1ab1608
3 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gramps.sh.in
View File

@ -1,5 +1,24 @@
#! /bin/sh
# @configure_input@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
prefix=@prefix@
@ -7,8 +26,23 @@ export GRAMPSDIR=@datadir@/@PACKAGE@
export PYTHONPATH=$GRAMPSDIR
export GRAMPSI18N=@prefix@/share/locale
if [ -f /usr/X11R6/lib/libX11.so ] ; then
export LD_PRELOAD=/usr/X11R6/lib/libX11.so
preload=""
#
# Mandrake has a tendency to build dynamic libraries without the proper
# dependencies in them. This causes havoc with the python gtk libraries.
# Preload the know problem libraries so that gramps does not fail under
# Mandrake
#
for l in /usr/X11R6/lib/libX11.so /usr/lib/libgdk-1.2.so.0 /usr/lib/libgdk_imlib.so.1
do
if [ -f $l ]; then
preload="$preload $l"
fi
done
if [ "$preload" != "" ]; then
export LD_PRELOAD="$preload"
fi
@PYTHON@ $GRAMPSDIR/gramps.py $*

2
src/Makefile.in
View File

@ -114,7 +114,7 @@ SUBDIRS = docgen filters plugins data po
# For intl. support, how do we compile?
CFLAGS = -fPIC -shared -O @CFLAGS@ @CPPFLAGS@ -I@includedir@
LDFLAGS = @LDFLAGS@ -L@libdir@ @LIBS@
LDFLAGS = @LDFLAGS@ -L@libdir@ @LIBS@
CLEANFILES = ${INTLLIBS}
MOSTLYCLEANFILES =

4
src/latin_utf8.py
View File

@ -22,7 +22,7 @@ import sys
if sys.version[0] != '1':
def utf8_to_latin(s):
return s.encode('latin-1')
return s.encode('latin-1','replace')
def latin_to_utf8(s):
return s
@ -37,7 +37,7 @@ else:
def utf8_to_latin(s):
y = UTF8String(s)
try:
return y.encode("iso-8859-1")
return y.encode("iso-8859-1",'replace')
except:
return s