On 2020/09/11 05:23, Rafael Sadowski wrote:
> x11/kde-applications/kitinerary: distinfo
Please, check your commits for extra/missing files, just
running "cvs -d cvs.openbsd.org:/cvs up -PdA" after committing
should make it obvious
--------------------------
Patching file src/pdf/popplerglobalparams.cpp using Plan A...
Hunk #1 succeeded at 22 (offset -11 lines).
done
===> Applying OpenBSD patch patch-src_pdf_popplertypes_p_h
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-src_pdf_popplertypes_p_h,v 1.1 2020/09/09 20:13:27 kili Exp $
|
|Starting with poppler-20, POPPLER_VERSION no longer is numeric -- it's
|what POPPLER_VERSION_STRING was in earlier releases.
|
|Index: src/pdf/popplertypes_p.h
|--- src/pdf/popplertypes_p.h.orig
|+++ src/pdf/popplertypes_p.h
--------------------------
Patching file src/pdf/popplertypes_p.h using Plan A...
No such line 22 in input file, ignoring
Hunk #1 failed at 21.
1 out of 1 hunks failed--saving rejects to src/pdf/popplertypes_p.h.rej
done
***> patch-src_pdf_popplertypes_p_h did not apply cleanly
===> Applying OpenBSD patch patch-src_pdf_popplerutils_cpp
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|$OpenBSD: patch-src_pdf_popplerutils_cpp,v 1.1 2020/09/09 20:13:27 kili Exp $
|
|Starting with poppler-20, POPPLER_VERSION no longer is numeric -- it's
|what POPPLER_VERSION_STRING was in earlier releases.
|
|Index: src/pdf/popplerutils.cpp
|--- src/pdf/popplerutils.cpp.orig
|+++ src/pdf/popplerutils.cpp
--------------------------
Patching file src/pdf/popplerutils.cpp using Plan A...
Hunk #1 succeeded at 75 (offset -11 lines).
done
===> Failed patches:
patch-src_pdf_pdfdocument_cpp
patch-src_pdf_popplertypes_p_h
*** Error 1 in x11/kde-applications/kitinerary
(/usr/ports/infrastructure/mk/bsd.port.mk:2800
'/pobj/kitinerary-20.08.0/.patch_done': @if cd...)
*** Error 2 in x11/kde-applications/kitinerary
(/usr/ports/infrastructure/mk/bsd.port.mk:2584 'patch':
@lock=kitinerary-20.08.0; export _LO...)
===> Exiting x11/kde-applications/kitinerary with an error
*** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:137 'patch': @:
${echo_msg:=echo}; : ${target:=patch}; for i in ; do eval...)
>>> Ended at 1599878868.49
max_stuck=4.03/depends=4.12/show-prepare-results=1.75/patch=0.53
Error: job failed with 512 on i386-3 at 1599878868
