Hi, fix build with poppler-26.04.0. ok? Ciao, Kili Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx =================================================================== RCS file: /cvs/ports/editors/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx,v diff -u -p -r1.21 patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx --- patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx 12 Feb 2026 21:25:53 -0000 1.21 +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx 6 Apr 2026 20:51:44 -0000 @@ -1,6 +1,6 @@ -Fix build with poppler-26.02.0. +Fix build with poppler-26.02.0 and 26.04.0. -From upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07. +First one from upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07. Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig @@ -61,7 +61,18 @@ Index: sdext/source/pdfimport/xpdfwrappe printf( "drawChar %f %f %f %f %f %f %f %f %f ", normalize(aPositionX), normalize(aPositionY), -@@ -1348,7 +1364,11 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *st +@@ -1098,7 +1114,9 @@ void PDFOutDev::drawChar(GfxState *state, double x, do + printf( "\n" ); + } + +-#if POPPLER_CHECK_VERSION(0, 64, 0) ++#if POPPLER_CHECK_VERSION(26, 4, 0) ++void PDFOutDev::drawString(GfxState*, const std::string & /*s*/) ++#elif POPPLER_CHECK_VERSION(0, 64, 0) + void PDFOutDev::drawString(GfxState*, const GooString* /*s*/) + #else + void PDFOutDev::drawString(GfxState*, GooString* /*s*/) +@@ -1348,7 +1366,11 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState *st const int nDPI = 72; // GfxState seems to have 72.0 as magic for some reason auto pSplashGfxState = new GfxState(nDPI, nDPI, &aBox, 0, false); Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx =================================================================== RCS file: /cvs/ports/editors/libreoffice/patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx,v diff -u -p -r1.12 patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx --- patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx 12 Feb 2026 21:25:53 -0000 1.12 +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx 6 Apr 2026 20:51:56 -0000 @@ -1,6 +1,6 @@ -Fix build with poppler-26.02.0. +Fix build with poppler-26.02.0 and 26.04.0. -From upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07. +First one from upstream commit 3c29b709cd2b5b18776b3c15638b66bd8a7dcb07. Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig @@ -60,3 +60,14 @@ Index: sdext/source/pdfimport/xpdfwrappe virtual void setDefaultCTM(const double *ctm) override; #else virtual void setDefaultCTM(double *ctm) override; +@@ -241,7 +260,9 @@ namespace pdfi + double originX, double originY, + CharCode code, int nBytes, Unicode *u, int uLen) override; +
Saturday, April 11, 2026
Re: [update] OpenTTD to 15.3
On Mon, 6 Apr 2026 11:19:59 +0200 Florian Viehweger <openbsd@out-of-creativity.de> wrote: > this is a simple update for OpenTTD to 15.3. > ... > [1] https://cdn.openttd.org/openttd-releases/15.3/changelog.md I committed this update. I also deleted the BROKEN-sparc64 line, after kmos@ checked that OpenTTD builds on sparc64 (probably because #include <bit> works in gcc 15). In the changelog, "Fix: Desync caused by train crashes (#15338)" is https://github.com/OpenTTD/OpenTTD/pull/15338 This might be the desync that I sometimes saw in multiplayer. A desync disconnects you from the server. I got lucky and my OpenBSD client never desynced. It might have been Windows clients desyncing from a Linux server. --gkoehler > Index: Makefile > =================================================================== > RCS file: /daten/openbsdmirror/cvs/mirror/ports/games/openttd/Makefile,v > retrieving revision 1.95 > diff -u -p -u -p -r1.95 Makefile > --- Makefile 9 Mar 2026 20:32:14 -0000 1.95 > +++ Makefile 6 Apr 2026 09:16:46 -0000 > @@ -2,7 +2,7 @@ BROKEN-sparc64= fatal error: bit: No suc > > COMMENT= open source clone of the game Transport Tycoon Deluxe > > -V = 15.2 > +V = 15.3 > DISTNAME = openttd-$V-source > PKGNAME = openttd-$V > > Index: distinfo > =================================================================== > RCS file: /daten/openbsdmirror/cvs/mirror/ports/games/openttd/distinfo,v > retrieving revision 1.50 > diff -u -p -u -p -r1.50 distinfo > --- distinfo 9 Mar 2026 20:32:14 -0000 1.50 > +++ distinfo 6 Apr 2026 09:16:46 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (openttd/openttd-15.2-source.tar.xz) = 0pq2F7fA+qVuxPjxNmPGkKG4XpIS3QFxfMIUxyDT/3Y= > -SIZE (openttd/openttd-15.2-source.tar.xz) = 8514360 > +SHA256 (openttd/openttd-15.3-source.tar.xz) = XqIe6n1Zx4pCBxkkrBjGvAEWCI8ulrFM/uk2kXWXO+c= > +SIZE (openttd/openttd-15.3-source.tar.xz) = 8531992 > > -- > greetings, > > Florian Viehweger >