[TeXmacs] Add missing -lz to link (#1105932)

Thu Jul 31 20:21:20 UTC 2014

commit 088cd92d69b9b9504e62a17cac366d79dae8bd8a
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Thu Jul 31 15:20:52 2014 -0500

    Add missing -lz to link (#1105932)

 TeXmacs-conffix.patch |   94 +++++++++++++++++++++++++++++++++++++++---------
 TeXmacs.spec          |    8 ++++-
 2 files changed, 83 insertions(+), 19 deletions(-)
---

diff --git a/TeXmacs-conffix.patch b/TeXmacs-conffix.patch
index 4dc5081..f6f4771 100644
--- a/TeXmacs-conffix.patch
+++ b/TeXmacs-conffix.patch
@@ -1,10 +1,11 @@
-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
+diff --git a/aclocal.m4 b/aclocal.m4
+index 06bdb79..39fc21c 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -8,15 +8,15 @@ AC_DEFUN([GUILE_FLAGS],[
+ ## The GUILE_FLAGS macro.
    ## 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; }
+   AC_MSG_CHECKING(for Guile)
 -  guile-config link > /dev/null || {
 -    echo "configure: cannot find guile-config; is Guile installed?" 1>&2
 +  guile1.8-config link > /dev/null || {
@@ -19,23 +20,80 @@ diff -up TeXmacs-1.99.1-src/configure.conffix TeXmacs-1.99.1-src/configure
 -  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; }
+   AC_SUBST(GUILE_CFLAGS)
+   AC_SUBST(GUILE_LDFLAGS)
+   AC_MSG_RESULT(yes)
+diff --git a/configure.in b/configure.in
+index ec51eea..f7687c6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -101,12 +101,12 @@ if test -z "$GUILE_CFLAGS" -a -z "$GUILE_LDFLAGS"; then
+ fi
+ AC_MSG_CHECKING(version of guile)
  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; }
+ AC_MSG_RESULT($GUILE_EFFECTIVE_VERSION)
+ AC_MSG_CHECKING(guile data path)
  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; }
+ AC_MSG_RESULT($GUILE_DATA_PATH)
+ 
+@@ -613,7 +613,7 @@ AC_SUBST(WINSPARKLE_PATH)
+ 
+ AC_MSG_CHECKING(whether ... arguments behave correctly)
+ if test -z "$GUILE_CFLAGS"; then
+-  CXXFLAGS="`guile-config compile`"
++  CXXFLAGS="`guile1.8-config compile`"
+ else
+   CXXFLAGS="$GUILE_CFLAGS"
+ fi
+@@ -634,7 +634,7 @@ CXXFLAGS=""
+ 
+ AC_MSG_CHECKING(the size_t of guile strings)
+ if test -z "$GUILE_CFLAGS"; then
+-  CXXFLAGS="`guile-config compile`"
++  CXXFLAGS="`guile1.8-config compile`"
+ else
+   CXXFLAGS="$GUILE_CFLAGS"
+ fi
+@@ -1017,6 +1017,7 @@ T1_EncodingType t;
+ #        CONFIG_PDF="Pdf Pdf/PDFWriter"
+         CONFIG_PDF="Pdf"
+       	PDF_CFLAGS="-DPDFHUMMUS_NO_TIFF -DPDFHUMMUS_NO_DCT"
++        PDF_LDFLAGS="-lz"
+ ],[
+         AC_MSG_RESULT(no)
+         AC_MSG_ERROR([cannot find FreeType or your version is < 2.4.8.
+@@ -1163,6 +1164,7 @@ AC_SUBST(X11_LDFLAGS)
+ AC_SUBST(COCOA_CFLAGS)
+ AC_SUBST(COCOA_LDFLAGS)
+ AC_SUBST(PDF_CFLAGS)
++AC_SUBST(PDF_LDFLAGS)
+ 
+ AC_SUBST(CONFIG_X11)
+ AC_SUBST(CONFIG_COCOA)
+diff --git a/src/makefile.in b/src/makefile.in
+index bd6f11f..13a766e 100644
+--- a/src/makefile.in
++++ b/src/makefile.in
+@@ -63,6 +63,7 @@ LDFREETYPE = @FREETYPE_LDFLAGS@
+ LDICONV = @ICONV_LDFLAGS@
+ LDGUILE = @GUILE_LDFLAGS@
+ LDSPARKLE = @SPARKLE_LDFLAGS@
++LDPDF = @PDF_LDFLAGS@
+ 
+ AR = ar
+ ARFLAGS = -r
+@@ -395,7 +396,7 @@ TEXMACS_objects := $(strip $(call uses,system kernel data graphics\
+ 
+ link_options:=-L$(tmsrc)/lib $(LDRT) -lm $(LDPATH) $(LDGUI) $(LDICONV) \
+    $(LDGUILE) $(LDAXEL) $(LDCAIRO) $(LDIMLIB2) $(LDSQLITE3) $(LDFREETYPE) \
+-   $(LDDL) $(LDSPARKLE)
++   $(LDDL) $(LDSPARKLE) $(LDPDF)
+ 
+ $(tmsrc)/bin/texmacs.bin: Objects/texmacs-$(link).bin
+ 	$(CP) $^ $@
diff --git a/TeXmacs.spec b/TeXmacs.spec
index f242e9e..b6df1b4 100644
--- a/TeXmacs.spec
+++ b/TeXmacs.spec
@@ -1,6 +1,6 @@
 Name:		TeXmacs
 Version:	1.99.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Structured WYSIWYG scientific text editor
 Group:		Applications/Editors
 License:	GPLv2+
@@ -24,6 +24,8 @@ BuildRequires:	libXrender-devel
 BuildRequires:	libXt-devel
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	qt-devel
+BuildRequires:	zlib-devel
+BuildRequires:	autoconf
 Provides:	texmacs = %{version}-%{release}
 Requires:	fig2ps
 Patch0:		TeXmacs-conffix.patch
@@ -69,6 +71,7 @@ TeXmacs font.
 %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
+autoconf -f
 
 
 %build
@@ -202,6 +205,9 @@ find $RPM_BUILD_ROOT%{_datadir}/mime/ -type f -maxdepth 1 -print | xargs rm -f
 
 
 %changelog
+* Thu Jul 31 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 1.99.1-2
+- Add missing -lz to link (#1105932)
+
 * 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
