diff --git a/pl-5.6.12-xft.patch b/pl-5.6.12-xft.patch new file mode 100644 index 0000000..4fe928f --- /dev/null +++ b/pl-5.6.12-xft.patch @@ -0,0 +1,119 @@ +--- pl-5.6.12/packages/xpce/src/configure.xft 2006-05-01 13:44:44.000000000 +0200 ++++ pl-5.6.12/packages/xpce/src/configure 2006-05-01 13:46:45.000000000 +0200 +@@ -309,7 +309,7 @@ + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS YACC NETLIBS PL PLBUILD PLNAME PLLD PLLIBS PLBASE PLARCH PLINCL XLIB XINCLUDES XLIBS CXXLIBHACK PCEHOME CIFLAGS COFLAGS CWFLAGS CMFLAGS ETAGS ARCH OS TAR_CP_FLAGS ALLTARGET RTSUFFIX LD SO LDSOFLAGS SONAMEFLAG SOWHOLEARCHIVE CXXTARGETS GCCLIB SOEXTRAOBJ PLTARGET buildsubdir VMAJOR VMINOR VPATCH LDCONFIG AR MAKESHELL RSYNC QPENTRIES QPBIN QPPATH SP_PATH VWS DLLIBVAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os QPproduct QGETPATH QPPRODUCT SICSTUS MAKE GXX LN_S CPP CXX CXXFLAGS ac_ct_CXX EGREP ALLOCA XFTCONFIG LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS YACC NETLIBS PL PLBUILD PLNAME PLLD PLLIBS PLBASE PLARCH PLINCL XLIB XINCLUDES XLIBS CXXLIBHACK PCEHOME CIFLAGS COFLAGS CWFLAGS CMFLAGS ETAGS ARCH OS TAR_CP_FLAGS ALLTARGET RTSUFFIX LD SO LDSOFLAGS SONAMEFLAG SOWHOLEARCHIVE CXXTARGETS GCCLIB SOEXTRAOBJ PLTARGET buildsubdir VMAJOR VMINOR VPATCH LDCONFIG AR MAKESHELL RSYNC QPENTRIES QPBIN QPPATH SP_PATH VWS DLLIBVAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os QPproduct QGETPATH QPPRODUCT SICSTUS MAKE GXX LN_S CPP CXX CXXFLAGS ac_ct_CXX EGREP ALLOCA LIBOBJS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -8036,7 +8036,7 @@ + /usr/openwin/share/include' + + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for Intrinsic.h. ++ # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -8044,7 +8044,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -8071,7 +8071,7 @@ + sed 's/^/| /' conftest.$ac_ext >&5 + + for ac_dir in $ac_x_header_dirs; do +- if test -r "$ac_dir/X11/Intrinsic.h"; then ++ if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +@@ -8092,11 +8092,11 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + int + main () + { +-XtMalloc (0) ++XrmInitialize () + ; + return 0; + } +@@ -9136,56 +9136,13 @@ + fi + + +-for ac_prog in xft-config +-do +- # Extract the first word of "$ac_prog", so it can be a program name with args. +-set dummy $ac_prog; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_prog_XFTCONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- if test -n "$XFTCONFIG"; then +- ac_cv_prog_XFTCONFIG="$XFTCONFIG" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_prog_XFTCONFIG="$ac_prog" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +-fi +-fi +-XFTCONFIG=$ac_cv_prog_XFTCONFIG +-if test -n "$XFTCONFIG"; then +- echo "$as_me:$LINENO: result: $XFTCONFIG" >&5 +-echo "${ECHO_T}$XFTCONFIG" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- test -n "$XFTCONFIG" && break +-done +-test -n "$XFTCONFIG" || XFTCONFIG=""false"" +- +-if test "$XFTCONFIG" != "false" ; then + + cat >>confdefs.h <<\_ACEOF + #define USE_XFT 1 + _ACEOF + +- XLIBS="$XLIBS `$XFTCONFIG --libs`" +- XINCLUDES="$XINCLUDES `$XFTCONFIG --cflags`" +-fi; ++ XLIBS="$XLIBS `pkg-config xft --libs`" ++ XINCLUDES="$XINCLUDES `pkg-config xft --cflags`" + + + +@@ -9927,7 +9884,6 @@ + s,@ac_ct_CXX@,$ac_ct_CXX,;t t + s,@EGREP@,$EGREP,;t t + s,@ALLOCA@,$ALLOCA,;t t +-s,@XFTCONFIG@,$XFTCONFIG,;t t + s,@LIBOBJS@,$LIBOBJS,;t t + s,@LTLIBOBJS@,$LTLIBOBJS,;t t + CEOF diff --git a/pl.spec b/pl.spec index 93cab1d..2bad4b1 100644 --- a/pl.spec +++ b/pl.spec @@ -1,6 +1,6 @@ Name: pl Version: 5.6.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -12,6 +12,7 @@ Source1: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTM Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: pl-5.4.6-rpath.patch Patch1: pl-5.6.0-multilib.patch +Patch2: pl-5.6.12-xft.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel BuildRequires: readline-devel @@ -45,6 +46,7 @@ toolkit, integrated editor (Emacs-clone) and source-level debugger). %setup -q %patch0 -p1 -b .rpath %patch1 -p1 -b .multilib +%patch2 -p1 -b .xft ( mkdir doc-install cd doc-install @@ -95,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 1 2006 Gerard Milmeister - 5.6.12-2 +- added patch to compile with xft + * Sun Apr 30 2006 Gerard Milmeister - 5.6.12-1 - new version 5.6.12