From d61b25032a499311f74a34ea105644b17caec47b Mon Sep 17 00:00:00 2001
From: Peter Marquardt <wwwutz@molgen.mpg.de>
Date: Mon, 21 Oct 2019 13:15:28 +0200
Subject: [PATCH 1/4] xpdf: update to 4.02

- new SRCURL
- force QT5
- add html & png
---
 xpdf.be0 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/xpdf.be0 b/xpdf.be0
index b41bc3b2c..5e494379c 100755
--- a/xpdf.be0
+++ b/xpdf.be0
@@ -1,10 +1,10 @@
 #!/bin/env beesh
 
-# BEE_VERSION xpdf-3.04-0
+# BEE_VERSION xpdf-4.02-0
 
 BEE_CONFIGURE=compat
 
-SRCURL[0]="ftp://ftp.foolabs.com/pub/xpdf/xpdf-${PKGVERSION}.tar.gz"
+SRCURL[0]="https://xpdfreader-dl.s3.amazonaws.com/xpdf-${PKGVERSION}.tar.gz"
 
 # PATCHURL+=()
 
@@ -24,6 +24,7 @@ SRCURL[0]="ftp://ftp.foolabs.com/pub/xpdf/xpdf-${PKGVERSION}.tar.gz"
 
 mee_configure() {
     bee_configure \
+        -DCMAKE_PREFIX_PATH=/usr/local/qt5 \
         --with-freetype2-includes=/usr/include/freetype2 \
         --enable-opi \
         --enable-multithreaded \
@@ -41,9 +42,9 @@ mee_configure() {
 
 mee_install_post() {
 # avoid conflicts with poppler. prefix all xpdf files with 'x'
-    for b in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do
+    for b in pdfdetach pdffonts pdfimages pdfinfo pdftohtml pdftopng pdftoppm pdftops pdftotext; do
         mv -v ${D}${BINDIR}/${b} ${D}${BINDIR}/x${b}
         mv -v ${D}${MANDIR}/man1/${b}.1 ${D}${MANDIR}/man1/x${b}.1
-        perl -pi -e 's/(pdfdetach|pdffonts|pdfimages|pdfinfo|pdftoppm|pdftops|pdftotext)/x$1/g' ${D}${MANDIR}/man1/x${b}.1
+        perl -pi -e 's/(pdfdetach|pdffonts|pdfimages|pdfinfo|pdftoppm|pdftops|pdftotext|pdftohtml|pdftopng)/x$1/g' ${D}${MANDIR}/man1/x${b}.1
     done
 }

From 7bcbc5b1120898a732190fb88857877e2613b2c4 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Wed, 23 Oct 2019 13:09:17 +0200
Subject: [PATCH 2/4] xpdf: Properly convert configure options to CMake

>    -DMULTITHREADED=0
>        Disables multithreading, which also disables building the GUI
>        viewer (xpdf).  This does not affect the command line tools.
>        Disabling multithreading should only be necessary if you're
>        building with a compiler other than gcc, clang, or Microsoft
>        Visual Studio.

So it can be removed.
---
 xpdf.be0 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xpdf.be0 b/xpdf.be0
index 5e494379c..27552ccbd 100755
--- a/xpdf.be0
+++ b/xpdf.be0
@@ -25,11 +25,11 @@ SRCURL[0]="https://xpdfreader-dl.s3.amazonaws.com/xpdf-${PKGVERSION}.tar.gz"
 mee_configure() {
     bee_configure \
         -DCMAKE_PREFIX_PATH=/usr/local/qt5 \
-        --with-freetype2-includes=/usr/include/freetype2 \
-        --enable-opi \
-        --enable-multithreaded \
-        --enable-wordlist \
-        --enable-a4-paper
+        -DA4_PAPER=ON \
+        -DOPI_SUPPORT=ON \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_COLOR_MAKEFILE=OFF \
+        -DCMAKE_VERBOSE_MAKEFILE=ON
 }
 
 #mee_build() {

From 92015095b0cfadae8b2ad7ad8354cdc4c6236ac0 Mon Sep 17 00:00:00 2001
From: Peter Marquardt <wwwutz@molgen.mpg.de>
Date: Mon, 21 Oct 2019 13:15:28 +0200
Subject: [PATCH 3/4] xpdf: update to 4.02

- new SRCURL
- force QT5
- add html & png
---
 xpdf.be0 | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/xpdf.be0 b/xpdf.be0
index b41bc3b2c..5f9303502 100755
--- a/xpdf.be0
+++ b/xpdf.be0
@@ -1,10 +1,10 @@
 #!/bin/env beesh
 
-# BEE_VERSION xpdf-3.04-0
+# BEE_VERSION xpdf-4.02-1
 
 BEE_CONFIGURE=compat
 
-SRCURL[0]="ftp://ftp.foolabs.com/pub/xpdf/xpdf-${PKGVERSION}.tar.gz"
+SRCURL[0]="https://xpdfreader-dl.s3.amazonaws.com/xpdf-${PKGVERSION}.tar.gz"
 
 # PATCHURL+=()
 
@@ -22,8 +22,15 @@ SRCURL[0]="ftp://ftp.foolabs.com/pub/xpdf/xpdf-${PKGVERSION}.tar.gz"
 #    bee_patch "${@}"
 #}
 
+mee_patch_post() {
+    sed -i -e '/\slastSize = size();/ a \ hide();\n event->ignore();' ${S}/xpdf-qt/XpdfViewer.cc
+}
+
 mee_configure() {
     bee_configure \
+        -DCMAKE_COLOR_MAKEFILE=OFF \
+        -DCMAKE_VERBOSE_MAKEFILE=ON \
+        -DCMAKE_PREFIX_PATH=/usr/local/qt5 \
         --with-freetype2-includes=/usr/include/freetype2 \
         --enable-opi \
         --enable-multithreaded \
@@ -41,9 +48,9 @@ mee_configure() {
 
 mee_install_post() {
 # avoid conflicts with poppler. prefix all xpdf files with 'x'
-    for b in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do
+    for b in pdfdetach pdffonts pdfimages pdfinfo pdftohtml pdftopng pdftoppm pdftops pdftotext; do
         mv -v ${D}${BINDIR}/${b} ${D}${BINDIR}/x${b}
         mv -v ${D}${MANDIR}/man1/${b}.1 ${D}${MANDIR}/man1/x${b}.1
-        perl -pi -e 's/(pdfdetach|pdffonts|pdfimages|pdfinfo|pdftoppm|pdftops|pdftotext)/x$1/g' ${D}${MANDIR}/man1/x${b}.1
+        perl -pi -e 's/(pdfdetach|pdffonts|pdfimages|pdfinfo|pdftoppm|pdftops|pdftotext|pdftohtml|pdftopng)/x$1/g' ${D}${MANDIR}/man1/x${b}.1
     done
 }

From 7968c5d42c825732f018e47c264fdf563933810d Mon Sep 17 00:00:00 2001
From: Peter Marquardt <wwwutz@molgen.mpg.de>
Date: Wed, 23 Oct 2019 13:43:59 +0200
Subject: [PATCH 4/4] xpdf: remove obsolete BEE_VAR

---
 xpdf.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xpdf.be0 b/xpdf.be0
index 877585f58..80e553008 100755
--- a/xpdf.be0
+++ b/xpdf.be0
@@ -2,7 +2,7 @@
 
 # BEE_VERSION xpdf-4.02-1
 
-BEE_CONFIGURE=compat
+# BEE_CONFIGURE=compat
 
 SRCURL[0]="https://xpdfreader-dl.s3.amazonaws.com/xpdf-${PKGVERSION}.tar.gz"