commit: a586b4c9b3381d8bd041fb61877d35a8b2ba4130 Author: Louis Leseur <louis.leseur <AT> gmail <DOT> com> AuthorDate: Sun Jun 7 20:34:55 2020 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Wed Jun 10 15:10:36 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a586b4c9
app-office/libreoffice: Remove unused patches Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Louis Leseur <louis.leseur <AT> gmail.com> Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> .../files/libreoffice-6.1.4.2-linux-musl.patch | 60 ------------------ .../libreoffice-6.1.4.2-musl-fix-includes.patch | 13 ---- .../libreoffice-6.3.3.2-mysql-connector-c-8.patch | 45 -------------- .../files/libreoffice-6.3.4.2-poppler-0.83.patch | 72 ---------------------- 4 files changed, 190 deletions(-) diff --git a/app-office/libreoffice/files/libreoffice-6.1.4.2-linux-musl.patch b/app-office/libreoffice/files/libreoffice-6.1.4.2-linux-musl.patch deleted file mode 100644 index 5fbf6b3..0000000 --- a/app-office/libreoffice/files/libreoffice-6.1.4.2-linux-musl.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- libreoffice-5.3.0.3/configure.ac.orig 2017-01-26 22:22:46.000000000 +0000 -+++ libreoffice-5.3.0.3/configure.ac 2017-02-08 13:14:16.777547599 +0000 -@@ -652,7 +652,7 @@ - fi - ;; - --linux-gnu*|k*bsd*-gnu*) -+linux-gnu*|linux-musl*|k*bsd*-gnu*) - test_gtk=yes - build_gstreamer_1_0=yes - build_gstreamer_0_10=yes -@@ -4170,7 +4170,7 @@ - esac - ;; - --linux-gnu*) -+linux-gnu*|linux-musl*) - COM=GCC - USING_X11=TRUE - OS=LINUX -@@ -7197,7 +7197,7 @@ - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" - ;; - -- linux-gnu*) -+ linux-gnu*|linux-musl*) - JAVAINC="-I$JAVA_HOME/include" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" -@@ -9748,21 +9748,6 @@ - fi - AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) - --dnl *************************************** --dnl testing libc version for Linux... --dnl *************************************** --if test "$_os" = "Linux"; then -- AC_MSG_CHECKING([whether libc is >= 2.1.1]) -- exec 6>/dev/null # no output -- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC) -- exec 6>&1 # output on again -- if test "$HAVE_LIBC"; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_ERROR([no, upgrade libc]) -- fi --fi -- - dnl ========================================= - dnl Check for the Windows SDK. - dnl ========================================= -@@ -12775,7 +12760,7 @@ - - case "$host_os" in - -- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) -+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) - if test "$ENABLE_JAVA" != ""; then - pathmunge "$JAVA_HOME/bin" "after" - fi diff --git a/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-fix-includes.patch b/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-fix-includes.patch deleted file mode 100644 index d2048e2..0000000 --- a/app-office/libreoffice/files/libreoffice-6.1.4.2-musl-fix-includes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx -index f177d86..99bb408 100644 ---- a/sd/source/ui/remotecontrol/BluetoothServer.cxx -+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx -@@ -21,7 +21,7 @@ - #include <dbus/dbus.h> - #include <errno.h> - #include <fcntl.h> -- #include <sys/unistd.h> -+ #include <unistd.h> - #include <sys/socket.h> - #include <bluetooth/bluetooth.h> - #include <bluetooth/rfcomm.h> diff --git a/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch b/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch deleted file mode 100644 index 5fa7b34..0000000 --- a/app-office/libreoffice/files/libreoffice-6.3.3.2-mysql-connector-c-8.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5917ba8bc645a2b105ec089101b8a664481b5b61 Mon Sep 17 00:00:00 2001 -From: Peter Levine <[email protected]> -Date: Thu, 17 Oct 2019 23:08:57 -0400 -Subject: Fix building against MySQL Connector/C 8 - -In MySQL Connector/C 8, my_bool is replaced by bool. It was -previously defined as char. When building against -MySQL Connector/C 8, this leads to type punning build errors. -Redefine affected members of struct BindMetaData as bool if using -version 8 of greater. Otherwise, default to char. - -Change-Id: If12b975d95afae86502867cb334cb4195802f91d -Reviewed-on: https://gerrit.libreoffice.org/81002 -Reviewed-by: Samuel Mehrbrodt <[email protected]> -Tested-by: Samuel Mehrbrodt <[email protected]> ---- - .../source/drivers/mysqlc/mysqlc_preparedstatement.hxx | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx -index 1df2c70..3450473 100644 ---- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx -+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx -@@ -39,11 +39,17 @@ using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Type; - -+#if defined MYSQL_VERSION_ID && (MYSQL_VERSION_ID >= 80000) && !defined MARIADB_BASE_VERSION -+using my_bool = bool; -+#else -+using my_bool = char; -+#endif -+ - struct BindMetaData - { -- char is_null = 0; -+ my_bool is_null = 0; - unsigned long length = 0; -- char error = 0; -+ my_bool error = 0; - }; - - typedef ::cppu::ImplHelper5<css::sdbc::XPreparedStatement, css::sdbc::XParameters, --- -cgit v1.1 diff --git a/app-office/libreoffice/files/libreoffice-6.3.4.2-poppler-0.83.patch b/app-office/libreoffice/files/libreoffice-6.3.4.2-poppler-0.83.patch deleted file mode 100644 index d5697f2..0000000 --- a/app-office/libreoffice/files/libreoffice-6.3.4.2-poppler-0.83.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001 -From: Martin Milata <[email protected]> -Date: Wed, 4 Dec 2019 02:37:40 +0100 -Subject: Fix build with poppler-0.83 - -Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9 -Reviewed-on: https://gerrit.libreoffice.org/84384 -Tested-by: Jenkins -Reviewed-by: Michael Stahl <[email protected]> ---- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++ - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ - sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++ - 3 files changed, 15 insertions(+) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 26048177e87d..e9c2a407c279 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const - gfree(pBuf); - } - -+#if POPPLER_CHECK_VERSION(0, 83, 0) -+void PDFOutDev::printPath( const GfxPath* pPath ) -+#else - void PDFOutDev::printPath( GfxPath* pPath ) -+#endif - { - int nSubPaths = pPath ? pPath->getNumSubpaths() : 0; - for( int i=0; i<nSubPaths; i++ ) - { -+#if POPPLER_CHECK_VERSION(0, 83, 0) -+ const -+#endif - GfxSubpath* pSub = pPath->getSubpath( i ); - const int nPoints = pSub->getNumPoints(); - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index 02f6b59f6f15..2e7d2186f9a1 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -149,7 +149,11 @@ namespace pdfi - - int parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const; - void writeFontFile( GfxFont* gfxFont ) const; -+#if POPPLER_CHECK_VERSION(0, 83, 0) -+ static void printPath( const GfxPath* pPath ); -+#else - static void printPath( GfxPath* pPath ); -+#endif - - public: - explicit PDFOutDev( PDFDoc* pDoc ); -diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx -index 42178b650cdd..b1a54bd09c5f 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx -@@ -68,7 +68,11 @@ int main(int argc, char **argv) - } - - // read config file -+#if POPPLER_CHECK_VERSION(0, 83, 0) -+ globalParams = std::make_unique<GlobalParams>(); -+#else - globalParams = new GlobalParams(); -+#endif - globalParams->setErrQuiet(true); - #if defined(_MSC_VER) - globalParams->setupBaseFonts(nullptr); --- -cgit v1.2.1
