[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - 2 commits - external/libpagemaker g

[Michael Stahl (via logerrit)]

 external/libpagemaker/include.patch.1 |   10 ++++++++++
 g                                     |   18 +++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit 7d9b1ebce953cf26c2ffd38319820374fc570c73
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon May 30 21:30:04 2022 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue May 16 11:22:18 2023 +0200

    g: we are not, in fact, in the BUILDDIR
    
    For an out-of-tree build, "make fetch" poinlessly clones all git
    submodules.
    
    Change-Id: If4afb218946f49ba934f68b35806fd8143c39387
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135143
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit aa8ef74b475a6fbd6e4ec27c42941aa274998df6)

diff --git a/g b/g
index 746babe23539..dd95b737d492 100755
--- a/g
+++ b/g
@@ -10,9 +10,9 @@ fi
 SUBMODULES_ALL="dictionaries helpcontent2 translations"
 
 pushd $(dirname $0) > /dev/null
-if [ -f config_host.mk ] ; then
-    # we are in the BUILDDIR
-    SRC_ROOT=$(< config_host.mk grep -a SRC_ROOT | sed -e "s/.*=//")
+if [ -f ${BUILDDIR}/config_host.mk ] ; then
+    # we are in the SRCDIR
+    SRC_ROOT=$(< ${BUILDDIR}/config_host.mk grep -a SRC_ROOT | sed -e 
"s/.*=//")
 else
     SRC_ROOT=$(pwd)
 fi
@@ -138,8 +138,8 @@ get_active_submodules()
 get_configured_submodules()
 {
     SUBMODULES_CONFIGURED=""
-    if [ -f config_host.mk ] ; then
-        SUBMODULES_CONFIGURED=$(< config_host.mk grep -a GIT_NEEDED_SUBMODULES 
| sed -e "s/.*=//")
+    if [ -f ${BUILDDIR}/config_host.mk ] ; then
+        SUBMODULES_CONFIGURED=$(< ${BUILDDIR}/config_host.mk grep -a 
GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
     else
         # if we need the configured submodule before the configuration is 
done. we assumed you want them all
         SUBMODULES_CONFIGURED=${SUBMODULES_ALL?}
@@ -149,12 +149,12 @@ get_configured_submodules()
 get_git_reference()
 {
     REFERENCED_GIT=""
-    if [ -f config_host.mk ]; then
-        REFERENCED_GIT=$(< config_host.mk grep -a GIT_REFERENCE_SRC | sed -e 
"s/.*=//")
+    if [ -f ${BUILDDIR}/config_host.mk ]; then
+        REFERENCED_GIT=$(< ${BUILDDIR}/config_host.mk grep -a 
GIT_REFERENCE_SRC | sed -e "s/.*=//")
     fi
     LINKED_GIT=""
-    if [ -f config_host.mk ]; then
-        LINKED_GIT=$(< config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//")
+    if [ -f ${BUILDDIR}/config_host.mk ]; then
+        LINKED_GIT=$(< ${BUILDDIR}/config_host.mk grep -a GIT_LINK_SRC | sed 
-e "s/.*=//")
     fi
 }
 
commit e2e7b6656f2d9657b01972026e8b49658c90bcbe
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue May 16 11:21:46 2023 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue May 16 11:21:46 2023 +0200

    libpagemaker: argh, forgot to git add the patch
    
    Change-Id: I58b09b3d1198bbdbf469ed26455efe4d17f90933

diff --git a/external/libpagemaker/include.patch.1 
b/external/libpagemaker/include.patch.1
new file mode 100644
index 000000000000..ac6cce7f5898
--- /dev/null
+++ b/external/libpagemaker/include.patch.1
@@ -0,0 +1,10 @@
+--- libpagemaker/src/lib/PMDTypes.h.orig       2023-05-10 19:58:32.975142131 
+0200
++++ libpagemaker/src/lib/PMDTypes.h    2023-05-10 19:58:55.511175229 +0200
+@@ -10,6 +10,7 @@
+ #ifndef __PMDTYPES_H__
+ #define __PMDTYPES_H__
+ 
++#include <cstdint>
+ #include <boost/optional.hpp>
+ 
+ #include "Units.h"