libreoffice: remove stale, unused patches
This commit is contained in:
parent
159b8a6eb2
commit
082984ef70
|
@ -1,10 +0,0 @@
|
|||
The way this check mixes C and C++ started to cause issues since gpgme 1.18.0
|
||||
But we can confidently skip the function check anyway.
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -12302,4 +12302 @@
|
||||
- # progress_callback is the only func with plain C linkage
|
||||
- # checking for it also filters out older, KDE-dependent libgpgmepp versions
|
||||
- AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ],
|
||||
- [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
|
||||
+ GPGMEPP_LIBS=-lgpgmepp
|
|
@ -1,100 +0,0 @@
|
|||
Patch from OpenSUSE
|
||||
https://build.opensuse.org/package/view_file/LibreOffice:Factory/libreoffice/poppler-22-04-0.patch?expand=1&rev=45e176f964509ebe3560d0dbf1ec8be9
|
||||
Index: libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
===================================================================
|
||||
--- libreoffice-7.3.3.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
+++ libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
@@ -474,12 +474,21 @@ int PDFOutDev::parseFont( long long nNew
|
||||
{
|
||||
// TODO(P3): Unfortunately, need to read stream twice, since
|
||||
// we must write byte count to stdout before
|
||||
+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed
|
||||
+ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef());
|
||||
+ if ( pBuf )
|
||||
+ {
|
||||
+ aNewFont.isEmbedded = true;
|
||||
+ nSize = pBuf->size();
|
||||
+ }
|
||||
+#else
|
||||
char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
|
||||
if( pBuf )
|
||||
{
|
||||
aNewFont.isEmbedded = true;
|
||||
gfree(pBuf);
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
m_aFontMap[ nNewId ] = aNewFont;
|
||||
@@ -492,21 +501,35 @@ void PDFOutDev::writeFontFile( GfxFont*
|
||||
return;
|
||||
|
||||
int nSize = 0;
|
||||
+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed
|
||||
+ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef());
|
||||
+ if ( !pBuf )
|
||||
+ return;
|
||||
+ nSize = pBuf->size();
|
||||
+#else
|
||||
char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize );
|
||||
if( !pBuf )
|
||||
return;
|
||||
+#endif
|
||||
|
||||
// ---sync point--- see SYNC STREAMS above
|
||||
fflush(stdout);
|
||||
|
||||
+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed
|
||||
+ if( fwrite(pBuf->data(), sizeof(unsigned char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
|
||||
+ {
|
||||
+#else
|
||||
if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast<size_t>(nSize) )
|
||||
{
|
||||
gfree(pBuf);
|
||||
+#endif
|
||||
exit(1); // error
|
||||
}
|
||||
// ---sync point--- see SYNC STREAMS above
|
||||
fflush(g_binary_out);
|
||||
+#if !POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed
|
||||
gfree(pBuf);
|
||||
+#endif
|
||||
}
|
||||
|
||||
#if POPPLER_CHECK_VERSION(0, 83, 0)
|
||||
@@ -759,7 +782,11 @@ void PDFOutDev::updateFont(GfxState *sta
|
||||
{
|
||||
assert(state);
|
||||
|
||||
+#if POPPLER_CHECK_VERSION(22, 04, 0)
|
||||
+ std::shared_ptr<GfxFont> gfxFont = state->getFont();
|
||||
+#else
|
||||
GfxFont *gfxFont = state->getFont();
|
||||
+#endif
|
||||
if( !gfxFont )
|
||||
return;
|
||||
|
||||
@@ -776,7 +803,11 @@ void PDFOutDev::updateFont(GfxState *sta
|
||||
m_aFontMap.find( fontID );
|
||||
if( it == m_aFontMap.end() )
|
||||
{
|
||||
+#if POPPLER_CHECK_VERSION(22, 04, 0)
|
||||
+ nEmbedSize = parseFont( fontID, gfxFont.get(), state );
|
||||
+#else
|
||||
nEmbedSize = parseFont( fontID, gfxFont, state );
|
||||
+#endif
|
||||
it = m_aFontMap.find( fontID );
|
||||
}
|
||||
|
||||
@@ -806,7 +837,11 @@ void PDFOutDev::updateFont(GfxState *sta
|
||||
|
||||
if (nEmbedSize)
|
||||
{
|
||||
+#if POPPLER_CHECK_VERSION(22, 04, 0)
|
||||
+ writeFontFile(gfxFont.get());
|
||||
+#else
|
||||
writeFontFile(gfxFont);
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
|
||||
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
|
||||
@@ -35,7 +35,7 @@ public:
|
||||
void testWeak();
|
||||
void testAsian();
|
||||
void testThai();
|
||||
-#if (U_ICU_VERSION_MAJOR_NUM > 51)
|
||||
+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70)
|
||||
void testLao();
|
||||
#ifdef TODO
|
||||
void testNorthernThai();
|
||||
@@ -52,7 +52,7 @@ public:
|
||||
CPPUNIT_TEST(testWeak);
|
||||
CPPUNIT_TEST(testAsian);
|
||||
CPPUNIT_TEST(testThai);
|
||||
-#if (U_ICU_VERSION_MAJOR_NUM > 51)
|
||||
+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70)
|
||||
CPPUNIT_TEST(testLao);
|
||||
#ifdef TODO
|
||||
CPPUNIT_TEST(testKhmer);
|
||||
@@ -843,7 +843,7 @@ void TestBreakIterator::testAsian()
|
||||
}
|
||||
}
|
||||
|
||||
-#if (U_ICU_VERSION_MAJOR_NUM > 51)
|
||||
+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70)
|
||||
//A test to ensure that our Lao word boundary detection is useful
|
||||
void TestBreakIterator::testLao()
|
||||
{
|
Loading…
Reference in a new issue