[Libreoffice-commits] .: 3 commits - fontconfig/ExternalProject_fontconfig.mk freetype/ExternalProject_freetype.mk redland/raptor redland/rasqal redland/redland tools/inc vcl/unx

[Libreoffice Gerrit user]

 fontconfig/ExternalProject_fontconfig.mk |    3 ++-
 freetype/ExternalProject_freetype.mk     |    3 ++-
 redland/raptor/makefile.mk               |    5 +++++
 redland/rasqal/makefile.mk               |    6 +++++-
 redland/redland/makefile.mk              |    1 +
 tools/inc/tools/solar.h                  |    6 ------
 vcl/unx/generic/app/saldisp.cxx          |    8 ++++----
 vcl/unx/generic/gdi/salvd.cxx            |    2 +-
 8 files changed, 20 insertions(+), 14 deletions(-)

New commits:
commit f83cf4e4c093012f966656e416b5ed5a44c75155
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Nov 19 12:21:12 2012 +0200

    Try to use -fvisibility=hidden when DISABLE_DYNLOADING
    
    Change-Id: I92a5de2344e82f99ac94608e1455afa8c33bd54a

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index fa759f5..8244d0d 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -129,6 +129,11 @@ CFLAGS:=-g
 .ELSE
 CFLAGS:=-O
 .ENDIF
+
+.IF "$(DISABLE_DYNLOADING)"=="TRUE"
+CFLAGS+=-fvisibility=hidden
+.ENDIF
+
 .IF "$(COM)"=="C52" && "$(CPU)"=="U"
 CFLAGS+=-m64
 .ENDIF
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 9911e2f..d10239b 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -104,8 +104,12 @@ LDFLAGS:=-Wl,-z,origin -Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-n
 LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
 .ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
 
+.IF "$(DISABLE_DYNLOADING)"=="TRUE"
+CFLAGS=-fvisibility=hidden
+.ENDIF
+
 .IF "$(COM)"=="C52" && "$(CPU)"=="U"
-CFLAGS=-m64
+CFLAGS+=-m64
 .EXPORT: CFLAGS
 .ENDIF
 
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 1fe3d6d..6459f6b 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -145,6 +145,7 @@ CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
 CONFIGURE_FLAGS=--disable-gtk-doc --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
 .IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
+CFLAGS=-fvisibility=hidden
 CONFIGURE_FLAGS+= --disable-shared
 .ELSE
 CONFIGURE_FLAGS+= --disable-static
commit b6c016da23d309b4ac7d154bc33a22397974ed73
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Nov 19 11:16:15 2012 +0200

    Use gb_VISIBILITY_FLAGS
    
    Change-Id: I6be70c0b8d73f4d1d1428c0df94ea6d8bdc782f7

diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk
index c0b1878..d882ecf 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -21,7 +21,8 @@ $(eval $(call gb_ExternalProject_register_targets,fontconfig,\
 
 $(call gb_ExternalProject_get_state_target,fontconfig,build) :
 	cd $(EXTERNAL_WORKDIR) \
-	&& $(if $(debug),CFLAGS=-g) $(if $(filter ANDROID,$(OS)),LIBS="-lm") ./configure \
+	&& CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" $(if $(filter ANDROID,$(OS)),LIBS="-lm") \
+		./configure \
 		--disable-shared \
 		--with-arch=arm \
 		--with-expat-includes=$(OUTDIR)/inc/external/expat \
diff --git a/freetype/ExternalProject_freetype.mk b/freetype/ExternalProject_freetype.mk
index 914007b..aa9c56c 100644
--- a/freetype/ExternalProject_freetype.mk
+++ b/freetype/ExternalProject_freetype.mk
@@ -17,7 +17,8 @@ $(eval $(call gb_ExternalProject_register_targets,freetype,\
 
 $(call gb_ExternalProject_get_state_target,freetype,build) :
 	cd $(EXTERNAL_WORKDIR) \
-	&& ./configure \
+	&& CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \
+		./configure \
 		--disable-shared \
 		--without-zlib \
 		--without-bzip2 \
commit 7238177ba30d51f68d7f43dc3f87283af17f382b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Nov 19 10:42:34 2012 +0200

    Drop ILLEGAL_POINTER sillyness
    
    Change-Id: I19316f0fd04f75d980719676c928c3455e0f07b7

diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index b1f3dac..5818e8f 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -50,12 +50,6 @@ typedef sal_uIntPtr    sal_uLong; /* Replaces type ULONG */
 #define __LOADONCALLAPI
 #endif
 
-#if defined UNX
-#define ILLEGAL_POINTER ((void*)1)
-#else
-#define ILLEGAL_POINTER NULL
-#endif
-
 // solar binary types
 
 /* Solar (portable) Binary (exchange) Type; OSI 6 subset
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 0522d61..b010359 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -343,8 +343,8 @@ void SalDisplay::doDestruct()
 
     if( IsDisplay() )
     {
-        delete mpInputMethod, mpInputMethod = (SalI18N_InputMethod*)ILLEGAL_POINTER;
-        delete mpKbdExtension, mpKbdExtension = (SalI18N_KeyboardExtension*)ILLEGAL_POINTER;
+        delete mpInputMethod, mpInputMethod = NULL;
+        delete mpKbdExtension, mpKbdExtension = NULL;
 
         for( unsigned int i = 0; i < m_aScreens.size(); i++ )
         {
@@ -2687,8 +2687,8 @@ SalColormap::SalColormap( sal_uInt16 nDepth )
 SalColormap::~SalColormap()
 {
 #ifdef DBG_UTIL
-    m_hColormap      = (Colormap)ILLEGAL_POINTER;
-    m_pDisplay       = (SalDisplay*)ILLEGAL_POINTER;
+    m_hColormap      = NULL;
+    m_pDisplay       = NULL;
 #endif
 }
 
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index f93f915..f241049 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -177,7 +177,7 @@ sal_Bool X11SalVirtualDevice::Init( SalDisplay *pDisplay,
 X11SalVirtualDevice::X11SalVirtualDevice() :
     m_nXScreen( 0 )
 {
-    pDisplay_               = (SalDisplay*)ILLEGAL_POINTER;
+    pDisplay_               = NULL;
     pGraphics_              = NULL;
     hDrawable_              = None;
     nDX_                    = 0;