Merge pull request #810 from pyhalov/openoffice

pyhalov

2014-10-04 3cbc246f24b639d78c6eb7c40d3935f853dff43f

Merge pull request #810 from pyhalov/openoffice

Update Apache OpenOffice to 4.1.1

 components/openoffice/openoffice/Makefile

@@ -16,14 +16,13 @@
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        openoffice
COMPONENT_VERSION=      4.1.0
COMPONENT_REVISION=    1
COMPONENT_VERSION=      4.1.1
COMPONENT_PROJECT_URL=  http://openoffice.apache.org/ 
COMPONENT_SUMMARY=    Apache OpenOffice Suite
COMPONENT_SRC=        aoo-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    apache-openoffice-$(COMPONENT_VERSION)-r1589052-src.tar.bz2
COMPONENT_ARCHIVE_HASH=    sha256:f73d01082fe52cc04dc91c4a53d9c8c27b551c0561b8e51ed14b1bfee8fa783e
COMPONENT_ARCHIVE_URL=    https://archive.apache.org/dist/openoffice/$(COMPONENT_VERSION)/source/$(COMPONENT_ARCHIVE)
COMPONENT_ARCHIVE=    apache-openoffice-$(COMPONENT_VERSION)-r1617669-src.tar.bz2
COMPONENT_ARCHIVE_HASH=    sha256:bb89a6d2324ddfe4c475e5484fde0dea316078f6b8ff4d8a4ebc801d17f3ff9f
COMPONENT_ARCHIVE_URL=    http://mirrors.koehn.com/apache/openoffice/$(COMPONENT_VERSION)/source/$(COMPONENT_ARCHIVE)

COMPONENT_ARCHIVE_1=0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
COMPONENT_ARCHIVE_HASH_1=md5:0168229624cfac409e766913506961a8

 components/openoffice/openoffice/openoffice.p5m

@@ -47,7 +47,7 @@
link path=usr/share/pixmaps/openoffice4-base.png target=../icons/hicolor/48x48/apps/base.png
link path=usr/share/pixmaps/openoffice4-calc.png target=../icons/hicolor/48x48/apps/calc.png
link path=usr/share/pixmaps/openoffice4-draw.png target=../icons/hicolor/48x48/apps/draw.png
link path=usr/share/pixmaps/openoffice4-impress target=../icons/hicolor/48x48/apps/impress.png
link path=usr/share/pixmaps/openoffice4-impress.png target=../icons/hicolor/48x48/apps/impress.png
link path=usr/share/pixmaps/openoffice4-math.png target=../icons/hicolor/48x48/apps/math.png
link path=usr/share/pixmaps/openoffice4-printeradmin.png target=../icons/hicolor/48x48/apps/printeradmin.png
link path=usr/share/pixmaps/openoffice4-writer.png target=../icons/hicolor/48x48/apps/writer.png

 components/openoffice/openoffice/patches/05.visibility.patch

@@ -1,41 +1,16 @@
--- aoo-4.1.0/main/sd/source/ui/slidesorter/controller/makefile.mk.~1~    2014-07-25 11:15:19.718921349 +0400
+++ aoo-4.1.0/main/sd/source/ui/slidesorter/controller/makefile.mk    2014-07-25 11:15:27.983210418 +0400
@@ -35,6 +35,7 @@
--- aoo-4.1.1/main/sc/util/makefile.pmk    2014-02-25 12:27:57.000000000 +0400
+++ aoo-4.1.1/main/sc/util/makefile.pmk    2014-10-03 18:40:42.540927212 +0400
@@ -25,4 +25,4 @@
 # define SC_DLLIMPLEMENTATION (see @ scdllapi.h)
 CDEFS += -DSC_DLLIMPLEMENTATION
 
 .INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
-VISIBILITY_HIDDEN=TRUE
+VISIBILITY_HIDDEN=
--- aoo-4.1.1/main/sd/util/makefile.pmk.~1~    2014-10-03 10:20:02.647625184 +0400
+++ aoo-4.1.1/main/sd/util/makefile.pmk    2014-10-03 10:20:50.401869732 +0400
@@ -25,4 +25,4 @@
 # define SD_DLLIMPLEMENTATION (see @ sddllapi.h)
 CDEFS += -DSD_DLLIMPLEMENTATION
 
 # --- Files --------------------------------------------------------
 
--- aoo-4.1.0/main/sc/source/filter/xml/makefile.mk.~1~    2014-07-25 17:22:15.408787581 +0400
+++ aoo-4.1.0/main/sc/source/filter/xml/makefile.mk    2014-07-25 17:22:55.391760383 +0400
@@ -38,6 +38,8 @@
 
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
-VISIBILITY_HIDDEN=TRUE
+VISIBILITY_HIDDEN=
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
--- aoo-4.1.0/main/sc/source/core/data/makefile.mk.~1~    2014-07-25 14:56:11.379754439 +0400
+++ aoo-4.1.0/main/sc/source/core/data/makefile.mk    2014-07-25 14:56:23.294858821 +0400
@@ -39,6 +39,7 @@
 .INCLUDE :  sc.mk
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
+VISIBILITY_HIDDEN=
 # --- Files --------------------------------------------------------
 
 SLOFILES =  \
--- aoo-4.1.0/main/sc/source/core/tool/makefile.mk.~1~    2014-07-25 16:02:58.759143795 +0400
+++ aoo-4.1.0/main/sc/source/core/tool/makefile.mk    2014-07-25 16:03:37.665850344 +0400
@@ -38,6 +38,7 @@
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
+VISIBILITY_HIDDEN=
 
 # --- Files --------------------------------------------------------
 

 components/openoffice/openoffice/patches/19.cppu_source_uno_data.cxx.patch

New file
@@ -0,0 +1,11 @@
--- aoo-4.1.0/main/cppu/source/uno/data.cxx.~1~    2014-08-12 12:58:22.017486428 +0400
+++ aoo-4.1.0/main/cppu/source/uno/data.cxx    2014-08-12 12:59:37.293556407 +0400
@@ -357,7 +357,7 @@
 
 #if defined(INTEL) \
     && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OS2)) || defined(MACOSX) \
-        || defined(__SUNPRO_CC) && defined(SOLARIS))
+        || ( defined(__SUNPRO_CC) || defined(__GNUC__)) && defined(SOLARIS))
 #define MAX_ALIGNMENT_4
 #endif