Re: [ITA] xpdf-4.00-1

[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.

Re: [PATCH cygport] Add a command to make a test release

[Andrew Schulman]

> Andrew Schulman writes:
> > Ooh, how about this:
> >
> >   cygport lftp.cygport all
> >   cygport lftp.cygport override curr=4.7.7-1 test=4.7.8-1
> >   cygport lftp.cygport up
> >
> > That would create override.hint and upload it with the package, leaving the
> > cygport file and source package alone.
> 
> The command line parsing in cygport would become a lot more complicated
> for starters, so the syntax should be different.
> 
> But more to the point, some people want to do this on the command line,
> while others do not.  I for one don't want to do it from the command
> line because I have oodles of packages that I build semi-automatically
> and changing the commands issued for each individual package just
> doesn't work well for me.  So I do want this to be part of the file set
> I commit to my Git repository instead (yes, if forced I could wrap
> another layer of scripting or cygport patches around it).  In other
> words, in the end we likely need to have both.

That's fine.

> A separate issue is if those things should end up in the package
> archives.  I agree that often they should not, so again my suggestion is
> to record this simply in a separate file that does not get packaged and
> (as outlined above) to provide means to create the same effects from the
> command line.

Agree. The idea is that cygport can create override.hint, or the packager can
create it. Then cygport uploads it along with the package files. But it's a
separate file, not part of the package archive.

Re: [PATCH setup] Allow setup to parse more than 3 versions from the setup.ini file

[Jon Turney]

On 06/12/2016 18:43, Corinna Vinschen wrote:

On Dec  6 17:21, Jon Turney wrote:

 From 35ecf968425762c72076059464dfb6c8b21a9331 Mon Sep 17 00:00:00 2001
From: Jon Turney 
Date: Wed, 31 Aug 2016 11:31:22 +0100
Subject: [PATCH setup] Allow setup to parse more than 3 versions from the
  setup.ini file

This recognizes any "[foo]" line as introducing the information for another
version, which doesn't have one of the trust levels [curr], [prev] or
[test], and so isn't automatically selected when setup is told to install
all packages at that trust level (by default, [curr]).

Setup already does all the necessary sorting in version order etc. to use
these additional versions.

The value of  carries no meaning, but the setup.ini specification
mandates the use of "[ver]".

* PackageTrust.h (trusts): Add TRUST_OTHER.
* inilex.ll: tokenize any other [version] as the T_OTHER token.
* iniparse.yy: Add T_OTHER token and set package trust
to TRUST_OTHER when it is used.


So, thinking about this change some more, I realize that there is a 
another way to do this, which doesn't break backwards compatibility with 
setup, by having multiple [prev] and [test] sections.


[1] doesn't say that these section names are unique, and setup doesn't 
require that, I'm going to claim that it's valid :)


Because of the way setup works, the last [test] section is the version 
which is selected when 'test' is selected, so a specific ordering of the 
sections would be required.  The calm change to implement this is at [1].


So, for example we could have:

@foo
...
version: 250-0
...
[prev]
version: 241-0
...
[prev]
version: 243-0
...
[test]
version: 251-0
...
[test]
version: 252-0
...

250-0 would be current, 252-0 would be test, and the other versions 
would also be available to install.


[1] https://sourceware.org/cygwin-apps/setup.ini.html
[2] 
https://github.com/jon-turney/calm/commit/c21cfdc8f8c94f615ff97000428c6e542d335dca

[ITA] xfig-3.2.6a-1

[Achim Gratz]

As previously mentioned, I'd like to adopt xfig (including
transfig/fig2dev).  Jon Turney already changed cygwin-pkg-maint and
moved transfig under the xfig umbrella and in turn removed the
non-existing fig2dev package.

root=http://cygwin.stromeko.net/
repo=$root/maint/$arch/release/xfig

$repo/transfig/transfig-3.2.6a-1.hint
$repo/transfig/transfig-3.2.6a-1.tar.xz
$repo/xfig-debuginfo/xfig-debuginfo-3.2.6a-1.hint
$repo/xfig-debuginfo/xfig-debuginfo-3.2.6a-1.tar.xz
$repo/xfig-lib/xfig-lib-3.2.6a-1.hint
$repo/xfig-lib/xfig-lib-3.2.6a-1.tar.xz
$repo/xfig-3.2.6a-1-src.tar.xz
$repo/xfig-3.2.6a-1.hint
$repo/xfig-3.2.6a-1.tar.xz

Alternatively, point setup.exe at $root and it should offer xfig and any
of its sub-packages you already have installed for update.  The
setup.ini is signed with my PGP key available at $root/stromeko.gpg,
which you can download and then feed to setup.exe via the -K switch.
The fingerprint of that key is:

  B22B 4890 B89E 5E5A 795C  E305 B40B EC75 3152 B1C3

If you have the keyart script (Python, you can just download from
https://raw.githubusercontent.com/atoponce/keyart/master/keyart), this
is what you should see after importing the key into your public keyring:

> keyart stromeko
+-[DSA 2048]+
| ^.|
|^ .|
|   ^ E |
|. . ^ :|
|. .  ^ : . |
|.^  . ^.:S |
| ..  . :^. |
|.  .^ ^.^  |
|. ^:.^ ..  |
| ^:... .   |
|.^.|
+-[3152B1C3]+
+---+
| :X|
| .  ^^^|
|:   ..^|
| . : .   E |
|  i . . .  |
|   ^ S l : .   |
|i l ^ ^|
|   ^ . .   |
|  .   .|
|   . . |
|  ...  |
+---+


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Samples for the Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra

Re: [Attn. Maintainers] Perl 5.26.1

[Ken Brown]

On 9/29/2017 2:06 PM, Yaakov Selkowitz wrote:

The following are mine and are
ready for upload:

gnumeric
graphviz
hexchat
libproxy
link-grammar
marisa
ming
openbabel
openwsman
rxvt-unicode
vim
xfconf
zbar
zinnia


Yaakov,

Have you also rebuilt your perl-Tk* packages?  If so, can you make them 
available somewhere?  I need them for the build of perl-PAR-Packer.


Thanks.

Ken

[ITA] xpdf-4.00-1

[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