Mercurial > mxe-octave
view src/pstoedit-2-gs.patch @ 4222:44b1a9b2193e
qt5: add initial qt5 to mxe-octave, based on mxe.cc
* src/qt5.mk: new file
* src/qtbase-1-fixes.patch: new file
* src/qtbase.mk: new file
* src/qtimageformats-1.patch: new file
* src/qtimageformats.mk: new file
* src/qtsvg.mk: new file
* src/qttools-1.patch: new file
* added src/qttools.mk: new file
* changed Makefile.in: added ENABLE_QT5 option
* configure.ac: added enable-qt5 option
* index.html: added new files to packages
* installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path
* installer-files/octave.vbs: added setup of qt5 bin, plugin path
* installer-files/octave.bat: added setup of qt5 bin path
* src/default-octave.mk: added settig fot qt5 usage
* src/qscintilla.mk: added qt5 path
author | John D |
---|---|
date | Thu, 29 Sep 2016 11:22:51 -0400 |
parents | ea3cab4018c5 |
children | 3c5634c6a422 |
line wrap: on
line source
diff -ur pstoedit-3.70.orig/configure.ac pstoedit-3.70/configure.ac --- pstoedit-3.70.orig/configure.ac 2015-02-27 13:34:44.538158342 -0500 +++ pstoedit-3.70/configure.ac 2015-02-27 15:12:27.821126740 -0500 @@ -53,12 +53,12 @@ dnl Check Ghostscript GS="" AC_PATH_PROG(GS,gs) -if test -z "${GS}"; then - AC_MSG_ERROR([** Cannot find ghostscript. If it is already installed, Check PATH.]) -else -dnl Strip off // to / that causes troubles. - GS=`echo $GS | sed -e 's/\/\//\//g'` -fi +dnl if test -z "${GS}"; then +dnl AC_MSG_ERROR([** Cannot find ghostscript. If it is already installed, Check PATH.]) +dnl else +dnl dnl Strip off // to / that causes troubles. +dnl GS=`echo $GS | sed -e 's/\/\//\//g'` +dnl fi PKG_PROG_PKG_CONFIG diff -ur pstoedit-3.70.orig/src/Makefile.am pstoedit-3.70/src/Makefile.am --- pstoedit-3.70.orig/src/Makefile.am 2015-02-27 13:34:45.004167901 -0500 +++ pstoedit-3.70/src/Makefile.am 2015-02-27 15:13:10.916976944 -0500 @@ -32,7 +32,7 @@ ${LIBEMF_CFLAGS} \ ${LIBPNG_CFLAGS} \ ${LIBZIP_CFLAGS} \ - -DDEFAULTGS=$(GS) \ + -DDEFAULTGS="\"$(GS)\"" \ -DPSTOEDITDATADIR="\"$(pkgdatadir)\"" \ -DPSTOEDITLIBDIR="\"$(pkglibdir)\"" \ ${SPECIAL_CXXFLAGS}