[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/bin sysui/desktop
configure.ac |7 ++-
solenv/bin/macosx-codesign-app-bundle | 16 +---
sysui/desktop/macosx/Info.plist.in|4
3 files changed, 19 insertions(+), 8 deletions(-)
New commits:
commit 6e6c6f697b019348161648d9d26398bf64de83ef
Author: Christian Lohmaier
AuthorDate: Tue Oct 18 13:12:29 2022 +0200
Commit: Christian Lohmaier
CommitDate: Sun Oct 23 12:11:38 2022 +0200
macOS sandbox: only use com.apple.application-identifier for main package
when multiple files are signed with that entitlement, the build will
just be listed with "Not Available for Testing" via Testflight
Change-Id: I92957f24513ab419ddbc4289b53175932111c198
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141497
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/solenv/bin/macosx-codesign-app-bundle
b/solenv/bin/macosx-codesign-app-bundle
index a29b339de744..6894329fa406 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -25,11 +25,14 @@ done
APP_BUNDLE="$1"
entitlements=
+application_identifier=
if test -n "$ENABLE_MACOSX_SANDBOX"; then
# In a sandboxed build executables need the entitlements
entitlements="--entitlements $BUILDDIR/lo.xcent"
+application_identifier=`/usr/libexec/PlistBuddy -c "print
com.apple.application-identifier" $BUILDDIR/lo.xcent`
+# remove the key from the entitlement - only use it when signing the whole
bundle in the final step
+/usr/libexec/PlistBuddy -c "delete com.apple.application-identifier"
$BUILDDIR/lo.xcent
# All data files are in Resources and included in the app bundle signature
-# through that. I think.
other_files=''
# HACK: remove donate menu entries, need to support apple-pay and be
verified
# as non profit as a bare minimum to allow asking
@@ -120,14 +123,13 @@ done
# CFBundleExecutable from Info.plist, i.e. soffice, plus the contents
# of the Resources tree.
#
-# At this stage we also attach the entitlements in the sandboxing case
-#
-# Also omit some files from the Bundle's seal via the resource-rules
-# (bootstraprc and similar that the user might adjust and image files)
# See also https://developer.apple.com/library/mac/technotes/tn2206/
-id=`echo ${PRODUCTNAME} | tr ' ' '-'`
-
+if test -n "$ENABLE_MACOSX_SANDBOX" && test -n "$application_identifier"; then
+# add back the application-identfier to the entitlements
+# testflight/beta-testing won't work if that key is used when signing the
other executables
+/usr/libexec/PlistBuddy -c "add com.apple.application-identifier string
$application_identifier" $BUILDDIR/lo.xcent
+fi
codesign --force --options=runtime --identifier="${MACOSX_BUNDLE_IDENTIFIER}"
--sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements "$APP_BUNDLE" || exit 1
exit 0
commit 3336cb1b3d12e9cd5c2f560c82129dc8ed7527da
Author: Christian Lohmaier
AuthorDate: Tue Oct 18 12:51:52 2022 +0200
Commit: Christian Lohmaier
CommitDate: Sun Oct 23 12:11:29 2022 +0200
macOS: add XCode and SDK buildversions to Info.plist
without those submitting a build for external testing via testflight is
not possible because appstore thinks you were using a beta version of XCode
Change-Id: I6979a9d290c3e67dd9969d6e535625760b639c25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141496
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/configure.ac b/configure.ac
index 259001e70b65..a40c08e16b29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3428,7 +3428,7 @@ if test $_os = Darwin; then
fi
AC_MSG_RESULT([macOS SDK $macosx_sdk at $MACOSX_SDK_PATH])
-
+MACOSX_SDK_BUILD_VERSION=$(xcodebuild -version -sdk "$MACOSX_SDK_PATH"
ProductBuildVersion)
case $macosx_sdk in
10.13)
MACOSX_SDK_VERSION=101300
@@ -3491,6 +3491,9 @@ if test $_os = Darwin; then
AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at
least Xcode 12.5])
fi
+my_xcode_ver1=$(xcrun xcodebuild -version | tail -n 1)
+MACOSX_XCODE_BUILD_VERSION=${my_xcode_ver1#Build version }
+
case "$with_macosx_version_min_required" in
10.14)
MAC_OS_X_VERSION_MIN_REQUIRED="101400"
@@ -3661,6 +3664,8 @@ AC_SUBST(ENABLE_MACOSX_SANDBOX)
AC_SUBST(MACOSX_BUNDLE_IDENTIFIER)
AC_SUBST(MACOSX_PROVISIONING_INFO)
AC_SUBST(MACOSX_PROVISIONING_PROFILE)
+AC_SUBST(MACOSX_SDK_BUILD_VERSION)
+AC_SUBST(MACOSX_XCODE_BUILD_VERSION)
dnl ===
dnl Check iOS SDK and compiler
diff --git a/sysui/desktop/macosx/Info.plist.in
b/sysui/desktop/macosx/Info.plist.in
index 6593139019fc..5401687027fa 100644
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1961,6 +1961,10 @@
NSContactsUsageDescription
You can add your contacts as a data source for mail merge or
similar
[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/bin
configure.ac |4 solenv/bin/native-code.py | 10 +- 2 files changed, 13 insertions(+), 1 deletion(-) New commits: commit 4ed53dffa64670fafe298826c7901f7b436dfab9 Author: Jan Holesovsky ke...@collabora.com Date: Tue Feb 17 15:24:41 2015 +0100 android: No need to include the entire libfrmlo.a, add just the used services. Made sure that ooo108922-1.doc and fields.doc are still loading. Change-Id: If009c25be1776eba77a397efb2eae820838ac053 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 0d4bdc0..929eafb 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -33,6 +33,7 @@ core_factory_list = [ (libhyphenlo.a, hyphen_component_getFactory), (libi18npoollo.a, i18npool_component_getFactory), (libi18nsearchlo.a, i18nsearch_component_getFactory), +(libinvocadaptlo.a, invocadapt_component_getFactory), (liblnglo.a, lng_component_getFactory), (liblnthlo.a, lnth_component_getFactory), (liblocalebe1lo.a, localebe1_component_getFactory), @@ -57,6 +58,7 @@ core_factory_list = [ (libxsec_xmlsec.a, xsec_xmlsec_component_getFactory, #ifndef ANDROID), (libxstor.a, xstor_component_getFactory), (libcanvasfactorylo.a, canvasfactory_component_getFactory), +(libvbaeventslo.a, vbaevents_component_getFactory), (libvclcanvaslo.a, vclcanvas_component_getFactory), (libmtfrendererlo.a, mtfrenderer_component_getFactory), ] @@ -88,6 +90,12 @@ core_constructor_list = [ # dbaccess/util/dba.component com_sun_star_comp_dba_ORowSet_get_implementation, # forms/util/frm.component +com_sun_star_form_OCheckBoxControl_get_implementation, +com_sun_star_form_OCheckBoxModel_get_implementation, +com_sun_star_form_OComboBoxControl_get_implementation, +com_sun_star_form_OComboBoxModel_get_implementation, +com_sun_star_form_ODateControl_get_implementation, +com_sun_star_form_ODateModel_get_implementation, com_sun_star_comp_forms_ODatabaseForm_get_implementation, com_sun_star_form_OFormsCollection_get_implementation, # framework/util/fwk.component @@ -145,6 +153,7 @@ core_constructor_list = [ # stoc/source/inspect/introspection.component com_sun_star_comp_stoc_Introspection_get_implementation, # toolkit/util/tk.component +stardiv_Toolkit_StdTabController_get_implementation, stardiv_Toolkit_UnoCheckBoxControl_get_implementation, stardiv_Toolkit_UnoComboBoxControl_get_implementation, stardiv_Toolkit_UnoControlCheckBoxModel_get_implementation, @@ -198,7 +207,6 @@ draw_constructor_list = [ ] writer_factory_list = [ -(libfrmlo.a, frm_component_getFactory), (libsblo.a, sb_component_getFactory, #if HAVE_FEATURE_SCRIPTING), (libswdlo.a, swd_component_getFactory), (libswlo.a, sw_component_getFactory), commit a7a5ba76f43f62c73ed35281178559bdda709ba7 Author: Jan Holesovsky ke...@collabora.com Date: Tue Feb 17 13:24:00 2015 +0100 android: Better check for package name when debugging. Change-Id: Iad29aa8cc47220e5aa33a4991a0c0d265d107152 diff --git a/configure.ac b/configure.ac index 1051d20..2329ae7 100644 --- a/configure.ac +++ b/configure.ac @@ -12347,6 +12347,10 @@ if echo $host_os | grep -q linux-android ; then AC_MSG_RESULT([not set, using $ANDROID_PACKAGE_NAME]) else +if test -n $ENABLE_DEBUG -a $with_android_package_name != org.libreoffice ; then +AC_MSG_ERROR([The package name must be set +to org.libreoffice when debugging, please avoid --with-android-package-name.]) +fi ANDROID_PACKAGE_NAME=$with_android_package_name AC_MSG_RESULT([$ANDROID_PACKAGE_NAME]) fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/bin
configure.ac |5 +
solenv/bin/modules/par2script/work.pm |5 +
2 files changed, 10 insertions(+)
New commits:
commit 76d2d78ac48c0ec7fcdc27c841d0777cab732464
Author: David Tardon dtar...@redhat.com
Date: Sat Nov 1 10:14:16 2014 +0100
fdo#85633 filter out empty file records
Change-Id: I9f96cf3e059d444c52ce81b37cf5f69157c2888d
diff --git a/solenv/bin/modules/par2script/work.pm
b/solenv/bin/modules/par2script/work.pm
index 9c03078..8003785 100644
--- a/solenv/bin/modules/par2script/work.pm
+++ b/solenv/bin/modules/par2script/work.pm
@@ -187,6 +187,11 @@ sub collect_definitions
if ( $oneitem eq Directory ) { if ( $itemkey =~ DosName ) {
$itemkey =~ s/DosName/HostName/; } }
if (( $oneitem eq Directory ) || ( $oneitem eq File ) || (
$oneitem eq Unixlink )) { if ( $itemvalue eq PD_PROGDIR ) { $itemvalue =
PREDEFINED_PROGDIR; }}
if (( $itemkey eq Styles ) ( $itemvalue =~ /^\s*(\w+)(\s*\;\s*)$/
)) { $itemvalue = ($1)$2; }
+elsif ( $itemkey eq Files ) # filter out empty file records, as they
mess up assignment to modules
+{
+$itemvalue =~ /^\(([^)]*)\)$/;
+$itemvalue = '(' . join( ',', grep( !/^$/, split( ',', $1 ) ) ) .
')';
+}
$oneitemhash{$itemkey} = $itemvalue;
}
commit 7f5672bb14956d589fd257067b9eebef3c28e421
Author: David Tardon dtar...@redhat.com
Date: Thu Oct 30 09:58:46 2014 +0100
system libgltf conflicts with dbgutil too
Change-Id: I326d62077b556501d0a98794bca4b00f4bcfc369
diff --git a/configure.ac b/configure.ac
index e39ce6b..84505ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3753,6 +3753,11 @@ if test -n $enable_dbgutil -a $enable_dbgutil !=
no; then
else
with_system_libcmis=no
fi
+if test $with_system_libgltf = yes; then
+AC_MSG_ERROR([--with-system-libgltf conflicts with --enable-dbgutil])
+else
+with_system_libgltf=no
+fi
if test $enable_win_mozab_driver = yes; then
AC_MSG_ERROR([--enable-win-mozab-driver conflicts with
--enable-dbgutil])
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
