[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scp2/source

2019-04-04 Thread Jim Jagielski (via logerrit) 
 scp2/source/ooo/module_systemint.scp |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d06353475daf23b5afdaabf6784e0b7c26e8e350
Author: Jim Jagielski 
AuthorDate: Thu Apr 4 11:28:00 2019 +
Commit: Jim Jagielski 
CommitDate: Thu Apr 4 11:28:00 2019 +

Merge r1856914 from trunk:

Reviewed by: jim

diff --git a/scp2/source/ooo/module_systemint.scp 
b/scp2/source/ooo/module_systemint.scp
index 684febdea109..dcb87b7130f3 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -36,7 +36,14 @@ Module gid_Module_Optional_Systemintegration
   #else
 Styles = 
(SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE);
   #endif
-  #if (defined(LINUX)) || (defined(SOLARIS))
+/*
+ * Hardcode name as 'openoffice' to handle Beta and Dev builds which
+ * would result in openoffice_beta, for example.
+ * See sysui/desktop/productversion.mk
+ */
+  #if (defined(LINUX))
+PackageName = "openoffice-desktop-integration.tar.gz";
+  #elif (defined(SOLARIS))
 PackageName = "${SYSTEMINTUNIXPACKAGENAME}-desktop-integration.tar.gz";
   #else
 PackageName = "";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - instsetoo_native/util

2019-04-03 Thread Jim Jagielski (via logerrit) 
 instsetoo_native/util/openoffice.lst |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 17f80c1c474faef188849ba1b250c70e6c4f6d98
Author: Jim Jagielski 
AuthorDate: Wed Apr 3 19:25:50 2019 +
Commit: Jim Jagielski 
CommitDate: Wed Apr 3 19:25:50 2019 +

Set ADDSYSTEMINTEGRATION for Beta and Dev builds

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 1270bacb0657..51840e1da084 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -139,6 +139,7 @@ Apache_OpenOffice_Dev
REGISTRYLAYERNAME LayerDev
UPDATEURL 
https://ooo-updates.apache.org/aoonextdev/check.Update
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
+   ADDSYSTEMINTEGRATION 1
EVAL
PACKAGEVERSION 4.5.0
PACKAGEREVISION {milestone}
@@ -354,7 +355,7 @@ Apache_OpenOffice_Beta
UPDATEURL 
https://ooo-updates.apache.org/aoonextbeta/check.Update
ADD_INCLUDE_FILES 
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
-   ADDSYSTEMINTEGRATION 0
+   ADDSYSTEMINTEGRATION 1
EVAL
PACKAGEVERSION 4.5.0
PACKAGEREVISION {milestone}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - desktop/source odk/setsdkenv_unix.sh.in odk/settings sal/prj solenv/gbuild solenv/inc sw/source

2018-07-12 Thread Jim Jagielski 
 desktop/source/pagein/makefile.mk |5 -
 odk/setsdkenv_unix.sh.in  |   10 +-
 odk/settings/settings.mk  |   34 +++
 sal/prj/d.lst |4 
 solenv/gbuild/platform/macosx.mk  |9 +-
 solenv/inc/libs.mk|   13 +-
 sw/source/ui/frmdlg/column.src|  170 +++---
 7 files changed, 121 insertions(+), 124 deletions(-)

New commits:
commit 4c184a25474995d41296f1c59eef364b3c710842
Author: Jim Jagielski 
Date:   Thu Jul 12 18:50:38 2018 +

Update targets for macOS

diff --git a/desktop/source/pagein/makefile.mk 
b/desktop/source/pagein/makefile.mk
index e4588785cd6a..fdf2988001fa 100644
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -63,13 +63,8 @@ ALL: \
 .INCLUDE :  target.mk
 
 ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR)
-.IF "$(OS)" == "MACOSX"
-UDKDLLPOST=$(patsubst %.dylib,%$(UDK_MAJOR).dylib,$(DLLPOST)
-UNODLLPOST=.uno$(DLLPOST)
-.ELSE
 UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR)
 UNODLLPOST=.uno$(DLLPOST)
-.ENDIF
 DFTDLLPOST=$(DLLPOSTFIX)$(DLLPOST) # Default 
 
 URELIBPATH=..$/ure-link$/lib
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 7b3a39874ef0..5a7fa6382f64 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -293,15 +293,15 @@ then
 if [ "${OFFICE_HOME}" ]
 then
mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu3.${soext}" \
+   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper3${comid}.${soext}" \
+   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \

"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal3.${soext}" \
+   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper3${comid}.${soext}" \
+   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \

"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper3${comid}.${soext}" 
\
+   ln -s 
"${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \

"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
 
 fi
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 276fa3091b2a..f22d2d1eedb2 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -436,23 +436,23 @@ URLPREFIX=file://
 # Include UDK version numbers
 include $(PRJ)/include/udkversion.mk
 
-SALLIB=-luno_sal3
-CPPULIB=-luno_cppu3
-CPPUHELPERLIB=-luno_cppuhelper3$(COMID)
-SALHELPERLIB=-luno_salhelper3$(COMID)
-REGLIB=-lreg3
-STORELIB=-lstore3
-
-SALDYLIB=-Wl,-dylib_file,@__URELIB/libuno_sal3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib'
-CPPUDYLIB=-Wl,-dylib_file,@__URELIB/libuno_cppu3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib'
-CPPUHELPERDYLIB=-Wl,-dylib_file,@__URELIB/libuno_cppuhelper3'$(COMID).dylib:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib'
-SALHELPERDYLIB=-Wl,-dylib_file,@__URELIB/libuno_salhelper3$(COMID).dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib'
-REGDYLIB=-Wl,-dylib_file,@__URELIB/libreg3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib'
-STOREDYLIB=-Wl,-dylib_file,@__URELIB/libstore3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib'
-
-INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change 
@__URELIB/libuno3_sal.dylib 
@executable_path/libuno_sal3.dylib -change  
@__URELIB/libuno_cppu3.dylib 
@executable_path/libuno_cppu3.dylib -change 
@__URELIB/libuno_cppuhelper$(COMID)3.dylib
 @executable_path/libuno_cppuhelper$(COMID)3.dylib -change 
@__URELIB/libuno_salhelper$(COMID)3.dylib
 @executable_path/libuno_salhelper$(COMID)3.dylib -change 
@__URELIB/libreg3.dylib 
@executable_path/libreg3.dylib -change 
@__URELIB/libstore3.dylib 
@executable_path

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/source odk/setsdkenv_unix.sh.in odk/settings sal/prj solenv/gbuild solenv/inc

2018-07-12 Thread Jim Jagielski 
 desktop/source/pagein/makefile.mk |5 +
 odk/setsdkenv_unix.sh.in  |   10 +-
 odk/settings/settings.mk  |   34 +-
 sal/prj/d.lst |4 ++--
 solenv/gbuild/platform/macosx.mk  |6 ++
 solenv/inc/libs.mk|   13 -
 6 files changed, 39 insertions(+), 33 deletions(-)

New commits:
commit bb86fdd2cef9abc011e398dd4a4be17f3d332641
Author: Jim Jagielski 
Date:   Thu Jul 12 17:25:33 2018 +

Work on getting macOS building again w/ 4.2.0 and the versioning of libs...

what a cluster*

diff --git a/desktop/source/pagein/makefile.mk 
b/desktop/source/pagein/makefile.mk
index fdf2988001fa..e4588785cd6a 100644
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -63,8 +63,13 @@ ALL: \
 .INCLUDE :  target.mk
 
 ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR)
+.IF "$(OS)" == "MACOSX"
+UDKDLLPOST=$(patsubst %.dylib,%$(UDK_MAJOR).dylib,$(DLLPOST)
+UNODLLPOST=.uno$(DLLPOST)
+.ELSE
 UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR)
 UNODLLPOST=.uno$(DLLPOST)
+.ENDIF
 DFTDLLPOST=$(DLLPOSTFIX)$(DLLPOST) # Default 
 
 URELIBPATH=..$/ure-link$/lib
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 5a7fa6382f64..7b3a39874ef0 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -293,15 +293,15 @@ then
 if [ "${OFFICE_HOME}" ]
 then
mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}.3" \
+   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu3.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
+   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper3${comid}.${soext}" \

"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}.3" \
+   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal3.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
-   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
+   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper3${comid}.${soext}" \

"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
-   ln -s 
"${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \
+   ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper3${comid}.${soext}" 
\

"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
 
 fi
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index f22d2d1eedb2..276fa3091b2a 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -436,23 +436,23 @@ URLPREFIX=file://
 # Include UDK version numbers
 include $(PRJ)/include/udkversion.mk
 
-SALLIB=-luno_sal
-CPPULIB=-luno_cppu
-CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-SALHELPERLIB=-luno_salhelper$(COMID)
-REGLIB=-lreg
-STORELIB=-lstore
-
-SALDYLIB=-Wl,-dylib_file,@__URELIB/libuno_sal.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib'
-CPPUDYLIB=-Wl,-dylib_file,@__URELIB/libuno_cppu.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib'
-CPPUHELPERDYLIB=-Wl,-dylib_file,@__URELIB/libuno_cppuhelper'$(COMID).dylib.3:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib'
-SALHELPERDYLIB=-Wl,-dylib_file,@__URELIB/libuno_salhelper$(COMID).dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib'
-REGDYLIB=-Wl,-dylib_file,@__URELIB/libreg.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib'
-STOREDYLIB=-Wl,-dylib_file,@__URELIB/libstore.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib'
-
-INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change 
@__URELIB/libuno_sal.dylib.3 
@executable_path/libuno_sal.dylib.3 -change  
@__URELIB/libuno_cppu.dylib.3 
@executable_path/libuno_cppu.dylib.3 -change 
@__URELIB/libuno_cppuhelper$(COMID).dylib.3
 @executable_path/libuno_cppuhelper$(COMID).dylib.3 -change 
@__URELIB/libuno_salhelper$(COMID).dylib.3
 @executable_path/libuno_salhelper$(COMID).dylib.3 -change 
@__URELIB/libreg.dylib.3 
@executable_path/libreg.dylib.3 -change 
@___

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - lingucomponent/Library_MacOSXSpell.mk lingucomponent/source

2018-07-05 Thread Jim Jagielski 
 lingucomponent/Library_MacOSXSpell.mk|6 ++
 lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx |2 ++
 2 files changed, 8 insertions(+)

New commits:
commit 6d1023002af66a4f7453ffdf50ff50f79d443b24
Author: Jim Jagielski 
Date:   Thu Jul 5 14:04:55 2018 +

This is a start in the right direction... Now try to track down why we

are getting these undefined symbol errors:

Undefined symbols for architecture x86_64:
"std::string::find(char const*, unsigned long, unsigned long) const", 
referenced from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::string::_Rep::_M_destroy(std::allocator const&)", referenced 
from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::string::_Rep::_S_empty_rep_storage", referenced from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::string::append(char const*, unsigned long)", referenced from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::string::append(std::string const&)", referenced from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::string::replace(unsigned long, unsigned long, char const*, unsigned 
long)", referenced from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::basic_string, std::allocator 
>::basic_string(char const*, std::allocator const&)", referenced from:
Hunspell::spellml(char***, char const*) in libhunspell-1.3.a(hunspell.o)
"std::__throw_length_error(char const*)", referenced from:
std::vector 
>::_M_fill_insert(__gnu_cxx::__normal_iterator > >, unsigned long, affentry const&) in 
libhunspell-1.3.a(affixmgr.o)
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see 
invocation)
make: *** [/Users/jim/src/asf/AOO420/main/solenv/gbuild/LinkTarget.mk:251: 
/Users/jim/src/asf/AOO420/main/solver/420/unxmaccx.pro/workdir/LinkTarget/Library/libspell.uno.dylib]
 Error 1
dmake:  Error code 2, while making 'all'

diff --git a/lingucomponent/Library_MacOSXSpell.mk 
b/lingucomponent/Library_MacOSXSpell.mk
index cd3a7dc098ea..7b33e3a7a725 100644
--- a/lingucomponent/Library_MacOSXSpell.mk
+++ b/lingucomponent/Library_MacOSXSpell.mk
@@ -56,6 +56,8 @@ $(eval $(call gb_Library_add_linked_libs,MacOSXSpell,\
 
 $(eval $(call gb_Library_add_libs,MacOSXSpell,\
-framework Cocoa \
+   -framework Carbon \
+   -framework CoreFoundation \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,MacOSXSpell,\
@@ -63,5 +65,9 @@ $(eval $(call gb_Library_add_exception_objects,MacOSXSpell,\
lingucomponent/source/spellcheck/macosxspell/macspellimp \
 ))
 
+$(eval $(call gb_Library_add_cxxflags,MacOSXSpell,\
+-x -objective-c++ -stdlib=libc++ \
+))
+
 # vim: set noet sw=4 ts=4:
 
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx 
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index 9ad776439f7c..db51849fda59 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -31,7 +31,9 @@
 #ifdef MACOSX
 #include 
 #include 
+#include 
 #import 
+#import 
 #include 
 #endif
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild

2018-07-03 Thread Jim Jagielski 
 solenv/gbuild/Library.mk |1 -
 solenv/gbuild/platform/macosx.mk |   18 ++
 2 files changed, 2 insertions(+), 17 deletions(-)

New commits:
commit b5beba607e1ae77088bf212517d2c5e942a4f071
Author: Jim Jagielski 
Date:   Tue Jul 3 22:41:51 2018 +

Just avoid versioning totally w/ macOS... it doesn't work like Linux and 
others and the format is totally different, from what I can tell...

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index b1a35af99a6a..f10dc030a284 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -102,7 +102,6 @@ gb_Library_get_runtime_filename = \
 
 define gb_Library_is_udk_versioned
 $(or \
-$(filter-out $(OS),MACOSX),\
$(filter $(patsubst %:$(notdir $(1)),%,$(filter %:$(notdir 
$(1)),$(gb_Library_FILENAMES))),$(gb_Library_RTVERLIBS)),\
$(filter $(patsubst %:$(notdir $(1)),%,$(filter %:$(notdir 
$(1)),$(gb_Library_FILENAMES))),$(gb_Library_UNOVERLIBS)))
 endef
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 065080a1ec2c..1f6345cffbf8 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -287,8 +287,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter 
Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) $(gb_macos_LDFLAGS) \
-   $(if $(VERSIONMAP),$(gb_Library_VERSIONMAPFLAG) $(VERSIONMAP)) \
-   $(if $(call 
gb_Library_is_udk_versioned,$(1)),-Wl$(COMMA)-h$(notdir $(1)).$(gb_UDK_MAJOR)) \
$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
@@ -296,7 +294,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
$(LIBS) \
-   -o $(if $(call 
gb_Library_is_udk_versioned,$(1)),$(1).$(gb_UDK_MAJOR),$(1)) \
+   -o $(1) \
`cat $${DYLIB_FILE}` && \
$(if $(filter Library,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library 
$(LAYER) $(1) && \
@@ -304,12 +302,6 @@ $(call gb_Helper_abbreviate_dirs,\
rm -f $${DYLIB_FILE})
 endef
 
-define gb_LinkTarget__command_symlink_udk_versioned_library
-   $(if $(call gb_Library_is_udk_versioned,$(1)),
-   $(call gb_Helper_abbreviate_dirs,\
-   rm -f $(1) && ln -s $(notdir $(1)).$(gb_UDK_MAJOR) 
$(1)))
-endef
-
 # parameters: 1-linktarget 2-cobjects 3-cxxobjects
 define gb_LinkTarget__command_staticlink
 $(call gb_Helper_abbreviate_dirs,\
@@ -325,7 +317,6 @@ endef
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
 $(if $(filter Library GoogleTest Executable,$(TARGETTYPE)),$(call 
gb_LinkTarget__command_dynamiclink,$(1),$(2)))
-$(if $(filter Library,$(TARGETTYPE)),$(call 
gb_LinkTarget__command_symlink_udk_versioned_library,$(1)))
 $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call 
gb_LinkTarget__command_staticlink,$(1)))
 endef
 
@@ -334,7 +325,6 @@ endef
 
 gb_Library_DEFS :=
 gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
-gb_Library_VERSIONMAPFLAG := -Wl,-exported_symbols_list
 gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
 gb_Library_PLAINEXT := .dylib
@@ -383,11 +373,7 @@ endef
 define gb_Library_Library_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call 
gb_Library_get_rpath,$(1))
 $(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call 
gb_Library_get_layer,$(1))
-ifneq (,$(call gb_Library_is_udk_versioned,$(call gb_Library_get_target,$(1
-$(call gb_Library_get_target,$(1)) \
-$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS +=  \
-   $(call gb_Library_get_target,$(1)).$(gb_UDK_MAJOR)
-endif
+
 endef
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - set_soenv.in solenv/gbuild

2018-07-03 Thread Jim Jagielski 
 set_soenv.in |3 ++-
 solenv/gbuild/Library.mk |1 +
 solenv/gbuild/platform/macosx.mk |   16 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit a38be85fd66236e041a2a0d24b2ed11b2cbc68ee
Author: Jim Jagielski 
Date:   Tue Jul 3 22:04:26 2018 +

restore until I can figure out a way to handle this crud which assumes 
everything is a .so

diff --git a/set_soenv.in b/set_soenv.in
index b4acb948299e..af8a7d8f1632 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -96,7 +96,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, 
$JAVAFLAGS, $OOO_SHELL,
  $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, 
$SOLARENV, 
  $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, 
$STAR_SSOLARINI, 
  $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $CXX_X64_BINARY, 
$LINK_X64_BINARY, $LIBMGR_X64_BINARY,
- $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $MACOSX_DEPLOYMENT_TARGET, 
$MACOSX_SDK_PATH,
+ $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $MACOSX_DEPLOYMENT_TARGET, 
$MACOSX_SDK_PATH, $SDKROOT,
  $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, 
  $SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL, 
  $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, 
$FRAME_HOME, 
@@ -1765,6 +1765,7 @@ if ( $platform =~ m/darwin/ )
 # http://developer.apple.com/technotes/tn2002/tn2064.html
 ToFile( "MACOSX_DEPLOYMENT_TARGET",   "@MACOSX_DEPLOYMENT_TARGET@",
   "e" );
 ToFile( "MACOSX_SDK_PATH",   "@MACOSX_SDK_PATH@",   "e" );
+ToFile( "SDKROOT",   "@SDKROOT@",   "e" );
 }
 if ( $platform =~ m/freebsd/ )
 {
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index f10dc030a284..b1a35af99a6a 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -102,6 +102,7 @@ gb_Library_get_runtime_filename = \
 
 define gb_Library_is_udk_versioned
 $(or \
+$(filter-out $(OS),MACOSX),\
$(filter $(patsubst %:$(notdir $(1)),%,$(filter %:$(notdir 
$(1)),$(gb_Library_FILENAMES))),$(gb_Library_RTVERLIBS)),\
$(filter $(patsubst %:$(notdir $(1)),%,$(filter %:$(notdir 
$(1)),$(gb_Library_FILENAMES))),$(gb_Library_UNOVERLIBS)))
 endef
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index fc54d1e66f1b..065080a1ec2c 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -288,6 +288,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) $(gb_macos_LDFLAGS) \
$(if $(VERSIONMAP),$(gb_Library_VERSIONMAPFLAG) $(VERSIONMAP)) \
+   $(if $(call 
gb_Library_is_udk_versioned,$(1)),-Wl$(COMMA)-h$(notdir $(1)).$(gb_UDK_MAJOR)) \
$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
@@ -295,7 +296,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
$(LIBS) \
-   -o $(1) \
+   -o $(if $(call 
gb_Library_is_udk_versioned,$(1)),$(1).$(gb_UDK_MAJOR),$(1)) \
`cat $${DYLIB_FILE}` && \
$(if $(filter Library,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library 
$(LAYER) $(1) && \
@@ -303,6 +304,12 @@ $(call gb_Helper_abbreviate_dirs,\
rm -f $${DYLIB_FILE})
 endef
 
+define gb_LinkTarget__command_symlink_udk_versioned_library
+   $(if $(call gb_Library_is_udk_versioned,$(1)),
+   $(call gb_Helper_abbreviate_dirs,\
+   rm -f $(1) && ln -s $(notdir $(1)).$(gb_UDK_MAJOR) 
$(1)))
+endef
+
 # parameters: 1-linktarget 2-cobjects 3-cxxobjects
 define gb_LinkTarget__command_staticlink
 $(call gb_Helper_abbreviate_dirs,\
@@ -318,6 +325,7 @@ endef
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
 $(if $(filter Library GoogleTest Executable,$(TARGETTYPE)),$(call 
gb_LinkTarget__command_dynamiclink,$(1),$(2)))
+$(if $(filter Library,$(TARGETTYPE)),$(call 
gb_LinkTarget__command_symlink_udk_versioned_library,$(1)))
 $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call 
gb_LinkTarget__command_staticlink,$(1)))
 endef
 
@@ -375,7 +383,11 @@ endef
 define gb_Library_Library_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call 
gb_Library_get_rpath,$(1))
 $(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call 
gb_Library_get_layer,$(1))
-
+ifneq (,$(call gb_Library_is_udk_versioned,$(call gb_Library_get_target,$(1
+$(call gb_Library_get_ta

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild

2018-03-19 Thread Jim Jagielski 
 solenv/gbuild/platform/macosx.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6af10244333e1a68c53b3a8ed2938f32976b53fa
Author: Jim Jagielski 
Date:   Tue Mar 20 00:15:51 2018 +

Pattern match and back to s5abi for now...

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 6bcd3a998ccd..a460cbb7767f 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -23,7 +23,7 @@
 
 GUI := UNX
 #COM := S5ABI
-#COMID := s5abi
+COMID := s5abi
 
 # Darwin mktemp -t expects a prefix, not a pattern
 gb_MKTEMP ?= /usr/bin/mktemp -t gbuild.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - lucene/lucene-java-version.patch solenv/gbuild

2018-03-19 Thread Jim Jagielski 
 lucene/lucene-java-version.patch |   20 ++--
 solenv/gbuild/platform/macosx.mk |2 --
 2 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 08c3b36e02e8c52597dc595b2b832390b3aa3147
Author: Jim Jagielski 
Date:   Mon Mar 19 16:53:04 2018 +

Use gcc3 for COMID for macOS/OSX

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index a57f7347628c..6bcd3a998ccd 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -22,8 +22,6 @@
 
 
 GUI := UNX
-COM := S5ABI
-COMID := s5abi
 #COM := S5ABI
 #COMID := s5abi
 
commit 146c1088dc5078c1722b37a9c84fdae6b4de2027
Author: Jim Jagielski 
Date:   Mon Mar 19 15:14:19 2018 +

More EOL foolishness

diff --git a/lucene/lucene-java-version.patch b/lucene/lucene-java-version.patch
index 626be2a8d1ed..c22e7fc94aa3 100644
--- a/lucene/lucene-java-version.patch
+++ b/lucene/lucene-java-version.patch
@@ -27,13 +27,13 @@
 --- misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml
2010-11-28 02:22:11.0 +0200
 +++ misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml
2018-03-05 06:41:07.207097100 +0200
 @@ -23,8 +23,8 @@
- Smart Chinese Analyzer
-   
- 
--  
--  
-+  
-+  
-   
-   
-   
+ Smart Chinese Analyzer
+   
+ 
+-  
+-  
++  
++  
+   
+   
+   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - lucene/lucene-java-version.patch

2018-03-19 Thread Jim Jagielski 
 lucene/lucene-java-version.patch |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 2cacdb9d5301529dde7449b81547b78805dae50c
Author: Jim Jagielski 
Date:   Mon Mar 19 14:16:14 2018 +

Strip out non-asciis which cause patch to barf

diff --git a/lucene/lucene-java-version.patch b/lucene/lucene-java-version.patch
index ece4c37a0848..626be2a8d1ed 100644
--- a/lucene/lucene-java-version.patch
+++ b/lucene/lucene-java-version.patch
@@ -24,16 +24,16 @@



 misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml
2010-11-28 02:22:11.0 +0200
-+++ misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml
2018-03-05 06:41:07.207097100 +0200
-@@ -23,8 +23,8 @@
- Smart Chinese Analyzer
-   
- 
--  
--  
-+  
-+  
-   
-   
-   
+--- misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml
2010-11-28 02:22:11.0 +0200
 misc/build/lucene-2.9.4/contrib/analyzers/smartcn/build.xml
2018-03-05 06:41:07.207097100 +0200
+@@ -23,8 +23,8 @@
+ Smart Chinese Analyzer
+   
+ 
+-  
+-  
++  
++  
+   
+   
+   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild vcl/Library_vcl.mk

2017-11-29 Thread Jim Jagielski 
 solenv/gbuild/platform/macosx.mk |7 ++-
 vcl/Library_vcl.mk   |3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 6f4da39da183978774be7cc241bf00e0c82a5e2c
Author: Jim Jagielski 
Date:   Wed Nov 29 13:02:36 2017 +

OK, let's try to maintain 10.7 as the min OSX version supported.

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index e71036bb22d9..7ec6a66a7155 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -107,6 +107,11 @@ ifneq ($(COM),GCC)
gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH -I../v1/
 endif
 
+ifeq ($(MACOSX_DEPLOYMENT_TARGET),$(filter $(MACOSX_DEPLOYMENT_TARGET), 10.7 
10.8))
+   gb_CXXFLAGS += -std=c++11 -stdlib=libc++
+   gb_macos_LDFLAGS := -std=c++11 -stdlib=libc++
+endif
+
 # these are to get g++ to switch to Objective-C++ mode
 # (see toolkit module for a case where it is necessary to do it this way)
 gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
@@ -280,7 +285,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter 
Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(subst \d,$$,$(RPATH)) \
-   $(T_LDFLAGS) \
+   $(T_LDFLAGS) $(gb_macos_LDFLAGS) \
$(if $(VERSIONMAP),$(gb_Library_VERSIONMAPFLAG) $(VERSIONMAP)) \
$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 673e0e680ba1..89dbf0baa0a8 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -511,7 +511,8 @@ $(eval $(call gb_Library_add_libs,vcl,\
 -framework CoreFoundation \
 ))
 # ??? what about this
-ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
+#ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
+ifneq ($(MACOSX_DEPLOYMENT_TARGET),$(filter $(MACOSX_DEPLOYMENT_TARGET), 10.7 
10.8))
 $(eval $(call gb_Library_add_ldflags,vcl, $$(LDFLAGS) -framework QuickTime ))
 endif
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - fpicker/Library_fps_aqua.mk framework/Library_fwk.mk scp2/source

2017-11-27 Thread Jim Jagielski 
 fpicker/Library_fps_aqua.mk  |2 +-
 framework/Library_fwk.mk |   10 ++
 scp2/source/ooo/file_library_ooo.scp |6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 8cb278ca61ead3b779e0402c1d77cacc7ea35e27
Author: Jim Jagielski 
Date:   Mon Nov 27 18:53:02 2017 +

Build and compilation changes for macOS:

o Change optimization level
o Created shared libs do not include major/minor numbers

diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index 0f792efe9e92..bb4ddf9a21c5 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_exception_objects,fps_aqua,\
 ))
 
 $(eval $(call gb_Library_add_cxxflags,fps_aqua,\
--x objective-c++ -DMACOSX_DEPLOYMENT_TARGET=10.7 \
+-x objective-c++ \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index eca095d0764e..fd66cae227c7 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -61,10 +61,6 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\
 $(gb_STDLIBS) \
 ))
 
-ifeq ($(OS),MACOSX)
-gb_COMPILEROPTFLAGS := -O1
-endif
-
 $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/accelerators/acceleratorcache \
 framework/source/accelerators/acceleratorconfiguration \
@@ -194,4 +190,10 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/xml/imagesdocumenthandler \
 ))
 
+# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX
+ifeq ($(OS),MACOSX)
+$(call gb_CxxObject_get_target,framework/source/loadenv/loadenv):\
+T_CXXFLAGS := $(gb_LinkTarget_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) 
$(gb_COMPILERNOOPTFLAGS)
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index e318922809c7..d433b01df9c0 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -2023,7 +2023,7 @@ File gid_File_Lib_Apr
// Looks like the major version number is part of the name, not
// part of the suffix.  An error?
#ifdef MACOSX
-Name = 
STRING(CONCAT6(libapr-1,.0.,APR_MINOR,.,APR_MICRO,UNXSUFFIX));
+Name = STRING(CONCAT2(libapr-1,UNXSUFFIX));
#elif FREEBSD
 Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.5));
 #else
@@ -2042,7 +2042,7 @@ File gid_File_Lib_AprUtil
// Looks like the major version number is part of the name, not
// part of the suffix.  An error?
#ifdef MACOSX
-Name = 
STRING(CONCAT6(libaprutil-1,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO,UNXSUFFIX));
+   Name = STRING(CONCAT2(libaprutil-1,UNXSUFFIX));
#elif FREEBSD
 Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.5));
#else
@@ -2061,7 +2061,7 @@ File gid_File_Lib_Serf
// Looks like the major version number is part of the name, not
// part of the suffix.  An error?
#ifdef MACOSX
-Name = STRING(CONCAT4(libserf-,SERF_MAJOR,.0.0.0,UNXSUFFIX));
+Name = STRING(CONCAT3(libserf-,SERF_MAJOR,UNXSUFFIX));
#elif FREEBSD
 Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0));
#else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - fpicker/Library_fps_aqua.mk fpicker/source

2017-11-27 Thread Jim Jagielski 
 fpicker/Library_fps_aqua.mk|8 +++-
 fpicker/source/aqua/AquaFilePickerDelegate.cxx |   24 
 fpicker/source/aqua/CFStringUtilities.hxx  |1 +
 fpicker/source/aqua/NSString_OOoAdditions.cxx  |   16 
 fpicker/source/aqua/NSURL_OOoAdditions.cxx |   10 +-
 5 files changed, 33 insertions(+), 26 deletions(-)

New commits:
commit ee5a916a73aa85e06115aca56d3b2696c0cd1eac
Author: Jim Jagielski 
Date:   Mon Nov 27 15:14:23 2017 +

Force fpicker to be treated as objC and ensure we

link to the required libs

diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index d42296d19489..0f792efe9e92 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -30,6 +30,12 @@ $(eval $(call gb_Library_set_include,fps_aqua,\
-I$(SRCDIR)/fpicker/inc/pch \
 ))
 
+$(eval $(call gb_Library_add_libs,fps_aqua,\
+-framework Cocoa \
+-framework Carbon \
+-framework CoreFoundation \
+))
+
 $(eval $(call gb_Library_add_api,fps_aqua,\
offapi \
udkapi \
@@ -59,7 +65,7 @@ $(eval $(call gb_Library_add_exception_objects,fps_aqua,\
 ))
 
 $(eval $(call gb_Library_add_cxxflags,fps_aqua,\
--x objective-c++ \
+-x objective-c++ -DMACOSX_DEPLOYMENT_TARGET=10.7 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm 
b/fpicker/source/aqua/AquaFilePickerDelegate.cxx
similarity index 96%
rename from fpicker/source/aqua/AquaFilePickerDelegate.mm
rename to fpicker/source/aqua/AquaFilePickerDelegate.cxx
index 0a9106288765..65f2106ebf0c 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.mm
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.cxx
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  */
 
 
@@ -84,35 +84,35 @@
 if (sender == nil) {
 return;
 }
-
+
 if ([sender class] != [NSPopUpButton class]) {
 return;
 }
-
+
 if (filterHelper == NULL) {
 return;
 }
-
+
 NSPopUpButton *popup = (NSPopUpButton*)sender;
 unsigned int selectedIndex = [popup indexOfSelectedItem];
-
+
 filterHelper->SetFilterAtIndex(selectedIndex);
-
+
 filePicker->filterControlChanged();
 }
 
-- (void)autoextensionChanged:(id)sender 
+- (void)autoextensionChanged:(id)sender
 {
 if (sender == nil) {
 return;
 }
-
+
 if ([sender class] != [NSButton class]) {
 return;
 }
 uno::Any aValue;
 aValue <<= ([((NSButton*)sender) state] == NSOnState);
-
+
 
filePicker->setValue(::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION,
 0, aValue);
 }
 
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx 
b/fpicker/source/aqua/CFStringUtilities.hxx
index 4df5b29f110b..6c9965849061 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.mm 
b/fpicker/source/aqua/NSString_OOoAdditions.cxx
similarity index 96%
rename from fpicker/source/aqua/NSString_OOoAdditions.mm
rename to fpicker/source/aqua/NSString_OOoAdditions.cxx
index 08acb37e9c66..59c831f5c5d0 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSString_OOoAdditions.cxx
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - framework/Library_fwk.mk

2017-11-18 Thread Jim Jagielski 
 framework/Library_fwk.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 20440b8f01a386ea7bf6f186cd2c4e45f22fa331
Author: Jim Jagielski 
Date:   Sat Nov 18 22:24:42 2017 +

Force compilation with -O1 flag instead of -O2

diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 1d0985f907f2..eca095d0764e 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -61,6 +61,10 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\
 $(gb_STDLIBS) \
 ))
 
+ifeq ($(OS),MACOSX)
+gb_COMPILEROPTFLAGS := -O1
+endif
+
 $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/accelerators/acceleratorcache \
 framework/source/accelerators/acceleratorconfiguration \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - fpicker/Library_fps_aqua.mk fpicker/Module_fpicker.mk

2017-10-14 Thread Jim Jagielski 
 fpicker/Library_fps_aqua.mk |3 +++
 fpicker/Module_fpicker.mk   |5 +
 2 files changed, 8 insertions(+)

New commits:
commit b1d5f4b57181db38a0543c18960a4d0de191b454
Author: Jim Jagielski 
Date:   Sat Oct 14 20:19:37 2017 +

We actually need to build fpicker for macOS/aqua

diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index 96efa4d89276..d42296d19489 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -58,5 +58,8 @@ $(eval $(call gb_Library_add_exception_objects,fps_aqua,\
fpicker/source/aqua/AquaFilePickerDelegate \
 ))
 
+$(eval $(call gb_Library_add_cxxflags,fps_aqua,\
+-x objective-c++ \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index dcd4070e9c23..5c5839ea13db 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -59,4 +59,9 @@ $(eval $(call gb_Module_add_targets,fpicker,\
 ))
 endif
 
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,fpicker,\
+   Library_fps_aqua \
+))
+endif
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - postprocess/packcomponents

2017-10-14 Thread Jim Jagielski 
 postprocess/packcomponents/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3ffcaf4b4b11808c60847224de81d5b2e29608d9
Author: Jim Jagielski 
Date:   Sat Oct 14 13:57:49 2017 +

Hmmm. Looks like a cut/paste error. The correct dir name is

'component' not 'components'

diff --git a/postprocess/packcomponents/makefile.mk 
b/postprocess/packcomponents/makefile.mk
index 13e215aff76d..98be0a54e500 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -314,7 +314,7 @@ my_components += \
 my_components += \
 component/avmedia/source/macavf/avmediaMacAVF \
 component/avmedia/source/quicktime/avmediaQuickTime \
-components/fpicker/source/aqua/fps_aqua \
+component/fpicker/source/aqua/fps_aqua \
 macab1 \
 macbe1 \
 MacOSXSpell
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - avmedia/AllLangResTarget_avmedia.mk avmedia/Library_avmediagst.mk avmedia/Library_avmediaMacAVF.mk avmedia/Library_avmedia.mk avmedia/Library_avmed

2017-10-13 Thread Jim Jagielski 
 avmedia/AllLangResTarget_avmedia.mk |6 ++
 avmedia/Library_avmedia.mk  |6 ++
 avmedia/Library_avmediaMacAVF.mk|6 ++
 avmedia/Library_avmediaQuickTime.mk |6 ++
 avmedia/Library_avmediagst.mk   |6 ++
 avmedia/Library_avmediawin.mk   |6 ++
 6 files changed, 36 insertions(+)

New commits:
commit 9072c77e9f723203252693d4ddd3d5452b535e05
Author: Jim Jagielski 
Date:   Fri Oct 13 20:45:00 2017 +

Required macOS changes to ensure build of avmedia module and

ObjC conflict in SDK

diff --git a/avmedia/AllLangResTarget_avmedia.mk 
b/avmedia/AllLangResTarget_avmedia.mk
index 050867400697..95906fa74770 100644
--- a/avmedia/AllLangResTarget_avmedia.mk
+++ b/avmedia/AllLangResTarget_avmedia.mk
@@ -32,6 +32,12 @@ $(eval $(call gb_SrsTarget_set_include,avmedia/res,\
-I$(SRCDIR)/avmedia/inc \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_cxxflags,avmedia,\
+-x objective-c++ \
+))
+endif
+
 # add src files here (complete path relative to repository root)
 $(eval $(call gb_SrsTarget_add_files,avmedia/res,\
avmedia/source/framework/mediacontrol.src \
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 006721121f11..59792bc1e92a 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -42,6 +42,12 @@ $(eval $(call gb_Library_add_api,avmedia,\
udkapi \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_cxxflags,avmedia,\
+-x objective-c++ \
+))
+endif
+
 $(eval $(call gb_Library_add_linked_libs,avmedia,\
comphelper \
cppuhelper \
diff --git a/avmedia/Library_avmediaMacAVF.mk b/avmedia/Library_avmediaMacAVF.mk
index 235611086962..fd13ae4d8110 100644
--- a/avmedia/Library_avmediaMacAVF.mk
+++ b/avmedia/Library_avmediaMacAVF.mk
@@ -33,6 +33,12 @@ $(eval $(call gb_Library_set_include,avmediaMacAVF,\
-I$(SRCDIR)/avmedia/source/inc \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_cxxflags,avmediaMacAVF,\
+-x objective-c++ \
+))
+endif
+
 $(eval $(call gb_Library_add_api,avmediaMacAVF,\
offapi \
udkapi \
diff --git a/avmedia/Library_avmediaQuickTime.mk 
b/avmedia/Library_avmediaQuickTime.mk
index ba9649a388ae..9769331b347e 100644
--- a/avmedia/Library_avmediaQuickTime.mk
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -33,6 +33,12 @@ $(eval $(call gb_Library_set_include,avmediaQuickTime,\
-I$(SRCDIR)/avmedia/source/inc \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_cxxflags,avmediaQuickTime,\
+-x objective-c++ \
+))
+endif
+
 $(eval $(call gb_Library_add_api,avmediaQuickTime,\
offapi \
udkapi \
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index b37ef6e6a795..d583e7398d6b 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -39,6 +39,12 @@ $(eval $(call gb_Library_add_cflags,avmediagst,\
$(filter-out -I%,$(GTK_CFLAGS)) \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_cxxflags,avmediagst,\
+-x objective-c++ \
+))
+endif
+
 $(eval $(call gb_Library_add_api,avmediagst,\
offapi \
udkapi \
diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index 579ff03114b9..d0d5c73b655a 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -38,6 +38,12 @@ $(eval $(call gb_Library_add_api,avmediawin,\
udkapi \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_cxxflags,avmediawin,\
+-x objective-c++ \
+))
+endif
+
 $(eval $(call gb_Library_add_linked_libs,avmediawin,\
comphelper \
cppuhelper \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/aqua vcl/Library_vcl.mk

2017-10-12 Thread Jim Jagielski 
 vcl/Library_vcl.mk  |7 +--
 vcl/aqua/source/dtrans/PictToBmpFlt.cxx |2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3215360f49ce63f773db32d1640de1e23c040b78
Author: Jim Jagielski 
Date:   Thu Oct 12 15:32:34 2017 +

macOS compilation fixes, mostly due to 10.7/10.9 SDK differences

and items deprecated

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 0f6393ce9ec1..673e0e680ba1 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -106,13 +106,15 @@ $(eval $(call gb_Library_add_libs,vcl,\
 endif
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_set_ldflags,vcl,\
+$(eval $(call gb_Library_add_ldflags,vcl,\
 $$(LDFLAGS) \
 ))
 endif
 
 ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_cxxflags,vcl,\
+$$(CXXFLAGS) \
+$$(OBJCXXFLAGS) \
 $(gb_OBJCXXFLAGS) \
 ))
 ifeq ($(ENABLE_CAIRO),TRUE)
@@ -503,13 +505,14 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
 AppleRemote \
 ))
 $(eval $(call gb_Library_add_libs,vcl,\
+$$(LDFLAGS) \
 -framework Cocoa \
 -framework Carbon \
 -framework CoreFoundation \
 ))
 # ??? what about this
 ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
-$(eval $(call gb_Library_set_ldflags,vcl, $$(LDFLAGS) -framework QuickTime ))
+$(eval $(call gb_Library_add_ldflags,vcl, $$(LDFLAGS) -framework QuickTime ))
 endif
 endif
 
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx 
b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
index ef103a8a2f80..549edeba3a44 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
@@ -31,7 +31,7 @@
 #define DEPRECATED_ATTRIBUTE
 
 #include 
-#include 
+// #include 
 #include 
 
 #include "PictToBmpFlt.hxx"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - nss/nss.patch sw/source

2017-10-09 Thread Jim Jagielski 
 nss/nss.patch   |4 ++--
 sw/source/ui/config/optload.src |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b647042ff4fcedff5b4817ed793095e5da84ebab
Author: Jim Jagielski 
Date:   Mon Oct 9 20:59:12 2017 +

Force lib again

diff --git a/nss/nss.patch b/nss/nss.patch
index 17ca773ac9b3..decd24926a5f 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -116,7 +116,7 @@ diff -ur misc/nss-3.25/nss/coreconf/Darwin.mk 
misc/build/nss-3.25/nss/coreconf/D
 +
 +# CC is taken from environment automatically.
 +#CC   = cc
-+CCC   = $(CXX) -stdlib=libc++
++CCC   = $(CXX) -stdlib=libc++ -std=c++11
  
 -CC= gcc
 -CCC   = g++
@@ -282,7 +282,7 @@ diff -ur misc/nss-3.25/nss/external_tests/common/gtest.mk 
misc/build/nss-3.25/ns
  else
 -CXXFLAGS += -std=c++0x
 +ifeq (Darwin,$(OS_ARCH))
-+CXXFLAGS += -stdlib=libc++
++CXXFLAGS += -stdlib=libc++ -std=c++11
 +else
 +CXXFLAGS += -std=c++0x
 +endif
commit 4ea2caad90cb3cb34ab9bf4dfa117b83e0c9f853
Author: Matthias Seidel 
Date:   Mon Oct 9 20:10:55 2017 +

Increased length for localized strings

diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src
index 856343037024..9ac20221f4d8 100644
--- a/sw/source/ui/config/optload.src
+++ b/sw/source/ui/config/optload.src
@@ -44,7 +44,7 @@ TabPage TP_OPTLOAD_PAGE
 FixedText FT_LINK
 {
 Pos = MAP_APPFONT ( 12 , 14 ) ;
-Size = MAP_APPFONT ( 115 , 8 ) ;
+Size = MAP_APPFONT ( 125 , 8 ) ;
 Text [ en-US ] = "Update links when loading";
 };
 RadioButton RB_ALWAYS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - nss/nss.patch solenv/gbuild

2017-10-09 Thread Jim Jagielski 
 nss/nss.patch|   33 ++---
 solenv/gbuild/platform/macosx.mk |4 ++--
 2 files changed, 32 insertions(+), 5 deletions(-)

New commits:
commit 97bf734e89eb17f0c35f96466e437d5b53960229
Author: Jim Jagielski 
Date:   Mon Oct 9 19:36:22 2017 +

More hoo-haa trying to get NSS to compile under macOS with

10.7 as the target. Moving to 10.9 most likely is the
better fix, but that means AOO 4.2.0 will no longer support
anything older than Mavericks. Which I don't think we
want to do.

diff --git a/nss/nss.patch b/nss/nss.patch
index 5caa67b34484..17ca773ac9b3 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -104,16 +104,19 @@ diff -ur misc/nss-3.25/nss/cmd/shlibsign/Makefile 
misc/build/nss-3.25/nss/cmd/sh
 diff -ur misc/nss-3.25/nss/coreconf/Darwin.mk 
misc/build/nss-3.25/nss/coreconf/Darwin.mk
 --- misc/nss-3.25/nss/coreconf/Darwin.mk   2016-06-20 10:11:28.0 
-0700
 +++ misc/build/nss-3.25/nss/coreconf/Darwin.mk 2016-07-14 23:47:54.560325000 
-0700
-@@ -6,10 +6,12 @@
+@@ -4,12 +4,14 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
  include $(CORE_DEPTH)/coreconf/UNIX.mk
- include $(CORE_DEPTH)/coreconf/Werror.mk
+-include $(CORE_DEPTH)/coreconf/Werror.mk
++#include $(CORE_DEPTH)/coreconf/Werror.mk
  
 -DEFAULT_COMPILER = gcc
 +DEFAULT_COMPILER = cc
 +
 +# CC is taken from environment automatically.
 +#CC   = cc
-+CCC   = $(CXX)
++CCC   = $(CXX) -stdlib=libc++
  
 -CC= gcc
 -CCC   = g++
@@ -260,3 +263,27 @@ diff -ur misc/nss-3.25/nss/lib/zlib/inflate.c 
misc/build/nss-3.25/nss/lib/zlib/i
  (state->mode == COPY ? state->length :
  (state->mode == MATCH ? state->was - state->length : 0));
  }
+diff -ur misc/nss-3.25/nss/external_tests/common/gtest.mk 
misc/build/nss-3.25/nss/external_tests/common/gtest.mk
+--- misc/nss-3.25/nss/external_tests/common/gtest.mk   2017-10-09 
14:16:48.0 -0400
 misc/build/nss-3.25/nss/external_tests/common/gtest.mk 2017-10-09 
14:17:55.0 -0400
+@@ -16,6 +16,9 @@
+ # platform.
+ ifeq (-Werror,$(filter -Werror -Wsign-compare,$(WARNING_CFLAGS)))
+ WARNING_CFLAGS += -Wsign-compare
++ifeq (Darwin,$(OS_ARCH))
++WARNING_CFLAGS += -Wno-error=deprecated -Wno-error=c++11-extensions
++endif
+ endif
+ WARNING_CFLAGS := $(filter-out -w44018,$(WARNING_CFLAGS))
+ 
+@@ -32,5 +35,9 @@
+ # Needed because we include files from a subdirectory
+ MAKE_OBJDIR = $(INSTALL) -D $(dir $@)
+ else
+-CXXFLAGS += -std=c++0x
++ifeq (Darwin,$(OS_ARCH))
++CXXFLAGS += -stdlib=libc++
++else
++CXXFLAGS += -std=c++0x
++endif
+ endif
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 6ad09990a5cc..ba286760ef14 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -116,8 +116,8 @@ ifneq ($(MACOSX_DEPLOYMENT_TARGET),)
 endif
 
 ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror
-gb_CXXFLAGS_WERROR := -Werror
+gb_CFLAGS_WERROR := -Werror -Wno-error=deprecated
+gb_CXXFLAGS_WERROR := -Werror -Wno-error=deprecated
 endif
 
 gb_LinkTarget_EXCEPTIONFLAGS := \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc vcl/Library_vcl.mk

2017-10-09 Thread Jim Jagielski 
 solenv/inc/unxmacc.mk |2 +-
 solenv/inc/unxmacx.mk |2 +-
 vcl/Library_vcl.mk|6 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 965224b537cbf234195818075d1172184fc3193e
Author: Jim Jagielski 
Date:   Mon Oct 9 17:07:51 2017 +

Get macOS compiling again:

o Restore 10.7 as min
o Deprecated is no longer a fatal warning error
o We need LDFLAGS when linking

diff --git a/solenv/inc/unxmacc.mk b/solenv/inc/unxmacc.mk
index dc651800b678..523dba9b5578 100644
--- a/solenv/inc/unxmacc.mk
+++ b/solenv/inc/unxmacc.mk
@@ -142,7 +142,7 @@ CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -Wno-error=deprecated
 
 # All modules on this platform compile without warnings.
 # If you need to set MODULES_WITH_WARNINGS here, comment
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 8169c14b83a5..46c5252d809a 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -143,7 +143,7 @@ CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -Wno-error=deprecated
 
 # All modules on this platform compile without warnings.
 # If you need to set MODULES_WITH_WARNINGS here, comment
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 6947ae8394ef..0f6393ce9ec1 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -105,6 +105,12 @@ $(eval $(call gb_Library_add_libs,vcl,\
 
 endif
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_set_ldflags,vcl,\
+$$(LDFLAGS) \
+))
+endif
+
 ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_cxxflags,vcl,\
 $(gb_OBJCXXFLAGS) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice] [tdf-discuss] Re: Proposal to join Apache OpenOffice

2011-06-05 Thread Jim Jagielski 

On Jun 5, 2011, at 12:03 PM, Simon Phipps wrote:

>> Sorry, but you *based* your conclusion of the inevitability of there being
>> 2 projects on the *ideology* of copyleft vs non-copyleft.
> 
> I did that because the diversity of the world of FOSS is a clearly observable 
> fact. You observe a different world around you?  I don't want to argue about 
> it precisely because it's so obvious :-)
> 

It is, agreed. Maybe I am just somewhat of an optimist
that I believe even pure idealogical stakeholders can find
common ground and that nothing is "inevitable".

> So back to the constructive point: what are the best, most uniting proposals 
> we can come up with for ASF and LibreOffice to co-operate? 
> 

Agreed again, and glad to see everyone discussing and negotiating
these proposals... and others!

Cheers!
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [tdf-discuss] Re: Proposal to join Apache OpenOffice

2011-06-05 Thread Jim Jagielski 

On Jun 5, 2011, at 11:47 AM, Simon Phipps wrote:
> 
> Hey, chill. As Sam says, there's no ideology involved, just choices. The last 
> thing I want is an ideological debate because I already know how it turns 
> out. That's why I think it would be far better not to keep making proposals 
> whose most likely response is an explanation of how licensing is the issue 
> blocking them.
> 

I'm chilling like a villain.

Sorry, but you *based* your conclusion of the inevitability of there being
2 projects on the *ideology* of copyleft vs non-copyleft.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [tdf-discuss] Re: Proposal to join Apache OpenOffice

2011-06-05 Thread Jim Jagielski 

On Jun 5, 2011, at 11:47 AM, Simon Phipps wrote:

> 
>> But just
>> recall that even the FSF admits that AL2.0 is the best license
>> where free/open standards are competing with non-free/proprietary
>> ones.
> 
> See Bradley Kuhn's rebuttals to Rob Weir[2][3].

"You should only do that when there is a strong reason to justify it."

I see a number of strong reasons, should people decide
to do it.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [tdf-discuss] Re: Proposal to join Apache OpenOffice

2011-06-05 Thread Jim Jagielski 

On Jun 5, 2011, at 11:01 AM, Simon Phipps wrote:
> 
> The plain fact is that Apache's rules do not allow any section of 
> Apache-maintained code to be licensed under copyleft licenses. That means 
> that groups of people who have made the the equally valid choice to have 
> their work licensed under LGPL will be unable to collaborate within the 
> Apache community. As a consequence, any part of the OOo/LO codebase whose 
> locus of development moves to Apache cannot be co-developed by people 
> preferring copyleft licensing.
> 
> The folk who choose non-copyleft licensing simply won't be welcome at Apache. 
> While the folk who choose only Apache licensing will be welcome at 
> LibreOffice (since their Apache-licensed contributions can readily be used in 
> the LibreOffice code), they will probably not be content with a work-product 
> that's not Apache licensed.
> 
> Given these plain facts, I believe it is inevitable that there will be two 
> projects. As such, I think it's important to get started on the "rules of 
> engagement" for productive co-operation rather than endlessly arguing about 
> licensing or the "possibility" that every developer with existing preferences 
> will spontaneously change them.
> 

Personally, I don't think it's "inevitable" at all, nor do I
think it the place for people to make such statements on behalf
of communities that they have, as far as I know, only limited associations
with.

If we want to turn this discussion into an ideological debate about
copyleft and non-copyleft, then I think it's a mistake. But just
recall that even the FSF admits that AL2.0 is the best license
where free/open standards are competing with non-free/proprietary
ones.

(PS: True, people who choose "only" copyleft won't be "welcome" at
the ASF (they would be welcome, really, it's just that the ASF
just does AL2... it's just an environment in which they might
feel as outsiders), but neither would those people who choose
"only" non-copyleft feel welcome at TDF... I think most people
are true pragmatics and choose the best license for the job at
hand.)

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice