Mercurial > mxe-octave

comparison src/pstoedit-2-gs.patch @ 3813:ea3cab4018c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pstoedit: update 4.70 * src/pstoedit-2-gs.patch: update patch * src/pstoedit.mk: update version, checksum * src/pstoedit-1-fixes.patc: updatepatch
author John Donoghue
date Fri, 27 Feb 2015 15:29:26 -0500
parents 7bccd055043e
children 3c5634c6a422
comparison
equal deleted inserted replaced
3812:82bd7cd7d06d 3813:ea3cab4018c5
1 diff -ur pstoedit-3.61-orig/configure.ac pstoedit-3.61/configure.ac 1 diff -ur pstoedit-3.70.orig/configure.ac pstoedit-3.70/configure.ac
2 --- pstoedit-3.61-orig/configure.ac 2012-08-28 06:46:41 -0400 2 --- pstoedit-3.70.orig/configure.ac 2015-02-27 13:34:44.538158342 -0500
3 +++ pstoedit-3.61/configure.ac 2013-07-05 23:29:38 -0400 3 +++ pstoedit-3.70/configure.ac 2015-02-27 15:12:27.821126740 -0500
4 @@ -53,12 +53,12 @@ 4 @@ -53,12 +53,12 @@
5 dnl Check Ghostscript 5 dnl Check Ghostscript
6 GS="" 6 GS=""
7 AC_PATH_PROG(GS,gs) 7 AC_PATH_PROG(GS,gs)
8 -if test -z "${GS}"; then 8 -if test -z "${GS}"; then
13 -fi 13 -fi
14 +dnl if test -z "${GS}"; then 14 +dnl if test -z "${GS}"; then
15 +dnl AC_MSG_ERROR([** Cannot find ghostscript. If it is already installed, Check PATH.]) 15 +dnl AC_MSG_ERROR([** Cannot find ghostscript. If it is already installed, Check PATH.])
16 +dnl else 16 +dnl else
17 +dnl dnl Strip off // to / that causes troubles. 17 +dnl dnl Strip off // to / that causes troubles.
18 +dnl GS=`echo $GS | sed -e 's/\/\//\//g'` 18 +dnl GS=`echo $GS | sed -e 's/\/\//\//g'`
19 +dnl fi 19 +dnl fi
20 20
21 PKG_PROG_PKG_CONFIG 21 PKG_PROG_PKG_CONFIG
22 22
23 diff -ur pstoedit-3.62.orig/src/Makefile.am pstoedit-3.62/src/Makefile.am 23 diff -ur pstoedit-3.70.orig/src/Makefile.am pstoedit-3.70/src/Makefile.am
24 --- pstoedit-3.62.orig/src/Makefile.am 2014-06-03 12:53:10 -0400 24 --- pstoedit-3.70.orig/src/Makefile.am 2015-02-27 13:34:45.004167901 -0500
25 +++ pstoedit-3.62/src/Makefile.am 2014-06-03 12:54:14 -0400 25 +++ pstoedit-3.70/src/Makefile.am 2015-02-27 15:13:10.916976944 -0500
26 @@ -31,7 +31,7 @@ 26 @@ -32,7 +32,7 @@
27 ${LIBMAGICK_CFLAGS} \
28 ${LIBEMF_CFLAGS} \ 27 ${LIBEMF_CFLAGS} \
29 ${LIBPNG_CFLAGS} \ 28 ${LIBPNG_CFLAGS} \
29 ${LIBZIP_CFLAGS} \
30 - -DDEFAULTGS=$(GS) \ 30 - -DDEFAULTGS=$(GS) \
31 + -DDEFAULTGS="\"$(GS)\"" \ 31 + -DDEFAULTGS="\"$(GS)\"" \
32 -DPSTOEDITDATADIR="\"$(pkgdatadir)\"" \ 32 -DPSTOEDITDATADIR="\"$(pkgdatadir)\"" \
33 -DPSTOEDITLIBDIR="\"$(pkglibdir)\"" \ 33 -DPSTOEDITLIBDIR="\"$(pkglibdir)\"" \
34 ${SPECIAL_CXXFLAGS} 34 ${SPECIAL_CXXFLAGS}