[new and wip]: audio/csound
Hi,
here's a quick hack to port csound to OpenBSD. Category "It compiles,
let's ship it", but at least I was able to create WAVs from the
examples included in the sources ('xanadu' and 'trapped').
I don't want any ok's for now, but I'd really appreciate tests and
comments on this, especially from people currently running csound
on other systems.
There's no native audio or midi support, audio is done with pulseaudio
(or just writing the output to a file).
For those who have no idea what this thing is:
Csound is a sound and music computing system that has its roots in
the earliest of computer software, the MUSIC-N series by Max Mathews.
Csound was originally released in 1986 by Barry Vercoe and it has
been a part of the computer music world since. Today's Csound works
on desktop, mobile, embedded, server, and web platforms and powers
music software and music-making for musicians around the world.
Ciao,
Kili
ps: the code base of csound is *old*, there's a mess of #ifdef's,
maybe for systems that don't exist any longer, and there are "fixes"
done in the wrong place (like the first chunk of
patches/patch-Top_csound_c). So don't look at the code unless you're
brave. I'll submit the patches to upstream when this port is good
enough.
csound.tgz
Description: application/tar-gz
Re: update: x11/xmonad update 0.18
Hi, On Sat, Aug 17, 2024 at 08:52:08PM -0400, José Maldonado wrote: > Hello! A small update for xmonad that has released version 0.18. > Compiled and tested on amd64, everything perfect. Thanks! I'll give it a try tomorrow. One minor nit from port-lib-depends-check: charset can be removed from WANTLIB. Ciao, Kili
Re: Dealing with software using Linux TCP socket options
On Wed, Aug 21, 2024 at 11:30:52PM +0200, David Uhden Collado wrote: > 2. Linux TCP Socket Options: SimpleXMQ, on which the SimpleX Chat CLI client > depends, uses Linux-specific TCP socket options [2] that are not available > in OpenBSD [3], namely TCP_KEEPIDLE, TCP_KEEPINTVL, and TCP_KEEPCNT. My > questions regarding this issue are: [...] For all of those options, https://man7.org/linux/man-pages/man7/tcp.7.html states that they should not be used in coded intended to be portable. So you should probably ask upstream why they use those options. Ciao, Kili
retire print/mftrace?
Hi, print/mftrace was only ever used as a build dependency of print/lilypond. I removed that dependency from lilypond, so mftrace could be sent to the attic. Does anyone use mftrace for other purposes? If not, I'd like to remove it in a week. Ciao, Kili
Re: [readd] games/hedgewars
Hi,
On Thu, Apr 20, 2023 at 07:58:38PM -0400, Thomas Frohwein wrote:
> Regarding the server build, it would be good to think about what would
> be needed to bring it back... Can the Haskell dependencies be pulled
> into the install via MASTER_SITES{0,1,...} and be used this way? Or
> would the removed ports need to be restored to get there?
Neither one. See cabal-module(5), especially the example mentioning
cabal-bundler. And productivity/hledger for an example.
The idea is to mention all required dependencies (on packages
available on hackage.haskell.org) in MODCABAL_MANIFEST, and build
all of them together with the port (games/hledger in this case),
so we don't need hundreds of hs-ports for providing end-user haskell
packages.
Ciao,
Kili
lang/ghc and IBT?
Hi, still slacking around like hell, but I guess we need a new bootstrap for lang/ghc. If so, I'll try to enable USE_NOBTCFI, build a new bootstrap with it, and then use that for building the regular ghc package. Ciao, Kili
Re: lang/* BTI breakage
Hi,
On Thu, Jun 29, 2023 at 10:55:34PM -0700, Greg Steuck wrote:
> Christian Weisgerber writes:
>
> > Since BTI affects any and all compilers that generate executable code,
> > I tried to build all lang/* ports on amd64 with BTI enabled. Here's the
> > list of failures:
> >
> > devel/jdk/1.8 # needs new bootstrap
> > lang/crystal
> > lang/fpc
> > lang/gcc/11
> > lang/ghc
>
> Naturally, as kili@ suspected, we need a new bootstrap with the right
> flags plumbed through. Unfortunately I don't have access to the hardware
> with this feature.
Same here. Could someone be so kind to try the diff below? It uses a
bootstrap I built from lang/ghc-8.10.7 with similar changes.
If it works, I'll commit both (lang/ghc and lang/ghc-8.10.7) and also
look to integrate Gregs work getting rid of USE_NOEXECONLY.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/lang/ghc/Makefile,v
retrieving revision 1.211
diff -u -p -r1.211 Makefile
--- Makefile17 Mar 2023 10:40:44 - 1.211
+++ Makefile30 Jun 2023 19:05:02 -
@@ -11,14 +11,16 @@ NO_CCACHE = Yes
# Upstream bug: https://gitlab.haskell.org/ghc/ghc/-/issues/22782
USE_NOEXECONLY = Yes
+USE_NOBTCFI = Yes
+
GHC_VERSION = 9.2.7
-REVISION = 1
+REVISION = 2
DISTNAME = ghc-${GHC_VERSION}
CATEGORIES = lang devel
HOMEPAGE = https://www.haskell.org/ghc/
# Version of the precompiled binaries
-BIN_VER = 8.10.7.20230316
+BIN_VER = 8.10.7.20230613
# lang/python needed for regression tests.
MODULES = lang/python
@@ -114,7 +116,8 @@ CONFIGURE_ARGS += --with-ffi-includes=${
CONFIGURE_ENV += SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
-GHC_CC_OPTS = -Wl,--no-execute-only -Qunused-arguments
+GHC_CC_OPTS = -Wl,--no-execute-only -Qunused-arguments \
+ -Wl,-z,nobtcfi
CONFIGURE_ENV += CONF_GCC_LINKER_OPTS_STAGE0="${GHC_CC_OPTS}" \
CONF_GCC_LINKER_OPTS_STAGE1="${GHC_CC_OPTS}" \
CONF_GCC_LINKER_OPTS_STAGE2="${GHC_CC_OPTS}" \
Index: distinfo
===
RCS file: /cvs/ports/lang/ghc/distinfo,v
retrieving revision 1.67
diff -u -p -r1.67 distinfo
--- distinfo17 Mar 2023 10:40:44 - 1.67
+++ distinfo30 Jun 2023 19:05:02 -
@@ -1,8 +1,8 @@
-SHA256 (ghc/ghc-8.10.7.20230316-amd64-unknown-openbsd.tar.xz) =
rj7ePY2zwgajLYmuRTyGi+TaJVFnE13TdaNpmPjEd1I=
-SHA256 (ghc/ghc-8.10.7.20230316-shlibs-amd64.tar.gz) =
8QVqNJq6XGI+Xw9Hdf4uMDAeYY9V97U0DDJFPePDe2U=
+SHA256 (ghc/ghc-8.10.7.20230613-amd64-unknown-openbsd.tar.xz) =
/QCac6kB92pFCO9fzn90h/bFJysRl8GUQjOHBVA/5SA=
+SHA256 (ghc/ghc-8.10.7.20230613-shlibs-amd64.tar.gz) =
LpQDN0fV+YASghLoGTjn0yzEeuYPNW9gtUasieUgu+g=
SHA256 (ghc/ghc-9.2.7-src.tar.xz) =
olNWehe3NKTA3Q/6KW0zwqW1pUp335iIBqKh4cp+iLg=
SHA256 (ghc/ghc-9.2.7-testsuite.tar.xz) =
JJSvF12xtiODaWBBo/N+s2VPyN9R8SifTygu6GsJ+1A=
-SIZE (ghc/ghc-8.10.7.20230316-amd64-unknown-openbsd.tar.xz) = 48940296
-SIZE (ghc/ghc-8.10.7.20230316-shlibs-amd64.tar.gz) = 2923557
+SIZE (ghc/ghc-8.10.7.20230613-amd64-unknown-openbsd.tar.xz) = 48998912
+SIZE (ghc/ghc-8.10.7.20230613-shlibs-amd64.tar.gz) = 2941676
SIZE (ghc/ghc-9.2.7-src.tar.xz) = 24610432
SIZE (ghc/ghc-9.2.7-testsuite.tar.xz) = 3219572
Re: [Maintainer Update] print/ghostscript/gnu 10.03.0
Hi,
On Thu, Mar 07, 2024 at 07:20:11PM +0100, Volker Schlecht wrote:
> Updates print/ghostscript/gnu to latest release 10.03.0
>
> This is marked as a security release, but the only documented vulnerability
> affects builds with tesseract enabled. In our port we disable it, so we seem
> to be unaffected.
>
> https://ghostscript.readthedocs.io/en/gs10.03.0/News.html
>
> Built and tested on amd64. print/lilypond in particular still builds :-)
Just FYI: the next gs release may need some extra testing with lilypond
;-)
https://lists.gnu.org/archive/html/lilypond-devel/2024-03/msg1.html
> ok?
Yes.
Ciao,
Kili
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/ghostscript/gnu/Makefile,v
> retrieving revision 1.129
> diff -u -p -r1.129 Makefile
> --- Makefile 3 Nov 2023 10:53:15 - 1.129
> +++ Makefile 7 Mar 2024 18:13:52 -
> @@ -1,10 +1,10 @@
> COMMENT =PostScript and PDF interpreter
>
> -VERSION =10.02.1
> +VERSION =10.03.0
> DISTNAME = ghostscript-${VERSION}
> EXTRACT_SUFX = .tar.xz
> CATEGORIES = lang print
> -SHARED_LIBS =gs 18.1
> +SHARED_LIBS =gs 18.2
>
> SITES =
> https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${VERSION:S/.//g}/
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/print/ghostscript/gnu/distinfo,v
> retrieving revision 1.24
> diff -u -p -r1.24 distinfo
> --- distinfo 3 Nov 2023 10:53:15 - 1.24
> +++ distinfo 7 Mar 2024 18:13:52 -
> @@ -1,2 +1,2 @@
> -SHA256 (ghostscript-10.02.1.tar.xz) =
> jFjJSLByG+zvzQApyNuV+bsyaK/8JeoB1MWmsH+hqwg=
> -SIZE (ghostscript-10.02.1.tar.xz) = 68017088
> +SHA256 (ghostscript-10.03.0.tar.xz) =
> 8l/0kacm2IPwsPnIr5uJXGdM93zd2BSqOCSzIj9DnuU=
> +SIZE (ghostscript-10.03.0.tar.xz) = 68041176
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-configure,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-configure
> --- patches/patch-configure 25 Sep 2023 07:55:12 - 1.7
> +++ patches/patch-configure 7 Mar 2024 18:13:52 -
> @@ -1,7 +1,7 @@
> Index: configure
> --- configure.orig
> +++ configure
> -@@ -13149,8 +13149,8 @@ DLL_EXT=""
> +@@ -13158,8 +13158,8 @@ DLL_EXT=""
> SO_LIB_VERSION_SEPARATOR="."
>
> libname1="_SO_BASE)\$(GS_SOEXT)\$(DLL_EXT)"
> @@ -12,7 +12,7 @@ Index: configure
> GS_SONAME="lib\$(GS${libname1}"
> GS_SONAME_MAJOR="lib\$(GS${libname2}"
> GS_SONAME_MAJOR_MINOR="lib\$(GS${libname3}"
> -@@ -13262,11 +13262,11 @@ case $host in
> +@@ -13271,11 +13271,11 @@ case $host in
> ;;
> *bsd*)
> DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS"
Re: firefox popup windows
Hi Greg, On Mon, Mar 11, 2024 at 11:52:59AM -0700, Greg Steuck wrote: > I recently noticed that notification that firefox shows for Google Chat > are displayed as ordinary windows by xmonad as opposed to corner popups. > Is this a recent change or did I simply not notice this behavior before? > > Anybody else hit this? Yes. Same combination (xmonad and firefox). I think this started with firefox-123.0, but I didn't find any hint in the upstream release notes. > Any workarounds? Not yet, except curse every time firefox displays a popup. Ciao, Kili
update print/poppler
Hi,
this updates poppler to 24.03.0.
graphics/inkscape and print/scribus require some patches, which I'll
send after this one.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
diff -u -p -r1.182 Makefile
--- Makefile5 Feb 2024 22:15:38 - 1.182
+++ Makefile17 Mar 2024 19:40:31 -
@@ -3,7 +3,7 @@ COMMENT-qt5=Qt5 interface to PDF render
COMMENT-qt6= Qt6 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 24.02.0
+V= 24.03.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -13,7 +13,7 @@ PKGNAME-qt6= poppler-qt6-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 77.0 # 134.0
+SHARED_LIBS += poppler 78.0 # 135.0
SHARED_LIBS += poppler-glib 19.12# 8.26
SHARED_LIBS += poppler-qt5 8.12 # 1.33
SHARED_LIBS += poppler-qt6 1.4 # 3.4
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
diff -u -p -r1.99 distinfo
--- distinfo5 Feb 2024 22:15:38 - 1.99
+++ distinfo17 Mar 2024 19:40:31 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-24.02.0.tar.xz) = GRh6P90F8z59YExHmcGD3lygEYZAyIs3DdzzE2NDIi4=
-SIZE (poppler-24.02.0.tar.xz) = 1897604
+SHA256 (poppler-24.03.0.tar.xz) = uvvw21cT3sJbXRbrLNh+SmI1HNxA8FDDk3zY3WiC1EY=
+SIZE (poppler-24.03.0.tar.xz) = 1902068
Index: patches/patch-poppler_XRef_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
diff -u -p -r1.30 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 11 Oct 2023 18:09:12 - 1.30
+++ patches/patch-poppler_XRef_cc 17 Mar 2024 19:40:31 -
@@ -1,7 +1,7 @@
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
-@@ -1110,7 +1110,7 @@ bool XRef::isRefEncrypted(Ref r)
+@@ -,7 +,7 @@ bool XRef::isRefEncrypted(Ref r)
bool XRef::okToPrint(bool ignoreOwnerPW) const
{
@@ -10,7 +10,7 @@ Index: poppler/XRef.cc
}
// we can print at high res if we are only doing security handler revision
-@@ -1118,48 +1118,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
+@@ -1119,48 +1119,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
// 3 and we are allowed to print, and bit 12 is set.
bool XRef::okToPrintHighRes(bool ignoreOwnerPW) const
{
Index: patches/patch-utils_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-utils_CMakeLists_txt,v
diff -u -p -r1.8 patch-utils_CMakeLists_txt
--- patches/patch-utils_CMakeLists_txt 17 Jul 2023 20:45:52 - 1.8
+++ patches/patch-utils_CMakeLists_txt 17 Mar 2024 19:40:31 -
@@ -4,7 +4,7 @@ up any already installed older version o
Index: utils/CMakeLists.txt
--- utils/CMakeLists.txt.orig
+++ utils/CMakeLists.txt
-@@ -36,7 +36,7 @@ if (HAVE_CAIRO)
+@@ -38,7 +38,7 @@ if (HAVE_CAIRO)
)
add_definitions(${CAIRO_CFLAGS})
add_executable(pdftocairo ${pdftocairo_SOURCES})
fix graphics/inkscape with new poppler
Hi,
this fixes inkscape with poppler-24.03.0. Tested on amd64 by importing
some PDFs with inkscape.
ok?
Ciao,
Kil
Index: patches/patch-src_extension_internal_pdfinput_svg-builder_cpp
===
RCS file: patches/patch-src_extension_internal_pdfinput_svg-builder_cpp
diff -N patches/patch-src_extension_internal_pdfinput_svg-builder_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_extension_internal_pdfinput_svg-builder_cpp 17 Mar
2024 19:39:49 -
@@ -0,0 +1,38 @@
+Fix build with poppler-24.03.
+
+From https://gitlab.com/inkscape/inkscape/-/merge_requests/6209/diffs
+(without any preprocessor conditionals)
+
+Index: src/extension/internal/pdfinput/svg-builder.cpp
+--- src/extension/internal/pdfinput/svg-builder.cpp.orig
src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1158,9 +1158,9 @@ static bool svgGetShadingColor(GfxShading *shading, do
+ #define INT_EPSILON 8
+ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading
*shading,
+_POPPLER_CONST Function *func) {
+-int type = func->getType();
++auto type = func->getType();
+ auto space = shading->getColorSpace();
+-if ( type == 0 || type == 2 ) { // Sampled or exponential function
++if ( type == Function::Type::Sampled || type ==
Function::Type::Exponential ) { // Sampled or exponential function
+ GfxColor stop1, stop2;
+ if (!svgGetShadingColor(shading, 0.0, &stop1) ||
!svgGetShadingColor(shading, 1.0, &stop2)) {
+ return false;
+@@ -1168,7 +1168,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node
+ _addStopToGradient(gradient, 0.0, &stop1, space, 1.0);
+ _addStopToGradient(gradient, 1.0, &stop2, space, 1.0);
+ }
+-} else if ( type == 3 ) { // Stitching
++} else if ( type == Function::Type::Stitching ) { // Stitching
+ auto stitchingFunc = static_cast<_POPPLER_CONST
StitchingFunction*>(func);
+ const double *bounds = stitchingFunc->getBounds();
+ const double *encode = stitchingFunc->getEncode();
+@@ -1183,7 +1183,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node
+ for ( int i = 0 ; i < num_funcs ; i++ ) {
+ svgGetShadingColor(shading, bounds[i + 1], &color);
+ // Add stops
+-if (stitchingFunc->getFunc(i)->getType() == 2) {// process
exponential fxn
++if (stitchingFunc->getFunc(i)->getType() ==
Function::Type::Exponential) {// process exponential fxn
+ double expE = (static_cast<_POPPLER_CONST
ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
+ if (expE > 1.0) {
+ expE = (bounds[i + 1] - bounds[i])/expE;//
approximate exponential as a single straight line at x=1
fix print/inkscape with new poppler
Hi,
similiar to the fix of graphics/inkscape, this fixes the build with
poppler-24.03.0.
ok?
Ciao,
Kili
Index: patches/patch-src_extension_internal_pdfinput_svg-builder_cpp
===
RCS file: patches/patch-src_extension_internal_pdfinput_svg-builder_cpp
diff -N patches/patch-src_extension_internal_pdfinput_svg-builder_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_extension_internal_pdfinput_svg-builder_cpp 17 Mar
2024 19:39:49 -
@@ -0,0 +1,38 @@
+Fix build with poppler-24.03.
+
+From https://gitlab.com/inkscape/inkscape/-/merge_requests/6209/diffs
+(without any preprocessor conditionals)
+
+Index: src/extension/internal/pdfinput/svg-builder.cpp
+--- src/extension/internal/pdfinput/svg-builder.cpp.orig
src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1158,9 +1158,9 @@ static bool svgGetShadingColor(GfxShading *shading, do
+ #define INT_EPSILON 8
+ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading
*shading,
+_POPPLER_CONST Function *func) {
+-int type = func->getType();
++auto type = func->getType();
+ auto space = shading->getColorSpace();
+-if ( type == 0 || type == 2 ) { // Sampled or exponential function
++if ( type == Function::Type::Sampled || type ==
Function::Type::Exponential ) { // Sampled or exponential function
+ GfxColor stop1, stop2;
+ if (!svgGetShadingColor(shading, 0.0, &stop1) ||
!svgGetShadingColor(shading, 1.0, &stop2)) {
+ return false;
+@@ -1168,7 +1168,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node
+ _addStopToGradient(gradient, 0.0, &stop1, space, 1.0);
+ _addStopToGradient(gradient, 1.0, &stop2, space, 1.0);
+ }
+-} else if ( type == 3 ) { // Stitching
++} else if ( type == Function::Type::Stitching ) { // Stitching
+ auto stitchingFunc = static_cast<_POPPLER_CONST
StitchingFunction*>(func);
+ const double *bounds = stitchingFunc->getBounds();
+ const double *encode = stitchingFunc->getEncode();
+@@ -1183,7 +1183,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node
+ for ( int i = 0 ; i < num_funcs ; i++ ) {
+ svgGetShadingColor(shading, bounds[i + 1], &color);
+ // Add stops
+-if (stitchingFunc->getFunc(i)->getType() == 2) {// process
exponential fxn
++if (stitchingFunc->getFunc(i)->getType() ==
Function::Type::Exponential) {// process exponential fxn
+ double expE = (static_cast<_POPPLER_CONST
ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
+ if (expE > 1.0) {
+ expE = (bounds[i + 1] - bounds[i])/expE;//
approximate exponential as a single straight line at x=1
scribus (was: fix print/inkscape with new poppler)
Hi,
On Sun, Mar 17, 2024 at 10:34:00PM +0100, Matthias Kilian wrote:
> similiar to the fix of graphics/inkscape, this fixes the build with
> poppler-24.03.0.
Argh! I meant print/scribus, and here's the correct diff:
Index: patches/patch-scribus_plugins_import_pdf_slaoutput_cpp
===
RCS file: patches/patch-scribus_plugins_import_pdf_slaoutput_cpp
diff -N patches/patch-scribus_plugins_import_pdf_slaoutput_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-scribus_plugins_import_pdf_slaoutput_cpp 17 Mar 2024
19:40:21 -
@@ -0,0 +1,41 @@
+Fix build with poppler-24.03.
+
+Index: scribus/plugins/import/pdf/slaoutput.cpp
+--- scribus/plugins/import/pdf/slaoutput.cpp.orig
scribus/plugins/import/pdf/slaoutput.cpp
+@@ -1845,7 +1845,7 @@ GBool SlaOutputDev::axialShadedFill(GfxState *state, G
+ VGradient FillGradient = VGradient(VGradient::linear);
+ FillGradient.clearStops();
+ GfxColorSpace *color_space = shading->getColorSpace();
+- if (func->getType() == 3)
++ if (func->getType() == Function::Type::PostScript)
+ {
+ StitchingFunction *stitchingFunc = (StitchingFunction*)func;
+ const double *bounds = stitchingFunc->getBounds();
+@@ -1867,7 +1867,7 @@ GBool SlaOutputDev::axialShadedFill(GfxState *state, G
+ FillGradient.addStop(
ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade),
stopPoint, 0.5, 1.0, stopColor, shade );
+ }
+ }
+- else if ((func->getType() == 2) || (func->getType() == 0))
++ else if ((func->getType() == Function::Type::Stitching) ||
(func->getType() == Function::Type::Sampled))
+ {
+ GfxColor stop1;
+ shading->getColor(0.0, &stop1);
+@@ -1979,7 +1979,7 @@ GBool SlaOutputDev::radialShadedFill(GfxState *state,
+ VGradient FillGradient = VGradient(VGradient::linear);
+ FillGradient.clearStops();
+ GfxColorSpace *color_space = shading->getColorSpace();
+- if (func->getType() == 3)
++ if (func->getType() == Function::Type::PostScript)
+ {
+ StitchingFunction *stitchingFunc = (StitchingFunction*)func;
+ const double *bounds = stitchingFunc->getBounds();
+@@ -2001,7 +2001,7 @@ GBool SlaOutputDev::radialShadedFill(GfxState *state,
+ FillGradient.addStop(
ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade),
stopPoint, 0.5, 1.0, stopColor, shade );
+ }
+ }
+- else if ((func->getType() == 2) || (func->getType() == 0))
++ else if ((func->getType() == Function::Type::Stitching) ||
(func->getType() == Function::Type::Sampled))
+ {
+ GfxColor stop1;
+ shading->getColor(0.0, &stop1);
Re: [new] net/matterhorn
Hi, On Tue, Mar 19, 2024 at 07:24:13PM +0100, Pascal Stumpf wrote: > Now with HOMEPAGE. > > > On Tue, 19 Mar 2024 18:51:58 +0100, Pascal Stumpf wrote: > > Matterhorn is a terminal client for the Mattermost chat system. > > > > Features include: > > * Channel creation, deletion, and membership management commands > > * Support for multiple teams > > * Optimized channel-switching modes: M-a, M-s, and C-g > > * Message posting, editing, replying, and deletion > > * Markdown rendering > > * Support for participating in threads via the thread window > > * Convenient URL-opening with local browser > > * Yank verbatim content from messages into the system clipboard > > * Edit messages with $EDITOR > > * Rebindable keys (see /help keybindings) > > * Message editor with kill/yank buffer and readline-style keybindings > > * Support for adding and removing emoji post reactions > > * Tab-completion > > * Multiple color themes with color theme customization support > > * Custom notifications via notification scripts Works for me. Ciao, Kili
Re: Upgrade hledger to 1.33 making it ghc-9.8 compatible in the process
Hi Greg,
On Sun, Apr 28, 2024 at 08:57:31PM -0700, Greg Steuck wrote:
> Running fine here. OK?
Of course, if it works for you.
Ciao,
Kili
> >From ce39a866ea4e5ff0b3042e50a83d0e25776562f1 Mon Sep 17 00:00:00 2001
> From: Greg Steuck
>
> ---
> productivity/hledger/Makefile | 66
> productivity/hledger/distinfo | 142 +-
> .../hledger/patches/patch-hledger_cabal | 43 ++
> 3 files changed, 151 insertions(+), 100 deletions(-)
> create mode 100644 productivity/hledger/patches/patch-hledger_cabal
>
> diff --git a/productivity/hledger/Makefile b/productivity/hledger/Makefile
> index 345bf36f89c..b9cf5afc91b 100644
> --- a/productivity/hledger/Makefile
> +++ b/productivity/hledger/Makefile
> @@ -15,7 +15,7 @@ LIB_DEPENDS = converters/libiconv \
>
> MODULES =devel/cabal
> MODCABAL_STEM = hledger
> -MODCABAL_VERSION = 1.32.2
> +MODCABAL_VERSION = 1.33
>
> post-install:
> @${INSTALL_MAN} ${WRKSRC}/hledger.1 ${PREFIX}/man/man1
> @@ -30,23 +30,23 @@ MODCABAL_MANIFEST = \
> StateVar1.2.2 0 \
> aeson 2.2.1.0 1 \
> aeson-pretty0.8.10 0 \
> - ansi-terminal 1.0.2 0 \
> - ansi-terminal-types 0.11.5 1 \
> + ansi-terminal 1.1.1 0 \
> + ansi-terminal-types 1.1 0 \
> assoc 1.1 1 \
> - async 2.2.5 0 \
> + async 2.2.5 1 \
> attoparsec 0.14.4 5 \
> base-compat 0.13.1 0 \
> base-orphans0.9.1 0 \
> - bifunctors 5.6.1 2 \
> - bitvec 1.1.5.0 0 \
> + bifunctors 5.6.2 0 \
> + bitvec 1.1.5.0 1 \
> blaze-builder 0.4.2.3 0 \
> - blaze-html 0.9.1.2 4 \
> + blaze-html 0.9.2.0 0 \
> blaze-markup0.8.3.0 1 \
> cabal-doctest 1.0.9 3 \
> call-stack 0.4.0 0 \
> case-insensitive1.2.1.0 0 \
> - cassava 0.5.3.0 5 \
> - cassava-megaparsec 2.0.4 1 \
> + cassava 0.5.3.1 0 \
> + cassava-megaparsec 2.1.1 0 \
> clock 0.8.4 0 \
> cmdargs 0.10.22 0 \
> colour 2.3.6 0 \
> @@ -67,52 +67,54 @@ MODCABAL_MANIFEST = \
> doclayout 0.4.0.1 0 \
> emojis 0.1.3 0 \
> extra 1.7.14 0 \
> - file-embed 0.0.15.00 \
> + file-embed 0.0.16.00 \
> generically 0.1.1 2 \
> githash 0.1.7.0 0 \
> - hashable1.4.3.0 1 \
> + hashable1.4.4.0 1 \
> hashtables 1.3.1 0 \
> - hledger-lib 1.32.2 0 \
> - hsc2hs 0.68.10 1 \
> + haskeline 0.8.2.1 1 \
> + hledger-lib 1.330 \
> + hsc2hs 0.68.10 2 \
> html1.0.1.2 0 \
> indexed-traversable 0.1.3 0 \
> indexed-traversable-instances 0.1.1.2 2 \
> integer-conversion 0.1.0.1 1 \
> - integer-logarithms 1.0.3.1 5 \
> + integer-logarithms 1.0.3.1 6 \
> lucid 2.11.20230408 1 \
> - math-functions 0.3.4.3 0 \
> + math-functions 0.3.4.4 0 \
> megaparsec 9.6.1 0 \
> microlens 0.4.13.11 \
> - microlens-th0.4.3.140 \
> + microlens-th0.4.3.150 \
> mmorph 1.2.0 3 \
> - mono-traversable1.0.15.30 \
> - network 3.1.4.0 1 \
> + mono-traversable1.0.17.00 \
> + network 3.2.0.0 0 \
> network-uri 2.6.4.2 1 \
> old-locale 1.0.0.7 2 \
> optparse-applicative0.18.1.00 \
> + os-string 2.0.2.1 0 \
> pager 0.1.1.0 0 \
> parser-combinators 1.3.0 1 \
> pretty-simple 4.1.2.0 0 \
> prettyprinter 1.7.1 0 \
> prettyprinter-ansi-terminal 1.1.3 0 \
> - primitive 0.9.0.0 0 \
> + primitive 0.9.0.0 1 \
> quote-quot 0.2.1.0 0 \
> - random 1.2.1.1 1 \
> + random 1.2.1.2 0 \
> regex-base 0.94.0.24 \
> - regex-tdfa 1.3.2.2 2 \
> + regex-tdfa 1.3.2.2 3 \
> resourcet 1.3.0 0 \
> - safe0.3.21 0 \
> + safe0.3.21 1 \
> scientific 0.3.7.0 7 \
> semialign 1.3 1 \
> semigroupoids 6.0.0.1 1 \
> shakespeare 2.1.0.1 0 \
> split 0.2.5 0 \
> - splitmix0.1.0.5 0 \
> + splitmix0.1.0.5 1 \
> streaming-
Re: Support ghc-9.8 in git-annex
Hi Greg,
On Sun, Apr 28, 2024 at 09:00:02PM -0700, Greg Steuck wrote:
> Seems to work. OK?
Yes.
Ciao,
Kili
> The main point of the two upgrades is to make ghc-9.8 import that
> follows not cause any further churn.
>
> >From 3d1fbcadc2598cdc75be6d7dd4f1337b2cd51279 Mon Sep 17 00:00:00 2001
> From: Greg Steuck
> Date: Sun, 28 Apr 2024 17:24:27 -0700
> Subject: [PATCH 2/2] Support ghc-9.8 in git-annex
>
> ---
> devel/git-annex/Makefile | 152 +
> devel/git-annex/distinfo | 348 ---
> 2 files changed, 264 insertions(+), 236 deletions(-)
>
> diff --git a/devel/git-annex/Makefile b/devel/git-annex/Makefile
> index 171d014c6c6..130e39c100d 100644
> --- a/devel/git-annex/Makefile
> +++ b/devel/git-annex/Makefile
> @@ -22,7 +22,10 @@ BUILD_DEPENDS =devel/git
> MODULES =devel/cabal
>
> MODCABAL_STEM= git-annex
> +# newer versions have no docs to install
> MODCABAL_VERSION = 10.20230802
> +REVISION = 0
> +
> MAN1_STAGING_DIR = ${WRKBUILD}/man1_staging
>
> post-build:
> @@ -41,6 +44,7 @@ post-install:
> ${INSTALL_MAN_DIR} ${PREFIX}/man/man1
> ${INSTALL_MAN} ${MAN1_STAGING_DIR}/*.1 ${PREFIX}/man/man1
>
> +MODCABAL_BUILD_ARGS = --allow-newer
> MODCABAL_MANIFEST= \
> DAV 1.3.4 0 \
> Glob0.10.2 3 \
> @@ -48,24 +52,24 @@ MODCABAL_MANIFEST = \
> IfElse 0.850 \
> OneTuple0.4.1.1 1 \
> Only0.1 2 \
> - QuickCheck 2.14.3 0 \
> + QuickCheck 2.150 \
> SafeSemaphore 0.10.1 1 \
> StateVar1.2.2 0 \
> adjunctions 4.4.2 2 \
> - aeson 2.1.2.1 3 \
> - alex3.4.0.1 0 \
> - ansi-terminal 1.0 0 \
> - ansi-terminal-types 0.11.5 1 \
> + aeson 2.2.1.0 1 \
> + alex3.5.1.0 0 \
> + ansi-terminal 1.1.1 0 \
> + ansi-terminal-types 1.1 0 \
> appar 0.1.8 0 \
> asn1-encoding 0.9.6 2 \
> asn1-parse 0.9.5 0 \
> asn1-types 0.3.4 0 \
> assoc 1.1 1 \
> - async 2.2.4 4 \
> + async 2.2.5 1 \
> attoparsec 0.14.4 5 \
> - attoparsec-aeson2.1.0.0 0 \
> - auto-update 0.1.6 0 \
> - aws 0.24.1 0 \
> + attoparsec-aeson2.2.0.1 0 \
> + auto-update 0.2.0 0 \
> + aws 0.24.2 0 \
> base-compat 0.13.1 0 \
> base-compat-batteries 0.13.1 0 \
> base-orphans0.9.1 0 \
> @@ -73,11 +77,11 @@ MODCABAL_MANIFEST = \
> base64-bytestring 1.2.1.0 1 \
> basement0.0.16 0 \
> bencode 0.6.1.1 0 \
> - bifunctors 5.6.1 2 \
> + bifunctors 5.6.2 0 \
> binary-orphans 1.0.4.1 3 \
> - bitvec 1.1.5.0 0 \
> + bitvec 1.1.5.0 1 \
> blaze-builder 0.4.2.3 0 \
> - blaze-html 0.9.1.2 4 \
> + blaze-html 0.9.2.0 0 \
> blaze-markup0.8.3.0 1 \
> bloomfilter 2.0.1.2 0 \
> bsb-http-chunked0.0.0.4 4 \
> @@ -86,7 +90,8 @@ MODCABAL_MANIFEST = \
> cabal-doctest 1.0.9 3 \
> call-stack 0.4.0 0 \
> case-insensitive1.2.1.0 0 \
> - cassava 0.5.3.0 5 \
> + cassava 0.5.3.1 0 \
> + cborg 0.2.10.00 \
> cereal 0.5.8.3 0 \
> clientsession 0.9.2.0 1 \
> clock 0.8.4 0 \
> @@ -97,14 +102,15 @@ MODCABAL_MANIFEST= \
> conduit 1.3.5 0 \
> conduit-extra 1.3.6 0 \
> contravariant 1.5.5 0 \
> - cookie 0.4.6 0 \
> + cookie 0.5.0 0 \
> criterion 1.6.3.0 0 \
> criterion-measurement 0.2.1.0 0 \
> crypto-api 0.13.3 1 \
> - cryptohash-md5 0.11.101.0 3 \
> - cryptohash-sha1 0.11.101.0 3 \
> - crypton 0.340 \
> - crypton-connection 0.3.1 0 \
> + crypto-token0.1.1 0 \
> + cryptohash-md5 0.11.101.0 4 \
> + cryptohash-sha1 0.11.101.0 4 \
> + crypton 1.0.0 0 \
> + crypton-connection 0.3.2 0 \
> crypton-x5091.7.6 1 \
> crypton-x509-store 1.6.9 0 \
> crypton-x509-system 1.6.7 0 \
> @@ -124,82 +130,87 @@ MODCABAL_MANIFEST = \
> dlist 1.0 1 \
> easy-file 0.2.5 0 \
> edit-distance 0.2.2.1 1 \
> - email-validate 2.3.2.190 \
> + email-validate 2.3.2.200 \
> entropy 0.
update math/eigen3
[cc'ing rsadowski, because there are a lot of kde consumers of eigen3]
Hi,
this updates math/eigen3 to the latest Version (from 2021). This
is required to switch editors/calligra to C++-20, which in turn is
required for an update of print/poppler.
Successfully rebuilt all ports using math/eigen3, and also tested
some of them (kstarts, krita, calligra):
astro/calcmysky
astro/kstars
cad/openscad
cad/prusaslicer
cad/solvespace
editors/calligra *
emulators/emulationstation
graphics/asymptote
graphics/digikam
graphics/krita
graphics/opencv
misc/openbabel
x11/kde-applications/analitza
x11/kde-applications/kalzium
x11/kde-applications/step
* calligra needs additional patches, which I'll send in a few
minutes.
ok?
I'll also bump all the ports listed above.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/math/eigen3/Makefile,v
diff -u -p -r1.14 Makefile
--- Makefile27 Sep 2023 09:27:53 - 1.14
+++ Makefile10 May 2024 18:00:59 -
@@ -6,7 +6,7 @@ CATEGORIES =math devel
HOMEPAGE = https://eigen.tuxfamily.org
-VERSION = 3.3.9
+VERSION = 3.4.0
DISTNAME = eigen-${VERSION}
PKGNAME = eigen3-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/math/eigen3/distinfo,v
diff -u -p -r1.3 distinfo
--- distinfo19 Feb 2022 21:10:57 - 1.3
+++ distinfo10 May 2024 18:00:59 -
@@ -1,2 +1,2 @@
-SHA256 (eigen-3.3.9.tar.gz) = eYWXW3hzQBJHhvCSs6B9WUsunNU7v+Xz2bHa7n1V9W8=
-SIZE (eigen-3.3.9.tar.gz) = 2142379
+SHA256 (eigen-3.4.0.tar.gz) = hYYIT3H5veVF7n+m0AKIsmSit6w2B7l05U0T5xYsHHI=
+SIZE (eigen-3.4.0.tar.gz) = 2705005
Index: patches/patch-cmake_FindGoogleHash_cmake
===
RCS file: /cvs/ports/math/eigen3/patches/patch-cmake_FindGoogleHash_cmake,v
diff -u -p -r1.2 patch-cmake_FindGoogleHash_cmake
--- patches/patch-cmake_FindGoogleHash_cmake11 Mar 2022 19:36:14 -
1.2
+++ patches/patch-cmake_FindGoogleHash_cmake10 May 2024 18:00:59 -
@@ -1,6 +1,7 @@
Fix configure check.
cmake/FindGoogleHash.cmake.origTue Jul 30 15:24:36 2013
-+++ cmake/FindGoogleHash.cmake Tue Jul 30 15:24:20 2013
+Index: cmake/FindGoogleHash.cmake
+--- cmake/FindGoogleHash.cmake.orig
cmake/FindGoogleHash.cmake
@@ -1,4 +1,7 @@
+include(CMakePushCheckState)
@@ -8,12 +9,9 @@ Fix configure check.
+
if (GOOGLEHASH_INCLUDES AND GOOGLEHASH_LIBRARIES)
set(GOOGLEHASH_FIND_QUIETLY TRUE)
- endif (GOOGLEHASH_INCLUDES AND GOOGLEHASH_LIBRARIES)
-@@ -9,12 +12,16 @@ find_path(GOOGLEHASH_INCLUDES
- PATHS
- ${INCLUDE_INSTALL_DIR}
+ endif ()
+@@ -11,10 +14,13 @@ find_path(GOOGLEHASH_INCLUDES
)
-+message(STATUS "GOOGLEHASH_INCLUDES: ${GOOGLEHASH_INCLUDES}")
if(GOOGLEHASH_INCLUDES)
- # let's make sure it compiles with the current compiler
@@ -27,6 +25,6 @@ Fix configure check.
+ set(CMAKE_REQUIRED_LIBRARIES)
+ check_cxx_source_compiles("#include \n#include
\nint main(int argc, char** argv) {
google::dense_hash_map a; google::sparse_hash_map b;
return 0;}\n" GOOGLEHASH_COMPILE)
+ cmake_pop_check_state()
- endif(GOOGLEHASH_INCLUDES)
+ endif()
include(FindPackageHandleStandardArgs)
Index: patches/patch-test_main_h
===
RCS file: /cvs/ports/math/eigen3/patches/patch-test_main_h,v
diff -u -p -r1.3 patch-test_main_h
--- patches/patch-test_main_h 11 Mar 2022 19:36:14 - 1.3
+++ patches/patch-test_main_h 10 May 2024 18:00:59 -
@@ -1,15 +1,16 @@
This test fails, and we actually DO provide min() and max() correctly,
so disable it.
+Index: test/main.h
--- test/main.h.orig
+++ test/main.h
-@@ -67,8 +67,8 @@
- // protected by parenthesis against macro expansion, the min()/max() macros
- // are defined here and any not-parenthesized min/max call will cause a
- // compiler error.
--#define min(A,B) please_protect_your_min_with_parentheses
--#define max(A,B) please_protect_your_max_with_parentheses
-+//#define min(A,B) please_protect_your_min_with_parentheses
-+//#define max(A,B) please_protect_your_max_with_parentheses
- #define isnan(X) please_protect_your_isnan_with_parentheses
- #define isinf(X) please_protect_your_isinf_with_parentheses
- #define isfinite(X) please_protect_your_isfinite_with_parentheses
+@@ -88,8 +88,8 @@
+ //
+ // So instead choosing to simply disable this check for HIP
+ //
+- #define min(A,B) please_protect_your_min_with_parentheses
+- #define max(A,B) please_protect_your_max_with_parentheses
++ //#define min(A,B) please_protect_your_min_with_parentheses
++ //#define max(A,B) please_protect_your_max_with_parentheses
+ #define isnan(X) please_protect_your_isnan_with_parentheses
+ #define isinf(X) please_protect_your_isinf_with_parentheses
+ #define isfinite(X) please_protect_your_isfinite_with_parentheses
Index: pkg/PLIST
==
switch editors/calligra to C++20
Hi,
this switches editors/calligra to be built with C++20 (requirement of
poppler-2024.05.0). It needs the update of math/eigen3 I just sent.
ok?
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/editors/calligra/Makefile,v
diff -u -p -r1.59 Makefile
--- Makefile1 Jan 2024 19:43:03 - 1.59
+++ Makefile10 May 2024 17:53:55 -
@@ -3,7 +3,7 @@ HOMEPAGE = https://www.calligra.org
VERSION = 3.2.1
DISTNAME = calligra-${VERSION}
CATEGORIES = editors
-REVISION = 11
+REVISION = 12
SHARED_LIBS = RtfReader 51.0 # 0.0
SHARED_LIBS += basicflakes 50.0 # 0.0
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/editors/calligra/patches/patch-CMakeLists_txt,v
diff -u -p -r1.8 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt28 Mar 2022 20:06:46 - 1.8
+++ patches/patch-CMakeLists_txt10 May 2024 17:53:55 -
@@ -1,5 +1,5 @@
- Fix build with OpenEXR>=3
-- Switch to C++17
+- Switch to C++20
- Update Cmake and deps, Fix Freetype and FontConfig Linkage,
from upstream
- disable GSL support for now. devel/gsl needs an update
@@ -21,7 +21,7 @@ Index: CMakeLists.txt
+#else ()
+#set (CMAKE_CXX_STANDARD 11)
+#endif ()
-+set (CMAKE_CXX_STANDARD 17)
++set (CMAKE_CXX_STANDARD 20)
#
Index: patches/patch-sheets_functions_reference_cpp
===
RCS file: patches/patch-sheets_functions_reference_cpp
diff -N patches/patch-sheets_functions_reference_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sheets_functions_reference_cpp10 May 2024 17:53:55
-
@@ -0,0 +1,15 @@
+Index: sheets/functions/reference.cpp
+--- sheets/functions/reference.cpp.orig
sheets/functions/reference.cpp
+@@ -415,11 +415,6 @@ Value func_indirect(valVector args, ValueCalc *calc, F
+ if (ref.isEmpty())
+ return Value::errorVALUE();
+
+-if (r1c1) {
+-// TODO: translate the r1c1 style to a1 style
+-ref = ref;
+-}
+-
+ const Calligra::Sheets::Region region(ref, e->sheet->map(), e->sheet);
+ if (!region.isValid() || !region.isSingular())
+ return Value::errorVALUE();
Index: patches/patch-sheets_functions_statistical_cpp
===
RCS file: patches/patch-sheets_functions_statistical_cpp
diff -N patches/patch-sheets_functions_statistical_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sheets_functions_statistical_cpp 10 May 2024 17:53:55
-
@@ -0,0 +1,19 @@
+Index: sheets/functions/statistical.cpp
+--- sheets/functions/statistical.cpp.orig
sheets/functions/statistical.cpp
+@@ -1633,7 +1633,6 @@ Value func_growth(valVector args, ValueCalc *calc, Fun
+ double sumX= 0.0;
+ double sumSqrX = 0.0;
+ double sumY= 0.0;
+-double sumSqrY = 0.0;
+ double sumXY = 0.0;
+ double valX, valY;
+
+@@ -1647,7 +1646,6 @@ Value func_growth(valVector args, ValueCalc *calc, Fun
+ sumX+= valX;
+ sumSqrX += valX * valX;
+ sumY+= valY;
+-sumSqrY += valY * valY;
+ sumXY += valX * valY;
+ ++count;
+ }
Update print/poppler
Hi here's the monthly poppler update ;-) All ports depending on it built fine on amd64, I'm currently running a build on i386 and waiting for an update on my desktop at home to finish, so I can run some tests. Anyone who want's to test his beloved ports depending on poppler, please go ahead. (I'll wait until friday before committing this) Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.110 diff -u -p -r1.110 Makefile --- Makefile22 Aug 2016 21:31:54 - 1.110 +++ Makefile12 Oct 2016 07:45:43 - @@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.47.0 +V= 0.48.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -16,7 +16,7 @@ PKGNAME-qt4= poppler-qt4-$V PKGNAME-qt5= poppler-qt5-$V OLDSHIT = poppler-0.16.7 -SHARED_LIBS += poppler 40.0 # 63.0 +SHARED_LIBS += poppler 41.0 # 64.0 SHARED_LIBS += poppler-glib 16.0 # 16.0 SHARED_LIBS += poppler-qt 12.0 # 3.0 SHARED_LIBS += poppler-qt4 19.0 # 14.0 Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.57 diff -u -p -r1.57 distinfo --- distinfo22 Aug 2016 21:31:54 - 1.57 +++ distinfo12 Oct 2016 07:45:13 - @@ -1,4 +1,4 @@ SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80= -SHA256 (poppler-0.47.0.tar.xz) = uHLnIo/DSnHOS0elrqKleuZ1KIGPqEbh4O2giTGb0kI= +SHA256 (poppler-0.48.0.tar.xz) = haADloB0yF2OE78yDsR872R7SWtW3P9MeQs05Ugv75M= SIZE (poppler-0.16.7.tar.gz) = 1952179 -SIZE (poppler-0.47.0.tar.xz) = 1682184 +SIZE (poppler-0.48.0.tar.xz) = 1684164
Re: GHC in snapshots with non-existent ld.
[cc'd ports, in case someone wants to comment]
Hi,
On Tue, Nov 01, 2016 at 01:39:56PM +0100, Karel Gardas wrote:
[ghc from packages not able to link anything outside of ports,
especially ghc HEAD]
> which is caused by this:
>
> $ ghc --version
> The Glorious Glasgow Haskell Compilation System, version 7.10.3
> $ ghc --info|grep ld
> ,("ld command","/usr/obj/ports/ghc-7.10.3/bin/ld")
>
>
> I think you should probably fix this to point to well known ld
> command? Or shall I work around this in GHC HEAD? Of course if I edit
> ports ghc settings file and change the ld command to /usr/bin/ld, then
> everything is working well here.
Please don't put a workaround into ghc HEAD.
I'll try to revert my latest USE_WXNEEDED change in lang/ghc and
again explicitely pass -Wl,-z,wxneeded to the linker (which would
then be /usr/bin/ld or just ld).
That would be the diff below.
I keep the USE_WXNEEDED but leaving it commented out, so people
know why it's done this way.
Any comments about this?
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/lang/ghc/Makefile,v
retrieving revision 1.142
diff -u -p -r1.142 Makefile
--- Makefile13 Sep 2016 18:52:05 - 1.142
+++ Makefile1 Nov 2016 16:03:05 -
@@ -12,7 +12,7 @@ COMMENT = compiler for the functional l
NO_CCACHE =Yes
DISTNAME = ghc-${MODGHC_VER}
-REVISION = 6
+REVISION = 7
CATEGORIES = lang devel
HOMEPAGE = https://www.haskell.org/ghc/
@@ -34,9 +34,10 @@ BUILD_DEPENDS = archivers/gtar \
textproc/docbook-xsl
RUN_DEPENDS =
-# XXX: wxneeded is a hack. Fix rts/Linker.c, mmapForLinker() and
-# loadObj_() instead.
-USE_WXNEEDED = Yes
+# We can't use the wrapper script, because it then gets hardcoded into
+# the packaged ghc. So we explicitely use -Wl,-z,wxneeded (see
+# CONFIGURE_ENV below)
+# USE_WXNEEDED = Yes
WANTLIB += c iconv m ncursesw pthread util
@@ -106,12 +107,14 @@ CFLAGS += -fno-pie
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --with-iconv-includes=${LOCALBASE}/include \
--with-iconv-libraries=${LOCALBASE}/lib
+# XXX: wxneeded is a hack. Fix rts/Linker.c, mmapForLinker() and
+# loadObj_() instead.
CONFIGURE_ENV += CONF_CC_OPTS_STAGE0="-fno-pie -nopie" \
CONF_CC_OPTS_STAGE1="-fno-pie -nopie" \
CONF_CC_OPTS_STAGE2="-fno-pie -nopie" \
CONF_GCC_LINKER_OPTS_STAGE0="-fno-pie -nopie" \
- CONF_GCC_LINKER_OPTS_STAGE1="-fno-pie -nopie" \
- CONF_GCC_LINKER_OPTS_STAGE2="-fno-pie -nopie"
+ CONF_GCC_LINKER_OPTS_STAGE1="-fno-pie -nopie
-Wl,-z,wxneeded" \
+ CONF_GCC_LINKER_OPTS_STAGE2="-fno-pie -nopie
-Wl,-z,wxneeded"
# Do not pick up gpatch
CONFIGURE_ENV += ac_cv_path_PatchCmd=/usr/bin/patch
Re: GHC in snapshots with non-existent ld.
Hi,
On Tue, Nov 01, 2016 at 09:45:32PM +0100, Karel Gardas wrote:
> On Tue, Nov 1, 2016 at 5:12 PM, Matthias Kilian
> wrote:
> > -# XXX: wxneeded is a hack. Fix rts/Linker.c, mmapForLinker() and
> > -# loadObj_() instead.
> > -USE_WXNEEDED = Yes
> > +# We can't use the wrapper script, because it then gets hardcoded into
> > +# the packaged ghc. So we explicitely use -Wl,-z,wxneeded (see
> > +# CONFIGURE_ENV below)
> > +# USE_WXNEEDED = Yes
> >
> > WANTLIB += c iconv m ncursesw pthread util
> >
> > @@ -106,12 +107,14 @@ CFLAGS += -fno-pie
> > CONFIGURE_STYLE = gnu
> > CONFIGURE_ARGS += --with-iconv-includes=${LOCALBASE}/include \
> > --with-iconv-libraries=${LOCALBASE}/lib
>
> Have you tried to use USE_WXNEEDED = Yes and add
> CONFIGURE_ARGS += --with-ld=/usr/bin/ld
This would probably cause the build to not use the ld wrapper script,
ending with ghc binaries linked without -Wl,-z,wxneeded. I don't
even watn to spend time on trying it.
Ciao,
Kili
Anyone using the a4 flavor of ghostscript?
Hi, looking at an (overdue) update of print/ghostscript/gnu, I'd really like to get rid of the a4 flavor. It's stupid, device drivers testing for a cpp macro 'A4' are cleary wrong (because they can derive the paper size by other means), and I can't think of many people still using DEC LN03 or Xerox XES (featuring sixel graphics) or similar cruft (I saw some mentioning of hercules graphics somewhere in the code). People using a printer whose gs driver requires the paper size defined at compile time should probably just buy a new printer. So, unless I see some real complaints, the a4 flavor will be removed. CIao, Kili
Re: update lang/ghc
On Fri, Nov 04, 2016 at 10:48:11PM +0100, Karel Gardas wrote: > Simple patch < your message (after stripping headers) failed on me > with a lot of rejected hunks and files. This is current CVS of ports. > Probably doing something wrong. The diff I sent was against the latest current lang/ghc, with Makefile,v 1.143 (that was the latest commit dealing with wxneeded). > Anyway, rejected files are: > $ find . -name '*.rej' > ./patches/patch-configure.rej > ./patches/patch-ghc_mk.rej [...] Strange. Was your tree clean, or did you already have some other diff applied? In any case, try cvs -qR up -dPAC to override any changes, then try to reapply my diff. > As haskell platform is on 8.0.1 version I would expect this is built > on top of GHC 8.0.1 too so at least some parts built into the platform > should be ready and compatible with GHC 8.0.1. At least that would be > my expectation on this... Well, haskell platform 8.0.1 in the "minimal" flavor basically is ghc with the libraries bundled with it, some additional tools (cabal-install, stack), but much less additional libraries as former versions of haskell platform. I'll work on the necessary updates for meta/haskell-platform and all the hs-ports during the next days (already have fixed (in my tree) a few dozens of ports which only require a bump and a new package-key). Ciao, Kili
Re: remove devel/eclipse ?
Hi, On Fri, Nov 04, 2016 at 11:12:46PM +0100, Landry Breuil wrote: > while looking at horrible things in the portstree, i was remembered that > we still had eclipse 3.2.2, which is from february 2007. There were > attempts around 2013 to have eclipse 4.2, but that wasnt finished. > > Are people really using that old cruft to build meaningful stuff on > OpenBSD ? Does it cope with the versions of java we have ? I don't have > answers to these questions, but im not sure we're doing a great service > to our users to keep that old junk in the tree, so it might be a good > candidate for removal... opinions ? I think I mentioned (friday evening, on icb), that the eclipse version we have in our tree may not play well with newer java features, and I had generics in mind. On the other hand, generics have been introduced in 2004, so i guess our eclipse at least supports generics. Not sure about other language features introduced since then. But I'm not doing much Java stuff these days, and when I do, I'm using vi(1). And there are some alternatives (netbeans, intellij), but I don't know how good or bad they are compared to eclipse. I think they both have features like showing call-graphs, doing several kinds of mechanical refactoring etc. So: *shrug* I probably wouldn't miss it much. Ciao, Kili
meta/haskell-platform -- full or minimal?
Hi, it looks like the concept of a haskell platform has been stripped down do a "minimal" and a "full" flavor: https://www.haskell.org/platform/contents.html I prefer the "minimal" version, because it's less work for me (less constraints on library versions, maybe even less hs-ports). If anyone prefers the "full" version, please let me know why. Ciao, Kili
mail/gmime: depend on security/gpgme
Hi, autoconf detects gpgme when installed, and includes it libgmime's .la file, breaking the build other ports like x11/gnome/totem when then gpgme is no longer installed. So, add security/gpgme to LIB_DEPENDS and adjust WANTLIB. Also, remove security/libgpg-error from BUILD_DEPENDS, because it's already pulled in by security/gpgme. ok? Or should I try to disable gpgme support? The interesting difference of the build log without vs. with gpgme installed is this: @@ -220,8 +218,8 @@ checking for getaddrinfo... (cached) yes checking for getaddrinfo in -lsocket... no checking for getaddrinfo in -lnsl... no -checking for gpgme-config... no -checking for GPGME pthread - version >= 1.1.6... no +checking for gpgme-config... /usr/local/bin/gpgme-config +checking for GPGME pthread - version >= 1.1.6... yes checking for gobject-introspection... yes checking for pkg-config... (cached) /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes @@ -268,7 +266,7 @@ Large file support: no Console warnings: no PGP/MIME support: yes - S/MIME support: no + S/MIME support: yes (via GpgME) Strict parser:no Mono bindings:no Index: Makefile === RCS file: /cvs/ports/mail/gmime/Makefile,v retrieving revision 1.54 diff -u -p -r1.54 Makefile --- Makefile18 Dec 2016 10:00:06 - 1.54 +++ Makefile23 Dec 2016 19:50:22 - @@ -4,6 +4,7 @@ COMMENT=MIME messages creation and par GNOME_PROJECT= gmime GNOME_VERSION= 2.6.22 +REVISION= 0 SHARED_LIBS += gmime-2.60.2 # 622.0 @@ -16,6 +17,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 WANTLIB += iconv intl pcre pthread z +WANTLIB += assuan gpg-error gpgme-pthread MODULES= x11/gnome @@ -24,10 +26,8 @@ MODGNOME_TOOLS= gobject-introspection # XXX No rule to make target 'GMime-2.6.metadata', needed by 'gmime-2.6.vapi' #MODGNOME_TOOLS += vala -# needed to build the tests -BUILD_DEPENDS += security/libgpg-error - -LIB_DEPENDS= devel/glib2 +LIB_DEPENDS= devel/glib2 \ + security/gpgme CONFIGURE_STYLE= gnu CONFIGURE_ARGS=--disable-mono Ciao, Kili
Re: new: editors/ged
On Mon, Jun 25, 2012 at 07:57:26PM +0200, Pascal Stumpf wrote: > On Sat, 26 May 2012 15:31:25 +0200, Pascal Stumpf wrote: > > GNU ed is a line-oriented text editor. It is used to create, display, > > modify and otherwise manipulate text files, both interactively and > > via shell scripts. A restricted version of ed, red, can only edit > > files in the current directory and cannot execute shell commands. > > Ed is the "standard" text editor in the sense that it is the original > > editor for Unix, and thus widely available. For most purposes, > > however, it is superseded by full-screen editors such as GNU Emacs > > or GNU Moe. > > > > ping? What's the benefit of ged(1) compared to ed(1) in base? Or do you have some specific port work that relies on features provded by ged(1) but not by ed(1)? Ciao, Kili
Haskell breakage
Hi, for yet unknown reasons, at least the unix library in ghc recently got a new "ABI hash", which requires bumps to either some hs-packages or to ghc itself. I prefer the latter and will also update the bootstrapper (see recent commit to lang/ghc; if some developer could waste some cycles on i386 to build a bootstrapper, please let me know). Anyway, I'm curious what caused the change. If anyone with a not-quite-current amd64 (say, two or three weeks old) could build lang/ghc and send me the full build log, I'd be glad. Your system would probably be "old enough" if ghc-pkg list -v unix lists unix-2.4.2.0-c912ec30ca1e7b6067d14990189a1353 If you already have the new version installed, it would be unix-2.4.2.0-ede8c1b2fd228f3f436412134498aafc (on amd64) Ciao, Kili
Re: Haskell breakage
On Tue, Jun 26, 2012 at 04:03:41PM -0400, Ted Unangst wrote: > > for yet unknown reasons, at least the unix library in ghc recently > > got a new "ABI hash", which requires bumps to either some hs-packages > > or to ghc itself. I prefer the latter and will also update the > > bootstrapper (see recent commit to lang/ghc; if some developer could > > waste some cycles on i386 to build a bootstrapper, please let me > > know). > > Do syscall changes trigger this? tfork moved around in that time frame. I don't hope so. The tfork changes should only fix the races we had some weeks ago in ghc, but it should not have any other effect (on the hs-libraries). Anyway, I'll try to run a build with the tfork change backed out to be sure. Ciao, Kili
Re: Haskell breakage
On Tue, Jun 26, 2012 at 08:35:39PM +0200, Matthias Kilian wrote: > Anyway, I'm curious what caused the change. If anyone with a > not-quite-current amd64 (say, two or three weeks old) could build > lang/ghc and send me the full build log, I'd be glad. Some kind people already sent me their build logs. Ciao, Kili
Re: UPDATE: Xombrero-1.1.0
On Wed, Jul 04, 2012 at 06:19:09PM -0300, Gonzalo L. R. wrote: > -LIB_DEPENDS= www/webkit>=1.6.1v0 > +LIB_DEPENDS= www/webkit>=1.8.0 You shouldn't drop the "v0" epoch marker here. Otherwise, looks ok (but I didn't yet test it). Ciao, Kili
Re: UPDATE: Xombrero-1.1.0
On Fri, Jul 06, 2012 at 04:17:14PM -0300, Gonzalo L. R. wrote: > New diff with EPOCH for webkit, pointed out by kili@ ok. Ciao, Kili > Index: Makefile > === > RCS file: /cvs/ports/www/xombrero/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- Makefile 7 Jun 2012 14:18:14 - 1.1.1.1 > +++ Makefile 6 Jul 2012 19:15:49 - > @@ -1,7 +1,7 @@ > # $OpenBSD: Makefile,v 1.1.1.1 2012/06/07 14:18:14 gonzalo Exp $ > > COMMENT= vi-like minimalists web browser > -DISTNAME=xombrero-1.0.0 > +DISTNAME=xombrero-1.1.0 > CATEGORIES= www > EPOCH= 1 > > @@ -28,7 +28,7 @@ WANTLIB += xcb xcb-render xcb-shm z java > > MASTER_SITES= > http://opensource.conformal.com/snapshots/xombrero/ > > -LIB_DEPENDS= www/webkit>=1.6.1v0 > +LIB_DEPENDS= www/webkit>=1.8.0v0 > RUN_DEPENDS= devel/desktop-file-utils > > EXTRACT_SUFX=.tgz > Index: distinfo > === > RCS file: /cvs/ports/www/xombrero/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 distinfo > --- distinfo 7 Jun 2012 14:18:14 - 1.1.1.1 > +++ distinfo 6 Jul 2012 19:15:49 - > @@ -1,5 +1,5 @@ > -MD5 (xombrero-1.0.0.tgz) = xctWoQb23zlbwdMjuQ4tFg== > -RMD160 (xombrero-1.0.0.tgz) = AwAoyKEkmmATpxtwH3rOo7kMhwk= > -SHA1 (xombrero-1.0.0.tgz) = j244eaYf687BBKg1e0eg5PlQ9iI= > -SHA256 (xombrero-1.0.0.tgz) = RvvBlTR2Y5yE2qj475BrbwVAcWgP3xynKuV5oHuimlg= > -SIZE (xombrero-1.0.0.tgz) = 229171 > +MD5 (xombrero-1.1.0.tgz) = o6dyd5f3u1rrEq9UIJMCHQ== > +RMD160 (xombrero-1.1.0.tgz) = fDqH8GcLhD88G5pMzCKpDxaUVb8= > +SHA1 (xombrero-1.1.0.tgz) = DbuONFX5TTgfEZyKCfnpPjmOSbU= > +SHA256 (xombrero-1.1.0.tgz) = yl4bvxSgLAcEZT/O+pIpEkz1sK+dhL+upw06n0Sq1D8= > +SIZE (xombrero-1.1.0.tgz) = 239758
Re: update: devel/hs-semigroups-0.8.3.2
Hi,
On Sat, Jul 07, 2012 at 12:57:46AM +0200, Dawe wrote:
> here's a simple update of hs-semigroups to 0.8.3.2
>
> Running make update-plist changed hs-${DISTNAME} to ${FULLPKGNAME}.
> Is this somehow a bad thing and should be left unchanged?
No, it should be changed back to hs-$PDISTNAME}. I use this script for
"repairing" hs-* PLISTs after running update-plist:
#!/bin/sh
if [ $# -eq 0 ]; then
set pkg/PLIST
fi
for plist; do
ed -s "$plist" <<- 'EOF'
g/\${FULLPKGNAME}/s/\${FULLPKGNAME}/hs-${DISTNAME}/g
g/^@exec .*%D\/lib\/ghc\/\${DISTNAME}\/register\.sh/d
g/^@unexec
.*%D\/lib\/ghc\/\${DISTNAME}\/unregister\.sh/d
/^lib\/ghc\/\${DISTNAME}\/register\.sh$/a
@exec /usr/bin/env HOME=/nonexistent
%D/lib/ghc/${DISTNAME}/register.sh -v0
@unexec /usr/bin/env HOME=/nonexistent
%D/lib/ghc/${DISTNAME}/unregister.sh -v0 --force
.
wq
EOF
done
Already done in my tree. I'll run a full build of all depending hs-*
ports withit and commit it if there's no problem.
CIao,
Kili
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/hs-semigroups/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 Makefile
> --- Makefile 23 Jan 2012 21:02:17 - 1.1.1.1
> +++ Makefile 6 Jul 2012 22:29:27 -
> @@ -2,7 +2,7 @@
>
> COMMENT =Haskell 98 semigroups
>
> -DISTNAME = semigroups-0.8
> +DISTNAME = semigroups-0.8.3.2
> CATEGORIES = devel math
>
> # BSD3
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/hs-semigroups/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo 23 Jan 2012 21:02:17 - 1.1.1.1
> +++ distinfo 6 Jul 2012 22:29:27 -
> @@ -1,5 +1,5 @@
> -MD5 (ghc/semigroups-0.8.tar.gz) = uLp/n/FGsSo5QKhi4hZZNg==
> -RMD160 (ghc/semigroups-0.8.tar.gz) = fYoK2AA1R2ijjA9YOHOHoy2X0OQ=
> -SHA1 (ghc/semigroups-0.8.tar.gz) = 6DmneBTXDImmnb4l7pACrW4RppQ=
> -SHA256 (ghc/semigroups-0.8.tar.gz) =
> DJVAPhzlsfuWYqDNHKSgwYV2ZpSsiM4m3z3/ToNLnoo=
> -SIZE (ghc/semigroups-0.8.tar.gz) = 9181
> +MD5 (ghc/semigroups-0.8.3.2.tar.gz) = 9AZgfgQhVUzeQFlLZfgwhg==
> +RMD160 (ghc/semigroups-0.8.3.2.tar.gz) = zixy4qTx5qoPZAIb69nMxoqyIU8=
> +SHA1 (ghc/semigroups-0.8.3.2.tar.gz) = xn5a9roLTDcvp6l7OjAlknfDSss=
> +SHA256 (ghc/semigroups-0.8.3.2.tar.gz) =
> 7NizaCFfvWl/ZQjcrHexU6wCuaFWhpS9yIbZmAkdgzw=
> +SIZE (ghc/semigroups-0.8.3.2.tar.gz) = 9392
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/hs-semigroups/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 23 Jan 2012 21:02:17 - 1.1.1.1
> +++ pkg/PLIST 6 Jul 2012 22:29:27 -
> @@ -14,25 +14,25 @@ lib/ghc/${DISTNAME}/register.sh
> @exec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/register.sh -v0
> @unexec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/unregister.sh
> -v0 --force
> lib/ghc/${DISTNAME}/unregister.sh
> -share/doc/hs-${DISTNAME}/
> -share/doc/hs-${DISTNAME}/LICENSE
> -share/doc/hs-${DISTNAME}/html/
> -share/doc/hs-${DISTNAME}/html/Data-List-NonEmpty.html
> -share/doc/hs-${DISTNAME}/html/Data-Semigroup.html
> -share/doc/hs-${DISTNAME}/html/Numeric-Natural-Internal.html
> -share/doc/hs-${DISTNAME}/html/Numeric-Natural.html
> -share/doc/hs-${DISTNAME}/html/doc-index.html
> -share/doc/hs-${DISTNAME}/html/frames.html
> -share/doc/hs-${DISTNAME}/html/haddock-util.js
> -share/doc/hs-${DISTNAME}/html/hslogo-16.png
> -share/doc/hs-${DISTNAME}/html/index-frames.html
> -share/doc/hs-${DISTNAME}/html/index.html
> -share/doc/hs-${DISTNAME}/html/mini_Data-List-NonEmpty.html
> -share/doc/hs-${DISTNAME}/html/mini_Data-Semigroup.html
> -share/doc/hs-${DISTNAME}/html/mini_Numeric-Natural-Internal.html
> -share/doc/hs-${DISTNAME}/html/mini_Numeric-Natural.html
> -share/doc/hs-${DISTNAME}/html/minus.gif
> -share/doc/hs-${DISTNAME}/html/ocean.css
> -share/doc/hs-${DISTNAME}/html/plus.gif
> -share/doc/hs-${DISTNAME}/html/semigroups.haddock
> -share/doc/hs-${DISTNAME}/html/synopsis.png
> +share/doc/${FULLPKGNAME}/
> +share/doc/${FULLPKGNAME}/LICENSE
> +share/doc/${FULLPKGNAME}/html/
> +share/doc/${FULLPKGNAME}/html/Data-List-NonEmpty.html
> +share/doc/${FULLPKGNAME}/html/Data-Semigroup.html
> +share/doc/${FULLPKGNAME}/html/Numeric-Natural-Internal.html
> +share/doc/${FULLPKGNAME}/html/Numeric-Natural.html
> +share/doc/${FULLPKGNAME}/html/doc-index.html
> +share/doc/${FULLPKGNAME}/html/frames.html
> +share/doc/${FULLPKGNAME}/html/haddock-util.js
> +share/doc/${FULLPKGNAME}/html/hslogo-16.png
> +share/doc/${FULLPKGNAME}/html/index-frames
update print/ghostscript/gnu
Update ghostscript to 9.05.
THe following devices had been added (+) or deleted (-):
+cdnj500
+eplcolor
+eplmono
+inkcov
+pamcmyk4
+plan
+planc
+plang
+plank
+planm
+tiff48nc
+tiff64nc
+tiffscaled
+tiffscaled24
+tiffscaled8
+tiffsep1
+txtwrite
-cgm24
-cgm8
-cgmmono
-imdi
-lx5000
-wtscmyk
-wtsimdi
Also, pstopxl had been renamed to gstopxl, but I'm adding a symlink
to avoid breakage.
Please test. This will go in very soon.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/ghostscript/gnu/Makefile,v
retrieving revision 1.90
diff -u -p -r1.90 Makefile
--- Makefile9 Mar 2012 10:59:54 - 1.90
+++ Makefile8 Jul 2012 21:51:06 -
@@ -2,12 +2,12 @@
COMMENT= GNU PostScript interpreter
-VERSION= 9.04
+VERSION= 9.05
DISTNAME= ghostscript-${VERSION}
CATEGORIES=print lang
SHARED_LIBS= gs 14.0
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/}
+MASTER_SITES= http://downloads.ghostscript.com/public/
HOMEPAGE= http://www.cs.wisc.edu/~ghost/
@@ -27,7 +27,7 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
-WANTLIB= c ijs m jbig2dec jpeg>=62 lcms png>=6 pthread tiff z
+WANTLIB= c ijs m jbig2dec jpeg>=62 lcms2 png>=6 pthread tiff z
MODULES= converters/libiconv
@@ -35,7 +35,7 @@ RUN_DEPENDS= print/ghostscript/gnu-fonts
BUILD_DEPENDS= print/cups>=1.5.0
LIB_DEPENDS= graphics/jbig2dec \
graphics/jpeg \
- graphics/lcms \
+ graphics/lcms2 \
graphics/png\
graphics/tiff \
print/ijs
@@ -63,7 +63,6 @@ MAKE_FLAGS= BINDIR=./obj\
INSTALL='${INSTALL}'\
INSTALL_DATA='${INSTALL_DATA}' \
INSTALL_PROGRAM='${INSTALL_PROGRAM}'\
- JPX_LIB=jasper \
LIBgs_VERSION=${LIBgs_VERSION} \
PSGENDIR=./obj \
PSLIBDIR=./lib \
@@ -90,15 +89,6 @@ MAKE_FLAGS= BINDIR=./obj\
USE_GMAKE= Yes
-# Jasper needs this. Everything else seems to work better without auto*.
-WRKCONF= ${WRKSRC}/jasper
-CONFIGURE_STYLE= gnu
-CONFIGURE_ENV= AWK=/usr/bin/awk\
- CFLAGS='${CFLAGS}' \
- GREP=/usr/bin/grep \
- LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib' \
- LIBS=-ljpeg
-
# Hack to let ALL_TARGET etc. depend on the value of NO_SHARED_LIBS,
# which is available only after the inclusion of bsd.port.mk.
ALL_TARGET_NON_SHARED-No = so all
@@ -127,7 +117,7 @@ MODULES+= devel/gettext
WANTLIB+= GL Xcomposite Xcursor Xdamage Xfixes Xi Xinerama
WANTLIB+= Xrandr Xrender atk-1.0 cairo expat fontconfig freetype
WANTLIB+= gdk-x11-2.0>=1000 gdk_pixbuf-2.0>=1000 gio-2.0 glib-2.0
-WANTLIB+= gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0>=1000
+WANTLIB+= gobject-2.0 gtk-x11-2.0>=1000
WANTLIB+= pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 pthread-stubs
WANTLIB+= xcb xcb-render xcb-shm
WANTLIB+= ${MODGETTEXT_WANTLIB}
@@ -166,7 +156,7 @@ post-configure:
-e '/GS_LIB/s!/usr!${PREFIX}!' \
-e 's!@SED_EXTENDED_REGEX_OPT@!-nEe!' \
-e 's!@GS@!gs!' \
- ${WRKSRC}/cups/pstopxl.in > ${WRKSRC}/cups/pstopxl
+ ${WRKSRC}/cups/gstopxl.in > ${WRKSRC}/cups/gstopxl
# Avoid surprises in update-patches.
# Use the old-style (non-autoconf) build.
@@ -174,14 +164,14 @@ post-extract:
find ${WRKDIST} -name '*.orig' -type f | xargs -r rm
ln -s base/unix-gcc.mak ${WRKDIST}/Makefile
cd ${WRKSRC} && mkdir junk && \
- mv freetype ijs jpeg libpng jbig2dec tiff zlib junk
+ mv freetype ijs jasper jpeg libpng jbig2dec tiff zlib junk
pre-build:
mkdir -p ${WRKDIST}/obj
pre-install:
- @${INSTALL_DATA_DIR} ${PREFIX}/share/ghostscript
- @${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
+ @${INSTALL_DATA_DIR} ${PREFIX}/share/ghostscript
+ @${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
@${INSTALL_MAN_DIR} ${PREFIX}/man/man1
.ifdef(DEBUG)
@@ -211,7 +201,8 @@ post-install:
ln -sf ps2pdf.1 ps2pdf14.1 && \
ln -sf ps2ps.1 eps2eps.1
${INSTALL_SCRIPT_DIR} ${PREFIX}/libexec/cups/filter
- ${INSTALL_SCRIPT} ${WRKSRC}/cups/pstopxl ${PREFIX}/libexec/cups/filter
+ ${INSTALL_SCRIPT} ${WR
some test build needed for devel/cpphs
For updating ghc, I also have to update cpphs, because cpphs-1.11
doesn't build with ghc-7.4.
I currently can't test wether this still builds on machines that
only support nhc98 (32 bit, not i386, not macppc). Could anyone
with such a machine (e.g. armish) give it a try, please?
CIao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/devel/cpphs/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile27 Dec 2011 21:12:36 - 1.29
+++ Makefile10 Jul 2012 10:53:48 -
@@ -5,11 +5,9 @@ COMMENT-lib = cpphs library
ONLY_FOR_ARCHS-lib = i386 amd64
-DISTNAME = cpphs-1.11
+DISTNAME = cpphs-1.13.3
PKGNAME-main = ${DISTNAME}
PKGNAME-lib = hs-${DISTNAME}
-REVISION-main =7
-REVISION-lib = 4
CATEGORIES = devel
MAINTAINER = Matthias Kilian
Index: distinfo
===
RCS file: /cvs/ports/devel/cpphs/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo22 Apr 2010 21:51:54 - 1.7
+++ distinfo10 Jul 2012 10:53:48 -
@@ -1,5 +1,5 @@
-MD5 (cpphs-1.11.tar.gz) = 7Of5pTNaj9Vp8LjHFT7Pqg==
-RMD160 (cpphs-1.11.tar.gz) = NWBy8DTCl7yQCSlQM7RqwDuL2Xo=
-SHA1 (cpphs-1.11.tar.gz) = lgcPXTv0O7UUYtVjfdijZ26g20o=
-SHA256 (cpphs-1.11.tar.gz) = JhJMorGvmpgEujfGJ9u8o5d73pOSX5efCLNCiVVI2wE=
-SIZE (cpphs-1.11.tar.gz) = 68421
+MD5 (cpphs-1.13.3.tar.gz) = kc85GoA7gHcMA+tLri0nFQ==
+RMD160 (cpphs-1.13.3.tar.gz) = pDQPbT3YwWCQETSGVqcIo5sgU5g=
+SHA1 (cpphs-1.13.3.tar.gz) = II6zs11z6BbSV6CTEQtEbYh+I3A=
+SHA256 (cpphs-1.13.3.tar.gz) = AkNKBEydp8axz7ShGvVcQ4lYsY/GTRq0F8ZkKFIi37Y=
+SIZE (cpphs-1.13.3.tar.gz) = 42481
update print/poppler
Update to poppler-0.20.2.
Mostly untested so far (I'm currently building ports depending on
it, and I already know that texlive/base needs patching).
I'd appreciate tests especially for the (legacy) poppler-qt subpackage
(kdegraphics and koffice). Of course, tests with other packages
using poppler are welcome, too.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile6 Jun 2012 18:27:34 - 1.62
+++ Makefile11 Jul 2012 12:11:31 -
@@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.18.4
+V= 0.20.2
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -14,15 +14,11 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-REVISION-main= 0
-REVISION-qt= 0
-REVISION-qt4= 0
-
-SHARED_LIBS += poppler 11.0
-SHARED_LIBS += poppler-cpp 1.0
-SHARED_LIBS += poppler-glib 9.0
-SHARED_LIBS += poppler-qt 8.0
-SHARED_LIBS += poppler-qt4 8.0
+SHARED_LIBS += poppler 12.0
+SHARED_LIBS += poppler-cpp 2.0
+SHARED_LIBS += poppler-glib 10.0
+SHARED_LIBS += poppler-qt 9.0
+SHARED_LIBS += poppler-qt4 9.0
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${OLDSHIT}${EXTRACT_SUFX}
HOMEPAGE= http://poppler.freedesktop.org/
@@ -67,7 +63,7 @@ BUILD_DEPENDS+= devel/gobject-introspect
LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
devel/glib2 \
graphics/cairo \
- graphics/lcms \
+ graphics/lcms2 \
graphics/openjpeg \
graphics/png \
graphics/tiff
@@ -85,14 +81,14 @@ WANTLIB-main= ${cWANTLIB} Xext Xfixes ff
glib-2.0 gobject-2.0 gthread-2.0 \
pixman-1 openjpeg \
X11 Xau Xdamage Xdmcp Xrender cairo pcre png \
- pthread-stubs xcb xcb-render lcms GL Xxf86vm \
+ pthread-stubs xcb xcb-render lcms2 GL Xxf86vm \
drm xcb-shm ${MODGETTEXT_WANTLIB}
-WANTLIB-qt=${cWANTLIB} lcms openjpeg poppler png ${MODQT3_WANTLIB}
+WANTLIB-qt=${cWANTLIB} lcms2 openjpeg poppler png ${MODQT3_WANTLIB}
WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtGui QtXml SM X11 Xext Xi \
-Xinerama Xrender lcms openjpeg png poppler QtCore QtGui QtXml
+Xinerama Xrender lcms2 openjpeg png poppler QtCore QtGui QtXml
WANTLIB-utils= GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm \
c cairo drm expat ffi fontconfig freetype glib-2.0 \
- gobject-2.0 gthread-2.0 jpeg lcms m pcre pixman-1 png \
+ gobject-2.0 gthread-2.0 jpeg lcms2 m pcre pixman-1 png \
pthread pthread-stubs stdc++ tiff xcb xcb-render xcb-shm \
openjpeg poppler z ${cWANTLIB} ${MODGETTEXT_WANTLIB}
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo27 Mar 2012 06:31:05 - 1.20
+++ distinfo11 Jul 2012 12:11:31 -
@@ -1,10 +1,10 @@
MD5 (poppler-0.16.7.tar.gz) = Ovoo48jE8GsPvKPJHgY5Tg==
-MD5 (poppler-0.18.4.tar.gz) = EmWPMwhZflfz+v9TjMc7rw==
+MD5 (poppler-0.20.2.tar.gz) = Rd0sFsjE0aOegw5FdFxOJQ==
RMD160 (poppler-0.16.7.tar.gz) = J5Mw5v6vl6IH8zluqxr4NtPR8Ww=
-RMD160 (poppler-0.18.4.tar.gz) = FVMBfpsmDL1iTUPXf89BCvqlfko=
+RMD160 (poppler-0.20.2.tar.gz) = i5NhqXLUPHySOYweIFXN9b4QwaI=
SHA1 (poppler-0.16.7.tar.gz) = Jsc1+GNoj2K1fVFZhj/a1Ccr6J8=
-SHA1 (poppler-0.18.4.tar.gz) = N1PK7Lpxr68p8JfgucUuD4OhClk=
+SHA1 (poppler-0.20.2.tar.gz) = D3RbWT52TSeg4hZF5v69atitKrk=
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.18.4.tar.gz) = M0IRSM3I4EPaKR3s4szhzqYiDUmlDADFbVbWQ1UB1C4=
+SHA256 (poppler-0.20.2.tar.gz) = LevFA04OhUApV9hPsmdHN2WKPb6KPGMeF5Lj+MiM42k=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.18.4.tar.gz) = 1992993
+SIZE (poppler-0.20.2.tar.gz) = 2146312
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 27 Mar 2012 06:31:05 - 1.3
+++ patches/patch-Makefile_in 11 Jul 2012 12:11:31 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.3 2012/03/27 06:31:05 kili Exp $
Makefile.in.orig Wed Feb 15 18:22:45 2012
-+++ Makefile.inMon Mar 26 06:01:36 2012
-@@ -276,6 +276,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+--- Makefile.in.orig Sun Jun 10 20:45:33 2012
Makefile.in
patch print/texlive/base to work with poppler-0.20
Here's the texlive/base fix for poppler-0.20. Shouldn't cause any
harm with poppler-0.18, either.
Index: patches/patch-texk_web2c_pdftexdir_pdftosrc_cc
===
RCS file: patches/patch-texk_web2c_pdftexdir_pdftosrc_cc
diff -N patches/patch-texk_web2c_pdftexdir_pdftosrc_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-texk_web2c_pdftexdir_pdftosrc_cc 11 Jul 2012 14:16:13
-
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+XRef::getSize() had been removed with poppler-0.20, so use
+XRef::getNumObjects(), which returns the same value.
+
+--- texk/web2c/pdftexdir/pdftosrc.cc.origy Mon May 2 14:27:51 2011
texk/web2c/pdftexdir/pdftosrc.cc Wed Jul 11 15:56:50 2012
+@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
+ exit(1);
+ }
+ if (extract_xref_table) {
+-int size = xref->getSize();
++int size = xref->getNumObjects();
+ int i;
+ for (i = 0; i < size; i++) {
+ if (xref->getEntry(i)->offset == 0x)
Re: patch print/texlive/base to work with poppler-0.20
On Wed, Jul 11, 2012 at 08:18:26AM -0600, Matthias Kilian wrote:
> Here's the texlive/base fix for poppler-0.20. Shouldn't cause any
> harm with poppler-0.18, either.
That diff was bullshit, because poppler switched from lcms to lcms2. So
texlive/base really needs a wantlib adjustment and a bump:
Index: Makefile
===
RCS file: /cvs/ports/print/texlive/base/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile17 Feb 2012 13:41:33 - 1.57
+++ Makefile11 Jul 2012 15:01:27 -
@@ -4,13 +4,13 @@ COMMENT = base binaries for TeXLive typ
DISTNAME = texlive-${DIST_V}-source
PKGNAME = texlive_base-${V}
-REVISION = 4
+REVISION = 5
SHARED_LIBS = kpathsea4.0
SHARED_LIBS += ptexenc 1.0
WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt c expat
-WANTLIB += fontconfig freetype gd jpeg lcms m ncurses
+WANTLIB += fontconfig freetype gd jpeg lcms2 m ncurses
WANTLIB += openjpeg png>=3 poppler pthread pthread-stubs stdc++
WANTLIB += t1>=4 tiff ttf xcb z
Index: patches/patch-texk_web2c_pdftexdir_pdftosrc_cc
===
RCS file: patches/patch-texk_web2c_pdftexdir_pdftosrc_cc
diff -N patches/patch-texk_web2c_pdftexdir_pdftosrc_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-texk_web2c_pdftexdir_pdftosrc_cc 11 Jul 2012 15:01:27
-
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+XRef::getSize() had been removed with poppler-0.20, so use
+XRef::getNumObjects(), which returns the same value.
+
+--- texk/web2c/pdftexdir/pdftosrc.cc.origy Mon May 2 14:27:51 2011
texk/web2c/pdftexdir/pdftosrc.cc Wed Jul 11 15:56:50 2012
+@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
+ exit(1);
+ }
+ if (extract_xref_table) {
+-int size = xref->getSize();
++int size = xref->getNumObjects();
+ int i;
+ for (i = 0; i < size; i++) {
+ if (xref->getEntry(i)->offset == 0x)
patch graphics/evince for poppler-0.20
Adjust WANTLIB for poppler update.
Index: Makefile
===
RCS file: /cvs/ports/graphics/evince/Makefile,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile
--- Makefile8 Jul 2012 10:33:49 - 1.80
+++ Makefile12 Jul 2012 20:50:54 -
@@ -20,7 +20,7 @@ PKGNAME-djvu= evince-djvu-${GNOME_VERSIO
PKGNAME-dvi= evince-dvi-${GNOME_VERSION}
PKGNAME-nautilus= nautilus-evince-${GNOME_VERSION}
-REVISION-main= 0
+REVISION-main= 1
REVISION-djvu= 0
SHARED_LIBS += evdocument3 0.0 # 3.0
@@ -59,7 +59,7 @@ LIB_DEPENDS= x11/gtk+3
WANTLIB-main= ${WANTLIB} ICE SM c dbus-1 gailutil-3 \
gnome-keyring gs gcrypt gpg-error \
- jpeg pthread tiff xml2 lcms openjpeg \
+ jpeg pthread tiff xml2 lcms2 openjpeg \
poppler poppler-glib spectre gnome-keyring
LIB_DEPENDS-main= print/poppler \
print/libspectre \
patch graphics/inkscape for poppler-0.20
Fix build for poppler-0.20, adjust WANTLIB.
Index: Makefile
===
RCS file: /cvs/ports/graphics/inkscape/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile23 Mar 2012 13:28:25 - 1.25
+++ Makefile12 Jul 2012 20:56:00 -
@@ -3,7 +3,7 @@
COMMENT= SVG vector drawing application
DISTNAME= inkscape-0.48.2
-REVISION= 1
+REVISION= 2
CATEGORIES=graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/}
@@ -25,7 +25,7 @@ WANTLIB= GL Magick++ MagickCore X11 Xcom
Xext Xfixes Xi Xinerama Xrandr Xrender \
aspell atk-1.0 atkmm-1.6 c cairo cairomm-1.0 expat \
fontconfig freetype gc gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4 \
- gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 \
+ gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 \
gsl gslcblas gthread-2.0 gtk-x11-2.0 gtkmm-2.4 gtkspell \
lcms m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 \
pixman-1 png poppler poppler-glib popt pthread pthread-stubs \
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/graphics/inkscape/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_ac
--- patches/patch-configure_ac 16 May 2011 19:39:18 - 1.3
+++ patches/patch-configure_ac 12 Jul 2012 20:56:00 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.3 2011/05/16 19:39:18 kili Exp $
configure.ac.orig Fri Apr 29 17:50:22 2011
-+++ configure.ac Fri Apr 29 17:51:09 2011
-@@ -767,7 +767,7 @@ if test "x$cairo_pdf" = "xyes"; then
+--- configure.ac.orig Fri Jul 8 21:23:16 2011
configure.ac Thu Jul 12 18:27:17 2012
+@@ -795,7 +795,7 @@ if test "x$cairo_pdf" = "xyes"; then
fi
dnl Shouldn't we test for libpng and libz?
Index: patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
===
RCS file: patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
diff -N patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp12 Jul
2012 20:56:00 -
@@ -0,0 +1,631 @@
+$OpenBSD$
+
+Fix build with poppler-0.20. From arch linux.
+
+--- src/extension/internal/pdfinput/pdf-parser.cpp.origFri Jul 8
20:25:09 2011
src/extension/internal/pdfinput/pdf-parser.cpp Thu Jul 12 18:55:07 2012
+@@ -367,14 +367,14 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
+ for (i = 0; i < obj->arrayGetLength(); ++i) {
+ obj->arrayGet(i, &obj2);
+ if (!obj2.isStream()) {
+- error(-1, const_cast("Weird page contents"));
++ error(errInternal, -1, const_cast("Weird page contents"));
+ obj2.free();
+ return;
+ }
+ obj2.free();
+ }
+ } else if (!obj->isStream()) {
+-error(-1, const_cast("Weird page contents"));
++error(errInternal, -1, const_cast("Weird page contents"));
+ return;
+ }
+ parser = new Parser(xref, new Lexer(xref, obj), gFalse);
+@@ -419,7 +419,7 @@ void PdfParser::go(GBool topLevel) {
+
+ // too many arguments - something is wrong
+ } else {
+- error(getPos(), const_cast("Too many args in content stream"));
++ error(errInternal, getPos(), const_cast("Too many args in
content stream"));
+ if (printCommands) {
+ printf("throwing away arg: ");
+ obj.print(stdout);
+@@ -436,7 +436,7 @@ void PdfParser::go(GBool topLevel) {
+
+ // args at end with no command
+ if (numArgs > 0) {
+-error(getPos(), const_cast("Leftover args in content stream"));
++error(errInternal, getPos(), const_cast("Leftover args in content
stream"));
+ if (printCommands) {
+ printf("%d leftovers:", numArgs);
+ for (i = 0; i < numArgs; ++i) {
+@@ -502,7 +502,7 @@ void PdfParser::execOp(Object *cmd, Object args[], int
+ name = cmd->getCmd();
+ if (!(op = findOp(name))) {
+ if (ignoreUndef == 0)
+- error(getPos(), const_cast("Unknown operator '%s'"), name);
++ error(errInternal, getPos(), const_cast("Unknown operator
'%s'"), name);
+ return;
+ }
+
+@@ -510,26 +510,26 @@ void PdfParser::execOp(Object *cmd, Object args[], int
+ argPtr = args;
+ if (op->numArgs >= 0) {
+ if (numArgs < op->numArgs) {
+- error(getPos(), const_cast("Too few (%d) args to '%s'
operator"), numArgs, name);
++ error(errInternal, getPos(), const_cast("Too few (%d) args to
'%s' operator"), numArgs, name);
+ return;
+ }
+ if (numArgs > op->numArgs) {
+ #if 0
+- error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
++ error(errInternal, getPos(), "Too many (%d) args to '%s' operator",
numArgs, name);
+ #endif
+ argPtr +=
A couple of new Haskell ports needed for bbeing able to update ghc
The attached ports are requirements for updating ghc to 7.4 (and haskell-platform to 2012.4.0.0). I'd like to import them (but not yet hook them to the build, as I'm still working on hs-* ports that need more work after the ghc update). All tarballs relative to /usr/ports. Descriptions: devel/hs-blaze-builder-conduit: Convert streams of builders to streams of bytestrings. devel/hs-bytestring-mmap: Wrapper to mmap(2), allowing files or devices to be lazily loaded into memory as strict or lazy ByteStrings, using the virtual memory subsystem to do on-demand loading. devel/hs-conduit: Conduits are an approach to the streaming data problem. It is meant as an alternative to enumerators\/iterators, hoping to address the same issues with different trade-offs based on real-world experience with enumerators. devel/hs-lifted-base: lifted-base exports IO operations from the base library lifted to any instance of 'MonadBase' or 'MonadBaseControl'. devel/hs-monad-control: This package defines the type class MonadBaseControl, a subset of MonadBase into which generic control operations such as catch can be lifted from IO or any other base monad. Instances are based on monad transformers in MonadTransControl, which includes all standard monad transformers in the transformers library except ContT. devel/hs-network-conduit: Stream socket data using conduits. devel/hs-random: A basic random number generation library, including the ability to split random number generators. devel/hs-resourcet: The Resource transformer keeps track of all registered actions, and calls them upon exit (via 'runResourceT'). Actions may be registered via 'register', or resources may be allocated atomically via 'allocate'. allocate corresponds closely to bracket. devel/hs-vault: A vault is a persistent store for values of arbitrary types. It's like having first-class access to the storage space behind IORefs. The data structure is analogous to a bank vault, where you can access different bank boxes with different keys; hence the name. Also provided is a /locker/ type, representing a store for a single element. devel/hs-void: A Haskell 98 logically uninhabited data type. Used to indicate that a given term should not exist. textproc/hs-blaze-markup: Core modules of a blazingly fast markup combinator library for the Haskell programming language. Ciao, Kili devel_hs-blaze-builder-conduit.tgz Description: application/tar-gz devel_hs-blazebuilder-conduit.tgz Description: application/tar-gz devel_hs-bytestring-mmap.tgz Description: application/tar-gz devel_hs-conduit.tgz Description: application/tar-gz devel_hs-lifted-base.tgz Description: application/tar-gz devel_hs-monad-control.tgz Description: application/tar-gz devel_hs-network-conduit.tgz Description: application/tar-gz devel_hs-random.tgz Description: application/tar-gz devel_hs-resourcet.tgz Description: application/tar-gz devel_hs-vault.tgz Description: application/tar-gz devel_hs-void.tgz Description: application/tar-gz textproc_hs-blaze-markup.tgz Description: application/tar-gz
patch print/py-poppler
Fix wantli for poppler-0.20.
Index: Makefile
===
RCS file: /cvs/ports/print/py-poppler/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile16 Sep 2011 11:13:41 - 1.5
+++ Makefile12 Jul 2012 21:47:56 -
@@ -6,7 +6,7 @@ DISTNAME= pypoppler-0.12.1
PKGNAME=${DISTNAME:S/^py/py-/}
CATEGORIES=print
-REVISION= 3
+REVISION= 4
MAINTAINER=Ido Admon
@@ -26,9 +26,9 @@ WANTLIB += GL X11 Xau Xcomposite Xcursor
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo drm
WANTLIB += expat ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB += gtk-x11-2.0 jpeg lcms m openjpeg pango-1.0 pangocairo-1.0
+WANTLIB += gtk-x11-2.0 jpeg lcms2 m openjpeg pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png poppler>=10 poppler-glib>=8
-WANTLIB += pthread-stubs xcb xcb-render xcb-shm xml2 z
+WANTLIB += pthread-stubs stdc++ tiff xcb xcb-render xcb-shm z
LIB_DEPENDS= devel/libffi \
print/poppler>=0.16
patch graphics/ruby-rmagick
Adjust wantlib for poppler-0.20. Index: Makefile === RCS file: /cvs/ports/graphics/ruby-rmagick/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- Makefile9 Nov 2011 00:17:38 - 1.19 +++ Makefile12 Jul 2012 21:52:01 - @@ -3,7 +3,7 @@ COMMENT = Ruby interface to ImageMagick DISTNAME = rmagick-2.13.1 -REVISION = 1 +REVISION = 2 CATEGORIES = graphics HOMEPAGE = http://rmagick.rubyforge.org/ @@ -18,7 +18,7 @@ MODULES = lang/ruby WANTLIB = freetype z MagickCore>=1 WANTLIB += ICE SM X11 Xext Xt bz2 djvulibre expat fftw3 fontconfig -WANTLIB += jasper jbig jpeg lcms ltdl lzma png tiff xml2 +WANTLIB += jasper jbig jpeg lcms2 ltdl lzma png tiff xml2 LIB_DEPENDS = graphics/ImageMagick
patch x11/xfce4/tumbler
WAntlib fix for poppler-0.20. Index: Makefile === RCS file: /cvs/ports/x11/xfce4/tumbler/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile30 Apr 2012 12:50:14 - 1.10 +++ Makefile12 Jul 2012 22:04:15 - @@ -4,6 +4,7 @@ COMMENT=D-Bus thumbnailing service XFCE_VERSION= 0.1.25 XFCE_GOODIE= tumbler +REVISION= 0 SHARED_LIBS+= tumbler-1 0.0 @@ -33,7 +34,7 @@ WANTLIB += GL X11 Xau Xdamage Xdmcp Xext WANTLIB += Xrender Xxf86vm c cairo dbus-1 dbus-glib-1 WANTLIB += drm expat fontconfig freetype gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 -WANTLIB += gthread-2.0 jpeg lcms m openjpeg +WANTLIB += gthread-2.0 jpeg lcms2 m openjpeg WANTLIB += pcre pixman-1 png poppler poppler-glib WANTLIB += pthread pthread-stubs xcb xcb-render xcb-shm WANTLIB += xml2 z ffi bz2 stdc++ tiff gsf-1
patch textproc/calibre to build with poppler-0.20
Fix build with poppler-0.20. No idea wether it still works (and I
don't care much).
Index: patches/patch-setup_build_environment_py
===
RCS file: /cvs/ports/textproc/calibre/patches/patch-setup_build_environment_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-setup_build_environment_py
--- patches/patch-setup_build_environment_py17 Apr 2011 18:39:21 -
1.1.1.1
+++ patches/patch-setup_build_environment_py13 Jul 2012 11:51:23 -
@@ -1,6 +1,12 @@
$OpenBSD: patch-setup_build_environment_py,v 1.1.1.1 2011/04/17 18:39:21
phessler Exp $
setup/build_environment.py.origFri Jan 21 23:22:10 2011
-+++ setup/build_environment.py Thu Jan 27 09:46:09 2011
+--- setup/build_environment.py.origFri Sep 23 19:14:20 2011
setup/build_environment.py Fri Jul 13 13:21:25 2012
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/local/bin/python2.7
+ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+ from __future__ import with_statement
+
@@ -170,7 +170,7 @@ else:
fc_inc = os.environ.get('FC_INC_DIR', fc_inc)
Index: patches/patch-setup_extensions_py
===
RCS file: /cvs/ports/textproc/calibre/patches/patch-setup_extensions_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_extensions_py
--- patches/patch-setup_extensions_py 5 Sep 2011 12:38:36 - 1.2
+++ patches/patch-setup_extensions_py 13 Jul 2012 11:51:23 -
@@ -1,6 +1,12 @@
$OpenBSD: patch-setup_extensions_py,v 1.2 2011/09/05 12:38:36 jasper Exp $
setup/extensions.py.orig Fri Jun 24 20:01:27 2011
-+++ setup/extensions.pyTue Jun 28 23:45:46 2011
+--- setup/extensions.py.orig Fri Sep 23 19:14:20 2011
setup/extensions.pyFri Jul 13 13:21:25 2012
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/local/bin/python2.7
+ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+ from __future__ import with_statement
+
@@ -111,8 +111,8 @@ extensions = [
reflow_sources,
headers=reflow_headers,
Index: patches/patch-setup_install_py
===
RCS file: /cvs/ports/textproc/calibre/patches/patch-setup_install_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-setup_install_py
--- patches/patch-setup_install_py 17 Apr 2011 18:39:21 - 1.1.1.1
+++ patches/patch-setup_install_py 13 Jul 2012 11:51:23 -
@@ -1,6 +1,21 @@
$OpenBSD: patch-setup_install_py,v 1.1.1.1 2011/04/17 18:39:21 phessler Exp $
setup/install.py.orig Thu Jan 27 09:50:17 2011
-+++ setup/install.py Thu Jan 27 09:50:20 2011
+--- setup/install.py.orig Fri Sep 23 19:14:20 2011
setup/install.py Fri Jul 13 13:21:25 2012
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/local/bin/python2.7
+ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+ from __future__ import with_statement
+
+@@ -12,7 +12,7 @@ from setup import (Command, islinux, isbsd, basenames,
+ __appname__, __version__)
+
+ HEADER = '''\
+-#!/usr/bin/env python2
++#!/usr/local/bin/python2.7
+
+ """
+ This is the standard runscript for all of calibre's tools.
@@ -269,7 +269,7 @@ class Install(Develop):
reldir = os.path.relpath(x[0], self.SRC)
destdir = os.path.join(dest, reldir)
Index: patches/patch-src_calibre_ebooks_pdf_reflow_cpp
===
RCS file:
/cvs/ports/textproc/calibre/patches/patch-src_calibre_ebooks_pdf_reflow_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_calibre_ebooks_pdf_reflow_cpp
--- patches/patch-src_calibre_ebooks_pdf_reflow_cpp 26 Nov 2011 19:50:08
- 1.1
+++ patches/patch-src_calibre_ebooks_pdf_reflow_cpp 13 Jul 2012 11:51:23
-
@@ -1,11 +1,6 @@
$OpenBSD: patch-src_calibre_ebooks_pdf_reflow_cpp,v 1.1 2011/11/26 19:50:08
kili Exp $
-
-With poppler-0.18, the classes Link and AnnotLink had been merged
-into AnnotLink. The latter should now contain all functionality of
-the former.
-
--- src/calibre/ebooks/pdf/reflow.cpp.orig Fri Sep 23 19:14:20 2011
-+++ src/calibre/ebooks/pdf/reflow.cpp Thu Nov 17 16:35:55 2011
src/calibre/ebooks/pdf/reflow.cpp Fri Jul 13 13:39:19 2012
@@ -625,7 +625,7 @@ static string get_link_dest(LinkAction *link, PDFDoc *
return oss.str();
}
@@ -15,3 +10,21 @@ the former.
double _x1, _y1, _x2, _y2;
int x1, y1, x2, y2;
+@@ -646,7 +646,7 @@ void XMLOutputDev::process_link(Link* link){
+
+
+ void XMLOutputDev::endPage() {
+-Links *slinks =
catalog->getPage(current_page->number())->getLinks(catalog);
++Links *slinks = catalog->getPage(current_page->number())->getLinks();
+ for (int i = 0; i < slinks->getNumLinks(); i++)
+ {
+ this->process_link(slinks->getLink(i));
+@@ -877,7 +877,7 @@ vector* Reflow::render_first_page(bool use_crop_
+ throw ReflowException("Faile
Re: patch textproc/calibre to build with poppler-0.20
On Fri, Jul 13, 2012 at 05:53:01AM -0600, Matthias Kilian wrote:
> Fix build with poppler-0.20. No idea wether it still works (and I
> don't care much).
[...]
> +@@ -1,4 +1,4 @@
> +-#!/usr/bin/env python
> ++#!/usr/local/bin/python2.7
> + # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
> + from __future__ import with_statement
> +
> @@ -170,7 +170,7 @@ else:
[...]
Oops! Better one, as noticed by antoine@ and Mikolaj Kurcharski:
Index: patches/patch-src_calibre_ebooks_pdf_reflow_cpp
===
RCS file:
/cvs/ports/textproc/calibre/patches/patch-src_calibre_ebooks_pdf_reflow_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_calibre_ebooks_pdf_reflow_cpp
--- patches/patch-src_calibre_ebooks_pdf_reflow_cpp 26 Nov 2011 19:50:08
- 1.1
+++ patches/patch-src_calibre_ebooks_pdf_reflow_cpp 13 Jul 2012 13:19:59
-
@@ -1,11 +1,6 @@
$OpenBSD: patch-src_calibre_ebooks_pdf_reflow_cpp,v 1.1 2011/11/26 19:50:08
kili Exp $
-
-With poppler-0.18, the classes Link and AnnotLink had been merged
-into AnnotLink. The latter should now contain all functionality of
-the former.
-
--- src/calibre/ebooks/pdf/reflow.cpp.orig Fri Sep 23 19:14:20 2011
-+++ src/calibre/ebooks/pdf/reflow.cpp Thu Nov 17 16:35:55 2011
src/calibre/ebooks/pdf/reflow.cpp Fri Jul 13 13:39:19 2012
@@ -625,7 +625,7 @@ static string get_link_dest(LinkAction *link, PDFDoc *
return oss.str();
}
@@ -15,3 +10,21 @@ the former.
double _x1, _y1, _x2, _y2;
int x1, y1, x2, y2;
+@@ -646,7 +646,7 @@ void XMLOutputDev::process_link(Link* link){
+
+
+ void XMLOutputDev::endPage() {
+-Links *slinks =
catalog->getPage(current_page->number())->getLinks(catalog);
++Links *slinks = catalog->getPage(current_page->number())->getLinks();
+ for (int i = 0; i < slinks->getNumLinks(); i++)
+ {
+ this->process_link(slinks->getLink(i));
+@@ -877,7 +877,7 @@ vector* Reflow::render_first_page(bool use_crop_
+ throw ReflowException("Failed to allocate SplashOutputDev");
+ }
+ try {
+-out->startDoc(doc->getXRef());
++out->startDoc(doc);
+ out->startPage(1, NULL);
+
+ double pg_w, pg_h;
Re: huge diff to update ghc, haskell-platform and almost all hs-* ports
On Fri, Jul 13, 2012 at 04:50:47AM -0600, Matthias Kilian wrote: > Sorry for the huge multi-port diff, but it's almost impossible to > do the ghc and haskell-platform updates in smaller steps. [...] Some of the patches were broken (they contained cvs conflicts), some additioal ports still need fixes. I'll send a diff later this day: devel/hasktags update to 0.68.2 devel/gmc4ccfix some import decls devel/hs-comonadremove conflict devel/hs-semigroupoids remove conflict security/hs-crypto remove conflict devel/hs-comonad-transformers remove conflict devel/hs-data-lens remove conflict devel/hs-tarupdate to 0.3.2.0 (not 0.4.0.0!) devel/darcs fix Ciao, Kili
Re: huge diff to update ghc, haskell-platform and almost all hs-* ports
On Fri, Jul 13, 2012 at 03:52:23PM +0200, Matthias Kilian wrote:
> Some of the patches were broken (they contained cvs conflicts),
> some additioal ports still need fixes. I'll send a diff later this
> day:
>
> devel/hasktags update to 0.68.2
> devel/gmc4ccfix some import decls
>
> devel/hs-comonad remove conflict
> devel/hs-semigroupoidsremove conflict
> security/hs-cryptoremove conflict
> devel/hs-comonad-transformers remove conflict
> devel/hs-data-lensremove conflict
>
> devel/hs-tarupdate to 0.3.2.0 (not 0.4.0.0!)
>
> devel/darcs fix
Here they are. Unfortunately, I don't yet have fixes for devel/bustle,
language/feldspar/*, net/hpodder and x11/xmobar, which I'm marking
as broken for now (and cc'd the people involved with those ports).
Please note that I'm not going to commit any of the Haskell updates
before sunday.
Ciao,
Kili
Index: devel/bustle/Makefile
===
RCS file: /cvs/ports/devel/bustle/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- devel/bustle/Makefile 27 Dec 2011 21:10:55 - 1.5
+++ devel/bustle/Makefile 13 Jul 2012 15:47:59 -
@@ -2,6 +2,8 @@
COMMENT= D-Bus profiler
+BROKEN=Does not build with ghc-7.4
+
DISTNAME= bustle-0.2.3
REVISION= 3
CATEGORIES=devel
Index: devel/darcs/Makefile
===
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- devel/darcs/Makefile13 May 2012 21:27:38 - 1.47
+++ devel/darcs/Makefile13 Jul 2012 15:47:59 -
@@ -2,8 +2,7 @@
COMMENT = advanced revision control system written in Haskell
-DISTNAME = darcs-2.8.0
-REVISION = 0
+DISTNAME = darcs-2.8.1
CATEGORIES = devel
HOMEPAGE = http://www.darcs.net/
@@ -22,7 +21,7 @@ BUILD_DEPENDS = archivers/hs-zlib>=0.5.
devel/hs-hashed-storage>=0.5.6,<0.6 \
devel/hs-haskeline>=0.6.3,<0.7 \
devel/hs-mmap>=0.5,<0.6 \
- devel/hs-mtl>=1.0,<2.1 \
+ devel/hs-mtl>=1.0,<2.2 \
devel/hs-network>=2.2,<2.4 \
devel/hs-parsec>=2.0,<3.2 \
devel/hs-regex-compat=0.95.1 \
Index: devel/darcs/distinfo
===
RCS file: /cvs/ports/devel/darcs/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- devel/darcs/distinfo9 May 2012 21:00:20 - 1.24
+++ devel/darcs/distinfo13 Jul 2012 15:47:59 -
@@ -1,5 +1,5 @@
-MD5 (ghc/darcs-2.8.0.tar.gz) = IFQwxnE8ETqJqQs5P1hXaQ==
-RMD160 (ghc/darcs-2.8.0.tar.gz) = XLcRbPJ34hKJW45ERhX5Z8yZGa0=
-SHA1 (ghc/darcs-2.8.0.tar.gz) = T89GlD6fxyrx1OKZxnzYGulVL2Q=
-SHA256 (ghc/darcs-2.8.0.tar.gz) = FBXCoamduM921fMfajSQoqnT4T8qv8xn/BCIhc9SzoM=
-SIZE (ghc/darcs-2.8.0.tar.gz) = 1297733
+MD5 (ghc/darcs-2.8.1.tar.gz) = y3CYn0ARwcmCaiZmIugwTA==
+RMD160 (ghc/darcs-2.8.1.tar.gz) = aXFA8aeCxL8fy3x7dimGJcihBn8=
+SHA1 (ghc/darcs-2.8.1.tar.gz) = FQxMH3weHk2eogofRPogCq0wrPw=
+SHA256 (ghc/darcs-2.8.1.tar.gz) = oeWtMUa29zi6FiYj8n+3BJjmgsKxFC84+A4sGH+a6bs=
+SIZE (ghc/darcs-2.8.1.tar.gz) = 1293098
Index: devel/gmc4cc/Makefile
===
RCS file: /cvs/ports/devel/gmc4cc/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/gmc4cc/Makefile 27 Dec 2011 21:16:03 - 1.3
+++ devel/gmc4cc/Makefile 13 Jul 2012 15:47:59 -
@@ -5,7 +5,7 @@ COMMENT=C compiler for GMC-4
DISTNAME= gmc4cc-0.6.2
CATEGORIES=devel lang
-REVISION= 1
+REVISION= 2
# Japanese, use this for the English version: http://goo.gl/LPtgg
HOMEPAGE= http://terus.jp/engineering/gmc4cc/
@@ -26,7 +26,7 @@ DISTFILES=${DISTNAME}${EXTRACT_SUFX} \
MODULES= converters/libiconv
-WANTLIB += c gmp m pthread util
+WANTLIB += c gmp m
BUILD_DEPENDS= lang/ghc
LIB_DEPENDS= devel/gmp
Index: devel/gmc4cc/patches/patch-Assembler_hs
===
RCS file: devel/gmc4cc/patches/patch-Assembler_hs
diff -N devel/gmc4cc/patches/patch-Assembler_hs
--- /dev/null 1 Jan 1970 00:00:00 -
+++ devel/gmc4cc/patches/patch-Assembler_hs 13 Jul 2012 15:47:59 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- Assembler.hs.orig Thu Jul 23 09:52:53 2009
Assembler.hs Fri Jul 13 14:27:41 2012
+@@ -1,6 +1,6 @@
+ module Assemb
Re: UPDATE: zathura
On Wed, Jul 11, 2012 at 07:54:01AM -0500, Abel Abraham Camarillo Ojeda wrote: > What I don't know is how updates are going to be handled, I mean, > people doing a pkg_add -u zathura alone will now have a zathura > program that does nothing by default, is there a way to somehow > install a plugin by default for people upgrading? (I have poppler and djavu > already ported). IMHO it would require a quirk. CIao, Kili
Re: A couple of new Haskell ports needed for bbeing able to update ghc
I'd really like to import the ports mentioned below in a about two weeks and proceed with the ghc and hs-* updates I worked on in budapest. Of course, I'll also look at the three ports suffering from that updates (feldspar-language, feldspar-compiler, hpodder). But I'll not import them without an ok (last time i imported some hs-* stuff, some people complained about it). Ciao, Kili On Thu, Jul 12, 2012 at 11:10:22PM +0200, Matthias Kilian wrote: > The attached ports are requirements for updating ghc to 7.4 (and > haskell-platform to 2012.4.0.0). I'd like to import them (but not > yet hook them to the build, as I'm still working on hs-* ports that > need more work after the ghc update). All tarballs relative to > /usr/ports. > > Descriptions: > > devel/hs-blaze-builder-conduit: > Convert streams of builders to streams of bytestrings. > > devel/hs-bytestring-mmap: > Wrapper to mmap(2), allowing files or devices to be lazily loaded > into memory as strict or lazy ByteStrings, using the virtual memory > subsystem to do on-demand loading. > > devel/hs-conduit: > Conduits are an approach to the streaming data problem. It is meant > as an alternative to enumerators\/iterators, hoping to address the > same issues with different trade-offs based on real-world experience > with enumerators. > > devel/hs-lifted-base: > lifted-base exports IO operations from the base library lifted to > any instance of 'MonadBase' or 'MonadBaseControl'. > > devel/hs-monad-control: > This package defines the type class MonadBaseControl, a subset of > MonadBase into which generic control operations such as catch can > be lifted from IO or any other base monad. Instances are based on > monad transformers in MonadTransControl, which includes all standard > monad transformers in the transformers library except ContT. > > devel/hs-network-conduit: > Stream socket data using conduits. > > devel/hs-random: > A basic random number generation library, including the ability to > split random number generators. > > devel/hs-resourcet: > The Resource transformer keeps track of all registered actions, and > calls them upon exit (via 'runResourceT'). Actions may be registered > via 'register', or resources may be allocated atomically via > 'allocate'. allocate corresponds closely to bracket. > > devel/hs-vault: > A vault is a persistent store for values of arbitrary types. It's > like having first-class access to the storage space behind IORefs. > The data structure is analogous to a bank vault, where you can > access different bank boxes with different keys; hence the name. > Also provided is a /locker/ type, representing a store for a single > element. > > devel/hs-void: > A Haskell 98 logically uninhabited data type. Used to indicate that > a given term should not exist. > > textproc/hs-blaze-markup: > Core modules of a blazingly fast markup combinator library for the > Haskell programming language. > > > > Ciao, > Kili
update print/poppler
Update to poppler-0.20.3. Depending ports still build fine here (amd64 only -- I'm still not in the situtation to use my other hardware). Tested with some pdf viewers using poppler. Major bump for libpoppler, because of changes to classes PSOutputDev and Splash. Please test/comment/ok. Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.65 diff -u -p -r1.65 Makefile --- Makefile1 Sep 2012 14:36:58 - 1.65 +++ Makefile1 Sep 2012 20:52:42 - @@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin COMMENT-qt4= qt4 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.20.2 +V= 0.20.3 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -14,9 +14,7 @@ PKGNAME-qt= poppler-qt-$V PKGNAME-qt4= poppler-qt4-$V OLDSHIT = poppler-0.16.7 -REVISION= 0 - -SHARED_LIBS += poppler 12.0 +SHARED_LIBS += poppler 13.0 SHARED_LIBS += poppler-cpp 2.0 SHARED_LIBS += poppler-glib 10.0 SHARED_LIBS += poppler-qt 9.0 Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.21 diff -u -p -r1.21 distinfo --- distinfo13 Jul 2012 15:03:19 - 1.21 +++ distinfo1 Sep 2012 20:52:42 - @@ -1,10 +1,4 @@ -MD5 (poppler-0.16.7.tar.gz) = Ovoo48jE8GsPvKPJHgY5Tg== -MD5 (poppler-0.20.2.tar.gz) = Rd0sFsjE0aOegw5FdFxOJQ== -RMD160 (poppler-0.16.7.tar.gz) = J5Mw5v6vl6IH8zluqxr4NtPR8Ww= -RMD160 (poppler-0.20.2.tar.gz) = i5NhqXLUPHySOYweIFXN9b4QwaI= -SHA1 (poppler-0.16.7.tar.gz) = Jsc1+GNoj2K1fVFZhj/a1Ccr6J8= -SHA1 (poppler-0.20.2.tar.gz) = D3RbWT52TSeg4hZF5v69atitKrk= SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80= -SHA256 (poppler-0.20.2.tar.gz) = LevFA04OhUApV9hPsmdHN2WKPb6KPGMeF5Lj+MiM42k= +SHA256 (poppler-0.20.3.tar.gz) = L/71dvbegAKF4BZPJEuwyk8C1X82VA1ESaaej7i3KSM= SIZE (poppler-0.16.7.tar.gz) = 1952179 -SIZE (poppler-0.20.2.tar.gz) = 2146312 +SIZE (poppler-0.20.3.tar.gz) = 2144857
hs-* fallout, some notes about ghc
After the switch to __guard_local, ghc's "dynamic linker" currently doesn't work any longer, which causes *at least* devel/hs-vector and devel/hs-type-level builds to fail (probably other hs-* ports that use template-Haskell. I'm awaere of it, and I hope to find time to fix this soon. Another note for people building lang/ghc themselves: haddock now needs even more memory. On amd64, you have to push your data size limit to 3 GB (2.5 GB may be enough, but I've set it to 3 GB at my place). Ciao, Kili
Re: hs-* fallout, some notes about ghc
Hi,
On Wed, Sep 05, 2012 at 10:01:37PM +0100, Stuart Henderson wrote:
> > After the switch to __guard_local, ghc's "dynamic linker" currently
> > doesn't work any longer, which causes *at least* devel/hs-vector
> > and devel/hs-type-level builds to fail (probably other hs-* ports
> > that use template-Haskell. I'm awaere of it, and I hope to find
> > time to fix this soon.
>
> In an i386 bulk, these 2 were the only hs-* ports failing (plus any
> depending on these which were knocked out of the build)
And those depending are really wubscale ;-)
> Both were related to gmp,
>
> Loading package integer-gmp ... linking ... ghc: /usr/local/lib/libgmp.a:
> unknown symbol `__guard_local'
Does the attached patch on i386
- help to build hs-vector and hs-type-level,
- allow to start ghci without immediately failing when loading
integer-gmp?
Please be aware that the patch is *not* a proper fix but rather a
quick hack. I only want to see wether it's worth patching ghc's
internal linker at all. The other option would be to enable shared
haskell libraries.
Ciao,
Kili
Index: patches/patch-rts_Linker_c
===
RCS file: patches/patch-rts_Linker_c
diff -N patches/patch-rts_Linker_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-rts_Linker_c 8 Sep 2012 21:08:43 -
@@ -0,0 +1,33 @@
+$OpenBSD$
+--- rts/Linker.c.orig Wed Jun 6 19:10:25 2012
rts/Linker.c Fri Sep 7 00:46:07 2012
+@@ -563,6 +563,13 @@ typedef struct _RtsSymbolVal {
+ #define RTS_DARWIN_ONLY_SYMBOLS
+ #endif
+
++#if defined(openbsd_HOST_OS)
++#define RTS_OPENBSD_ONLY_SYMBOLS\
++ SymE_NeedsProto(__guard_local)
++#else
++#define RTS_OPENBSD_ONLY_SYMBOLS
++#endif
++
+ #ifndef SMP
+ # define MAIN_CAP_SYM SymI_HasProto(MainCapability)
+ #else
+@@ -1084,6 +1091,7 @@ RTS_POSIX_ONLY_SYMBOLS
+ RTS_MINGW_ONLY_SYMBOLS
+ RTS_CYGWIN_ONLY_SYMBOLS
+ RTS_DARWIN_ONLY_SYMBOLS
++RTS_OPENBSD_ONLY_SYMBOLS
+ RTS_LIBGCC_SYMBOLS
+ RTS_LIBFFI_SYMBOLS
+ #undef SymI_NeedsProto
+@@ -1119,6 +1127,7 @@ static RtsSymbolVal rtsSyms[] = {
+ RTS_MINGW_ONLY_SYMBOLS
+ RTS_CYGWIN_ONLY_SYMBOLS
+ RTS_DARWIN_ONLY_SYMBOLS
++ RTS_OPENBSD_ONLY_SYMBOLS
+ RTS_LIBGCC_SYMBOLS
+ RTS_LIBFFI_SYMBOLS
+ #if defined(darwin_HOST_OS) && defined(i386_HOST_ARCH)
Re: hs-* fallout, some notes about ghc
Hi, On Sun, Sep 16, 2012 at 10:16:40PM +0100, Nigel Taylor wrote: > Message-ID: <505641b8.9040...@asterisk.demon.co.uk> > Date: Sun, 16 Sep 2012 22:16:40 +0100 > From: Nigel Taylor > To: ports > Subject: Re: hs-* fallout, some notes about ghc > > On 09/08/12 22:22, Matthias Kilian wrote: > > Please be aware that the patch is *not* a proper fix but rather a > > quick hack. I only want to see wether it's worth patching ghc's > > internal linker at all. The other option would be to enable shared > > haskell libraries. [...] > Missed the e-mail on @ports till mentioned on icb, have only just tried this > > I applied the patches to both amd64 and i386, the two failing ports > hs-vector and hs-type-level built on i386, not on amd64. Thanks for the tests. On amd64, did you still get messages like Loading package integer-gmp ... linking ... ghc: /usr/local/lib/libgmp.a: unknown symbol `__guard_local' or just segfaults? (I'd expect the latter). Anyway, I tried to understand ghc's own runtime linker this day, and got lost in #ifdef hell, so I'll probably just enable shared libraries in ghc (in the hope that ghci will use dlopen(3) to load hs-libraries). Ciao, Kili
Re: hs-* fallout, some notes about ghc
Hi, On Mon, Oct 01, 2012 at 04:32:51PM +0200, David Coppa wrote: > > >> Loading package integer-gmp ... linking ... ghc: > > >> /usr/local/lib/libgmp.a: unknown symbol `__guard_local' [...] > > I applied the patches to both amd64 and i386, the two failing ports > > hs-vector and hs-type-level built on i386, not on amd64. [...] > The diff below, replacing SymE_NeedsProto with SymI_NeedsProto, > makes things work for me on amd64 (tested with hs-vector and > hs-type-level)... For me, both versions (using either SymI_NeedsProto or SymE_NeedsProto) *appear* to work (on amd64). I don't understand why the SymE_NeedsProto did fail for Nigel on amd64. Note: if you don't want to read all the details, just skip forward to "What can we do?" ;-) Anyway, that's not important, because both "fixes" are wrong, because they fix the linker error (unknown symbol `__guard_local') but cause random crashes at runtime if there's heavy enough use of libgmp.a (that just tries to calculate the 400th fibonacci number): $ cd $(make show=WRKBUILD) $ echo 'let f = 1 : 1 : zipWith (+) f (tail f) in f !! 400' | ./inplace/bin/ghc-stage2 --interactive GHCi, version 7.4.2: http://www.haskell.org/ghc/ :? for help Loading package ghc-prim ... linking ... done. Loading package integer-gmp ... linking ... done. Loading package base ... linking ... done. Prelude> 284812298108489611757988937681460995615380088782304890986477195645969271404032323901 Prelude> Leaving GHCi. $ echo 'let f = 1 : 1 : zipWith (+) f (tail f) in f !! 400' | ./inplace/bin/ghc-stage2 --interactive GHCi, version 7.4.2: http://www.haskell.org/ghc/ :? for help Loading package ghc-prim ... linking ... done. Loading package integer-gmp ... linking ... done. Loading package base ... linking ... done. Prelude> Segmentation fault (core dumped) > *GIANT* WARNING: > http://blogs.gnome.org/diegoe/files/2012/09/no-idea-what-im-doing-dog.jpg Yeah, same here. I didn't yet manage to read and understand all of rts/Linker.c (well, I tried, but it's no fun reading that code). But there are some comments about all the Sym[IE]_(Needs|Has)Proto macros in it, especially a comment about a nasty hack for amd64 and that this probably will fail if the exposed symbol is *not* a function. Anyway, what's the purpose of rts/Linker.c? Initially, it was used for ghci only, to load *statically* linked *Haskell* libraries and object files at runtime. Unfortunately, today it's also used for a language extension called "Template Haskell", which requires the *compiler* to execute Haskell code during compile time, requiring the compiler itself to load additional (statically linked) Haskell libraries. Loading *Haskell* libraries with ghc's rts/Linker.c worked and still works fine, because the code generated by ghc does not reference __guard_local; AFAIK, it doesn't even contain any normal functions. Instead, it does some calculations and then jumps to another chunk of code. It also maintains its own stack (not comparable to the stack we know from C). To confirm yourself that there's no reference to __guard_local, try $ nm /usr/local/lib/ghc/integer-gmp-0.4.0.0/libHSinteger-gmp-0.4.0.0.a | grep -c __guard_local However, when using the Haskell library integer-gmp (or any other library listed in the field "extra-libraries" of a Haskell library package info, that extra library *will* contain references to __guard_local. This works when linking normal executables (because ghc uses ld or cc for this), but it doesn't work when rts/Linker.c is involved (which in this case has to load both libHSinteger-gmp-0.4.0.0.a and libgmp.a). What can we do? There are several options: 1 Expose __guard_local like your and my diff does, to apparently "fix" ports which need Template Haskell at configure time. This is the least attractive option, because this approach is just broken (see the fibonacci examples above). 2 Read and understand rts/Linker.c and handle __guard_local correctly. Not very attractive, because it's a lot of pain and I really want to avoid touching this code. 3 Enable shared library support in ghc, so our ld.so(1) could take over. Unfortunately, there are two problems: a) I tried it, and got horrible failures doring the build. b) On some of the GHC mailinglists, someone recently mentioned that ghci (and Code using Template Haskell) still loads libraries via rts/Linker.c, even if shared llibraries are enabled. c) I'm still very scared about the consequences of enabling shared library support for *Haskell* libraries. 4 Ignore the ghci problem for now but modify Template Haskell to *not* trying to interpret Haskell code embedded in Haskell code but to create a temporary preprocessor which then translates the original source code to pure Haskell code. That would be a pretty opportunity to learn more about Tempate Haskell, but it would never been accepted upstream, because it would slow down compilation a lot. 5 Let ghci (and ghc + Template Haske
Re: hs-* fallout, some notes about ghc
Hi, On Wed, Oct 10, 2012 at 04:05:34PM +0200, David Coppa wrote: [analysis snipped] > But since /usr/local/lib/libgmp.a comes from a vanilla gmp-5.0.2, > we're totally belly-up! > > As a proof, try this: > > $ cd /usr/ports/devel/gmp > $ make clean patch > $ cd /usr/ports/pobj/gmp-5.0.2/gmp-5.0.2/ > $ patch -NEp1 -i > /usr/ports/pobj/ghc-7.4.2-no_doc/ghc-7.4.2/libraries/integer-gmp/gmp/tarball/patch > $ cd - > $ make fake > $ sudo cp /usr/ports/pobj/gmp-5.0.2/fake-amd64/usr/local/lib/libgmp.a > /usr/local/lib/libgmp.a > > and then repeat the fibonacci test: > > $ ghci > GHCi, version 7.4.2: http://www.haskell.org/ghc/ :? for help > Loading package ghc-prim ... linking ... done. > Loading package integer-gmp ... linking ... done. > Loading package base ... linking ... done. > Prelude> let fibs = 0 : 1 : zipWith (+) fibs (tail fibs) > Prelude> let fib n = fibs!!n > Prelude> fib 1 > 336447648764317832666216120051075433103021484606800639065647699746800814421236815559551363373402558206533268083615937373479048386526826304089246305643188735454436955982749160660209988418393386465273130008883026923567361313511757929743785441375213052050434770160226475831890652789085515436615958298727968298751063120057542878345321551510387081829896979161312785626503319548714021428753269818796204693609787990035096230229102636813149319527563022783762844154036058440257211433496118002309120828704608892396232883546150577658327125254609359112820392528539343462090424524892940390170623388899108584106518317336043747073790855263176432573399371287193758774689747992630583706574283016163740896917842637862421283525811282051637029808933209990570792006436742620238978311147005407499845925036063356093388383192338678305613643535189213327973290813373264265263398976392272340788292817795358057099369104917547080893184105614632233821746563732124822638309210329770164805472624384237486241145309381220656491403275108664339451751216152654536133311131404243685480510676584349352383695965342807176877532834823434555736671973139274627362910821067928078471803532913117677892465908993863545932789452377767440619224033763867400402133034329749690202832814593341882681768389307200363479562311710310129195316979460763273758925353077255237594378843450406771779056450443016640119462580972216729758615026968443146952034614932291105970676243268515992834709891284706740862008587135016260312071903172086094081298321581077282076353186624611278245537208532365305775956430072517744315051539600905168603220349163222640885248852433158051534849622434848299380905070483482449327453732624567755879089187190803662058009594743150052402532709746995318770724376825907419939632265984147498193609285223945039707165443156421328157688908058783183404917434556270520223564846495196112460268313970975069382648706613264507665074611512677522748621598642530711298441182622661057163515069260029861704945425047491378115154139941550671256271197133252763631939606902895650288268608362241082050562430701794976171121233066073310059947366875 > Prelude> > Leaving GHCi. > $ Whow! Thanks for hurting your brain on this problem ;-) > How to properly fix this problem (ports-wise speaking)? > > A working solution is to use the gmp library that comes bundled > with GHC. Yes, that's the way to go. > While doing a build with my diff, for mysterious causes I caught > another error: > > ---8<--- > > "inplace/bin/ghc-stage1" -o utils/hsc2hs/dist-install/build/tmp/hsc2hs > -H32m -O-hide-all-packages -i -iutils/hsc2hs/. > -iutils/hsc2hs/dist-install/build -iutils/hsc2hs/dist-install/build/autogen > -Iutils/hsc2hs/dist-install/build -Iutils/hsc2hs/dist-install/build/autogen > -optP-include -optPutils/hsc2hs/dist-install/build/autogen/cabal_macros.h > -package base-4.5.1.0 -package containers-0.4.2.1 -package directory-1.1.0.2 > -package process-1.1.0.1 -XHaskell98 -XCPP -XForeignFunctionInterface > -no-user-package-conf -rtsopts -odir utils/hsc2hs/dist-install/build > -hidir utils/hsc2hs/dist-install/build -stubdir > utils/hsc2hs/dist-install/build -hisuf hi -osuf o -hcsuf hc > utils/hsc2hs/dist-install/build/Main.o > utils/hsc2hs/dist-install/build/HSCParser.o > utils/hsc2hs/dist-install/build/DirectCodegen.o > utils/hsc2hs/dist-install/build/CrossCodegen.o > utils/hsc2hs/dist-install/build/UtilsCodegen.o > utils/hsc2hs/dist-install/build/Common.o utils/hsc2hs/dist-install/build/C.o > utils/hsc2hs/dist-install/build/Flags.o > utils/hsc2hs/dist-install/build/Paths_hsc2hs.o > /usr/ports/pobj/ghc-7.4.2-no_doc/ghc-7.4.2/rts/dist/build/libHSrts.a(RtsFlags.o): > In function `copyArg': > RtsFlags.c:(.text+0x2bd): warning: warning: strcpy() is almost always > misused, please use strlcpy() > /usr/ports/pobj/ghc-7.4.2-no_doc/ghc-7.4.2/rts/dist/build/libHSrts.a(RtsUtils.o): > In function `showStgWord64': > RtsUtils.c:(.text+0x329): warning: warning: sprintf() is often misused, > please use snprintf() > /usr/ports/pobj/ghc-7.4.2-no_doc/ghc-7.4.2/rts/dist/build/libHSrts.a(ffi64.o): >
Re: hs-* fallout, some notes about ghc
On Wed, Oct 10, 2012 at 04:38:55PM +0200, Matthias Kilian wrote: > On Wed, Oct 10, 2012 at 04:05:34PM +0200, David Coppa wrote: > > Here's the diff, comments are highly appreciated. Please commit, but without patches/patch-libraries_integer-gmp_configure It's enough to drop the --with-gmp-includes and --with-gmp-libraries from CONFIGURE_ARGS to let libraries/integer-gmp use the bundled libgmp. At least i was able to run something as weird as echo 'let f = 1 : 1 : zipWith (+) f (tail f) in f !! 42' | ./inplace/bin/ghc-stage2 --inter after a make fake with it ;-) Ciao, Kili
Re: lang/ghc: missing dep
On Thu, Oct 11, 2012 at 08:37:01AM +0200, Sébastien Marie wrote:
> > Please commit, but without patches/patch-libraries_integer-gmp_configure
> >
>
> Hi,
>
> Before commit, is it possible to fix a missing BUILD_DEPENDS for
> documentation ?
>
> textproc/docbook is missing.
lang/ghc BUILD_DEPENDS on textproc/docbook-xsl which in turn
RUN_DEPENDS on textproc/docbook and textproc/libxslt.
The docbook{,-xsl} dependencies had been changed about two weeks
ago. Are your ports tree and packages up to date?
> when build without (and systrace enable):
>
> checking for DocBook DTD... I/O error : Attempt to load network entity
> http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd
>
> and after, there are "parser error" for resolving entity (like “)
If this happens with an up-to-date tree, something else is wrong.
Maybe the handling of /var/db/xmlcatalog in textproc/libxml and/or
textproc/libxslt.
Ciao,
Kili
Update devel/hs-base64-bytestring
Update to hs-base64-bytestring-1.0.0.0. Required for an upcoming
update of www/hs-snap & related ports.
security/hs-certificate will need a bump after this update.
ok?
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/devel/hs-base64-bytestring/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile21 Jan 2012 17:15:34 - 1.4
+++ Makefile14 Oct 2012 14:06:25 -
@@ -2,7 +2,7 @@
COMMENT= fast base64 encodings and decoding for ByteStrings
-DISTNAME= base64-bytestring-0.1.0.3
+DISTNAME= base64-bytestring-1.0.0.0
CATEGORIES=devel
MAINTAINER=Jasper Lievisse Adriaanse
Index: distinfo
===
RCS file: /cvs/ports/devel/hs-base64-bytestring/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo21 Jan 2012 17:15:34 - 1.3
+++ distinfo14 Oct 2012 14:06:25 -
@@ -1,5 +1,2 @@
-MD5 (ghc/base64-bytestring-0.1.0.3.tar.gz) = +Y7kn/unckysbirpSJx96Q==
-RMD160 (ghc/base64-bytestring-0.1.0.3.tar.gz) = AQxIlZKfth4c1XrV0pEcusc2Ap4=
-SHA1 (ghc/base64-bytestring-0.1.0.3.tar.gz) = hn2FRzEFuJS8RGBKVIqRKbPhUyw=
-SHA256 (ghc/base64-bytestring-0.1.0.3.tar.gz) =
o9dtJ/InHGA5kNkJ/tCk8XVijpxuGUJ8yDh91MJCkjQ=
-SIZE (ghc/base64-bytestring-0.1.0.3.tar.gz) = 4983
+SHA256 (ghc/base64-bytestring-1.0.0.0.tar.gz) =
dZ+7D48/8mxK0+cfvMz9RyvBpO7+S1UIznioeTMFGXw=
+SIZE (ghc/base64-bytestring-1.0.0.0.tar.gz) = 8861
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/hs-base64-bytestring/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 11 Apr 2011 14:45:15 - 1.2
+++ pkg/PLIST 14 Oct 2012 14:06:25 -
@@ -2,7 +2,13 @@
lib/ghc/${DISTNAME}/
lib/ghc/${DISTNAME}/Data/
lib/ghc/${DISTNAME}/Data/ByteString/
+lib/ghc/${DISTNAME}/Data/ByteString/Base64/
lib/ghc/${DISTNAME}/Data/ByteString/Base64.hi
+lib/ghc/${DISTNAME}/Data/ByteString/Base64/Internal.hi
+lib/ghc/${DISTNAME}/Data/ByteString/Base64/Lazy.hi
+lib/ghc/${DISTNAME}/Data/ByteString/Base64/URL/
+lib/ghc/${DISTNAME}/Data/ByteString/Base64/URL.hi
+lib/ghc/${DISTNAME}/Data/ByteString/Base64/URL/Lazy.hi
lib/ghc/${DISTNAME}/HS${DISTNAME}.o
lib/ghc/${DISTNAME}/libHS${DISTNAME}.a
lib/ghc/${DISTNAME}/register.sh
@@ -12,6 +18,9 @@ lib/ghc/${DISTNAME}/unregister.sh
share/doc/hs-${DISTNAME}/
share/doc/hs-${DISTNAME}/LICENSE
share/doc/hs-${DISTNAME}/html/
+share/doc/hs-${DISTNAME}/html/Data-ByteString-Base64-Lazy.html
+share/doc/hs-${DISTNAME}/html/Data-ByteString-Base64-URL-Lazy.html
+share/doc/hs-${DISTNAME}/html/Data-ByteString-Base64-URL.html
share/doc/hs-${DISTNAME}/html/Data-ByteString-Base64.html
share/doc/hs-${DISTNAME}/html/base64-bytestring.haddock
share/doc/hs-${DISTNAME}/html/doc-index.html
@@ -20,6 +29,9 @@ share/doc/hs-${DISTNAME}/html/haddock-ut
share/doc/hs-${DISTNAME}/html/hslogo-16.png
share/doc/hs-${DISTNAME}/html/index-frames.html
share/doc/hs-${DISTNAME}/html/index.html
+share/doc/hs-${DISTNAME}/html/mini_Data-ByteString-Base64-Lazy.html
+share/doc/hs-${DISTNAME}/html/mini_Data-ByteString-Base64-URL-Lazy.html
+share/doc/hs-${DISTNAME}/html/mini_Data-ByteString-Base64-URL.html
share/doc/hs-${DISTNAME}/html/mini_Data-ByteString-Base64.html
share/doc/hs-${DISTNAME}/html/minus.gif
share/doc/hs-${DISTNAME}/html/ocean.css
Update www/hs-snap and related ports (+ 2 new ports)
From: Matthias Kilian
To: j...@openbsd.org
Cc: ports@openbsd.org
Bcc:
Subject: Update www/hs-snap & related ports (includes two new ports)
Reply-To:
Hi,
This contains the following updates (the recent update of
devel/hs-base64-bytestring is required to build them):
www/hs-snap 0.8.1 -> 0.9.2.2
www/hs-snap-server 0.8.1.1 -> 0.9.2.4
www/hs-snap-core0.8.1 -> 0.9.2.2
www/hs-clientsession0.7.3.6 -> 0.8.0.1
security/hs-pwstore-fast2.2 -> 2.3
Some functionality previously included within www/hs-snap has now
moved to two new ports (attached), www/hs-snap-loader-dynamic and
www/hs-snap-loader-static. Those libraries aren't mentioned in
snap.cabal, but I think www/hs-snap should still depend on them,
because they are required by any project created by "snap init".
Diffs and attached ports are relative to /usr/ports.
comments / oks?
Ciao,
Kili
Index: www/hs-snap/Makefile
===
RCS file: /cvs/ports/www/hs-snap/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- www/hs-snap/Makefile11 Oct 2012 14:45:53 - 1.6
+++ www/hs-snap/Makefile17 Oct 2012 20:41:10 -
@@ -2,8 +2,7 @@
COMMENT = Snap project starter and glue code library
-DISTNAME = snap-0.8.1
-REVISION = 0
+DISTNAME = snap-0.9.2.2
CATEGORIES = www
HOMEPAGE = http://snapframework.com/
@@ -32,29 +31,31 @@ RUN_DEPENDS += devel/hs-MonadCatchIO-tr
devel/hs-configurator>=0.1,<0.3 \
devel/hs-data-lens>=2.0.1,<2.11 \
devel/hs-data-lens-template>=2.1,<2.2 \
- devel/hs-directory-tree>=0.10,<0.11 \
+ devel/hs-directory-tree>=0.10,<0.12 \
devel/hs-hashable>=1.1,<1.2 \
- devel/hs-hint>=0.3.3.1,<0.4 \
devel/hs-logict>=0.4.2,<0.6 \
devel/hs-mtl>2.0,<2.2 \
- devel/hs-safe>=0.3,<0.4 \
- devel/hs-stm>=2.2,<2.4 \
+ devel/hs-stm>=2.2,<2.5 \
devel/hs-syb>=0.1,<0.4 \
devel/hs-text>=0.11,<0.12 \
devel/hs-transformers>=0.2,<0.4 \
devel/hs-unordered-containers>=0.1.4,<0.3 \
+ devel/hs-vector>=0.7.1,<0.11 \
devel/hs-vector-algorithms>=0.4,<0.6 \
- devel/hs-vector>=0.7.1,<0.10 \
- security/hs-crypto>=4.2,<4.3 \
security/hs-mwc-random>=0.8,<0.13 \
- security/hs-pwstore-fast>=2.2,<2.3 \
- security/hs-skein>=0.1.0.3,<0.2 \
+ security/hs-pwstore-fast>=2.3,<2.4 \
textproc/hs-attoparsec>=0.10,<0.11 \
textproc/hs-heist>=0.7,<0.9 \
- textproc/hs-xmlhtml>=0.1,<0.2.1 \
- www/hs-clientsession>=0.7.3.6,<0.8 \
- www/hs-snap-core>=0.8.1,<0.9 \
- www/hs-snap-server>=0.8.1,<0.9 \
+ textproc/hs-xmlhtml>=0.1,<0.3 \
+ www/hs-clientsession>=0.8,<0.9 \
+ www/hs-snap-core>=0.9.2,<0.10 \
+ www/hs-snap-server>=0.9.2,<0.10
+
+# Those are NOT mentioned in snap.cabal, but they are required by
+# default snap projects created with "snap init", so it's probably a
+# good idea to add them:
+RUN_DEPENDS += www/hs-snap-loader-dynamic \
+ www/hs-snap-loader-static
BUILD_DEPENDS += ${RUN_DEPENDS}
Index: www/hs-snap/distinfo
===
RCS file: /cvs/ports/www/hs-snap/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- www/hs-snap/distinfo2 Sep 2012 21:51:15 - 1.3
+++ www/hs-snap/distinfo17 Oct 2012 20:41:10 -
@@ -1,5 +1,2 @@
-MD5 (ghc/snap-0.8.1.tar.gz) = SUthx8EQ2HzG7za9mGab7Q==
-RMD160 (ghc/snap-0.8.1.tar.gz) = EelbqXGEQrc/Zm6H66WjJ7uXQu8=
-SHA1 (ghc/snap-0.8.1.tar.gz) = d8q684R34b25+rBEIxAsjT9zIpU=
-SHA256 (ghc/snap-0.8.1.tar.gz) = lKOzeFa41qysr1YygNP3OM3tgo9PKWSE9WaKVHb2q+w=
-SIZE (ghc/snap-0.8.1.tar.gz) = 76665
+SHA256 (ghc/snap-0.9.2.2.tar.gz) = XP/UyAua+sNWYZKmMa4+CKrYCL0xak75R41llRZiieI=
+SIZE (ghc/snap-0.9.2.2.tar.gz) = 73548
Index: www/hs-snap/patches/patch-snap_cabal
===
RCS file: www/hs-snap/patches/patch-snap_caba
update print/poppler-data
Update to poppler-data-0.4.6. Index: Makefile === RCS file: /cvs/ports/print/poppler-data/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile26 Nov 2011 19:51:13 - 1.10 +++ Makefile4 Nov 2012 18:22:04 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.10 2011/11/26 19:51:13 kili Exp $ COMMENT = encoding files for poppler -DISTNAME = poppler-data-0.4.5 +DISTNAME = poppler-data-0.4.6 CATEGORIES = print HOMEPAGE = http://poppler.freedesktop.org/ Index: distinfo === RCS file: /cvs/ports/print/poppler-data/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo26 Nov 2011 19:51:13 - 1.7 +++ distinfo4 Nov 2012 18:22:04 - @@ -1,5 +1,2 @@ -MD5 (poppler-data-0.4.5.tar.gz) = RI3XxQd1cONANAcGzvkxqg== -RMD160 (poppler-data-0.4.5.tar.gz) = V7cdf7BB/q3gSRPeZyOZ99ILD+Q= -SHA1 (poppler-data-0.4.5.tar.gz) = cDNyEyQVbeXcY1kwuZ7pc9nPj3Y= -SHA256 (poppler-data-0.4.5.tar.gz) = MZC8RXuv5LFY95oI6KPxgkAx7BKs78NZ5o4PBNoPcP0= -SIZE (poppler-data-0.4.5.tar.gz) = 4126275 +SHA256 (poppler-data-0.4.6.tar.gz) = 8waQHfpb2pDNZmPU7tscdzw8cJ3ngBjHnxKCssj5Cvo= +SIZE (poppler-data-0.4.6.tar.gz) = 4182141
print/poppler: fix autoconf detection of jpeglib.h
Let configure properly detect jpeglib.h.
This affects quite some C++ classes, so aply major bumps to all
shared libraries.
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile15 Oct 2012 17:44:33 - 1.69
+++ Makefile4 Nov 2012 18:14:32 -
@@ -9,16 +9,20 @@ V=0.20.5
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
-PKGNAME-utils= poppler-utils-$V
+REVISION-main= 0
+PKGNAME-utils= poppler-utils-$V
+REVISION-utils=0
PKGNAME-qt=poppler-qt-$V
+REVISION-qt= 0
PKGNAME-qt4= poppler-qt4-$V
+REVISION-qt4= 0
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 14.0 # 28.0
-SHARED_LIBS += poppler-glib 10.0 # 12.0
-SHARED_LIBS += poppler-qt 9.0 # 3.0
-SHARED_LIBS += poppler-qt4 10.0 # 4.0
-SHARED_LIBS += poppler-cpp 2.0 # 2.0
+SHARED_LIBS += poppler 15.0 # 28.0
+SHARED_LIBS += poppler-glib 11.0 # 12.0
+SHARED_LIBS += poppler-qt 10.0 # 3.0
+SHARED_LIBS += poppler-qt4 11.0 # 4.0
+SHARED_LIBS += poppler-cpp 3.0 # 2.0
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${OLDSHIT}${EXTRACT_SUFX}
@@ -104,7 +108,8 @@ CONFIGURE_ARGS+= --disable-gtk-doc \
--disable-gtk-test
CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ LIBJPEG_CFLAGS="-I${LOCALBASE}/include"
# If one of these tools is found at configure stage, it might be used,
# no matter whether we use --disable-gtk-doc or not.
lang/ghc: silence ghc-pkg unregister -v0 --force
Hi,
This will shut up the annoying warnings on hs-* packages during
pkg_add -u.
It's ugly, but IMHO it doesn't cause any harm for normal users of
ghc-pkg, because no sane person would ever run something like
ghc-pkg unregister bytestring -v0 --force
manually (where both -v0 and --force are given). Heck, nobody is
supposed to use the register/unregister subcommands of ghc-pkg at
all, except when fiddling with an already broken hs-* package
repository. So, if anyone runs this manually, he should know what
he's doing.
And the "warning" message is wrong anyway, because with --force,
it should read "unregistering blah *will* break the following
packages:"
Comments, or any suggestions for better solutions?
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/lang/ghc/Makefile,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile
--- Makefile11 Oct 2012 11:05:02 - 1.84
+++ Makefile4 Nov 2012 20:18:28 -
@@ -11,7 +11,7 @@ COMMENT-doc = documentation for GHC
DISTNAME = ghc-${MODGHC_VER}
PKGNAME-main = ghc-${MODGHC_VER}
-REVISION-main =1
+REVISION-main =2
PKGNAME-doc = ghc-doc-${MODGHC_VER}
CATEGORIES = lang devel
HOMEPAGE = http://www.haskell.org/ghc/
Index: patches/patch-utils_ghc-pkg_Main_hs
===
RCS file: patches/patch-utils_ghc-pkg_Main_hs
diff -N patches/patch-utils_ghc-pkg_Main_hs
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-utils_ghc-pkg_Main_hs 4 Nov 2012 20:18:28 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Horrible hack to get rid of the annoying warnings when running
+pkg_add -u. This means that you do NOT get any such warning when
+running ghc-pkg unregister ... -v0 --force.
+
+--- utils/ghc-pkg/Main.hs.orig Wed Jun 6 19:10:25 2012
utils/ghc-pkg/Main.hs Sun Nov 4 20:45:43 2012
+@@ -915,7 +915,7 @@ modifyPackage fn pkgid verbosity my_flags force = do
+ new_broken = map sourcePackageId (brokenPackages (allPackagesInStack
new_stack))
+ newly_broken = filter (`notElem` map sourcePackageId old_broken)
new_broken
+ --
+- when (not (null newly_broken)) $
++ when (not (null newly_broken || (force == ForceAll && verbosity <=
Silent))) $
+ dieOrForceAll force ("unregistering " ++ display pkgid ++
+" would break the following packages: "
+ ++ unwords (map display newly_broken))
hs-* ports
For those not reading ports-changes: if you update existing or create new hs-* ports that use cabal, please transfer all relevant dependencies mentioned in the .cabal file to appropriate RUN_DEPENDS in the port, even if a dependency gets pulled in otherwise. For example, if a.cabal has b and c as dependencies, and b.cabal has c as dependency, please be sure to still add hs-c to RUN_DEPENDS in hs-a, even if this doesn't look necessary ports-wise. Ciao, Kili
new devel/hs-async
This new port is required for an update to Haskell-Platform-2012.4.0.0.
DESCR:
A higher-level interface over threads, in which an "Async a" is a
concurrent thread that will eventually deliver a value of type "a".
The package provides ways to create "Async" computations, wait for
their results, and cancel them.
Using Async is safer than using threads in two ways:
* When waiting for a thread to return a result, if the thread dies
with an exception then the caller must either re-throw the exception
('wait') or handle it ('waitCatch'); the exception cannot be
ignored.
* The API makes it possible to build a tree of threads that are
automatically killed when their parent dies (see 'withAsync').
ok to import?
hs-async.tgz
Description: application/tar-gz
Enable cabal test-suites for hs-ports by default?
Hi,
I'd like to add --enable-tests by default in ghc.port.mk, unless a
hs-ports has set NO_REGRESS=Yes. However, this will have negative
impact on build times. Not much yet (see below), but as time goes
by, more and more hs-ports may include test-suites, so I better ask
before I just do such a change (proposed diff at the end of this
mail).
We currently have a total of 28 hs-ports which use the test-suite
feature of Cabal. One problem is that one *has* to configure those
ports with --enable-tests or a make regress will *always* fail
(noticed by sthen@ the other day while reviewing the new devel/hs-async
port). The next problem is that --enable-tests causes the test-suites
to be compiled and link during the build stage, not during the
regress stage. So, setting --enable-tests by default in ghc.port.mk
obviously will have an impact at the build time, even if you're not
going to make regress at all.
>From those 28 ports, only the 9 ports listed below are buildable
with --enable-tests and without NO_REGRESS=Yes. Building them with
--enable-tests set in ghc.port.mk takes those times (measuring mere
build time, not extract/patch/configure):
1st run: 147.87 real 117.49 user17.80 sys
2nd run: 142.19 real 117.69 user17.72 sys
And building them without --enable-tests set:
1st run: 99.50 real83.72 user11.38 sys
2nd run: 101.19 real85.14 user11.30 sys
devel/hs-aeson, devel/hs-async, devel/hs-base64-bytestring,
devel/hs-concurrent-extra, devel/hs-lifted-base, devel/hs-network,
devel/hs-network-conduit, devel/hs-split, devel/hs-unordered-containers
Most of the remaining ports are failing during configure time,
because --enable-regress causes them to require some dependencies
we don't yet have in the ports tree. For now, they'll just get
NO_REGRESS=Yes:
archivers/hs-zlib-bindings, devel/hs-blaze-builder-conduit,
devel/hs-blaze-textual, devel/hs-conduit, devel/hs-hashable,
devel/hs-monad-par, devel/hs-simple-sendfile, lang/feldspar/language,
lang/hs-syntactic, net/hs-HTTP, security/hs-mwc-random, security/hs-skein,
textproc/hs-blaze-html, textproc/hs-blaze-markup, www/hs-clientsession,
www/hs-http-types, www/hs-warp
Two ports fail during build and need NO_REGRESS=Yes, too:
devel/hs-text, textproc/hs-attoparsec
Should this go in?
Ciao,
Kili
here's the diff that would go in:
Index: lang/ghc/ghc.port.mk
===
RCS file: /cvs/ports/lang/ghc/ghc.port.mk,v
retrieving revision 1.26
diff -u -p -r1.26 ghc.port.mk
--- lang/ghc/ghc.port.mk8 Nov 2012 22:21:45 - 1.26
+++ lang/ghc/ghc.port.mk3 Dec 2012 21:26:03 -
@@ -57,6 +57,10 @@ MODGHC_SETUP_CONF_ARGS +=--docdir=\$$da
MODGHC_SETUP_CONF_ARGS += --libsubdir=ghc/\$$pkgid
. endif
+. if !${NO_REGRESS:L:Myes}
+MODGHC_SETUP_CONF_ARGS += --enable-tests
+. endif
+
. if ${MODGHC_BUILD:L:Mhaddock}
BUILD_DEPENDS += devel/haddock \
lang/ghc,-doc
Index: archivers/hs-zlib-bindings/Makefile
===
RCS file: /cvs/ports/archivers/hs-zlib-bindings/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- archivers/hs-zlib-bindings/Makefile 28 Oct 2012 23:24:28 - 1.7
+++ archivers/hs-zlib-bindings/Makefile 3 Dec 2012 21:26:03 -
@@ -19,4 +19,7 @@ MODGHC_BUILD =cabal hackage haddock re
RUN_DEPENDS = archivers/hs-zlib>=0.5.2.0,<0.6
BUILD_DEPENDS =${RUN_DEPENDS}
+# Missing dependencies (hs-hspec).
+NO_REGRESS = Yes
+
.include
Index: devel/hs-async/Makefile
===
RCS file: /cvs/ports/devel/hs-async/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- devel/hs-async/Makefile 2 Dec 2012 20:10:22 - 1.1.1.1
+++ devel/hs-async/Makefile 3 Dec 2012 21:26:03 -
@@ -20,8 +20,4 @@ MODGHC_BUILD =cabal hackage haddock re
BUILD_DEPENDS =${RUN_DEPENDS}
RUN_DEPENDS = devel/hs-stm>=2.2,<2.5
-# Needs --enable-test, which will probably set by ghc.port.mk soon
-# (when I have some numbers about build times).
-NO_REGRESS = Yes
-
.include
Index: devel/hs-blaze-builder-conduit/Makefile
===
RCS file: /cvs/ports/devel/hs-blaze-builder-conduit/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- devel/hs-blaze-builder-conduit/Makefile 28 Oct 2012 23:26:38 -
1.2
+++ devel/hs-blaze-builder-conduit/Makefile 3 Dec 2012 21:26:03 -
@@ -25,4 +25,7 @@ RUN_DEPENDS = devel/hs-blaze-builder>=0
devel/hs-text>=0.11 \
devel/hs-transformers>=0.2.2,<0.4
+# Missing dependencies (hs-hspec).
+NO_REGRESS = Yes
+
.include
Index: devel/hs-blaze-tex
Re: new: textproc/hs-scanner
Hi, On Wed, Apr 20, 2016 at 05:04:13PM +0200, David Coppa wrote: > With the release of hedis-0.8.0 (databases/hs-hedis), upstream > replaced attoparsec with this. > > scanner is a fast non-backtracking incremental combinator parsing > library for bytestrings. > It is often convenient to use backtracking to parse some sophisticated > input. Unfortunately it kills performance, so usually you should > avoid backtracking. > Often (actually always, but it could be too hard sometimes) you can > implement your parser without any backtracking. It that case all > the bookkeeping usual parser combinators do becomes unnecessary. > The scanner library is designed for such cases. It is often 2 times > faster than attoparsec. > > New port attached to this mail. > > Oky? ok Ciao, Kili
update print/poppler
Hi,
this is an update to poppler-0.43.0. It also replaces the gettext module
by normal dependencies and enables libnss (for pdfsig(1)). For easier
read, I've split it up into three separate diffs.
I'm currently running a bulk build with this on amd64. Tests and
comments are welcome.
Ciao,
Kili
*** part 1: replcae gettext module:
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.104
diff -u -p -r1.104 Makefile
--- Makefile23 Mar 2016 20:09:34 - 1.104
+++ Makefile29 Apr 2016 19:35:32 -
@@ -65,14 +65,15 @@ MODULES+= x11/qt5
CONFIGURE_ARGS+= --disable-poppler-qt5
.endif
-MODULES+= devel/gettext
-
BUILD_DEPENDS+= devel/gobject-introspection
-RUN_DEPENDS-main=${MODGETTEXT_RUN_DEPENDS} \
+RUN_DEPENDS-main= \
+ devel/gettext \
print/poppler-data>=0.4.7
-LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
+LIB_DEPENDS-main= \
+ converters/libiconv \
+ devel/gettext \
devel/glib2 \
graphics/cairo \
graphics/lcms2 \
@@ -94,7 +95,7 @@ LIB_DEPENDS-utils= print/poppler
WANTLIB-main= ${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 pixman-1 openjpeg X11 Xrender cairo pcre \
png pthread-stubs xcb xcb-render lcms2 xcb-shm \
- ${MODGETTEXT_WANTLIB}
+ iconv intl
WANTLIB-qt=${cWANTLIB} lcms2 openjpeg poppler png pthread-stubs \
${MODQT3_WANTLIB}
WANTLIB-qt4=${cWANTLIB} ${MODQT4_WANTLIB} ICE QtCore QtGui QtXml \
*** part 2: update to poppler-0.43.0
diff -rup -x CVS ./Makefile ../poppler/Makefile
--- ./Makefile Fri Apr 29 21:44:13 2016
+++ ../poppler/Makefile Fri Apr 29 21:44:39 2016
@@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.42.0
+V= 0.43.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -16,7 +16,7 @@ PKGNAME-qt4= poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 35.0 # 58.0
+SHARED_LIBS += poppler 36.0 # 60.0
SHARED_LIBS += poppler-glib 15.0 # 15.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 18.0 # 13.0
diff -rup -x CVS ./distinfo ../poppler/distinfo
--- ./distinfo Fri Apr 29 21:44:13 2016
+++ ../poppler/distinfo Fri Apr 29 21:44:39 2016
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.42.0.tar.xz) = n+8Hb/4qTxik4NpUfYFO9cXm+KKDr+M4dQSguxpBgBA=
+SHA256 (poppler-0.43.0.tar.xz) = xyDiaibuELfryeJW0u563NtTbPhfnxxHd6OPf4H7JFY=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.42.0.tar.xz) = 1674024
+SIZE (poppler-0.43.0.tar.xz) = 1671368
diff -rup -x CVS ./patches/patch-configure_ac
../poppler/patches/patch-configure_ac
--- ./patches/patch-configure_acFri Apr 29 21:44:13 2016
+++ ../poppler/patches/patch-configure_ac Fri Apr 29 21:44:40 2016
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.17 2016/03/23 20:09:34 kili Exp $
configure.ac.orig Wed Mar 16 20:35:38 2016
-+++ configure.ac Mon Mar 21 11:06:07 2016
-@@ -684,6 +684,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
+--- configure.ac.orig Fri Apr 29 00:30:06 2016
configure.ac Fri Apr 29 20:48:31 2016
+@@ -679,6 +679,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
@@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2016/03/23 20:09:3
dnl
dnl Try Qt4
dnl
-@@ -776,31 +794,35 @@ if test x$enable_poppler_qt5 = xyes; then
+@@ -771,31 +789,35 @@ if test x$enable_poppler_qt5 = xyes; then
AC_CHECK_TOOL(MOCQT5, moc)
AC_MSG_CHECKING([for Qt5 moc])
mocversion=`$MOCQT5 -v 2>&1`
@@ -75,7 +75,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2016/03/23 20:09:3
AC_SUBST(MOCQT5)
AC_MSG_RESULT([$MOCQT5])
fi
-@@ -1001,6 +1023,9 @@ glib/reference/Makefile
+@@ -996,6 +1018,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@@ -85,7 +85,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2016/03/23 20:09:3
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
-@@ -1036,6 +1061,7 @@ if test x$enable_cmyk = xyes;then
+@@ -1031,6 +1056,7 @@ if test x$enable_cmyk = xyes;then
echo " with CMYK support"
fi
echo " cairo output:$use_cairo"
diff -rup -x CVS ./patches/patch-poppler_XRef_cc
../poppler/patches/patch-poppler_XRef_cc
--- ./patches/patch-poppler_XRef_cc Fri Apr 29 21:44:13 2016
+++ ../poppler/patches/patch-poppler_XRef_ccFri Apr 29 21:44:40 2016
@@ -1,7 +1,7 @@
$OpenBSD: patch-poppler_XRef_cc,v 1.14 2016/03/23 20:09:34 kili Exp $
lang/hugs (was: 'avoid W|X mappings in libffi' - MARC)
On Tue, May 24, 2016 at 11:51:08AM +0100, Stuart Henderson wrote:
> I've collected the known problems so far at
> https://docs.google.com/spreadsheets/d/1RjfH2_ecaUc_G5kmPAKbH00w0qcR-vWljTiUb4UCVXI/edit?usp=sharing
Regarding lang/hugs, there's this masterpiece in src/builtin.c:
/*
* Allocate len bytes which are readable, writable, and executable.
*
* ToDo: If this turns out to be a performance bottleneck, one could
* e.g. cache the last VirtualProtect/mprotect-ed region and do
* nothing in case of a cache hit.
*/
static void* local mallocBytesRWX(int len) {
void *addr = (void *)malloc(len);
#if defined(i386_HOST_ARCH) && defined(_WIN32)
/* This could be necessary for processors which distinguish between
READ and EXECUTE memory accesses, e.g. Itaniums. */
DWORD dwOldProtect = 0;
if (VirtualProtect(addr, len, PAGE_EXECUTE_READWRITE, &dwOldProtect) == 0) {
ERRMSG(0) "mallocBytesRWX: failed to protect 0x%p\n", addr
EEND;
}
#elif defined(openbsd_HOST_OS) || defined(linux_HOST_OS)
/* malloced memory isn't executable by default on OpenBSD */
uintptr_t pageSize = sysconf(_SC_PAGESIZE);
uintptr_t mask = ~(pageSize - 1);
uintptr_t startOfFirstPage = ((uintptr_t)addr ) & mask;
uintptr_t startOfLastPage = ((uintptr_t)addr + len - 1) & mask;
uintptr_t size = startOfLastPage - startOfFirstPage + pageSize;
if (mprotect((void*)startOfFirstPage,
(size_t)size, PROT_EXEC | PROT_READ | PROT_WRITE) != 0)
{
ERRMSG(0) "mallocBytesRWX: failed to protect 0x%p\n", addr
EEND;
}
#endif
return addr;
}
IIRC, I once wrote that the ports tree isn't a software museum, so
instead of trying to fix it, i'd just cimpletely remove it from the
tree, and maybe other ancient haskell implementations (yes, I mean
you, nhc98!).
I know that I tried to preserve that old shit a year ago (or even
less), but it's just in the way and no longer maintained upstream.
Ciao,
Kili
update print/poppler
Hi
aja@ wants ze new poppler. Here it is, in case anyone wants to test it
(I'm still waiting for my bulk build to finish before I can start
testing).
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile
--- Makefile1 May 2016 12:33:24 - 1.105
+++ Makefile26 May 2016 17:41:14 -
@@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.43.0
+V= 0.44.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -16,7 +16,7 @@ PKGNAME-qt4= poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 36.0 # 60.0
+SHARED_LIBS += poppler 37.0 # 61.0
SHARED_LIBS += poppler-glib 15.0 # 15.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 18.0 # 13.0
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.53
diff -u -p -r1.53 distinfo
--- distinfo1 May 2016 12:33:24 - 1.53
+++ distinfo26 May 2016 17:41:14 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.43.0.tar.xz) = xyDiaibuELfryeJW0u563NtTbPhfnxxHd6OPf4H7JFY=
+SHA256 (poppler-0.44.0.tar.xz) = W0Z+0mpV4YJNpr2G9fVisbRVggacA4mMkfAa1cb6Dqs=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.43.0.tar.xz) = 1671368
+SIZE (poppler-0.44.0.tar.xz) = 1671900
Index: patches/patch-poppler_Decrypt_cc
===
RCS file: patches/patch-poppler_Decrypt_cc
diff -N patches/patch-poppler_Decrypt_cc
--- patches/patch-poppler_Decrypt_cc27 Mar 2016 20:04:25 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,88 +0,0 @@
-$OpenBSD: patch-poppler_Decrypt_cc,v 1.2 2016/03/27 20:04:25 sthen Exp $
poppler/Decrypt.cc.origMon Mar 14 13:18:16 2016
-+++ poppler/Decrypt.cc Sun Mar 27 14:03:21 2016
-@@ -1444,22 +1444,22 @@ static void sha256(Guchar *msg, int msgLen, Guchar *ha
- //
- // SHA 384 and SHA 512 use the same sequence of eighty constant 64 bit words.
- static const uint64_t K[80] = {
-- 0x428a2f98d728ae22, 0x7137449123ef65cd, 0xb5c0fbcfec4d3b2f,
0xe9b5dba58189dbbc, 0x3956c25bf348b538,
-- 0x59f111f1b605d019, 0x923f82a4af194f9b, 0xab1c5ed5da6d8118,
0xd807aa98a3030242, 0x12835b0145706fbe,
-- 0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2, 0x72be5d74f27b896f,
0x80deb1fe3b1696b1, 0x9bdc06a725c71235,
-- 0xc19bf174cf692694, 0xe49b69c19ef14ad2, 0xefbe4786384f25e3,
0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65,
-- 0x2de92c6f592b0275, 0x4a7484aa6ea6e483, 0x5cb0a9dcbd41fbd4,
0x76f988da831153b5, 0x983e5152ee66dfab,
-- 0xa831c66d2db43210, 0xb00327c898fb213f, 0xbf597fc7beef0ee4,
0xc6e00bf33da88fc2, 0xd5a79147930aa725,
-- 0x06ca6351e003826f, 0x142929670a0e6e70, 0x27b70a8546d22ffc,
0x2e1b21385c26c926, 0x4d2c6dfc5ac42aed,
-- 0x53380d139d95b3df, 0x650a73548baf63de, 0x766a0abb3c77b2a8,
0x81c2c92e47edaee6, 0x92722c851482353b,
-- 0xa2bfe8a14cf10364, 0xa81a664bbc423001, 0xc24b8b70d0f89791,
0xc76c51a30654be30, 0xd192e819d6ef5218,
-- 0xd69906245565a910, 0xf40e35855771202a, 0x106aa07032bbd1b8,
0x19a4c116b8d2d0c8, 0x1e376c085141ab53,
-- 0x2748774cdf8eeb99, 0x34b0bcb5e19b48a8, 0x391c0cb3c5c95a63,
0x4ed8aa4ae3418acb, 0x5b9cca4f7763e373,
-- 0x682e6ff3d6b2b8a3, 0x748f82ee5defb2fc, 0x78a5636f43172f60,
0x84c87814a1f0ab72, 0x8cc702081a6439ec,
-- 0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915,
0xc67178f2e372532b, 0xca273eceea26619c,
-- 0xd186b8c721c0c207, 0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178,
0x06f067aa72176fba, 0x0a637dc5a2c898a6,
-- 0x113f9804bef90dae, 0x1b710b35131c471b, 0x28db77f523047d84,
0x32caab7b40c72493, 0x3c9ebe0a15c9bebc,
-- 0x431d67c49c100d4c, 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a,
0x5fcb6fab3ad6faec, 0x6c44198c4a475817
-+ 0x428a2f98d728ae22LL, 0x7137449123ef65cdLL, 0xb5c0fbcfec4d3b2fLL,
0xe9b5dba58189dbbcLL, 0x3956c25bf348b538LL,
-+ 0x59f111f1b605d019LL, 0x923f82a4af194f9bLL, 0xab1c5ed5da6d8118LL,
0xd807aa98a3030242LL, 0x12835b0145706fbeLL,
-+ 0x243185be4ee4b28cLL, 0x550c7dc3d5ffb4e2LL, 0x72be5d74f27b896fLL,
0x80deb1fe3b1696b1LL, 0x9bdc06a725c71235LL,
-+ 0xc19bf174cf692694LL, 0xe49b69c19ef14ad2LL, 0xefbe4786384f25e3LL,
0x0fc19dc68b8cd5b5LL, 0x240ca1cc77ac9c65LL,
-+ 0x2de92c6f592b0275LL, 0x4a7484aa6ea6e483LL, 0x5cb0a9dcbd41fbd4LL,
0x76f988da831153b5LL, 0x983e5152ee66dfabLL,
-+ 0xa831c66d2db43210LL, 0xb00327c898fb213fLL, 0xbf597fc7beef0ee4LL,
0xc6e00bf33da88fc2LL, 0xd5a79147930aa725LL,
-+ 0x06ca6351e003826fLL, 0x142929670a0e6e70LL, 0x27b70a8546d22ffcLL,
0x2e1b21385c
lang/rust (was: CVS: cvs.openbsd.org: ports)
Hi,
On Sat, Jun 11, 2016 at 09:51:29PM +0100, Stuart Henderson wrote:
> +DISTFILES += rustc-bootstrap-${MACHINE_ARCH}-${BV}.tar.gz:0
>
> dpb fetching is run on all arches, including ones which are not
> listed in "ONLY_FOR_ARCHS", so whatever makes it into DISTFILES
> needs to be fetchable.
>
> Diff below is probably the easiest way out for now, unless someone
> has a better idea.
lang/ghc has a similar mechanism, just with some more indirection and
iterating over architectures.
So i think your diff is ok.
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/rust/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile 9 Jun 2016 04:20:10 - 1.24
> +++ Makefile 11 Jun 2016 20:48:33 -
> @@ -38,7 +38,9 @@ MASTER_SITES0 = http://semarie.free.fr/
>
> DIST_SUBDIR =rust
> DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
> +.if "${MACHINE_ARCH}" == "amd64"
> DISTFILES += rustc-bootstrap-${MACHINE_ARCH}-${BV}.tar.gz:0
> +.endif
>
> SUPDISTFILES = rustc-bootstrap-amd64-${BV}.tar.gz:0
Re: Sandboxing Haskell Port Builds: ghc.port.mk diff + example converters/pandoc
Hi,
On Thu, Jun 16, 2016 at 05:34:09PM -0500, Aaron Poffenberger wrote:
> Thanks to your suggestion and a pointer to the Java "maven" thread by
> Ian Darwin, I've updated the patches to ghc.port.mk to include fetching
> the cabal dependencies using DISTFILES.
>
> I tested building pandoc with networking disabled. It works.
I don't think this cabal sandbox model is suitable for ports in any
way. What will happen if we enable shared libraries for ghc (which,
according to some mails from Karel Gardas, should be possible with
ghc-8)? Where will those libraries be end up in ${LOCALBASE}?
And do you think it's useful to have several different versions of
the same haskell library sprinkled over the system?
In the pandoc port, MODGHC_CABAL_PKGS even contains library/version
combinations we already have as separate ports.
Sorry, but I'm not a big fan of this concept.
BTW, the pandoc-lib subpackage doesn't make any sense unless it
does not depend on any of the cabal packages listed in MODGHC_CABAL_PKGS,
because the libraries provided by those packages would be missing
(they aren't installed). It also wouldn't install properly because
PLIST-lib is wrong.
Ciao,
Kili
update print/poppler
Hi,
here's an update to poppler-0.45.0 (and this time I didn't need a
reminder from aja@ ;-))
Adding a major bump to poppler-cpp, because
time_type detail::convert_date(const char *date)
had been removed. Nothing external should use it, but you never
know...
Built but not yet packaged nor tested on amd64 (because I've still
a bulk build running on my test/build machine), so if anyone wants
to give it a try, go ahead ;-)
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile27 May 2016 21:14:31 - 1.106
+++ Makefile17 Jun 2016 19:20:24 -
@@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.44.0
+V= 0.45.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -16,12 +16,12 @@ PKGNAME-qt4=poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 37.0 # 61.0
+SHARED_LIBS += poppler 38.0 # 62.0
SHARED_LIBS += poppler-glib 15.0 # 15.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 18.0 # 13.0
SHARED_LIBS += poppler-qt5 0.0 # 7.0
-SHARED_LIBS += poppler-cpp 6.1 # 2.1
+SHARED_LIBS += poppler-cpp 7.0 # 2.1
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.54
diff -u -p -r1.54 distinfo
--- distinfo27 May 2016 21:14:31 - 1.54
+++ distinfo17 Jun 2016 18:46:11 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.44.0.tar.xz) = W0Z+0mpV4YJNpr2G9fVisbRVggacA4mMkfAa1cb6Dqs=
+SHA256 (poppler-0.45.0.tar.xz) = lt0aYCS82qRTCjtJaH2z1cJN39ByzLN8beDkJZlyh5g=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.44.0.tar.xz) = 1671900
+SIZE (poppler-0.45.0.tar.xz) = 1674464
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
retrieving revision 1.18
diff -u -p -r1.18 patch-configure_ac
--- patches/patch-configure_ac 1 May 2016 12:33:24 - 1.18
+++ patches/patch-configure_ac 17 Jun 2016 19:01:13 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.18 2016/05/01 12:33:24 kili Exp $
configure.ac.orig Fri Apr 29 00:30:06 2016
-+++ configure.ac Fri Apr 29 20:48:31 2016
-@@ -679,6 +679,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
+--- configure.ac.orig Fri Jun 17 00:12:16 2016
configure.ac Fri Jun 17 21:01:05 2016
+@@ -680,6 +680,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
@@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.18 2016
dnl
dnl Try Qt4
dnl
-@@ -771,31 +789,35 @@ if test x$enable_poppler_qt5 = xyes; then
+@@ -772,31 +790,35 @@ if test x$enable_poppler_qt5 = xyes; then
AC_CHECK_TOOL(MOCQT5, moc)
AC_MSG_CHECKING([for Qt5 moc])
mocversion=`$MOCQT5 -v 2>&1`
@@ -75,7 +75,7 @@ $OpenBSD: patch-configure_ac,v 1.18 2016
AC_SUBST(MOCQT5)
AC_MSG_RESULT([$MOCQT5])
fi
-@@ -996,6 +1018,9 @@ glib/reference/Makefile
+@@ -997,6 +1019,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@@ -85,7 +85,7 @@ $OpenBSD: patch-configure_ac,v 1.18 2016
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
-@@ -1031,6 +1056,7 @@ if test x$enable_cmyk = xyes;then
+@@ -1032,6 +1057,7 @@ if test x$enable_cmyk = xyes;then
echo " with CMYK support"
fi
echo " cairo output:$use_cairo"
print/poppler: disable pdfsig(1) or not?
Hi,
sthen@ pointed out that poppler with pdfsig(1) introduced dependencies
on nss, which would require WANTLIB changes on a couple of other
ports.
So we could either disable pdfsig(1) in poppler (and fix WANTLIB
in cups-filters), or keep it and fix WANTLIB in about 9 other ports.
I prefer the former, because I just have the diffs ready for it ;-)
Everyone who would be sad about poppler without pdfsig(1) for now,
please speak up.
Ciao,
Kili
Index: print/poppler/Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.107
diff -u -p -r1.107 Makefile
--- print/poppler/Makefile 19 Jun 2016 19:42:26 - 1.107
+++ print/poppler/Makefile 8 Jul 2016 20:56:21 -
@@ -16,7 +16,9 @@ PKGNAME-qt4= poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 38.0 # 62.0
+REVISION= 0
+
+SHARED_LIBS += poppler 39.0 # 62.0
SHARED_LIBS += poppler-glib 15.0 # 15.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 18.0 # 13.0
@@ -45,8 +47,7 @@ MULTI_PACKAGES=-main -qt -qt4 -qt5 -util
.include
-cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z stdc++ \
- nspr4 nss3 nss3 plc4 plds4 smime3
+cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z stdc++
.if ${BUILD_PACKAGES:M-qt}
MODULES+= x11/qt3
@@ -79,48 +80,42 @@ LIB_DEPENDS-main= \
graphics/lcms2 \
graphics/openjpeg \
graphics/png \
- graphics/tiff \
- security/nss
+ graphics/tiff
LIB_DEPENDS-qt=${MODQT3_LIB_DEPENDS} \
- print/poppler \
- security/nss
+ print/poppler
LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
- print/poppler \
- security/nss
+ print/poppler
LIB_DEPENDS-qt5=${MODQT5_LIB_DEPENDS} \
- print/poppler \
- security/nss
+ print/poppler
-LIB_DEPENDS-utils= print/poppler \
- security/nss
+LIB_DEPENDS-utils= print/poppler
WANTLIB-main= ${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 pixman-1 openjpeg X11 Xrender cairo pcre \
png pthread-stubs xcb xcb-render lcms2 xcb-shm \
- iconv intl nssutil3 plds4 softokn3 sqlite3 ssl3
+ iconv intl
WANTLIB-qt=${cWANTLIB} lcms2 openjpeg poppler png pthread-stubs \
- softokn3 ssl3 ${MODQT3_WANTLIB}
+ ${MODQT3_WANTLIB}
WANTLIB-qt4=${cWANTLIB} ${MODQT4_WANTLIB} ICE QtCore QtGui QtXml \
SM X11 Xext Xi Xinerama Xrender ffi glib-2.0 \
gobject-2.0 gthread-2.0 iconv intl lcms2 openjpeg \
- png poppler pcre pthread-stubs xcb softokn3 ssl3
+ png poppler pcre pthread-stubs xcb
WANTLIB-qt5= ${cWANTLIB} ${MODQT5_WANTLIB} ${MODGCC4_CPPWANTLIB} \
GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb \
Xdamage Xext Xfixes Xxf86vm drm execinfo ffi glapi \
glib-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz \
iconv icudata icui18n icuuc intl lcms2 openjpeg pcre \
- pcre16 png poppler pthread-stubs xcb xcb-dri2 xcb-glx \
- softokn3 ssl3
+ pcre16 png poppler pthread-stubs xcb xcb-dri2 xcb-glx
WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
png pthread-stubs xcb xcb-render xcb-shm openjpeg \
- poppler z ${cWANTLIB} softokn3 ssl3
+ poppler z ${cWANTLIB}
CONFIGURE_STYLE=autoconf
AUTOCONF_VERSION=2.69
@@ -128,7 +123,8 @@ CONFIGURE_ARGS+=--enable-xpdf-headers \
--enable-poppler-cpp \
--enable-utils \
--enable-zlib \
- --disable-gtk-test
+ --disable-gtk-test \
+ --disable-libnss
CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
Index: print/poppler/pkg/PLIST-main
===
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST-main
--- print/poppler/pkg/PLIST-main1 May 2016 12:33:24 - 1.25
+++ print/poppler/pkg/PLIST-main8 Jul 2016 20:56:21 -
@@ -56,7 +56,6 @@ include/poppler/PreScanOutputDev.h
include/poppler/ProfileData.h
include/poppler/Rendition.h
include/poppler/SecurityHandler.h
-include/poppler/SignatureHandler.h
include/poppler/SignatureInfo.h
include/poppler/Sound.h
include/poppler/SplashOutputDev.h
Index: print/poppler/pkg/PLIST-utils
===
RCS file: /cvs/ports/print/poppler/pkg/
update print/poppler
[cc'd zhuk because of the qt5 changes]
Hi,
here's an update to poppler-0.46.0, in case anyone wants do some
early tests.
In addition to the update, this also simplfies configure.ac patch
for Qt5. It looks like you can just set MOCQT52 (where the '2' has
nothing to do with any version of qt) to our moc-qt5 (after fixing
the grep command in configure.ac). The only difference I can see
in the build log is that moc-qt5 is now run with an absolute path
(i.e./usr/local/bin/moc-qt5 instead of qt5).
As usual, I'll build everything depending on poppler and run some
tests, but this will take some time.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.108
diff -u -p -r1.108 Makefile
--- Makefile9 Jul 2016 15:37:46 - 1.108
+++ Makefile30 Jul 2016 20:58:28 -
@@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.45.0
+V= 0.46.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -16,14 +16,12 @@ PKGNAME-qt4=poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-REVISION= 0
-
-SHARED_LIBS += poppler 39.0 # 62.0
-SHARED_LIBS += poppler-glib 15.0 # 15.0
+SHARED_LIBS += poppler 40.0 # 63.0
+SHARED_LIBS += poppler-glib 16.0 # 16.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
-SHARED_LIBS += poppler-qt4 18.0 # 13.0
-SHARED_LIBS += poppler-qt5 0.0 # 7.0
-SHARED_LIBS += poppler-cpp 7.0 # 2.1
+SHARED_LIBS += poppler-qt4 19.0 # 14.0
+SHARED_LIBS += poppler-qt5 1.0 # 8.0
+SHARED_LIBS += poppler-cpp 8.0 # 3.0
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
@@ -130,7 +128,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/i
LDFLAGS="-L${LOCALBASE}/lib" \
LIBJPEG_CFLAGS="-I${LOCALBASE}/include" \
ac_cv_prog_MOCQT4=${MODQT4_MOC} \
- ac_cv_prog_MOCQT5=${MODQT5_MOC}
+ ac_cv_prog_MOCQT52=${MODQT5_MOC}
USE_GMAKE= Yes
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- distinfo19 Jun 2016 19:42:26 - 1.55
+++ distinfo30 Jul 2016 20:12:16 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.45.0.tar.xz) = lt0aYCS82qRTCjtJaH2z1cJN39ByzLN8beDkJZlyh5g=
+SHA256 (poppler-0.46.0.tar.xz) = ln010T1h3uL+5la4Dv7544ip51K8ebcSPxW0nHdp5Ic=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.45.0.tar.xz) = 1674464
+SIZE (poppler-0.46.0.tar.xz) = 1680940
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
retrieving revision 1.19
diff -u -p -r1.19 patch-configure_ac
--- patches/patch-configure_ac 19 Jun 2016 19:42:26 - 1.19
+++ patches/patch-configure_ac 30 Jul 2016 20:48:58 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.19 2016/06/19 19:42:26 kili Exp $
configure.ac.orig Fri Jun 17 00:12:16 2016
-+++ configure.ac Fri Jun 17 21:01:05 2016
+--- configure.ac.orig Mon Jul 25 00:03:53 2016
configure.ac Sat Jul 30 22:48:42 2016
@@ -680,6 +680,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
@@ -26,56 +26,16 @@ $OpenBSD: patch-configure_ac,v 1.19 2016
dnl
dnl Try Qt4
dnl
-@@ -772,31 +790,35 @@ if test x$enable_poppler_qt5 = xyes; then
- AC_CHECK_TOOL(MOCQT5, moc)
- AC_MSG_CHECKING([for Qt5 moc])
- mocversion=`$MOCQT5 -v 2>&1`
-- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
-- if test x"$mocversiongrep" != x"$mocversion"; then
-+ case $mocversion in
-+ *Qt\ 5*|*moc\ 5*)
-+;;
-+ *)
- AC_MSG_RESULT([no])
- # moc was not the qt5 one, try with moc-qt5
+@@ -779,7 +797,7 @@ if test x$enable_poppler_qt5 = xyes; then
AC_CHECK_TOOL(MOCQT52, moc-qt5)
AC_MSG_CHECKING([for Qt5 moc-qt5])
mocversion=`$MOCQT52 -v 2>&1`
-mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
--if test x"$mocversiongrep" != x"$mocversion"; then
-+case $mocversion in
-+*Qt\ 5*|*moc\ 5*|*moc-qt5\ 5*)
-+ MOCQT5=$MOCQT52
-+ ;;
-+*)
++mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
+ if test x"$mocversiongrep" != x"$mocversion"; then
AC_CHECK_TOOL(QTCHOOSER, qtchooser)
AC_MSG_CHECKING([for qtchooser])
- qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut
-d '=' -f 2 | cut -d \" -f 2`
- mocversion=`$qt5tooldir/moc -v 2>&1`
--
Re: update print/poppler
On Mon, Aug 01, 2016 at 11:43:26AM +0300, Vadim Zhukov wrote: > Date: Mon, 1 Aug 2016 11:43:26 +0300 > From: Vadim Zhukov > To: Matthias Kilian > Cc: "ports@openbsd.org" , a...@openbsd.org > Subject: Re: update print/poppler > Message-ID: > > > 2016-07-31 0:24 GMT+03:00 Matthias Kilian : > > In addition to the update, this also simplfies configure.ac patch > > for Qt5. It looks like you can just set MOCQT52 (where the '2' has > > nothing to do with any version of qt) to our moc-qt5 (after fixing > > the grep command in configure.ac). The only difference I can see > > in the build log is that moc-qt5 is now run with an absolute path > > (i.e./usr/local/bin/moc-qt5 instead of qt5). [...] > The ac_cv_MOCQT52 in CONFIGURE_ENV isn't needed, the configure script > picks up moc-qt5 from /usr/local/bin, which is correct thing. Thanks for the hint. > Also, I've had a failure with building Qt3 backend; I didn't look in > thoroughly yet, though, so it could be PEBKAC. I built it several time now, both with dpb and directly from the port directory (using env FLAVOR= make ...), without noticing any qt3 problems. CIao, Kili
Re: Haskell wxneeded
Hi, On Mon, Aug 08, 2016 at 01:07:57PM +0200, Martijn Rijkeboer wrote: > How do I set the wxneeded flag for Haskell? I tried the following in my > cabal file, but to no avail: > > ghc-options: -optl -Wl,-z,wxneeded > ld-options: -optl -Wl,-z,wxneeded > > I have also tried the ld-options flag without the '-optl'. When I try > to compile my yesod app I get the following: > > ghc: mmap 630784 bytes at 0x4000: Not supported > ghc: Try specifying an address with +RTS -xm -RTS > ghc: panic! (the 'impossible' happened) > (GHC version 7.10.3 for x86_64-unknown-openbsd): > loadObj > "/usr/local/lib/ghc/ghcpr_8TmvWUcS1U1IKHT0levwg3/HSghc-prim-0.4.0.0-8TmvWUcS1U1IKHT0levwg3.o": > failed Looks like it's ghc itself failing here while trying to dynamically load ghc-prim. I'll try to write a patch for ghc which marks it as wxneeded as a workaround. A real fix would be either hacking on ghcs dynamic loader or trying to update to a newer ghc. @Karel Gardas and anyone else who is playing with the newest upstream ghc (8.x): If you have some time, could you please try to build some hs-programs or libraries for which naddy@ reported w^x violations recently with ghc-8 (and probably cabal-install, because I don't think this will work with the hs-libraries we currently have in the ports tree)? I'd owe you unlimited amounts of beer for such a test, of course ;-) Ciao, Kili
Re: UPDATE: hs-async-2.1.0
Hi,
On Mon, Aug 08, 2016 at 11:01:43AM +0200, David Coppa wrote:
> Update async to the latest version, 2.1.0.
>
> Index: hs-async/Makefile
> ===
> RCS file: /cvs/ports/devel/hs-async/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- hs-async/Makefile 29 Jan 2016 20:28:07 - 1.10
> +++ hs-async/Makefile 8 Aug 2016 08:45:27 -
> @@ -6,8 +6,7 @@ COMMENT = asynchronous IO operations
> # Please do *not* update without thinking.
> PORTROACH = ignore:1
>
> -DISTNAME = async-2.0.2
> -REVISION = 1
> +DISTNAME = async-2.1.0
> CATEGORIES = devel
>
> MAINTAINER = Matthias Kilian
> @@ -19,7 +18,7 @@ MODULES = lang/ghc
>
> MODGHC_BUILD = cabal hackage haddock register
>
> -MODGHC_PACKAGE_KEY = DTdw00O3YMaL0S98EkJDXS
> +MODGHC_PACKAGE_KEY = 5jwpzKVjQQAElehhWvNUXP
>
> BUILD_DEPENDS = ${RUN_DEPENDS}
> RUN_DEPENDS =devel/hs-stm>=2.2,<2.5
> Index: hs-async/distinfo
> ===
> RCS file: /cvs/ports/devel/hs-async/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- hs-async/distinfo 19 Sep 2015 07:53:09 - 1.4
> +++ hs-async/distinfo 8 Aug 2016 08:45:27 -
> @@ -1,2 +1,2 @@
> -SHA256 (ghc/async-2.0.2.tar.gz) =
> 21TThCWe7i88pSWCH0X+UJuaEB+/Oo33EyqpYiYm/Ss=
> -SIZE (ghc/async-2.0.2.tar.gz) = 8565
> +SHA256 (ghc/async-2.1.0.tar.gz) =
> k8N2EfnGi1zcjNmWCud6f7wl2oPK6QE37xN42FfyLC8=
> +SIZE (ghc/async-2.1.0.tar.gz) = 9293
[...]
Ok. But please be aware that this requires a change to
meta/haskell-platform which I'll commit this evening.
(haskell-platform-2016 already references async-2.1.0, and the
haskell stuff needs to be updated during this release cycle anyways).
Ciao,
Kili
Re: Haskell wxneeded
Hi, On Tue, Aug 09, 2016 at 10:20:47AM +0200, Martijn Rijkeboer wrote: > > A real fix would be either hacking on ghcs dynamic loader or trying > > to update to a newer ghc. > > For now I would like to stick to 7.10.3 because I'm using Stackage LTS > which targets that version. But I want to move forward with ghc (because ghc-8 works much better on OpenBSD as Karel Gardas wrote some time ago). Not necessarily right now, but at least during this release cycle (i.e. before OpenBSD 6.1). Ciao, Kili
Re: Haskell wxneeded
Hi Karel, On Sat, Aug 13, 2016 at 06:56:39PM +0200, Karel Gardas wrote: > > $ ./inplace/bin/ghc-stage2 --interactive > > GHCi, version 8.1.20160812: http://www.haskell.org/ghc/ :? for help > > Prelude> 1+1 > > 2 > > Prelude> :q > > Leaving GHCi. > > $ > > > > I'll try to propagate those fixes to GHC HEAD... > > FYI: The fixes are here: > > https://phabricator.haskell.org/D2453 > https://phabricator.haskell.org/D2454 The wxneeded "fix" is really just a workaround. Right now I'm building and then testing a ghc-7.10.3 that - doas *not* link with -z wxneeded, - uses mmap with PROT_READ | PROT_WRITE in rts/Linker.c - uses mprotect with PROT_READ | PROT_EXEC right after loading and resolving an object in Linker.c (i.e., just plain W^X) Results should be available tomorrow. > if you do have any objections feel free to comment on phabricator... If the testing goes well, I'll add a comment there. Ciao, Kili
Update print/poppler
Here comes the monthly poppler update. Only some bugfixes and the non-gnu-grep fix to configure.ac, no interface changes this time. I'll test and commit it when my builds finish (probably in a day or two), but in case anyone wants to run some special tests... Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.109 diff -u -p -r1.109 Makefile --- Makefile1 Aug 2016 18:35:40 - 1.109 +++ Makefile20 Aug 2016 20:30:00 - @@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.46.0 +V= 0.47.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.56 diff -u -p -r1.56 distinfo --- distinfo1 Aug 2016 18:35:40 - 1.56 +++ distinfo20 Aug 2016 20:30:00 - @@ -1,4 +1,4 @@ SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80= -SHA256 (poppler-0.46.0.tar.xz) = ln010T1h3uL+5la4Dv7544ip51K8ebcSPxW0nHdp5Ic= +SHA256 (poppler-0.47.0.tar.xz) = uHLnIo/DSnHOS0elrqKleuZ1KIGPqEbh4O2giTGb0kI= SIZE (poppler-0.16.7.tar.gz) = 1952179 -SIZE (poppler-0.46.0.tar.xz) = 1680940 +SIZE (poppler-0.47.0.tar.xz) = 1682184 Index: patches/patch-configure_ac === RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v retrieving revision 1.20 diff -u -p -r1.20 patch-configure_ac --- patches/patch-configure_ac 1 Aug 2016 18:35:40 - 1.20 +++ patches/patch-configure_ac 20 Aug 2016 20:30:00 - @@ -26,15 +26,6 @@ $OpenBSD: patch-configure_ac,v 1.20 2016 dnl dnl Try Qt4 dnl -@@ -779,7 +797,7 @@ if test x$enable_poppler_qt5 = xyes; then - AC_CHECK_TOOL(MOCQT52, moc-qt5) - AC_MSG_CHECKING([for Qt5 moc-qt5]) - mocversion=`$MOCQT52 -v 2>&1` --mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"` -+mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"` - if test x"$mocversiongrep" != x"$mocversion"; then - AC_CHECK_TOOL(QTCHOOSER, qtchooser) - AC_MSG_CHECKING([for qtchooser]) @@ -997,6 +1015,9 @@ glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile Ciao, Kili
Re: Haskell wxneeded
hi, On Thu, Aug 11, 2016 at 09:37:57AM +0200, Martijn Rijkeboer wrote: > On 2016-08-10 22:04, Matthias Kilian wrote: > > But I want to move forward with ghc (because ghc-8 works much better > > on OpenBSD as Karel Gardas wrote some time ago). Not necessarily > > right now, but at least during this release cycle (i.e. before > > OpenBSD 6.1). > > Would it be possible to have multiple versions of GHC like the way it is > done with Erlang or would that be too much work? Only if the older version of ghc is standalone (no ghc.port.mk, no support for any hs-packages for it, and it would conflict with ghc-8, i.e. you can't install both ghc-7 and ghc-8 packages). And if the bulk builders don't complain about something like ghc-lts in the ports tree. Ciao, Kili
Re: darcs w^x trouble
Hi,
On Thu, Sep 01, 2016 at 10:27:24AM +0200, Karel Gardas wrote:
> I'm not sure if USE_WXNEEDED is also applicable to Haskell-based
> ports.
Looking at /usr/local/lib/ghc/settings, it isn't. My latest changed
to lang/ghc (rev. 1.141 of lang/ghc/Makefile) added USE_WXNEEDED =
Yes and removed the explicit -Wl,-z,wxneeded from
CONF_GCC_LINKER_OPTS_STAGE{1,2}. The latter was probably wrong.
I'll check this tomorrow and revert the removal of the explicit
-Wl,-z,wxneeded if necessary.
Sorry for the inconvenience.
Ciao,
Kili
Re: darcs w^x trouble
Hi, On Thu, Sep 01, 2016 at 10:27:24AM +0200, Karel Gardas wrote: > I'm not sure if USE_WXNEEDED is also applicable to Haskell-based > ports. Please forget my previous mail ;-) Actually it is applicable, because at least haskell programs using Setup.l?hs (i.e. cabal) are linked with the ld-wrapper script. And for darcs, the W^X violations comes from the ghc runtime, but via some c bits in devel/hs-mmap, which is only used by darcs, so I hope darcs is the only haskell program which this problem. Ciao, Kili
update print/poppler
Update to poppler-0.38.0.
Tests are welcome, including a bulk build test (I've some hard times
on my build machine, so I couldn't run a complete build yet).
Denoised upstream diff for reviews:
https://openbsd.dead-parrot.de/poppler-0.37-0.38.diff
In that diff, I can't see any reason for the upstream bump of
poppler-qt4, so I'm not touching it for our port.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- Makefile11 Oct 2015 15:50:49 - 1.98
+++ Makefile18 Nov 2015 20:16:15 -
@@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.37.0
+V= 0.38.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -14,10 +14,10 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 32.0 # 55.0
+SHARED_LIBS += poppler 33.0 # 57.0
SHARED_LIBS += poppler-glib 14.0 # 15.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
-SHARED_LIBS += poppler-qt4 18.0 # 12.0
+SHARED_LIBS += poppler-qt4 18.0 # 13.0
SHARED_LIBS += poppler-cpp 6.1 # 2.1
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.47
diff -u -p -r1.47 distinfo
--- distinfo11 Oct 2015 15:50:49 - 1.47
+++ distinfo18 Nov 2015 19:45:32 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.37.0.tar.xz) = uJ+cXq47uxBGsPdncUr9deyhAqBAajowhWd41CpoW+4=
+SHA256 (poppler-0.38.0.tar.xz) = bwwNScg0bXwM/mNIEk5/GcyQG101yc2JlEqsbkVOios=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.37.0.tar.xz) = 1636496
+SIZE (poppler-0.38.0.tar.xz) = 1637772
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile_in
--- patches/patch-Makefile_in 11 Oct 2015 15:50:49 - 1.11
+++ patches/patch-Makefile_in 18 Nov 2015 19:45:32 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.11 2015/10/11 15:50:49 kili Exp $
Makefile.in.orig Fri Oct 9 18:25:46 2015
-+++ Makefile.inSat Oct 10 10:16:15 2015
+--- Makefile.in.orig Mon Nov 16 21:45:23 2015
Makefile.inWed Nov 18 19:59:20 2015
@@ -386,6 +386,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2015/
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -473,13 +477,15 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
+@@ -474,13 +478,15 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
@BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
@BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
@BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
@@ -36,7 +36,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2015/
# Add CMake buildsystem files here so they get added on make dist
EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
-@@ -524,6 +530,7 @@ pkgconfig_DATA = \
+@@ -525,6 +531,7 @@ pkgconfig_DATA = \
$(cairo_pc_file)\
$(splash_pc_file) \
$(glib_pc_file) \
@@ -44,7 +44,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2015/
$(qt4_pc_file) \
$(qt5_pc_file) \
$(cpp_pc_file)
-@@ -595,6 +602,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
+@@ -596,6 +603,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
poppler-glib.pc: $(top_builddir)/config.status $(srcdir)/poppler-glib.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
poppler-glib-uninstalled.pc: $(top_builddir)/config.status
$(srcdir)/poppler-glib-uninstalled.pc.in
Re: Build Qt5 subpackage
Hi Vadim,
On Tue, Nov 24, 2015 at 12:31:08AM +0300, Vadim Zhukov wrote:
> This patch adds Qt5 support to poppler, resulting in one more
> subpackage (guess it's name!) and a few more hunks to the patch
> for configure script.
>
> I need this for KDE Frameworks (i.e., KDE5 core libraries). Tested
> on amd64 for a few releases of poppler already.
>
> Okay?
I've no problem with this, but as sthen noticed, it pulls in both
libstdc++ and libestdc++, as can also seen with objdump:
objdump -p poppler-0.38.0/fake-amd64/usr/local/lib/libpoppler-qt5.so.0.0 | grep
stdc
NEEDED libstdc++.so.57.0
NEEDED libestdc++.so.17.0
But if this causes trouble, it could be fixed later, so ok for now.
Ciao,
Kili
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.99
> diff -u -p -r1.99 Makefile
> --- Makefile 20 Nov 2015 07:47:44 - 1.99
> +++ Makefile 23 Nov 2015 20:35:09 -
> @@ -3,6 +3,7 @@
> COMMENT-main=PDF rendering library
> COMMENT-qt= qt interface to PDF rendering library
> COMMENT-qt4= qt4 interface to PDF rendering library
> +COMMENT-qt5= Qt5 interface to PDF rendering library
> COMMENT-utils= PDF conversion tools and utilities
>
> V= 0.38.0
> @@ -12,12 +13,14 @@ PKGNAME-main= poppler-$V
> PKGNAME-utils= poppler-utils-$V
> PKGNAME-qt= poppler-qt-$V
> PKGNAME-qt4= poppler-qt4-$V
> +PKGNAME-qt5= poppler-qt5-$V
> OLDSHIT =poppler-0.16.7
>
> SHARED_LIBS += poppler 33.0 # 57.0
> SHARED_LIBS += poppler-glib 14.0 # 15.0
> SHARED_LIBS += poppler-qt 12.0 # 3.0
> SHARED_LIBS += poppler-qt4 18.0 # 13.0
> +SHARED_LIBS += poppler-qt5 0.0 # 10.0
> SHARED_LIBS += poppler-cpp 6.1 # 2.1
>
> DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
> @@ -31,13 +34,14 @@ PERMIT_PACKAGE_CDROM= Yes
>
> MASTER_SITES=${HOMEPAGE}
>
> -PSEUDO_FLAVORS=no_qt no_qt4 bootstrap
> +PSEUDO_FLAVORS=no_qt no_qt4 no_qt5 bootstrap
> # XXX not strictly a bootstrap loop, but on the critical path for libreoffice
> -FLAVOR?=no_qt no_qt4 bootstrap
> +FLAVOR?=no_qt no_qt4 no_qt5 bootstrap
>
> NOT_FOR_ARCHS-qt4 = arm
> +NOT_FOR_ARCHS-qt5 = arm
>
> -MULTI_PACKAGES=-main -qt -qt4 -utils
> +MULTI_PACKAGES=-main -qt -qt4 -qt5 -utils
>
> .include
>
> @@ -55,8 +59,11 @@ MODULES+= x11/qt4
> CONFIGURE_ARGS+= --disable-poppler-qt4
> .endif
>
> -# until Qt5 is enabled
> +.if ${BUILD_PACKAGES:M-qt5}
> +MODULES+=x11/qt5
> +.else
> CONFIGURE_ARGS+= --disable-poppler-qt5
> +.endif
>
> MODULES+=devel/gettext
>
> @@ -79,6 +86,9 @@ LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \
> LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
> print/poppler
>
> +LIB_DEPENDS-qt5=${MODQT5_LIB_DEPENDS} \
> + print/poppler
> +
> LIB_DEPENDS-utils= print/poppler
>
> WANTLIB-main=${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \
> @@ -91,6 +101,12 @@ WANTLIB-qt4=${cWANTLIB} ${MODQT4_WAN
> SM X11 Xext Xi Xinerama Xrender ffi glib-2.0 \
> gobject-2.0 gthread-2.0 iconv intl lcms2 openjpeg \
> png poppler pcre pthread-stubs xcb
> +WANTLIB-qt5= ${cWANTLIB} ${MODQT5_WANTLIB} ${MODGCC4_CPPWANTLIB} \
> + GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb Xau \
> + Xdamage Xdmcp Xext Xfixes Xxf86vm drm execinfo ffi glapi \
> + glib-2.0 gobject-2.0 gthread-2.0 iconv icudata icui18n \
> + icuuc intl lcms2 openjpeg pcre pcre16 png poppler \
> + pthread-stubs xcb xcb-dri2 xcb-glx
> WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
> png pthread-stubs xcb xcb-render xcb-shm openjpeg \
> poppler z ${cWANTLIB}
> @@ -105,10 +121,19 @@ CONFIGURE_ARGS+=--enable-xpdf-headers \
>
> CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib" \
> - LIBJPEG_CFLAGS="-I${LOCALBASE}/include"
> + LIBJPEG_CFLAGS="-I${LOCALBASE}/include" \
> + ac_cv_prog_MOCQT4=${MODQT4_MOC} \
> + ac_cv_prog_MOCQT5=${MODQT5_MOC}
>
> USE_GMAKE= Yes
>
> +MAIN_CC= /usr/bin/cc
> +MAIN_CXX=/usr/bin/c++
> +.if "${USE_CCACHE:L}" == "yes"
> +MAIN_CC:=ccache ${MAIN_CC}
> +MAIN_CXX:= ccache ${MAIN_CXX}
> +.endif
> +
> post-extract:
> cd ${WRKDIST} && \
> for i in poppler-qt-uninstalled.pc.in poppler-qt.pc.cmake \
> @@ -117,5 +142,12 @@ post-extract:
> done; \
> ln -sf ../../${OLDSHIT}/m4/qt.m4 m4/qt.m4
> cd ${WRKDIST} && cp -R ../${OLDSHIT}/qt qt
> +
> +post-configure:
> + find ${WRKBUILD} -name Makefile \! -path '*/qt5/*' -print0 | xargs -0 \
> + perl -pi -e 's,^CC = \S+,CC = ${MAIN_CC},;' \
> +
Re: update graphics/potrace
Hi, On Fri, Nov 20, 2015 at 10:32:12PM +0100, Daniel Jakots wrote: > The shared_libs.log shows that the minor was bumped though I can't see > any difference between the old and the new one with `nm -g lib.so.X.Y | > cut -c10- | grep -e^T` so I'm not sure, in doubt I bumped the minor too. Nor do I see any relevant changes when looking at a diff between potrace-1.12 and potrace-1.13 sources. But a minor bump is cheap, so let's keep it. Any objections to commit Daniels diff? Ciao, Kili ps: builT and ran make test on amd64 > Index: Makefile > === > RCS file: /cvs/ports/graphics/potrace/Makefile,v > retrieving revision 1.7 > diff -u -p -r1.7 Makefile > --- Makefile 19 Jun 2015 14:23:33 - 1.7 > +++ Makefile 20 Nov 2015 21:22:42 - > @@ -2,8 +2,8 @@ > > COMMENT= transforming bitmaps into vector graphics > > -DISTNAME=potrace-1.12 > -SHARED_LIBS += potrace 0.0 # 0.2 > +DISTNAME=potrace-1.13 > +SHARED_LIBS += potrace 0.1 # 0.3 > CATEGORIES= graphics > > HOMEPAGE=http://potrace.sourceforge.net > Index: distinfo > === > RCS file: /cvs/ports/graphics/potrace/distinfo,v > retrieving revision 1.4 > diff -u -p -r1.4 distinfo > --- distinfo 19 Jun 2015 14:23:33 - 1.4 > +++ distinfo 20 Nov 2015 21:22:42 - > @@ -1,2 +1,2 @@ > -SHA256 (potrace-1.12.tar.gz) = sLvx17rb6/y5kigPA4k2KBtH3briEuiukehjzgt2Fzs= > -SIZE (potrace-1.12.tar.gz) = 604946 > +SHA256 (potrace-1.13.tar.gz) = YlJDi2tmRLm2KYBWtMXeNpCh1OhitmiJq+Ie7N8Wt4Q= > +SIZE (potrace-1.13.tar.gz) = 605931
'Could not find module' when working on new hs-ports
Hi, abieiber just ran into this problem while working on a new hs- port. I'm not sure wether I mentioned it anywhere except in the commit message, so: When working on a new hs- port or on an update of an existing one, you should run /usr/ports/lang/ghc/files/fixup-hs-plist on the ports PLIST after creating / updating it. The script will do some reordering of PLIST entries (register.sh, unregister.sh) and, more important, add @exec and @unexec entries. Otherwise you'll end up with a nice installable package which doesn't show up when running ghc-pkg list Ciao, Kili
new: devel/hs-half
Hi, this new port is a requirement for an update of meta/haskell-platform to 7.10.3. (To be exact, it's dependency of graphics/hs-OpenGLRaw 2.6.0.0, which is part of haskell-platform 7.10.3) ok to import? Description: This package supplies half-precision floating point values w/ 1 bit of sign, 5 bits of exponent, 11 bits of mantissa trailing a leading 1 bit with proper underflow. These arise commonly in GPU applications. Ciao, Kili hs-half.tgz Description: application/tar-gz
update meta/haskell-platform and some related ports
Hi,
This updates meta/haskell-platform to 7.10.3 and the following related
ports:
devel/hs-HUnit (to 1.3.0.0)
devel/hs-StateVar (to 1.1.0.1)
devel/hs-case-insensitive (to 1.2.0.5)
devel/hs-fgl (to 5.5.2.3)
devel/hs-primitive (to 0.6.1.0)
devel/hs-syb (to 0.6)
graphics/hs-GLURaw (to 1.5.0.2)
graphics/hs-GLUT (to 2.7.0.3)
graphics/hs-OpenGL (to 2.13.1.0)
graphics/hs-OpenGLRaw (to 2.6.0.0)
It also needs the update of lang/ghc and the new devel/hs-half i
sent a few days ago. And all other hs-* ports will get new
MODGHC_PACKAGE_KEYs and bumps because of the ghc update (I'll not
send diffs for those, because they are just boring; even more boring
than the below diffs).
Ciao,
Kili
Index: meta/haskell-platform/Makefile
===
RCS file: /cvs/ports/meta/haskell-platform/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- meta/haskell-platform/Makefile 19 Sep 2015 08:23:58 - 1.12
+++ meta/haskell-platform/Makefile 14 Dec 2015 19:36:55 -
@@ -2,7 +2,7 @@
COMMENT = Haskell platform meta-package
-PKGNAME = haskell-platform-7.10.2
+PKGNAME = haskell-platform-7.10.3
EPOCH =0
HOMEPAGE = http://hackage.haskell.org/platform/
@@ -11,15 +11,15 @@ MAINTAINER = Matthias Kilian http://hunit.sourceforge.net/
@@ -18,6 +17,6 @@ MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
-MODGHC_PACKAGE_KEY = BtnRLgvPKTa5fiI6MJ17K4
+MODGHC_PACKAGE_KEY = BG7FInvjg0k8rLNKmL1VFA
.include
Index: devel/hs-HUnit/distinfo
===
RCS file: /cvs/ports/devel/hs-HUnit/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- devel/hs-HUnit/distinfo 18 Jul 2013 21:50:16 - 1.6
+++ devel/hs-HUnit/distinfo 14 Dec 2015 19:36:55 -
@@ -1,2 +1,2 @@
-SHA256 (ghc/HUnit-1.2.5.2.tar.gz) =
CvWtNNuifeSLlM5tX37jqmr2GDvcSjlnuBHihSA2mkE=
-SIZE (ghc/HUnit-1.2.5.2.tar.gz) = 24889
+SHA256 (ghc/HUnit-1.3.0.0.tar.gz) =
4TDblTojENLCVqOSOvAlC+bqGTF/fTabVtSPhM+WpVw=
+SIZE (ghc/HUnit-1.3.0.0.tar.gz) = 22814
Index: devel/hs-HUnit/pkg/PLIST
===
RCS file: /cvs/ports/devel/hs-HUnit/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- devel/hs-HUnit/pkg/PLIST19 Sep 2015 07:51:55 - 1.10
+++ devel/hs-HUnit/pkg/PLIST14 Dec 2015 19:36:55 -
@@ -1,8 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2015/09/19 07:51:55 kili Exp $
-@comment bin/basic-tests
-@comment bin/extended-tests
-@comment bin/optimize-1-tests
-@comment bin/terminal-tests
lib/ghc/${DISTNAME}/
lib/ghc/${DISTNAME}/HS${DISTNAME}-${MODGHC_PACKAGE_KEY}.o
lib/ghc/${DISTNAME}/Test/
@@ -45,7 +41,7 @@ share/doc/hs-${DISTNAME}/html/ocean.css
share/doc/hs-${DISTNAME}/html/plus.gif
share/doc/hs-${DISTNAME}/html/synopsis.png
share/hs-${DISTNAME}/
-share/hs-${DISTNAME}/README
+share/hs-${DISTNAME}/README.md
share/hs-${DISTNAME}/doc/
share/hs-${DISTNAME}/doc/Guide.html
share/hs-${DISTNAME}/examples/
Index: devel/hs-StateVar/Makefile
===
RCS file: /cvs/ports/devel/hs-StateVar/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- devel/hs-StateVar/Makefile 11 Sep 2015 18:49:53 - 1.1.1.1
+++ devel/hs-StateVar/Makefile 14 Dec 2015 19:36:55 -
@@ -4,7 +4,7 @@ COMMENT = State variables
# Dependency of meta/haskell-platform.
# Please do *not* update without thinking.
-DISTNAME = StateVar-1.1.0.0
+DISTNAME = StateVar-1.1.0.1
CATEGORIES = devel
MAINTAINER = Matthias Kilian
@@ -16,7 +16,7 @@ MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
-MODGHC_PACKAGE_KEY = 6iqvTorEoPGBvP2zy1zFJg
+MODGHC_PACKAGE_KEY = FY3ACHU7buPKhi6jREemUn
BUILD_DEPENDS =${RUN_DEPENDS}
RUN_DEPENDS = devel/hs-stm>=2.0,<2.5
Index: devel/hs-StateVar/distinfo
===
RCS file: /cvs/ports/devel/hs-StateVar/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- devel/hs-StateVar/distinfo 11 Sep 2015 18:49:53 - 1.1.1.1
+++ devel/hs-StateVar/distinfo 14 Dec 2015 19:36:55 -
@@ -1,2 +1,2 @@
-SHA256 (ghc/StateVar-1.1.0.0.tar.gz) =
oZlj8BTUUWMDWjxU5SZrMd/lOmQOU9hp7pRu/Pl5PX4=
-SIZE (ghc/StateVar-1.1.0.0.tar.gz) = 4265
+SHA256 (ghc/StateVar-1.1.0.1.tar.gz) =
Dq55zMWFCfIwLLkPIwbWuy8YBaKEcFj6ZD0YzDcL5ao=
+SIZE (ghc/StateVar-1.1.0.1.tar.gz) = 4462
Index: devel/hs-case-insensitive/Makefile
===
RCS file: /cvs/ports/devel/hs-case-insensitive/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- devel/hs-case-insensitive/Makefile 19 Sep 2015 07:53:46 - 1.10
+++ devel/hs-case-
update print/poppler
Hi, Update to poppler-0.39.0. The major bump to libpoppler-glib is necessary because the removal of a function. >From NEWS: core: * Ignore the alternateSpace and tintTransform. Bug #92381 * CairoOutputDev: Scale radial pattern. Bug #22098 * CairoOutputDev: Implement function shading using mesh gradients. Bug #88394 * Regression test improvements * Fix typos in error messages build system: * Visual Studio 2015 now supports snprintf. Bug #93116 utils: * pdftops: fix %%PageBoundingBox. Bug #87161 * pdftocairo: Fix double free when both user and owner passwords are given glib: * Add duration_real to PopplerPageTransition. Bug #92040 * Remove enum PopplerOrientation from API. Bug #93229 * documentation improvements * glib-demo improvements I'll start a bulk update test with this on amd64 in a few minutes. As always, tests, comments and oks are welcome. Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.100 diff -u -p -r1.100 Makefile --- Makefile14 Dec 2015 14:25:47 - 1.100 +++ Makefile17 Dec 2015 19:48:04 - @@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.38.0 +V= 0.39.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -16,8 +16,8 @@ PKGNAME-qt4= poppler-qt4-$V PKGNAME-qt5= poppler-qt5-$V OLDSHIT = poppler-0.16.7 -SHARED_LIBS += poppler 33.0 # 57.0 -SHARED_LIBS += poppler-glib 14.0 # 15.0 +SHARED_LIBS += poppler 34.0 # 58.0 +SHARED_LIBS += poppler-glib 15.0 # 15.0 SHARED_LIBS += poppler-qt 12.0 # 3.0 SHARED_LIBS += poppler-qt4 18.0 # 13.0 SHARED_LIBS += poppler-qt5 0.0 # 7.0 Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.48 diff -u -p -r1.48 distinfo --- distinfo20 Nov 2015 07:47:44 - 1.48 +++ distinfo17 Dec 2015 19:48:04 - @@ -1,4 +1,4 @@ SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80= -SHA256 (poppler-0.38.0.tar.xz) = bwwNScg0bXwM/mNIEk5/GcyQG101yc2JlEqsbkVOios= +SHA256 (poppler-0.39.0.tar.xz) = r9db76nDpB4dd1XE5D3qcM/Y8aTawRjoMDLLtBzhe7k= SIZE (poppler-0.16.7.tar.gz) = 1952179 -SIZE (poppler-0.38.0.tar.xz) = 1637772 +SIZE (poppler-0.39.0.tar.xz) = 1641156 Index: patches/patch-aclocal_m4 === RCS file: /cvs/ports/print/poppler/patches/patch-aclocal_m4,v retrieving revision 1.9 diff -u -p -r1.9 patch-aclocal_m4 --- patches/patch-aclocal_m411 Oct 2015 15:50:49 - 1.9 +++ patches/patch-aclocal_m417 Dec 2015 19:48:04 - @@ -1,7 +1,7 @@ $OpenBSD: patch-aclocal_m4,v 1.9 2015/10/11 15:50:49 kili Exp $ aclocal.m4.origFri Oct 9 18:25:45 2015 -+++ aclocal.m4 Sat Oct 10 10:16:14 2015 -@@ -2373,6 +2373,7 @@ m4_include([m4/define-dir.m4]) +--- aclocal.m4.origThu Dec 17 00:10:12 2015 aclocal.m4 Thu Dec 17 20:12:20 2015 +@@ -2434,6 +2434,7 @@ m4_include([m4/define-dir.m4]) m4_include([m4/gtk-doc.m4]) m4_include([m4/iconv.m4]) m4_include([m4/introspection.m4]) Index: patches/patch-configure_ac === RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v retrieving revision 1.15 diff -u -p -r1.15 patch-configure_ac --- patches/patch-configure_ac 14 Dec 2015 14:25:47 - 1.15 +++ patches/patch-configure_ac 17 Dec 2015 19:48:04 - @@ -1,6 +1,6 @@ $OpenBSD: patch-configure_ac,v 1.15 2015/12/14 14:25:47 zhuk Exp $ configure.ac.orig Sun Aug 9 18:28:07 2015 -+++ configure.ac Thu Aug 13 20:03:50 2015 +--- configure.ac.orig Thu Dec 17 00:07:03 2015 configure.ac Thu Dec 17 20:12:20 2015 @@ -643,6 +643,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES) GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) @@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.15 2015 dnl dnl Try Qt4 dnl -@@ -682,31 +700,35 @@ if test x$enable_poppler_qt5 = xyes; then +@@ -735,31 +753,35 @@ if test x$enable_poppler_qt5 = xyes; then AC_CHECK_TOOL(MOCQT5, moc) AC_MSG_CHECKING([for Qt5 moc]) mocversion=`$MOCQT5 -v 2>&1` @@ -75,7 +75,7 @@ $OpenBSD: patch-configure_ac,v 1.15 2015 AC_SUBST(MOCQT5) AC_MSG_RESULT([$MOCQT5]) fi -@@ -907,6 +929,9 @@ glib/reference/Makefile +@@ -960,6 +982,9 @@ glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile test/Makefile @@ -85,7 +85,7 @@ $OpenBSD: patch-configure_ac,v 1.15 2015 qt4/Makefile qt4/src/Makefile qt4/
print/py-poppler (was: update print/poppler)
Hi,
On Thu, Dec 17, 2015 at 09:01:58PM +0100, Matthias Kilian wrote:
> Update to poppler-0.39.0. The major bump to libpoppler-glib is
> necessary because the removal of a function.
This appears to break print/py-poppler. Here's a fix for it. Any
objections?
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/py-poppler/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile5 May 2015 17:00:18 - 1.10
+++ Makefile18 Dec 2015 08:19:57 -
@@ -6,7 +6,7 @@ DISTNAME= pypoppler-0.12.1
PKGNAME=${DISTNAME:S/^py/py-/}
CATEGORIES=print
-REVISION= 6
+REVISION= 7
MASTER_SITES= ${HOMEPAGE}/trunk/development/+download/
HOMEPAGE= http://launchpad.net/poppler-python/
Index: patches/patch-poppler_defs
===
RCS file: /cvs/ports/print/py-poppler/patches/patch-poppler_defs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-poppler_defs
--- patches/patch-poppler_defs 27 Apr 2013 16:02:59 - 1.2
+++ patches/patch-poppler_defs 18 Dec 2015 12:00:55 -
@@ -8,8 +8,39 @@ And follow API changes from poppler-0.16
--- poppler.defs.orig Sun Sep 27 11:07:59 2009
-+++ poppler.defs Fri Apr 26 22:49:32 2013
-@@ -1646,58 +1646,6 @@
poppler.defs Fri Dec 18 13:00:41 2015
+@@ -578,18 +578,6 @@
+ )
+ )
+
+-(define-enum Orientation
+- (in-module "Poppler")
+- (c-name "PopplerOrientation")
+- (gtype-id "POPPLER_TYPE_ORIENTATION")
+- (values
+-'("portrait" "POPPLER_ORIENTATION_PORTRAIT")
+-'("landscape" "POPPLER_ORIENTATION_LANDSCAPE")
+-'("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN")
+-'("seascape" "POPPLER_ORIENTATION_SEASCAPE")
+- )
+-)
+-
+ (define-enum PageTransitionType
+ (in-module "Poppler")
+ (c-name "PopplerPageTransitionType")
+@@ -1341,11 +1329,6 @@
+ (return-type "GType")
+ )
+
+-(define-function poppler_orientation_get_type
+- (c-name "poppler_orientation_get_type")
+- (return-type "GType")
+-)
+-
+ (define-function poppler_page_transition_type_get_type
+ (c-name "poppler_page_transition_type_get_type")
+ (return-type "GType")
+@@ -1646,58 +1629,6 @@
(return-type "GType")
)
@@ -68,7 +99,7 @@ And follow API changes from poppler-0.16
(define-method render
(of-object "PopplerPage")
(c-name "poppler_page_render")
-@@ -1795,6 +1743,12 @@
+@@ -1795,6 +1726,12 @@
(define-method get_text
(of-object "PopplerPage")
(c-name "poppler_page_get_text")
Re: new: devel/hs-half
On Sat, Dec 12, 2015 at 01:27:20PM +0100, Matthias Kilian wrote: > this new port is a requirement for an update of meta/haskell-platform > to 7.10.3. (To be exact, it's dependency of graphics/hs-OpenGLRaw > 2.6.0.0, which is part of haskell-platform 7.10.3) > > ok to import? Ping. I can't update lang/ghc nor meta/haskellplatform without this. Ciao, Kili hs-half.tgz Description: application/tar-gz
lang/ghc: merge -main and -doc?
Hi, is anyone ysubg euther *only* the ghc package or *only* the ghc-doc package but nothing else related to ghc? If not, I'd like to merge ghc-main and ghc-doc into a single ghc package. Any hs-port already depends on both ghc-main and ghc-doc so it wouldn't hurt anyone installing hs-ports. The disk space used by ghc-main is about 886 MB, the space used by ghc-doc is about 46 MB (according to pkg_info -s), so only people with ghc-doc installed but ghc-main not installed would be hur for real. In addition a fresh pkg_add ghc will spill out lots of warnings if ghc-doc isn't installed. To stop this, ghc-main would have to run-depend on ghc-doc. So I really don't see the point of keeping ghc-main and ghc-doc in separate packages. If there are no complaints, I'll merge both packages in a few days (there's a mini update of ghc pending with just some documentation changes). Ciao, Kili
Re: [new] security/hs-SHA
Hi,
On Sun, Dec 27, 2015 at 03:52:49PM +0100, Pascal Stumpf wrote:
> This library implements the SHA suite of message digest functions,
> according to NIST FIPS 180-2 (with the SHA-224 addendum), as well
> as the SHA-based HMAC routines. The functions have been tested
> against most of the NIST and RFC test vectors for the various
> functions. While some attention has been paid to performance, these
> do not presently reach the speed of well-tuned libraries, like
> OpenSSL.
>
> This is a prerequisite for games/hedgewars,-server. ok?
- If HOMEPAGE points to hackage, and MODGHC_BUILD contains hackage, you
don't have to set it manually.
- your PLIST looks like it has been generated after building the port
with ghc-7.8.
See diff below.
Otherwise ok.
Ciao,
Kili
diff -rup ../hs-SHA~/Makefile ./Makefile
--- ../hs-SHA~/Makefile Sun Apr 5 18:21:20 2015
+++ ./Makefile Sun Dec 27 16:48:02 2015
@@ -6,8 +6,6 @@ DISTNAME = SHA-1.6.4.2
CATEGORIES = security
-HOMEPAGE = https://hackage.haskell.org/package/SHA
-
MAINTAINER = Pascal Stumpf
# BSD3
@@ -16,5 +14,7 @@ PERMIT_PACKAGE_CDROM =Yes
MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
+
+MODGHC_PACKAGE_KEY = 0ooW8jYoKWjDUFkZlEvhJX
.include
diff -rup ../hs-SHA~/pkg/PLIST ./pkg/PLIST
--- ../hs-SHA~/pkg/PLISTSun Apr 5 18:21:20 2015
+++ ./pkg/PLIST Sun Dec 27 16:49:33 2015
@@ -5,8 +5,9 @@ lib/ghc/${DISTNAME}/Data/Digest/
lib/ghc/${DISTNAME}/Data/Digest/Pure/
lib/ghc/${DISTNAME}/Data/Digest/Pure/SHA.hi
lib/ghc/${DISTNAME}/Data/Digest/Pure/SHA.p_hi
-lib/ghc/${DISTNAME}/libHS${DISTNAME}.a
-lib/ghc/${DISTNAME}/libHS${DISTNAME}_p.a
+lib/ghc/${DISTNAME}/HS${DISTNAME}-${MODGHC_PACKAGE_KEY}.o
+lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}.a
+lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}_p.a
lib/ghc/${DISTNAME}/register.sh
share/doc/hs-${DISTNAME}/
share/doc/hs-${DISTNAME}/LICENSE
7 new hs-ports and an update of devel/darcs
Hi,
here are seven new ports which are required to unbreak devel/darcs
and update it to the latest version. Also appended is the diff for
devel/darcs itself. The diff below and the attached new ports are
all relative to /usr/ports.
ok's (especially for the new ports) are welcome. Tests and comments,
too, of course ;-)
Unfortunately, the Setup.lhs of devel/darcs uses template Haskell,
which is still broken on i386, so at the moment it will only build
on amd64.
Ciao,
Kili
DESCRs of the new ports:
archivers/hs-zip-archive:
The zip-archive library provides functions for creating, modifying,
and extracting files from zip archives.
devel/hs-data-ordlist:
This module implements bag and set operations on ordered lists. For
the purposes of this module, a "bag" (or "multiset") is a non-decreasing
list, whereas a "set" is a strictly ascending list. Bags are sorted
lists that may contain duplicates, whereas sets are sorted lists
that do not contain duplicates.
devel/hs-regex-applicative:
regex-applicative is aimed to be an efficient and easy to use parsing
combinator library for Haskell based on regular expressions.
devel/hs-regex-compat-tdfa:
One module layer over regex-tdfa to replace Text.Regex. regex-compat
can't use Unicode characters correctly because of using regex-posix.
This is not good for Unicode users.
devel/hs-regex-tdfa:
A new all Haskell tagged DFA regex engine, inspired by libtre.
devel/hs-sandi:
Reasonably fast data encoding library that handles base16, base32,
base32-hex, base64, base64-uri, base85, quoted-printable, uu-encoding,
xx-encoding and y-encoding.
security/hs-digest:
This package provides efficient cryptographic hash implementations
for strict and lazy bytestrings. For now, CRC32 and Adler32 are
supported; they are implemented as FFI bindings to efficient code
from zlib.
Index: devel/darcs/Makefile
===
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- devel/darcs/Makefile23 Dec 2015 20:06:28 - 1.60
+++ devel/darcs/Makefile28 Dec 2015 19:51:55 -
@@ -1,11 +1,8 @@
# $OpenBSD: Makefile,v 1.60 2015/12/23 20:06:28 kili Exp $
-BROKEN = needs an update
-
COMMENT = advanced revision control system written in Haskell
-DISTNAME = darcs-2.8.5
-REVISION = 0
+DISTNAME = darcs-2.10.2
CATEGORIES = devel
HOMEPAGE = http://www.darcs.net/
@@ -13,61 +10,47 @@ HOMEPAGE = http://www.darcs.net/
WANTLIB = c curl>=2 m ncursesw pthread util z
MODULES = lang/ghc converters/libiconv
MODGHC_BUILD = cabal hackage nort
-MODGHC_SETUP_CONF_ARGS =-f 'curl -http -library test'
+MODGHC_SETUP_CONF_ARGS =-f 'curl -http -library use-time-1point5 -test'
LIB_DEPENDS = net/curl
# Yes, build dependencies, because GHC libs are still static and we
# don't want to pull in all of ghc.
-#
-# Commented out because I want to mop up a little bit before the update.
-#
-# BUILD_DEPENDS = archivers/hs-zlib>=0.5.1.0,<0.6.0.0 \
-# devel/hs-extensible-exceptions>=0.1,<0.2 \
-# devel/hs-hashed-storage>=0.5.6,<0.6 \
-# devel/hs-mmap>=0.5,<0.6 \
-# devel/hs-mtl>=1.0,<2.3 \
-# devel/hs-network>=2.2,<2.5 \
-# devel/hs-parsec>=2.0,<3.2 \
-# devel/hs-random>=1.0,<1.1 \
-# devel/hs-regex-compat>=0.95.1 \
-# devel/hs-tar>=0.3,<0.5 \
-# devel/hs-text>=0.11.0.6,<1.2 \
-# devel/hs-utf8-string>=0.3.6,<0.4 \
-# devel/hs-vector>=0.7 \
-# www/hs-html>=1.0,<1.1 \
-# print/texlive/base \
-# textproc/latex2html \
-# ${RUN_DEPENDS}
-
-# Used for building the test suite (which is done during normal
-# build time, not during regress time).
-# BUILD_DEPENDS += devel/hs-FindBin>=0.0,<0.1 \
-# devel/hs-QuickCheck>=2.3 \
-# devel/hs-HUnit>=1.0 \
-# devel/hs-cmdlib>=0.2.1,<0.4 \
-# devel/hs-shellish>=0.1.3,<0.2 \
-# devel/hs-test-framework>=0.4.0 \
-# devel/hs-test-framework-hunit>=0.2.2 \
-# devel/hs-test-framework-quickcheck2>=0.2.8
-
-# TEST_DEPENDS = devel/hs-hlint \
-# shells/bash \
-# sysutils/coreutils
-
-# For the documentation
-USE_GMAKE =Yes
-PORTHOME = ${WRKDIR}
+BUILD_DEPENDS =archivers/hs-zip-archive>=0.2.3,<0.3 \
+ archivers/hs-zlib>=0.5.3.0,<0.7.0.0 \
+ devel/hs-base16-bytestring>=0.1,<0.2 \
+ devel/h
pledge(2) binding for Haskell
Add a binding to pledge(2) to package 'unix'.
To use it:
- run ghc with -package unix
- import System.OpenBSD.Process ( pledge )
- call the pledge function as needed. It returns an IO () computation,
which will throw an exception in case of an error.
Notes:
- I'll also merge the -main and -doc subpackages, so no bump yet.
- The module System.OpenBSD.Process may end in its own package in the
future, but for now it's probably to put it into the unix package.
Comments (and tests) are welcome.
Ciao,
Kili
Index: files/Process.hsc
===
RCS file: files/Process.hsc
diff -N files/Process.hsc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/Process.hsc 19 Jan 2016 07:58:19 -
@@ -0,0 +1,29 @@
+{-# LANGUAGE Safe #-}
+
+module System.OpenBSD.Process ( pledge ) where
+
+import Foreign
+import Foreign.C
+import System.Posix.Internals ( withFilePath )
+
+pledge :: String -> [FilePath] -> IO ()
+
+pledge promises paths =
+ withCString promises $ \cproms ->
+ withPaths2Array0 paths $ \paths_arr ->
+ throwErrnoIfMinus1_ "pledge" (c_pledge cproms paths_arr)
+
+withPaths2Array0 :: [FilePath] -> (Ptr (Ptr CChar) -> IO a) -> IO a
+
+-- If paths is the empty list, just pass a nullPtr instead of an
+-- array containing only a nullPtr. This avoids EINVAL while the
+-- paths feature of pledge(2) is still disabled.
+withPaths2Array0 [] f = f nullPtr
+
+withPaths2Array0 paths f =
+ withMany withFilePath paths $ \cstrs ->
+ withArray0 nullPtr cstrs $ \paths_arr ->
+ f paths_arr
+
+foreign import ccall unsafe "unistd.h pledge"
+ c_pledge :: CString -> Ptr CString -> IO CInt
Index: patches/patch-libraries_unix_unix_cabal
===
RCS file: patches/patch-libraries_unix_unix_cabal
diff -N patches/patch-libraries_unix_unix_cabal
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libraries_unix_unix_cabal 19 Jan 2016 07:58:19 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libraries/unix/unix.cabal.orig Sun Jan 4 23:56:26 2015
libraries/unix/unix.cabal Tue Jan 19 00:42:33 2016
+@@ -109,6 +109,8 @@ library
+ System.Posix.Terminal
+ System.Posix.Terminal.ByteString
+
++System.OpenBSD.Process
++
+ other-modules:
+ System.Posix.Directory.Common
+ System.Posix.DynamicLinker.Common
Re: pledge(2) binding for Haskell
Hi,
On Tue, Jan 19, 2016 at 09:29:58AM +0100, Sebastien Marie wrote:
> Just a question, as I am unsure by just reading the code.
[...]
> > +pledge :: String -> [FilePath] -> IO ()
>
> Shouldn't be:
>
> pledge :: String -> Maybe [FilePath] -> IO ()
>
> in order to differenciate passing not second argument, and an empty
> array ?
Yes. Thanks for pointing me to it.
On Tue, Jan 19, 2016 at 08:24:06AM -0700, Aaron Bieber wrote:
> > Comments (and tests) are welcome.
>
> I believe there is a patch missing to copy files/Process.hs into
> libraries/unix/dist-install/build/System/OpenBSD/Process.hs
Oops.
Below is a hopefully correct and more complete diff. Again without
bump because I'll also merge -main and -doc.
I've loosely tested this with
1. pledge "stdio" Nothing
2. pledge "stdio" Nothing
pledge "stdio dns" Nothing
(which fails with EPERM)
3. pledge "stdio" (Just [])
(fails with EINVAL)
4. pledge "stdio" (Just ["/tmp"])
(also fails with EINVAL)
I also used ktrace to ensure that the correct system calls happen.
Index: Makefile
===
RCS file: /cvs/ports/lang/ghc/Makefile,v
retrieving revision 1.131
diff -u -p -r1.131 Makefile
--- Makefile28 Dec 2015 19:18:52 - 1.131
+++ Makefile19 Jan 2016 19:10:33 -
@@ -157,6 +157,11 @@ PORTHOME = ${WRKDIR}
TEST_DEPENDS = print/ghostscript/gnu
+post-extract:
+ cd ${WRKSRC}/libraries/unix && \
+ mkdir -p System/OpenBSD && \
+ install -m 644 ${FILESDIR}/Process.hsc System/OpenBSD
+
post-patch:
# - Install a precompiled binary.
cd ${WRKDIR}/ghc-${BIN_VER} && \
Index: files/Process.hsc
===
RCS file: files/Process.hsc
diff -N files/Process.hsc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/Process.hsc 19 Jan 2016 19:10:33 -
@@ -0,0 +1,26 @@
+{-# LANGUAGE Safe #-}
+
+module System.OpenBSD.Process ( pledge ) where
+
+import Foreign
+import Foreign.C
+import System.Posix.Internals ( withFilePath )
+
+pledge :: String -> Maybe [FilePath] -> IO ()
+
+pledge promises paths =
+ withCString promises $ \cproms ->
+ withPaths2Array0 paths $ \paths_arr ->
+ throwErrnoIfMinus1_ "pledge" (c_pledge cproms paths_arr)
+
+withPaths2Array0 :: Maybe [FilePath] -> (Ptr (Ptr CChar) -> IO a) -> IO a
+
+withPaths2Array0 Nothing f = f nullPtr
+
+withPaths2Array0 (Just paths) f =
+ withMany withFilePath paths $ \cstrs ->
+ withArray0 nullPtr cstrs $ \paths_arr ->
+ f paths_arr
+
+foreign import ccall unsafe "unistd.h pledge"
+ c_pledge :: CString -> Ptr CString -> IO CInt
Index: patches/patch-libraries_unix_unix_cabal
===
RCS file: patches/patch-libraries_unix_unix_cabal
diff -N patches/patch-libraries_unix_unix_cabal
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libraries_unix_unix_cabal 19 Jan 2016 19:10:33 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libraries/unix/unix.cabal.orig Sun Jan 4 23:56:26 2015
libraries/unix/unix.cabal Tue Jan 19 00:42:33 2016
+@@ -109,6 +109,8 @@ library
+ System.Posix.Terminal
+ System.Posix.Terminal.ByteString
+
++System.OpenBSD.Process
++
+ other-modules:
+ System.Posix.Directory.Common
+ System.Posix.DynamicLinker.Common
Re: pledge(2) binding for Haskell
On Tue, Jan 19, 2016 at 08:22:54PM +0100, Matthias Kilian wrote: > Below is a hopefully correct and more complete diff. Again without > bump because I'll also merge -main and -doc. Famous last words. I missed the plist changes. Will send a new diff later (at the moment i'm rebuilding ghc). Ciao, Kili
Re: pledge(2) binding for Haskell
On Tue, Jan 19, 2016 at 08:43:17PM +0100, Matthias Kilian wrote:
> > Below is a hopefully correct and more complete diff. Again without
> > bump because I'll also merge -main and -doc.
>
> Famous last words. I missed the plist changes. Will send a new diff
> later (at the moment i'm rebuilding ghc).
Here it is. Works fine for me, so I'm going to commit this in a few
hours.
Index: Makefile
===
RCS file: /cvs/ports/lang/ghc/Makefile,v
retrieving revision 1.131
diff -u -p -r1.131 Makefile
--- Makefile28 Dec 2015 19:18:52 - 1.131
+++ Makefile20 Jan 2016 04:24:09 -
@@ -157,6 +157,11 @@ PORTHOME = ${WRKDIR}
TEST_DEPENDS = print/ghostscript/gnu
+post-extract:
+ cd ${WRKSRC}/libraries/unix && \
+ mkdir -p System/OpenBSD && \
+ install -m 644 ${FILESDIR}/Process.hsc System/OpenBSD
+
post-patch:
# - Install a precompiled binary.
cd ${WRKDIR}/ghc-${BIN_VER} && \
Index: files/Process.hsc
===
RCS file: files/Process.hsc
diff -N files/Process.hsc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/Process.hsc 20 Jan 2016 04:24:09 -
@@ -0,0 +1,26 @@
+{-# LANGUAGE Safe #-}
+
+module System.OpenBSD.Process ( pledge ) where
+
+import Foreign
+import Foreign.C
+import System.Posix.Internals ( withFilePath )
+
+pledge :: String -> Maybe [FilePath] -> IO ()
+
+pledge promises paths =
+ withCString promises $ \cproms ->
+ withPaths2Array0 paths $ \paths_arr ->
+ throwErrnoIfMinus1_ "pledge" (c_pledge cproms paths_arr)
+
+withPaths2Array0 :: Maybe [FilePath] -> (Ptr (Ptr CChar) -> IO a) -> IO a
+
+withPaths2Array0 Nothing f = f nullPtr
+
+withPaths2Array0 (Just paths) f =
+ withMany withFilePath paths $ \cstrs ->
+ withArray0 nullPtr cstrs $ \paths_arr ->
+ f paths_arr
+
+foreign import ccall unsafe "unistd.h pledge"
+ c_pledge :: CString -> Ptr CString -> IO CInt
Index: patches/patch-libraries_unix_unix_cabal
===
RCS file: patches/patch-libraries_unix_unix_cabal
diff -N patches/patch-libraries_unix_unix_cabal
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libraries_unix_unix_cabal 20 Jan 2016 04:24:09 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libraries/unix/unix.cabal.orig Sun Jan 4 23:56:26 2015
libraries/unix/unix.cabal Tue Jan 19 00:42:33 2016
+@@ -109,6 +109,8 @@ library
+ System.Posix.Terminal
+ System.Posix.Terminal.ByteString
+
++System.OpenBSD.Process
++
+ other-modules:
+ System.Posix.Directory.Common
+ System.Posix.DynamicLinker.Common
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/ghc/pkg/PLIST-main,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST-main
--- pkg/PLIST-main 2 Nov 2015 21:31:26 - 1.17
+++ pkg/PLIST-main 20 Jan 2016 04:24:09 -
@@ -2228,6 +2228,9 @@ lib/ghc/trans_${TRANSFORMERS_KEY}/libHSt
lib/ghc/unix_${UNIX_KEY}/
lib/ghc/unix_${UNIX_KEY}/HSunix-${UNIX_VER}-${UNIX_KEY}.o
lib/ghc/unix_${UNIX_KEY}/System/
+lib/ghc/unix_${UNIX_KEY}/System/OpenBSD/
+lib/ghc/unix_${UNIX_KEY}/System/OpenBSD/Process.hi
+lib/ghc/unix_${UNIX_KEY}/System/OpenBSD/Process.p_hi
lib/ghc/unix_${UNIX_KEY}/System/Posix/
lib/ghc/unix_${UNIX_KEY}/System/Posix.hi
lib/ghc/unix_${UNIX_KEY}/System/Posix.p_hi
