mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
LibreOffice: bump version
This commit is contained in:
Gerasim Troeglazov
@@ -21,10 +21,10 @@ REVISION="1"
|
||||
|
||||
SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz"
|
||||
SOURCE_DIR="core-libreoffice-$portVersion"
|
||||
CHECKSUM_SHA256="0c2a85fbbd6bbf42c4fdf006e378c1c101a1aa74abeaa3a2a887625aedc2eb52"
|
||||
CHECKSUM_SHA256="4b32d059812b4f890bb4cabf6e7903a06c0cc9a331911dd11c5eec2499d50406"
|
||||
|
||||
SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256_2="e322c3831f06c79fe5d974c728b07b9fa7aa8f509904f73f952258dbab18796a"
|
||||
CHECKSUM_SHA256_2="97fced6a20d64a25eabe355867189fa68d138e3233306a71981d5403b5fe1e91"
|
||||
SOURCE_DIR_2="translations-libreoffice-$portVersion"
|
||||
SOURCE_FILENAME_2="translations-libreoffice-$portVersion.tar.gz"
|
||||
|
||||
@@ -1,180 +0,0 @@
|
||||
From f57fefa38c2fbf6fbc914e66829cec9822a77456 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Wed, 24 Oct 2018 17:00:02 +0300
|
||||
Subject: Make Elementary the default on Haiku
|
||||
|
||||
|
||||
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
|
||||
index c4e60fd..81490ed 100644
|
||||
--- a/vcl/source/app/IconThemeSelector.cxx
|
||||
+++ b/vcl/source/app/IconThemeSelector.cxx
|
||||
@@ -54,6 +54,8 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
|
||||
#ifdef _WIN32
|
||||
(void)desktopEnvironment;
|
||||
return OUString("colibre");
|
||||
+#elif defined(__HAIKU__)
|
||||
+ return OUString("elementary");
|
||||
#else
|
||||
OUString r;
|
||||
if ( desktopEnvironment.equalsIgnoreAsciiCase("kde5") ||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From e24fe058181a1021ec49b65c52bd368a46f067de Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Wed, 24 Oct 2018 17:01:09 +0300
|
||||
Subject: Show used vcl backend on Haiku
|
||||
|
||||
|
||||
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
|
||||
index d087a15..6613105 100644
|
||||
--- a/vcl/source/app/svapp.cxx
|
||||
+++ b/vcl/source/app/svapp.cxx
|
||||
@@ -1163,7 +1163,7 @@ OUString Application::GetHWOSConfInfo()
|
||||
aDetails.append( VclResId(SV_APP_DEFAULT) );
|
||||
aDetails.append( "; " );
|
||||
|
||||
-#if (defined LINUX || defined _WIN32 || defined MACOSX)
|
||||
+#if (defined LINUX || defined _WIN32 || defined MACOSX || defined (__HAIKU__))
|
||||
aDetails.append( SV_APP_VCLBACKEND );
|
||||
aDetails.append( GetToolkitName() );
|
||||
aDetails.append( "; " );
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From d8a5bc6eb1857592116da4dcab58137934c189d9 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Wed, 24 Oct 2018 17:01:34 +0300
|
||||
Subject: Identify Haiku in about window
|
||||
|
||||
|
||||
diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx
|
||||
index dff6ff0..0901bdb 100644
|
||||
--- a/vcl/unx/generic/app/geninst.cxx
|
||||
+++ b/vcl/unx/generic/app/geninst.cxx
|
||||
@@ -76,6 +76,8 @@ OUString SalGenericInstance::getOSVersion()
|
||||
}
|
||||
fclose( pVersion );
|
||||
}
|
||||
+#elif defined(__HAIKU__)
|
||||
+ aKernelVer = "Haiku";
|
||||
#endif
|
||||
return aKernelVer;
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From a5ea92f5c753f4c671c23a141a9cdd3492a165f1 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Wed, 24 Oct 2018 17:02:04 +0300
|
||||
Subject: Workaround a crash on quit. See Haiku #13159
|
||||
|
||||
|
||||
diff --git a/desktop/source/app/main.c b/desktop/source/app/main.c
|
||||
index 643c42a..d4b47cb 100644
|
||||
--- a/desktop/source/app/main.c
|
||||
+++ b/desktop/source/app/main.c
|
||||
@@ -17,6 +17,12 @@
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include <unistd.h>
|
||||
+#include <sys/types.h>
|
||||
+#include <signal.h>
|
||||
+#endif
|
||||
+
|
||||
#include <sal/main.h>
|
||||
|
||||
#include "sofficemain.h"
|
||||
@@ -50,6 +56,9 @@ SAL_IMPLEMENT_MAIN() {
|
||||
#ifdef __gnu_linux__
|
||||
g_Exiting = 1;
|
||||
#endif
|
||||
+#endif
|
||||
+#ifdef __HAIKU__
|
||||
+ kill (getpid(), SIGKILL);
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From 163e0ccf38d5ce6c4d38e49006530820903e987b Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Wed, 21 Nov 2018 13:39:14 +0300
|
||||
Subject: Implement ShellExec on Haiku
|
||||
|
||||
|
||||
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
|
||||
index 7355eae..3e8788d 100644
|
||||
--- a/shell/source/unix/exec/shellexec.cxx
|
||||
+++ b/shell/source/unix/exec/shellexec.cxx
|
||||
@@ -173,6 +173,9 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
|
||||
// Results in "The file /.../foo:bar does not exits." (where "/..." is
|
||||
// the CWD) on stderr and SystemShellExecuteException.
|
||||
aBuffer.append("open --");
|
||||
+
|
||||
+#elif __HAIKU__
|
||||
+ aBuffer.append("open");
|
||||
#else
|
||||
// Just use xdg-open on non-Mac
|
||||
aBuffer.append("/usr/bin/xdg-open");
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From d2fa1c69d2fc2d1ec4fcc3ff17c0ee9ecb9ad090 Mon Sep 17 00:00:00 2001
|
||||
From: Lionel Elie Mamane <lionel@mamane.lu>
|
||||
Date: Wed, 10 Jul 2019 10:27:19 +0200
|
||||
Subject: build failure - disambiguate Calendar return class
|
||||
|
||||
Change-Id: I892281f85f6cc9c2de2c341ae63240ae85d302c4
|
||||
|
||||
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
|
||||
index c9e22f7..228bed3 100644
|
||||
--- a/i18npool/source/calendar/calendarImpl.cxx
|
||||
+++ b/i18npool/source/calendar/calendarImpl.cxx
|
||||
@@ -128,7 +128,7 @@ CalendarImpl::getLoadedCalendar2()
|
||||
return xCalendar->getLoadedCalendar2();
|
||||
}
|
||||
|
||||
-Calendar SAL_CALL
|
||||
+::css::i18n::Calendar SAL_CALL
|
||||
CalendarImpl::getLoadedCalendar()
|
||||
{
|
||||
if (!xCalendar.is())
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From b965788d8e21d247f7d96b472b53a2450a9c03e5 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Sat, 20 Jul 2019 01:18:50 +0300
|
||||
Subject: Comment out linking with pthread
|
||||
|
||||
|
||||
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
|
||||
index 1d6b38c..6a50da3 100644
|
||||
--- a/solenv/gbuild/platform/unxgcc.mk
|
||||
+++ b/solenv/gbuild/platform/unxgcc.mk
|
||||
@@ -45,9 +45,9 @@ gb_CFLAGS := \
|
||||
# At least libstdc++ (which is approximated here with !HAVE_LIBCXX) needs -pthread when including
|
||||
# various C++ headers like <thread>, see <https://gcc.gnu.org/onlinedocs/gcc-8.3.0/libstdc++/manual/
|
||||
# manual/using.html#manual.intro.using.flags>:
|
||||
-ifeq ($(HAVE_LIBCXX),)
|
||||
-gb_CXX_LINKFLAGS := -pthread
|
||||
-endif
|
||||
+#ifeq ($(HAVE_LIBCXX),)
|
||||
+#gb_CXX_LINKFLAGS := -pthread
|
||||
+#endif
|
||||
|
||||
gb_CXXFLAGS := \
|
||||
$(gb_CXXFLAGS_COMMON) \
|
||||
--
|
||||
2.21.0
|
||||
|
||||
379
app-office/libreoffice/patches/libreoffice-6.3.0.4.patchset
Normal file
379
app-office/libreoffice/patches/libreoffice-6.3.0.4.patchset
Normal file
@@ -0,0 +1,379 @@
|
||||
From 5f113b2ae2e6e84d39f93d24293ce80a508aa217 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Wed, 24 Oct 2018 17:00:02 +0300
|
||||
Subject: Make Elementary the default on Haiku
|
||||
|
||||
|
||||
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
|
||||
index c4e60fd..81490ed 100644
|
||||
--- a/vcl/source/app/IconThemeSelector.cxx
|
||||
+++ b/vcl/source/app/IconThemeSelector.cxx
|
||||
@@ -54,6 +54,8 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
|
||||
#ifdef _WIN32
|
||||
(void)desktopEnvironment;
|
||||
return OUString("colibre");
|
||||
+#elif defined(__HAIKU__)
|
||||
+ return OUString("elementary");
|
||||
#else
|
||||
OUString r;
|
||||
if ( desktopEnvironment.equalsIgnoreAsciiCase("kde5") ||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From f7e3677000d2734ddecd3b281da949888f6671f4 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Wed, 24 Oct 2018 17:01:09 +0300
|
||||
Subject: Show used vcl backend on Haiku
|
||||
|
||||
|
||||
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
|
||||
index d087a15..6613105 100644
|
||||
--- a/vcl/source/app/svapp.cxx
|
||||
+++ b/vcl/source/app/svapp.cxx
|
||||
@@ -1163,7 +1163,7 @@ OUString Application::GetHWOSConfInfo()
|
||||
aDetails.append( VclResId(SV_APP_DEFAULT) );
|
||||
aDetails.append( "; " );
|
||||
|
||||
-#if (defined LINUX || defined _WIN32 || defined MACOSX)
|
||||
+#if (defined LINUX || defined _WIN32 || defined MACOSX || defined (__HAIKU__))
|
||||
aDetails.append( SV_APP_VCLBACKEND );
|
||||
aDetails.append( GetToolkitName() );
|
||||
aDetails.append( "; " );
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From 5bb186abfc2e6d561a78d17da02a39f1de8cc947 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Wed, 24 Oct 2018 17:01:34 +0300
|
||||
Subject: Identify Haiku in about window
|
||||
|
||||
|
||||
diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx
|
||||
index dff6ff0..0901bdb 100644
|
||||
--- a/vcl/unx/generic/app/geninst.cxx
|
||||
+++ b/vcl/unx/generic/app/geninst.cxx
|
||||
@@ -76,6 +76,8 @@ OUString SalGenericInstance::getOSVersion()
|
||||
}
|
||||
fclose( pVersion );
|
||||
}
|
||||
+#elif defined(__HAIKU__)
|
||||
+ aKernelVer = "Haiku";
|
||||
#endif
|
||||
return aKernelVer;
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From f17d884a8ecc6a83fffcf7cc564de88506861d89 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Wed, 24 Oct 2018 17:02:04 +0300
|
||||
Subject: Workaround a crash on quit. See Haiku #13159
|
||||
|
||||
|
||||
diff --git a/desktop/source/app/main.c b/desktop/source/app/main.c
|
||||
index 643c42a..d4b47cb 100644
|
||||
--- a/desktop/source/app/main.c
|
||||
+++ b/desktop/source/app/main.c
|
||||
@@ -17,6 +17,12 @@
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include <unistd.h>
|
||||
+#include <sys/types.h>
|
||||
+#include <signal.h>
|
||||
+#endif
|
||||
+
|
||||
#include <sal/main.h>
|
||||
|
||||
#include "sofficemain.h"
|
||||
@@ -50,6 +56,9 @@ SAL_IMPLEMENT_MAIN() {
|
||||
#ifdef __gnu_linux__
|
||||
g_Exiting = 1;
|
||||
#endif
|
||||
+#endif
|
||||
+#ifdef __HAIKU__
|
||||
+ kill (getpid(), SIGKILL);
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From 099c88f1676ae5ed00c70dd29de6a045b59529df Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Wed, 21 Nov 2018 13:39:14 +0300
|
||||
Subject: Implement ShellExec on Haiku
|
||||
|
||||
|
||||
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
|
||||
index 7355eae..3e8788d 100644
|
||||
--- a/shell/source/unix/exec/shellexec.cxx
|
||||
+++ b/shell/source/unix/exec/shellexec.cxx
|
||||
@@ -173,6 +173,9 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
|
||||
// Results in "The file /.../foo:bar does not exits." (where "/..." is
|
||||
// the CWD) on stderr and SystemShellExecuteException.
|
||||
aBuffer.append("open --");
|
||||
+
|
||||
+#elif __HAIKU__
|
||||
+ aBuffer.append("open");
|
||||
#else
|
||||
// Just use xdg-open on non-Mac
|
||||
aBuffer.append("/usr/bin/xdg-open");
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From ad735903c80efd54580ad9188297048c44ec34a5 Mon Sep 17 00:00:00 2001
|
||||
From: Lionel Elie Mamane <lionel@mamane.lu>
|
||||
Date: Wed, 10 Jul 2019 10:27:19 +0200
|
||||
Subject: build failure - disambiguate Calendar return class
|
||||
|
||||
Change-Id: I892281f85f6cc9c2de2c341ae63240ae85d302c4
|
||||
|
||||
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
|
||||
index c9e22f7..228bed3 100644
|
||||
--- a/i18npool/source/calendar/calendarImpl.cxx
|
||||
+++ b/i18npool/source/calendar/calendarImpl.cxx
|
||||
@@ -128,7 +128,7 @@ CalendarImpl::getLoadedCalendar2()
|
||||
return xCalendar->getLoadedCalendar2();
|
||||
}
|
||||
|
||||
-Calendar SAL_CALL
|
||||
+::css::i18n::Calendar SAL_CALL
|
||||
CalendarImpl::getLoadedCalendar()
|
||||
{
|
||||
if (!xCalendar.is())
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From d4fae787dc5055dd11f2bfb866bb4c6546d2ae1c Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
Date: Sat, 20 Jul 2019 01:18:50 +0300
|
||||
Subject: Comment out linking with pthread
|
||||
|
||||
|
||||
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
|
||||
index 1d6b38c..6a50da3 100644
|
||||
--- a/solenv/gbuild/platform/unxgcc.mk
|
||||
+++ b/solenv/gbuild/platform/unxgcc.mk
|
||||
@@ -45,9 +45,9 @@ gb_CFLAGS := \
|
||||
# At least libstdc++ (which is approximated here with !HAVE_LIBCXX) needs -pthread when including
|
||||
# various C++ headers like <thread>, see <https://gcc.gnu.org/onlinedocs/gcc-8.3.0/libstdc++/manual/
|
||||
# manual/using.html#manual.intro.using.flags>:
|
||||
-ifeq ($(HAVE_LIBCXX),)
|
||||
-gb_CXX_LINKFLAGS := -pthread
|
||||
-endif
|
||||
+#ifeq ($(HAVE_LIBCXX),)
|
||||
+#gb_CXX_LINKFLAGS := -pthread
|
||||
+#endif
|
||||
|
||||
gb_CXXFLAGS := \
|
||||
$(gb_CXXFLAGS_COMMON) \
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From 66176185412c45eb22d9307041988ec4e8c64a2b Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 11 Aug 2019 11:46:49 +1000
|
||||
Subject: Workaround for ambiguous methods
|
||||
|
||||
|
||||
diff --git a/include/o3tl/sorted_vector.hxx b/include/o3tl/sorted_vector.hxx
|
||||
index 35882ab..c5d0386 100644
|
||||
--- a/include/o3tl/sorted_vector.hxx
|
||||
+++ b/include/o3tl/sorted_vector.hxx
|
||||
@@ -80,6 +80,17 @@ public:
|
||||
return 0;
|
||||
}
|
||||
|
||||
+ size_type erase2( const Value& x )
|
||||
+ {
|
||||
+ std::pair<const_iterator, bool> const ret(Find_t()(m_vector.begin(), m_vector.end(), x));
|
||||
+ if (ret.second)
|
||||
+ {
|
||||
+ m_vector.erase(m_vector.begin() + (ret.first - m_vector.begin()));
|
||||
+ return 1;
|
||||
+ }
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
void erase( size_t index )
|
||||
{
|
||||
m_vector.erase(m_vector.begin() + index);
|
||||
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
|
||||
index 9431c46..f48d8d9 100644
|
||||
--- a/sc/source/core/data/attarray.cxx
|
||||
+++ b/sc/source/core/data/attarray.cxx
|
||||
@@ -375,7 +375,7 @@ void ScAttrArray::RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 n
|
||||
if(itr != rCondFormatData.end())
|
||||
{
|
||||
ScCondFormatIndexes aNewCondFormatData(rCondFormatData);
|
||||
- aNewCondFormatData.erase(nIndex);
|
||||
+ aNewCondFormatData.erase2(nIndex);
|
||||
ScCondFormatItem aItem( std::move(aNewCondFormatData) );
|
||||
pPatternAttr->GetItemSet().Put( aItem );
|
||||
SetPatternArea( nTempStartRow, nTempEndRow, std::move(pPatternAttr), true );
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From 79a55ca412cc07bf6e9761c5a8ce23f4b6a2907f Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 11 Aug 2019 11:47:40 +1000
|
||||
Subject: Add XP_HAIKU defs for xmlsec
|
||||
|
||||
|
||||
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
|
||||
index 64e2feb..f60f43b 100644
|
||||
--- a/svl/Library_svl.mk
|
||||
+++ b/svl/Library_svl.mk
|
||||
@@ -95,6 +95,12 @@ $(eval $(call gb_Library_use_system_win32_libs,svl,\
|
||||
shlwapi \
|
||||
))
|
||||
|
||||
+ifeq ($(OS),HAIKU)
|
||||
+$(eval $(call gb_Library_add_defs,svl,\
|
||||
+ -DXP_HAIKU=1 \
|
||||
+))
|
||||
+endif
|
||||
+
|
||||
ifeq ($(OS),WNT)
|
||||
$(eval $(call gb_Library_add_defs,svl,\
|
||||
-DSVL_CRYPTO_MSCRYPTO \
|
||||
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
|
||||
index f067e14..62fc24e 100644
|
||||
--- a/xmlsecurity/Library_xsec_xmlsec.mk
|
||||
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
|
||||
@@ -116,6 +116,12 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
|
||||
-DXMLSEC_CRYPTO_NSS \
|
||||
))
|
||||
|
||||
+ifeq ($(OS),HAIKU)
|
||||
+$(eval $(call gb_Library_add_defs,xsec_xmlsec,\
|
||||
+ -DXP_HAIKU=1 \
|
||||
+))
|
||||
+endif
|
||||
+
|
||||
ifeq ($(SYSTEM_XMLSEC),)
|
||||
$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
|
||||
$(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \
|
||||
--
|
||||
2.21.0
|
||||
|
||||
|
||||
From 3fd2780182e2b80d8ff41744a2e33d6113c9da94 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 11 Aug 2019 11:48:38 +1000
|
||||
Subject: Cast to boolean
|
||||
|
||||
|
||||
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
|
||||
index f6e18a5..4405871 100644
|
||||
--- a/vcl/source/filter/jpeg/jpegc.cxx
|
||||
+++ b/vcl/source/filter/jpeg/jpegc.cxx
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <setjmp.h>
|
||||
+//#include <jmorecfg.h>
|
||||
#include <jpeglib.h>
|
||||
#include <jerror.h>
|
||||
|
||||
@@ -166,13 +167,13 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputS
|
||||
rContext.aOwner.set(&rContext.cinfo);
|
||||
jpeg_svstream_src(&rContext.cinfo, pInputStream);
|
||||
SourceManagerStruct *source = reinterpret_cast<SourceManagerStruct*>(rContext.cinfo.src);
|
||||
- jpeg_read_header(&rContext.cinfo, TRUE);
|
||||
+ jpeg_read_header(&rContext.cinfo, static_cast<boolean>(TRUE));
|
||||
|
||||
rContext.cinfo.scale_num = 1;
|
||||
rContext.cinfo.scale_denom = 1;
|
||||
rContext.cinfo.output_gamma = 1.0;
|
||||
- rContext.cinfo.raw_data_out = FALSE;
|
||||
- rContext.cinfo.quantize_colors = FALSE;
|
||||
+ rContext.cinfo.raw_data_out = static_cast<boolean>(FALSE);
|
||||
+ rContext.cinfo.quantize_colors = static_cast<boolean>(FALSE);
|
||||
|
||||
/* change scale for preview import */
|
||||
long nPreviewWidth = previewSize.Width();
|
||||
@@ -207,8 +208,8 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputS
|
||||
if (rContext.cinfo.scale_denom > 1)
|
||||
{
|
||||
rContext.cinfo.dct_method = JDCT_FASTEST;
|
||||
- rContext.cinfo.do_fancy_upsampling = FALSE;
|
||||
- rContext.cinfo.do_block_smoothing = FALSE;
|
||||
+ rContext.cinfo.do_fancy_upsampling = static_cast<boolean>(FALSE);
|
||||
+ rContext.cinfo.do_block_smoothing = static_cast<boolean>(FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -397,7 +398,7 @@ bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream,
|
||||
}
|
||||
|
||||
jpeg_set_defaults( &cinfo );
|
||||
- jpeg_set_quality( &cinfo, static_cast<int>(nQualityPercent), FALSE );
|
||||
+ jpeg_set_quality( &cinfo, static_cast<int>(nQualityPercent), static_cast<boolean>(FALSE) );
|
||||
|
||||
cinfo.density_unit = 1;
|
||||
cinfo.X_density = rPPI.getX();
|
||||
@@ -422,7 +423,7 @@ bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream,
|
||||
cinfo.comp_info[0].v_samp_factor = 2;
|
||||
}
|
||||
|
||||
- jpeg_start_compress( &cinfo, TRUE );
|
||||
+ jpeg_start_compress( &cinfo, static_cast<boolean>(TRUE) );
|
||||
|
||||
for( nY = 0; nY < nHeight; nY++ )
|
||||
{
|
||||
@@ -457,10 +458,10 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle)
|
||||
jvirt_barray_ptr* aSourceCoefArrays = nullptr;
|
||||
jvirt_barray_ptr* aDestinationCoefArrays = nullptr;
|
||||
|
||||
- aTransformOption.force_grayscale = FALSE;
|
||||
- aTransformOption.trim = FALSE;
|
||||
- aTransformOption.perfect = FALSE;
|
||||
- aTransformOption.crop = FALSE;
|
||||
+ aTransformOption.force_grayscale = static_cast<boolean>(FALSE);
|
||||
+ aTransformOption.trim = static_cast<boolean>(FALSE);
|
||||
+ aTransformOption.perfect = static_cast<boolean>(FALSE);
|
||||
+ aTransformOption.crop = static_cast<boolean>(FALSE);
|
||||
|
||||
// Angle to transform option
|
||||
// 90 Clockwise = 270 Counterclockwise
|
||||
@@ -489,7 +490,7 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle)
|
||||
aDestinationInfo.err->error_exit = errorExit;
|
||||
aDestinationInfo.err->output_message = outputMessage;
|
||||
|
||||
- aDestinationInfo.optimize_coding = TRUE;
|
||||
+ aDestinationInfo.optimize_coding = static_cast<boolean>(TRUE);
|
||||
|
||||
JpegDecompressOwner aDecompressOwner;
|
||||
JpegCompressOwner aCompressOwner;
|
||||
@@ -509,7 +510,7 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle)
|
||||
jpeg_svstream_src (&aSourceInfo, pInputStream);
|
||||
|
||||
jcopy_markers_setup(&aSourceInfo, aCopyOption);
|
||||
- jpeg_read_header(&aSourceInfo, TRUE);
|
||||
+ jpeg_read_header(&aSourceInfo, static_cast<boolean>(TRUE));
|
||||
jtransform_request_workspace(&aSourceInfo, &aTransformOption);
|
||||
|
||||
aSourceCoefArrays = jpeg_read_coefficients(&aSourceInfo);
|
||||
@@ -519,7 +520,7 @@ void Transform(void* pInputStream, void* pOutputStream, long nAngle)
|
||||
jpeg_svstream_dest (&aDestinationInfo, pOutputStream);
|
||||
|
||||
// Compute optimal Huffman coding tables instead of precomputed tables
|
||||
- aDestinationInfo.optimize_coding = TRUE;
|
||||
+ aDestinationInfo.optimize_coding = static_cast<boolean>(TRUE);
|
||||
jpeg_write_coefficients(&aDestinationInfo, aDestinationCoefArrays);
|
||||
jcopy_markers_execute(&aSourceInfo, &aDestinationInfo, aCopyOption);
|
||||
jtransform_execute_transformation(&aSourceInfo, &aDestinationInfo, aSourceCoefArrays, &aTransformOption);
|
||||
--
|
||||
2.21.0
|
||||
|
||||
Reference in New Issue
Block a user