haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-21 19:20:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

libreoffice: fix invalid casts on 32-bit build

Browse Source
This commit is contained in:
Kacper Kasper
2018-08-01 19:51:04 +02:00
parent 9c7e77201b
commit 88314feb3c
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app-office/libreoffice/libreoffice-6.2.0.0~git.recipe
View File

@@ -17,7 +17,7 @@ and Open Source office suite on the market:
HOMEPAGE="https://www.libreoffice.org/"
COPYRIGHT="2000-2018 LibreOffice contributors"
LICENSE="MPL v2.0"
REVISION="11"
REVISION="12"
COMMIT="1c56d5fec2ddd9f68aaaf21e9dbe287db893c092"
SOURCE_URI="https://github.com/LibreOffice/core/archive/$COMMIT.tar.gz"
CHECKSUM_SHA256="8ead56edb57384bf6f18331566a6d52a04d97bfd9e52e139925b8f6224d84b20"

39
app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset
View File

@@ -1,4 +1,4 @@
From 502b3d46c2b0edf22c4d47d1384f3f740ed7e7c9 Mon Sep 17 00:00:00 2001
From 440de18f647d1bd4283277f220f2bb00312a3ed6 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Fri, 1 Jun 2018 15:23:47 +0300
Subject: Fix make distro-pack-install on Haiku
@@ -39,7 +39,7 @@ index 9936b0e..4193e55 100644
2.16.4
From bcab46b0dee58ee4e501aa46204a392afcd4e854 Mon Sep 17 00:00:00 2001
From 8c67df59467dc3bc0352c194c764f9d8d8d3756b Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 4 Jun 2018 11:55:30 +0300
Subject: Fix profile dir location on Haiku
@@ -62,7 +62,7 @@ index ebeb00d..da4f697 100644
2.16.4
From d3973ea8b2cdadfe9a748d424835de9fde8f5140 Mon Sep 17 00:00:00 2001
From cfa12d272f5e67de45cbc7430f68c26dfb1fcf08 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Mon, 30 Jul 2018 22:38:23 +0000
Subject: Fix stack protector check
@@ -86,3 +86,36 @@ index 9b31d89..e19cd6c 100644
--
2.16.4
From 2f934356bc2d1c5accf25848e491affc3554d38b Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Wed, 1 Aug 2018 19:14:07 +0200
Subject: qt5: Fix invalid casts
diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/Qt5Bitmap.cxx
index 6e22ad1..7fe7bb5 100644
--- a/vcl/qt5/Qt5Bitmap.cxx
+++ b/vcl/qt5/Qt5Bitmap.cxx
@@ -152,15 +152,15 @@ bool Qt5Bitmap::Create(const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount)
buffer_data_pos += pBitmap->m_nScanline;
for (sal_uInt32 w = 0; w < nWidth; ++w)
{
- *image_data = reinterpret_cast<sal_uInt32>(colorTable.at(*buffer_data >> 4));
+ *image_data = static_cast<sal_uInt32>(colorTable.at(*buffer_data >> 4));
++image_data;
- *image_data = reinterpret_cast<sal_uInt32>(colorTable.at(*buffer_data & 0xF));
+ *image_data = static_cast<sal_uInt32>(colorTable.at(*buffer_data & 0xF));
++image_data;
++buffer_data;
}
if (isOdd)
{
- *image_data = reinterpret_cast<sal_uInt32>(colorTable.at(*buffer_data >> 4));
+ *image_data = static_cast<sal_uInt32>(colorTable.at(*buffer_data >> 4));
++image_data;
}
}
--
2.16.4