aboutsummaryrefslogtreecommitdiffstats
path: root/community/libreoffice/fix-includes.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-08-05 13:25:54 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-08-05 13:29:16 +0200
commitfee5a91cb7b20f393b27c73cefbeca41984facfc (patch)
tree1b85a78ce0979bcffb21a10911adf1e7cebc0f37 /community/libreoffice/fix-includes.patch
parentfac04c4fb41bf054506216f5565878e0261da628 (diff)
downloadaports-fee5a91cb7b20f393b27c73cefbeca41984facfc.tar.bz2
aports-fee5a91cb7b20f393b27c73cefbeca41984facfc.tar.xz
community/libreoffice: upgrade to 5.2.0.4
Diffstat (limited to 'community/libreoffice/fix-includes.patch')
-rw-r--r--community/libreoffice/fix-includes.patch41
1 files changed, 18 insertions, 23 deletions
diff --git a/community/libreoffice/fix-includes.patch b/community/libreoffice/fix-includes.patch
index b1f1b44101..1c925fc9be 100644
--- a/community/libreoffice/fix-includes.patch
+++ b/community/libreoffice/fix-includes.patch
@@ -1,26 +1,8 @@
---- libreoffice-4.4.0.3/vcl/inc/headless/svpinst.hxx 2015-02-02 20:38:46.879497689 -0200
-+++ libreoffice-4.4.0.3/vcl/inc/headless/svpinst.hxx 2015-02-02 20:38:55.482831474 -0200
-@@ -32,6 +32,7 @@
- #include <list>
-
- #include <time.h>
-+#include <sys/time.h>
-
- #define VIRTUAL_DESKTOP_WIDTH 1024
- #define VIRTUAL_DESKTOP_HEIGHT 768
---- libreoffice-4.4.0.3/vcl/unx/generic/gdi/cairotextrender.cxx 2015-02-02 21:19:22.822959064 -0200
-+++ libreoffice-4.4.0.3/vcl/unx/generic/gdi/cairotextrender.cxx 2015-02-02 21:19:48.312960404 -0200
-@@ -18,6 +18,7 @@
- */
-
- #include "cairotextrender.hxx"
-+#include "generic/glyphcache.hxx"
-
- #include <basegfx/polygon/b2dpolypolygon.hxx>
- #include <vcl/settings.hxx>
---- libreoffice-4.4.0.3/sd/source/ui/remotecontrol/BluetoothServer.cxx 2015-02-03 08:42:36.590056362 -0200
-+++ libreoffice-4.4.0.3/sd/source/ui/remotecontrol/BluetoothServer.cxx 2015-02-03 08:42:46.030056456 -0200
-@@ -22,7 +22,7 @@
+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>
@@ -29,3 +11,16 @@
#include <sys/socket.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/rfcomm.h>
+diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
+index 932e928..b65ced7 100644
+--- a/vcl/inc/headless/svpinst.hxx
++++ b/vcl/inc/headless/svpinst.hxx
+@@ -30,7 +30,7 @@
+
+ #include <list>
+
+-#include <time.h>
++#include <sys/time.h>
+
+ #define VIRTUAL_DESKTOP_WIDTH 1024
+ #define VIRTUAL_DESKTOP_HEIGHT 768