[TeXmacs] Update to 1.99.1 - build against Guile-1.8

Jindrich Novy jnovy at fedoraproject.org
Tue Jun 24 07:46:05 UTC 2014 

commit a541fc654cc3d92c14f81d52d6703ef35a50d317
Author: Jindrich Novy <novyjindrich at gmail.com>
Date:   Tue Jun 24 08:46:00 2014 +0100

    Update to 1.99.1
    - build against Guile-1.8

 .gitignore            |    2 +-
 TeXmacs-conffix.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 TeXmacs.spec          |   19 ++++++++++++++-----
 sources               |    2 +-
 4 files changed, 57 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 87f121b..d33ac5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/TeXmacs-1.0.7.21-src.tar.gz
+/TeXmacs-1.99.1-src.tar.gz
diff --git a/TeXmacs-conffix.patch b/TeXmacs-conffix.patch
new file mode 100644
index 0000000..4dc5081
--- /dev/null
+++ b/TeXmacs-conffix.patch
@@ -0,0 +1,41 @@
+diff -up TeXmacs-1.99.1-src/configure.conffix TeXmacs-1.99.1-src/configure
+--- TeXmacs-1.99.1-src/configure.conffix	2013-05-10 10:48:37.000000000 +0100
++++ TeXmacs-1.99.1-src/configure	2014-06-24 07:54:50.621054910 +0100
+@@ -4659,15 +4659,15 @@ if test -z "$GUILE_CFLAGS" -a -z "$GUILE
+   ## First, let's just see if we can find Guile at all.
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Guile" >&5
+ $as_echo_n "checking for Guile... " >&6; }
+-  guile-config link > /dev/null || {
+-    echo "configure: cannot find guile-config; is Guile installed?" 1>&2
++  guile1.8-config link > /dev/null || {
++    echo "configure: cannot find guile1.8-config; is Guile installed?" 1>&2
+     exit 1
+   }
+-  GUILE_ORIGINAL_CFLAGS="`guile-config compile`"
++  GUILE_ORIGINAL_CFLAGS="`guile1.8-config compile`"
+   GUILE_CFLAGS="$GUILE_ORIGINAL_CFLAGS"
+   GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile $GUILE_ORIGINAL_CFLAGS/libguile"
+-  GUILE_LDFLAGS="`guile-config link`"
+-  GUILE_VARIANT_LDFLAGS="-L`guile-config info libdir` -lguile -lreadline -ltermcap"
++  GUILE_LDFLAGS="`guile1.8-config link`"
++  GUILE_VARIANT_LDFLAGS="-L`guile1.8-config info libdir` -lguile -lreadline -ltermcap"
+ 
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -4677,14 +4677,14 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of guile" >&5
+ $as_echo_n "checking version of guile... " >&6; }
+ if test -z "$GUILE_EFFECTIVE_VERSION" ; then
+-  GUILE_EFFECTIVE_VERSION=`guile -c '(display (version))'`
++  GUILE_EFFECTIVE_VERSION=`guile1.8 -c '(display (version))'`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUILE_EFFECTIVE_VERSION" >&5
+ $as_echo "$GUILE_EFFECTIVE_VERSION" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking guile data path" >&5
+ $as_echo_n "checking guile data path... " >&6; }
+ if test -z "$GUILE_DATA_PATH" ; then
+-  GUILE_DATA_PATH=`guile-config info pkgdatadir`
++  GUILE_DATA_PATH=`guile1.8-config info pkgdatadir`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUILE_DATA_PATH" >&5
+ $as_echo "$GUILE_DATA_PATH" >&6; }
diff --git a/TeXmacs.spec b/TeXmacs.spec
index 174524c..f242e9e 100644
--- a/TeXmacs.spec
+++ b/TeXmacs.spec
@@ -1,6 +1,6 @@
 Name:		TeXmacs
-Version:	1.0.7.21
-Release:	2%{?dist}
+Version:	1.99.1
+Release:	1%{?dist}
 Summary:	Structured WYSIWYG scientific text editor
 Group:		Applications/Editors
 License:	GPLv2+
@@ -9,7 +9,7 @@ Source:		http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-%{version}-src
 Requires:	tex(tex)
 Requires:	ghostscript
 Requires:	texmacs-fedora-fonts = %{version}-%{release}
-BuildRequires:	guile-devel
+BuildRequires:	compat-guile18-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	tex(tex)
 BuildRequires:	freetype-devel
@@ -26,6 +26,7 @@ BuildRequires:	libtool-ltdl-devel
 BuildRequires:	qt-devel
 Provides:	texmacs = %{version}-%{release}
 Requires:	fig2ps
+Patch0:		TeXmacs-conffix.patch
 
 %description
 GNU TeXmacs is a free scientific text editor, which was both inspired
@@ -65,6 +66,7 @@ TeXmacs font.
 
 %prep
 %setup -q -n TeXmacs-%{version}-src
+%patch0 -p1 -b .conffix
 sed -i "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in
 sed -i "s|5\.14\.\*|5.15.*|" plugins/maxima/bin/tm_maxima
 
@@ -73,14 +75,15 @@ sed -i "s|5\.14\.\*|5.15.*|" plugins/maxima/bin/tm_maxima
 export QMAKE=%{_libdir}/qt4/bin/qmake-qt4
 export MOC=%{_libdir}/qt4/bin/moc-qt4
 export UIC=%{_libdir}/qt4/bin/uic-qt4
+export HAS_GS_EXE=yes
 %configure --enable-optimize="$RPM_OPT_FLAGS -fpermissive"
 make %{?_smp_mflags}
 
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install STRIP=/bin/true
-export GUILE_DATA_PATH=%(guile-config info pkgdatadir)
-export GUILE_LOAD_PATH=$GUILE_DATA_PATH/%(guile-config info guileversion | cut -f 1 -d ".").%(guile-config info guileversion | cut -f 2 -d ".")/ice-9
+export GUILE_DATA_PATH=%(guile1.8-config info pkgdatadir)
+export GUILE_LOAD_PATH=$GUILE_DATA_PATH/%(guile1.8-config info guileversion | cut -f 1 -d ".").%(guile1.8-config info guileversion | cut -f 2 -d ".")/ice-9
 cp -r -f $GUILE_LOAD_PATH $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs
 chmod -f 755 $RPM_BUILD_ROOT%{_datadir}/TeXmacs/progs/ice-9
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry
@@ -199,6 +202,12 @@ find $RPM_BUILD_ROOT%{_datadir}/mime/ -type f -maxdepth 1 -print | xargs rm -f
 
 
 %changelog
+* Tue Jun 24 2014 Jindrich Novy <novyjindrich at gmail.com> - 1.99.1
+- update to 1.99.1 (#928733)
+- fix configure script to detect/compile against Guile-1.8
+- compiling against Guile-1.8 fixes crashes on startup (#957417, #1028754)
+- add HAS_GS_EXE option (#1105932) - thanks to Yaakov Selkowitz
+
 * Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index d1ef529..8b18f23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a56e2f14761e9003471fd26d91058ef0  TeXmacs-1.0.7.21-src.tar.gz
+9201dbb79f6d3b50c740c1ea248e0788  TeXmacs-1.99.1-src.tar.gz

More information about the scm-commits mailing list