Mercurial > mxe-octave

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3813
ea3cab4018c5 pstoedit: update 4.70
John Donoghue
parents: 3608
diff changeset
1 diff -ur pstoedit-3.70.orig/configure.ac pstoedit-3.70/configure.ac
ea3cab4018c5 pstoedit: update 4.70
John Donoghue
parents: 3608
diff changeset
2 --- pstoedit-3.70.orig/configure.ac 2015-02-27 13:34:44.538158342 -0500
ea3cab4018c5 pstoedit: update 4.70
John Donoghue
parents: 3608
diff changeset
3 +++ pstoedit-3.70/configure.ac 2015-02-27 15:12:27.821126740 -0500
3123
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -53,12 +53,12 @@
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 dnl Check Ghostscript
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 GS=""
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 AC_PATH_PROG(GS,gs)
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 -if test -z "${GS}"; then
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 - AC_MSG_ERROR([** Cannot find ghostscript. If it is already installed, Check PATH.])
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 -else
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 -dnl Strip off // to / that causes troubles.
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 - GS=`echo $GS | sed -e 's/\/\//\//g'`
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 -fi
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 +dnl if test -z "${GS}"; then
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 +dnl AC_MSG_ERROR([** Cannot find ghostscript. If it is already installed, Check PATH.])
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 +dnl else
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 +dnl dnl Strip off // to / that causes troubles.
3813
ea3cab4018c5 pstoedit: update 4.70
John Donoghue
parents: 3608
diff changeset
18 +dnl GS=`echo $GS | sed -e 's/\/\//\//g'`
3123
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 +dnl fi
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 PKG_PROG_PKG_CONFIG
38ee52ac978e Don't error pstoedit's configure script if GS is not found.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22
3813
ea3cab4018c5 pstoedit: update 4.70
John Donoghue
parents: 3608
diff changeset
23 diff -ur pstoedit-3.70.orig/src/Makefile.am pstoedit-3.70/src/Makefile.am
ea3cab4018c5 pstoedit: update 4.70
John Donoghue
parents: 3608
diff changeset
24 --- pstoedit-3.70.orig/src/Makefile.am 2015-02-27 13:34:45.004167901 -0500
ea3cab4018c5 pstoedit: update 4.70
John Donoghue
parents: 3608
diff changeset
25 +++ pstoedit-3.70/src/Makefile.am 2015-02-27 15:13:10.916976944 -0500
ea3cab4018c5 pstoedit: update 4.70
John Donoghue
parents: 3608
diff changeset
26 @@ -32,7 +32,7 @@
3608
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
27 ${LIBEMF_CFLAGS} \
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
28 ${LIBPNG_CFLAGS} \
3813
ea3cab4018c5 pstoedit: update 4.70
John Donoghue
parents: 3608
diff changeset
29 ${LIBZIP_CFLAGS} \
3608
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
30 - -DDEFAULTGS=$(GS) \
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
31 + -DDEFAULTGS="\"$(GS)\"" \
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
32 -DPSTOEDITDATADIR="\"$(pkgdatadir)\"" \
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
33 -DPSTOEDITLIBDIR="\"$(pkglibdir)\"" \
7bccd055043e pstoedit: update to pstoedit 3.62, quote ghostscript path.
John Donoghue
parents: 3123
diff changeset
34 ${SPECIAL_CXXFLAGS}