Re: [ITA] xpdf-4.00-1

2017-10-13 Thread Andrew Schulman
> On 09/10/2017 17:19, Ken Brown wrote:
> > My cygport file and patches are attached.  Note that there has been a 
> > change in the build system since the last release.  It now uses cmake 
> > and libQt.  For comparison, I'm also attaching the cygport file from the 
> > previous release.
> 
> Added to your packages.

Gold star awarded! https://cygwin.com/goldstars/#KB



Re: [ITA] xpdf-4.00-1

2017-10-09 Thread Jon Turney

On 09/10/2017 17:19, Ken Brown wrote:
My cygport file and patches are attached.  Note that there has been a 
change in the build system since the last release.  It now uses cmake 
and libQt.  For comparison, I'm also attaching the cygport file from the 
previous release.


Added to your packages.



[ITA] xpdf-4.00-1

2017-10-09 Thread Ken Brown
My cygport file and patches are attached.  Note that there has been a 
change in the build system since the last release.  It now uses cmake 
and libQt.  For comparison, I'm also attaching the cygport file from the 
previous release.


Package files
=

D=http://sanibeltranquility.com/cygwin
${D}/x86/release/xpdf/xpdf-4.00-1-src.tar.xz
${D}/x86/release/xpdf/xpdf-4.00-1.hint
${D}/x86/release/xpdf/xpdf-4.00-1.tar.xz
${D}/x86/release/xpdf/xpdf-debuginfo/xpdf-debuginfo-4.00-1.hint
${D}/x86/release/xpdf/xpdf-debuginfo/xpdf-debuginfo-4.00-1.tar.xz
${D}/x86_64/release/xpdf/xpdf-4.00-1-src.tar.xz
${D}/x86_64/release/xpdf/xpdf-4.00-1.hint
${D}/x86_64/release/xpdf/xpdf-4.00-1.tar.xz
${D}/x86_64/release/xpdf/xpdf-debuginfo/xpdf-debuginfo-4.00-1.hint
${D}/x86_64/release/xpdf/xpdf-debuginfo/xpdf-debuginfo-4.00-1.tar.xz

Ken
NAME="xpdf"
VERSION=4.00
RELEASE=1
CATEGORY="X11 Doc"
SUMMARY="An open source viewer for Portable Document Format (PDF) files"
DESCRIPTION="Xpdf is an open source viewer for Portable Document Format (PDF)
files.  (These are also sometimes called 'Acrobat' files, from the
name of Adobe's PDF software.)  The Xpdf viewer uses the Qt
cross-platform GUI toolkit.  The Xpdf project also includes a PDF text
extractor, PDF-to-PostScript converter, and various other utilities.
These are not included in the Cygwin xpdf package because poppler
provides similar utilities."

HOMEPAGE="http://www.xpdfreader.com/;
SRC_URI="
${HOMEPAGE}/dl/${P}.tar.gz
${HOMEPAGE}/dl/${PN}-arabic.tar.gz
${HOMEPAGE}/dl/${PN}-chinese-simplified.tar.gz
${HOMEPAGE}/dl/${PN}-chinese-traditional.tar.gz
${HOMEPAGE}/dl/${PN}-cyrillic.tar.gz
${HOMEPAGE}/dl/${PN}-greek.tar.gz
${HOMEPAGE}/dl/${PN}-hebrew.tar.gz
${HOMEPAGE}/dl/${PN}-japanese.tar.gz
${HOMEPAGE}/dl/${PN}-korean.tar.gz
${HOMEPAGE}/dl/${PN}-latin2.tar.gz
${HOMEPAGE}/dl/${PN}-thai.tar.gz
${HOMEPAGE}/dl/${PN}-turkish.tar.gz
"

inherit cmake

# Don't try to use lcms2; it's not supported in the open-source version.
CYGCMAKE_ARGS="
-DUSE_LIBPAPER=ON
-DA4_PAPER=ON
-DOPI_SUPPORT=ON
-DSPLASH_CMYK=ON
-DSYSTEM_XPDFRC=/etc/xpdfrc
"

PATCH_URI="xpdfrc.patch"
PATCH_URI+=" libpaper.patch"

DEPEND="cmake libQt5Core-devel libQt5Gui-devel libpaper-devel libfreetype-devel"

REQUIRES="libQt5Svg5"   # Needed for the toolbar icons.

src_install() {
cd ${B}
cyginstall
insinto /etc
newins ${S}/doc/sample-xpdfrc xpdfrc

# For the following deletions see --> 
http://cygwin.com/ml/cygwin-apps/2012-02/msg00148.html
rm -fr ${D}/usr/{bin,share/man/man1}/pdf*

for l in arabic chinese-simplified chinese-traditional cyrillic greek \
 hebrew japanese korean latin2 thai turkish
do
cd ${S}/../${PN}-${l}

newdoc README README.${l}

echo >> ${D}/etc/xpdfrc
cat add-to-xpdfrc >> ${D}/etc/xpdfrc

insinto /usr/share/${PN}/${l}
doins *.unicodeMap

if [ -f *.nameToUnicode ]
then
doins *.nameToUnicode
fi

if [ -d CMap ]
then
doins *.cidToUnicode
cp -r CMap ${D}/usr/share/${PN}/${l}/
fi
done

sed -e 's#/usr/local/share/xpdf#/usr/share/xpdf#g' -i ${D}/etc/xpdfrc

make_etc_defaults /etc/xpdfrc
}
Based on https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=222002

--- origsrc/xpdf-4.00/cmake-config.txt  2017-08-08 19:22:50.0 -0400
+++ src/xpdf-4.00/cmake-config.txt  2017-10-02 12:11:58.200991200 -0400
@@ -79,6 +79,7 @@ option(USE_EXCEPTIONS "use C++ exception
 option(USE_FIXEDPOINT "use fixed point (instead of floating point) arithmetic" 
OFF)
 option(SPLASH_CMYK "include support for CMYK rasterization" OFF)
 option(SPLASH_DEVICEN "include support for DeviceN rasterization" OFF)
+option(USE_LIBPAPER "use libpaper" OFF)
 if (SPLASH_DEVICEN)
   set(SPLASH_CMYK ON)
 endif ()
@@ -278,10 +279,34 @@ else()
 endif()
 
 #--- look for libpaper
-find_library(HAVE_PAPER_H
- NAMES paper libpaper
- PATH_SUFFIXES lib64 lib
-)
+if(USE_LIBPAPER)
+  find_library(PAPER_LIBRARY
+NAMES paper libpaper
+HINTS
+${PAPER_DIR}
+PATHS
+/usr/local
+/usr/freeware
+  )
+  find_path(PAPER_INCLUDE_DIR paper.h
+HINTS
+${PAPER_DIR}
+PATHS
+/usr/local/include
+/usr/freeware/include
+PATH_SUFFIXES include
+  )
+endif()
+
+if (USE_LIBPAPER)
+ if (PAPER_INCLUDE_DIR AND PAPER_LIBRARY)
+   set(HAVE_PAPER_H TRUE)
+   message(STATUS "Found libpaper: ${PAPER_LIBRARY}")
+ else ()
+  set(HAVE_PAPER_H FALSE)
+  message(STATUS "libpaper not found")
+ endif ()
+endif ()
 
 #--- look for pthreads
 find_package(Threads)
--- origsrc/xpdf-4.00/xpdf/CMakeLists.txt