From 93af7b5ac1079a12426c3fed756c35c37b13ca05 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Nov 26 2020 19:40:10 +0000
Subject: Version 8.2.3.


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

---

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