Actually upload the new sources.

Add swipl-8.2.3-qt-deprecated.patch to silence Qt deprecation warnings.

pl.spec

@@ -17,7 +17,7 @@
 %endif
 
 Name:       pl
-Version:    8.2.1
+Version:    8.2.3
 Release:    1%{?dist}
 Summary:    SWI-Prolog - Edinburgh compatible Prolog compiler
 #LICENSE:                               BSD
@@ -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
@@ -88,8 +88,11 @@ 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
+# Silence some Qt deprecation warnings
+Patch4:     swipl-8.2.3-qt-deprecated.patch
+
 BuildRequires:  cmake
 BuildRequires:  findutils
 BuildRequires:  gcc-c++
@@ -147,6 +150,7 @@ BuildRequires:  pkgconfig(zlib)
 # Doc building
 BuildRequires:  tex(latex)
 BuildRequires:  tex(a4wide.sty)
+BuildRequires:  tex(tabulary.sty)
 # http
 Requires:       js-jquery
 
@@ -257,11 +261,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 +282,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,' \
@@ -309,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 \
@@ -324,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
@@ -351,11 +361,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 +493,15 @@ rm %{buildroot}%{_libdir}/swipl-%{version}/customize/README.md
 
 
 %changelog
+* Thu Nov 26 2020 Jerry James <loganjerry@gmail.com> - 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 <loganjerry@gmail.com> - 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 <loganjerry@gmail.com> - 8.2.1-1
 - 8.2.1 bump
 - Add -bad-bibtex-entry patch

sources

@@ -1,2 +1,2 @@
 SHA512 (userguide.html.tgz) = baa16d8f06a666e77ef45aaf7708e877710bfcb8fc0fb519bc70c54619c45def2d2ab4feaa0f1a1875b2a2270e8907551b63582da1b4beaa5b50f013a41d7ab9
-SHA512 (swipl-8.2.1_repackaged.tar.gz) = 644e59dcf69fc69155ae1ba21cf9b04eca2454d3602687be5d1c24aaaa151a41da97556c44f52ff0bc96e8ed5f4b8970c34e28d4591f55caa93e8cbcfd192987
+SHA512 (swipl-8.2.3_repackaged.tar.gz) = 8e798fdd6dd151b2c593ac6ac5e0f252916ef87a8d11183ce86397a30b4907f83fb4d08e482d64f603c142a2c7566528f0c2a4d8a6952dfcc920ca3844c42aa8

swipl-8.2.1-bad-bibtex-entry.patch

@@ -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}

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.
+<to be read again>
+                   \protect
+l.12 ...{Redicate indicators}{subsection.4.1.2}{}}
+
+?
+! Emergency stop.
+<to be read again>
+                   \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{[<mo
+ generally omitted if it is irrelevant (case of a built-in predicate) or if it
+ can be inferred from context.
+ 
+-\subsubsection{Non-terminal indicatora}		\label{sec:nonterminal_indic}
++\subsubsection{Non-terminal indicatora}		\label{sec:nonterminal:indic}
+ 
+ \index{non-terminal indicator}%
+ Compliant to the ISO standard draft on Definite Clause Grammars (see

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();
+     }