[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/

["Sam James" <sam@gentoo.org>]

commit:     d9101ddf57435043ca5d01567d482269e69e7a78
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 00:00:58 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  9 00:01:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9101ddf

app-office/libreoffice: fix version check in Poppler 22.04.0 patch

On a machine with Poppler 22.03.0 still, it failed, as it tried
to take the new branch.

Bug: https://bugs.gentoo.org/843311
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch b/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch
index 7879f87a516b..39cb13bbc7d6 100644
--- a/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch
+++ b/app-office/libreoffice/files/libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch
@@ -1,6 +1,8 @@
 https://bugs.gentoo.org/843311
 https://cgit.freebsd.org/ports/commit/?id=d9b5ef800dbd0366eae81b03bfa89689ec73c6f7
 
+(sam: adapt version check to 22.4.0)
+
 From: Sam James <sam@gentoo.org>
 Date: Sun, 8 May 2022 21:20:25 +0000
 Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
@@ -11,7 +13,7 @@ Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
      {
          // TODO(P3): Unfortunately, need to read stream twice, since
          // we must write byte count to stdout before
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
          char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
 +#else
 +        std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
@@ -19,7 +21,7 @@ Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
          if( pBuf )
          {
              aNewFont.isEmbedded = true;
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
              gfree(pBuf);
 +#endif
          }
@@ -30,7 +32,7 @@ Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
  
      int nSize = 0;
 -    char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
 +        char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
 +#else
 +        std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() );
@@ -41,14 +43,14 @@ Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
      // ---sync point--- see SYNC STREAMS above
      fflush(stdout);
 -
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
      if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
 +#else
 +    if( fwrite(reinterpret_cast<char*>(pBuf.value().data()), sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
 +#endif
      {
 -        gfree(pBuf);
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
 +            gfree(pBuf);
 +#endif
          exit(1); // error
@@ -56,7 +58,7 @@ Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
      // ---sync point--- see SYNC STREAMS above
      fflush(g_binary_out);
 -    gfree(pBuf);
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
 +            gfree(pBuf);
 +#endif
  }
@@ -66,7 +68,7 @@ Subject: [PATCH 1/2] Import FreeBSD patch for Poppler 22.04.0 build
  {
      assert(state);
  
-+#if !POPPLER_CHECK_VERSION(22, 3, 0)
++#if !POPPLER_CHECK_VERSION(22, 4, 0)
      GfxFont *gfxFont = state->getFont();
 +#else
 +    GfxFont *gfxFont = state->getFont().get();