From 08eaaec9f0dc2790412b1b17744d01f24d663078 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 21 Jul 2020 20:26:10 -0600 Subject: [PATCH 1/4] Change URL to use https instead of http. --- pl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl.spec b/pl.spec index 0d898fd..644274b 100644 --- a/pl.spec +++ b/pl.spec @@ -75,7 +75,7 @@ Summary: SWI-Prolog - Edinburgh compatible Prolog compiler #bench/simple_analyzer.pl Free for non-commercial #man/txt/dvi2tty/dvi2tty.c Free for non-commercial License: (GPLv2+ with exceptions or Artistic 2.0) and (GPL+ or Artistic) and (BSD or GPL+) and TCL and UCD and MIT and BSD and Public Domain -URL: http://www.swi-prolog.org/ +URL: https://www.swi-prolog.org/ # Source0: %%{url}download/stable/src/swipl-%%{version}.tar.gz # To create the repackaged archive, use ./repackage.sh %%{version} Source0: swipl-%{version}_repackaged.tar.gz From be60c9ef26c487f8e370292919d11969787c0ef4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 27 Oct 2020 13:17:38 -0600 Subject: [PATCH 2/4] Version 8.2.2. - Remove upstreamed -bad-bibtex-entry patch. - Add -underscore patch to work around LaTeX errors. --- pl.spec | 24 +++++++++---------- sources | 2 +- swipl-8.2.1-bad-bibtex-entry.patch | 20 ---------------- swipl-8.2.2-underscore.patch | 37 ++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 33 deletions(-) delete mode 100644 swipl-8.2.1-bad-bibtex-entry.patch create mode 100644 swipl-8.2.2-underscore.patch diff --git a/pl.spec b/pl.spec index 644274b..63c96b6 100644 --- a/pl.spec +++ b/pl.spec @@ -17,7 +17,7 @@ %endif Name: pl -Version: 8.2.1 +Version: 8.2.2 Release: 1%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler #LICENSE: BSD @@ -88,8 +88,9 @@ Patch0: swipl-8.2.0-Remove-files-locations-from-swipl-1-manual.patch Patch1: swipl-8.2.1-Fix-JNI.patch # Unbundle libstemmer Patch2: swipl-8.2.0-unbundle-libstemmer.patch -# Fix a bad BibTeX entry -Patch3: swipl-8.2.1-bad-bibtex-entry.patch +# Fix a LaTeX error when labels contain underscores +Patch3: swipl-8.2.2-underscore.patch + BuildRequires: cmake BuildRequires: findutils BuildRequires: gcc-c++ @@ -257,11 +258,7 @@ in Prolog. In both setups it provides a re-entrant bidirectional interface. %prep %global docdir doc-install -%setup -q -n swipl-%{version} -%patch0 -p1 -b .man-files -%patch1 -p1 -b .jni -%patch2 -p1 -b .libstemmer -%patch3 -p1 -b .bibtex +%autosetup -p1 -n swipl-%{version} # Fix the installation path on 64-bit systems if [ "%{_lib}" = "lib64" ]; then @@ -282,8 +279,8 @@ popd cp -p %{SOURCE2} . # Adjustments to take into account the new location of JNI stuff -sed --in-place=.jni2 -e 's#LIBDIR#%{_libdir}#g' packages/jpl/jpl.pl -sed --in-place=.jni2 -e 's#LIBDIR#"%{_libdir}/swipl-jpl"#g' packages/jpl/src/main/java/org/jpl7/JPL.java +sed --in-place=.jni -e 's#LIBDIR#%{_libdir}#g' packages/jpl/jpl.pl +sed --in-place=.jni -e 's#LIBDIR#"%{_libdir}/swipl-jpl"#g' packages/jpl/src/main/java/org/jpl7/JPL.java # Find junit.jar sed --in-place 's,\(%{_datadir}/java/junit\)4\.jar,\1.jar,' \ @@ -351,11 +348,9 @@ pushd %{buildroot}%{_libdir} mkdir -p swipl-jpl mv swipl-%{version}/lib/%{swipl_arch}/libjpl.so swipl-jpl/ mv swipl-%{version}/lib/jpl.jar swipl-jpl/ -mv swipl-%{version}/lib/jpl-${jpl_ver}.jar swipl-jpl/ # Original locations are referenced by internal libraries and examples ln -s ../../../swipl-jpl/libjpl.so swipl-%{version}/lib/%{swipl_arch}/libjpl.so ln -s ../../swipl-jpl/jpl.jar swipl-%{version}/lib/jpl.jar -ln -s ../../swipl-jpl/jpl-${jpl_ver}.jar swipl-%{version}/lib/jpl-${jpl_ver}.jar popd %endif @@ -485,6 +480,11 @@ rm %{buildroot}%{_libdir}/swipl-%{version}/customize/README.md %changelog +* Tue Oct 27 2020 Jerry James - 8.2.2-1 +- Version 8.2.2 +- Remove upstreamed -bad-bibtex-entry patch +- Add -underscore patch to work around LaTeX errors + * Mon Jun 29 2020 Jerry James - 8.2.1-1 - 8.2.1 bump - Add -bad-bibtex-entry patch diff --git a/sources b/sources index f31eac2..5c7be1b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (userguide.html.tgz) = baa16d8f06a666e77ef45aaf7708e877710bfcb8fc0fb519bc70c54619c45def2d2ab4feaa0f1a1875b2a2270e8907551b63582da1b4beaa5b50f013a41d7ab9 -SHA512 (swipl-8.2.1_repackaged.tar.gz) = 644e59dcf69fc69155ae1ba21cf9b04eca2454d3602687be5d1c24aaaa151a41da97556c44f52ff0bc96e8ed5f4b8970c34e28d4591f55caa93e8cbcfd192987 +SHA512 (swipl-8.2.2_repackaged.tar.gz) = 63736e8e245dedc3e177084d1d3e89ce41adcb3c079701b502ae867d762c638f4eb363e658641a8ca97badcf43e40290251481d40a7bd677e9a5dfb784be6943 diff --git a/swipl-8.2.1-bad-bibtex-entry.patch b/swipl-8.2.1-bad-bibtex-entry.patch deleted file mode 100644 index 701c3e5..0000000 --- a/swipl-8.2.1-bad-bibtex-entry.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/man/pl.bib -+++ b/man/pl.bib -@@ -1111,7 +1111,7 @@ pages = {14--17} - Languages Implementation and Logic Programming (PLILP'94)}, LNCS - 844, Madrid 1994. - --@inproceedings{DBLP:dblpjournals/tplp/CovingtonBOWP12, -+@article{DBLP:dblpjournals/tplp/CovingtonBOWP12, - author = {Michael A. Covington and - Roberto Bagnara and - Richard A. O'Keefe and -@@ -1119,6 +1119,8 @@ pages = {14--17} - Simon Price}, - title = {Coding guidelines for {Prolog}.}, - journal = {{TPLP}}, -+ volume = {12}, -+ number = {6}, - year = {2012}, - pages = {889-927}, - ee = {http://journals.cambridge.org/action/displayAbstract?aid} diff --git a/swipl-8.2.2-underscore.patch b/swipl-8.2.2-underscore.patch new file mode 100644 index 0000000..daf9f27 --- /dev/null +++ b/swipl-8.2.2-underscore.patch @@ -0,0 +1,37 @@ +This prevents a LaTeX error when labels contain underscores: + +(./SWI-Prolog-8.2.2.aux (./intro.aux) (./overview.aux) (./ide.aux) +(./builtin.aux +! Missing \endcsname inserted. + + \protect +l.12 ...{Redicate indicators}{subsection.4.1.2}{}} + +? +! Emergency stop. + + \protect +l.12 ...{Redicate indicators}{subsection.4.1.2}{}} + +End of file on the terminal! + +--- a/man/builtin.doc 2020-10-27 05:10:19.000000000 -0600 ++++ b/man/builtin.doc 2020-10-27 12:43:43.386433966 -0600 +@@ -78,7 +78,7 @@ See also \secref{metacall} for examples + \secref{metapred} for mode flags to label meta-predicate arguments in + module export declarations. + +-\subsection{Redicate indicators} \label{sec:predicate_indic} ++\subsection{Redicate indicators} \label{sec:predicate:indic} + + \index{predicate indicator}% + Referring to a predicate in running text is done using a +@@ -87,7 +87,7 @@ predicate indicator is a term \exam{[ Date: Thu, 26 Nov 2020 10:44:38 -0700 Subject: [PATCH 3/4] Version 8.2.3. Add swipl-8.2.3-qt-deprecated.patch to silence Qt deprecation warnings. --- pl.spec | 21 +++++++++++++++++++-- swipl-8.2.3-qt-deprecated.patch | 25 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 swipl-8.2.3-qt-deprecated.patch diff --git a/pl.spec b/pl.spec index 63c96b6..d0ec968 100644 --- a/pl.spec +++ b/pl.spec @@ -17,7 +17,7 @@ %endif Name: pl -Version: 8.2.2 +Version: 8.2.3 Release: 1%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler #LICENSE: BSD @@ -90,6 +90,8 @@ Patch1: swipl-8.2.1-Fix-JNI.patch Patch2: swipl-8.2.0-unbundle-libstemmer.patch # Fix a LaTeX error when labels contain underscores Patch3: swipl-8.2.2-underscore.patch +# Silence some Qt deprecation warnings +Patch4: swipl-8.2.3-qt-deprecated.patch BuildRequires: cmake BuildRequires: findutils @@ -148,6 +150,7 @@ BuildRequires: pkgconfig(zlib) # Doc building BuildRequires: tex(latex) BuildRequires: tex(a4wide.sty) +BuildRequires: tex(tabulary.sty) # http Requires: js-jquery @@ -306,12 +309,13 @@ cp -p customize/README.md README-customize.md LC_CTYPE=C.UTF-8 javac JavaConfig.java JAVA_HOME=$(java JavaConfig --home) JAVA_LIBS=$(java JavaConfig --libs-only-L) +export LD_LIBRARY_PATH=$JAVA_HOME/lib/server %else # Processed by packages/configure export DISABLE_PKGS="jpl" %endif -# Build +# Configure mkdir build cd build %cmake \ @@ -321,6 +325,15 @@ cd build -DJQUERYDIR:STRING=%{_datadir}/javascript/jquery/latest \ -DSWIPL_VERSIONED_DIR:BOOL=ON \ -G Ninja .. + +# Help latex2html find the bibliographies +for d in $(find . -name gen); do + target=$(dirname $d) + mkdir -p %{_vpath_builddir}/$target + cp -p $d/*.bbl %{_vpath_builddir}/$target +done + +# Build ninja # Switch back before installing; see above @@ -480,6 +493,10 @@ rm %{buildroot}%{_libdir}/swipl-%{version}/customize/README.md %changelog +* Thu Nov 26 2020 Jerry James - 8.2.3-1 +- Version 8.2.3 +- Add swipl-8.2.3-qt-deprecated.patch to silence Qt deprecation warnings + * Tue Oct 27 2020 Jerry James - 8.2.2-1 - Version 8.2.2 - Remove upstreamed -bad-bibtex-entry patch diff --git a/swipl-8.2.3-qt-deprecated.patch b/swipl-8.2.3-qt-deprecated.patch new file mode 100644 index 0000000..5ab7f15 --- /dev/null +++ b/swipl-8.2.3-qt-deprecated.patch @@ -0,0 +1,25 @@ +Silence some deprecation warnings. + +--- swipl-8.2.3/packages/swipl-win/ParenMatching.cpp.orig 2020-11-04 06:02:43.000000000 -0700 ++++ swipl-8.2.3/packages/swipl-win/ParenMatching.cpp 2020-11-23 09:44:33.888327758 -0700 +@@ -84,9 +84,9 @@ QString ParenMatching::range::plainText( + e = doc->findBlock(end); + QTextStream s(&x); + if (b != e) { +- s << b.text().mid(b.position() - beg) << endl; ++ s << b.text().mid(b.position() - beg) << Qt::endl; + for (b = b.next(); b != e; b = b.next()) +- s << b.text() << endl; ++ s << b.text() << Qt::endl; + s << b.text().left(end - b.position()); + } + else +@@ -105,7 +105,7 @@ QString ParenMatching::range::linesText( + if (b != doc->end()) { + QTextStream s(&x); + for ( ; b != e; b = b.next()) +- s << b.text() << endl; ++ s << b.text() << Qt::endl; + if (b != doc->end()) + s << b.text(); + } From 233580606cce6a7a585548fe00dc33a84e27ca9f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 26 Nov 2020 11:15:40 -0700 Subject: [PATCH 4/4] Actually upload the new sources. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 5c7be1b..0e9c0e4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (userguide.html.tgz) = baa16d8f06a666e77ef45aaf7708e877710bfcb8fc0fb519bc70c54619c45def2d2ab4feaa0f1a1875b2a2270e8907551b63582da1b4beaa5b50f013a41d7ab9 -SHA512 (swipl-8.2.2_repackaged.tar.gz) = 63736e8e245dedc3e177084d1d3e89ce41adcb3c079701b502ae867d762c638f4eb363e658641a8ca97badcf43e40290251481d40a7bd677e9a5dfb784be6943 +SHA512 (swipl-8.2.3_repackaged.tar.gz) = 8e798fdd6dd151b2c593ac6ac5e0f252916ef87a8d11183ce86397a30b4907f83fb4d08e482d64f603c142a2c7566528f0c2a4d8a6952dfcc920ca3844c42aa8