strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Linux cppuhelper_detail_findSofficePath

Browse source 
...so that it looks for the /usr/bin/ symlink with the name with which it is
created by sysui/CustomTarget_share.mk via sysui/desktop/share/create_tree.sh

Change-Id: I46c2bb9d8df936fd5c7bd52bbee86da959d5c6cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176597
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
Stephan Bergmann 2024-11-14 13:48:51 +01:00
parent 80cea92291
commit 6c5355d45d
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config_host/config_version.h.in
View file

@ -15,9 +15,12 @@ Version settings
#undef LIBO_VERSION_PATCH #undef LIBO_VERSION_PATCH
#undef LIBO_THIS_YEAR #undef LIBO_THIS_YEAR
#define LIBO_VERSION_DOTTED \ #define LIBO_VERSION_DOTTED_2 \
LIBO_VERSION_STRINGIFY(LIBO_VERSION_MAJOR) "." \ LIBO_VERSION_STRINGIFY(LIBO_VERSION_MAJOR) "." \
LIBO_VERSION_STRINGIFY(LIBO_VERSION_MINOR) "." \ LIBO_VERSION_STRINGIFY(LIBO_VERSION_MINOR)
#define LIBO_VERSION_DOTTED \
LIBO_VERSION_DOTTED_2 "." \
LIBO_VERSION_STRINGIFY(LIBO_VERSION_MICRO) "." \ LIBO_VERSION_STRINGIFY(LIBO_VERSION_MICRO) "." \
LIBO_VERSION_STRINGIFY(LIBO_VERSION_PATCH) LIBO_VERSION_STRINGIFY(LIBO_VERSION_PATCH)

4
cppuhelper/source/findsofficepath.c
View file

@ -22,6 +22,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <config_version.h>
#include <cppuhelper/findsofficepath.h> #include <cppuhelper/findsofficepath.h>
#if defined(_WIN32) #if defined(_WIN32)
@ -136,7 +137,8 @@ static char* platformSpecific(void)
const int SEPARATOR = '/'; const int SEPARATOR = '/';
const char* PATHSEPARATOR = ":"; const char* PATHSEPARATOR = ":";
const char* PATHVARNAME = "PATH"; const char* PATHVARNAME = "PATH";
const char* APPENDIX = "/libreoffice"; const char* APPENDIX = "/libreoffice" LIBO_VERSION_DOTTED_2;
// must match the product's UNIXFILENAME.* in sysui/productlist.mk
char* path = NULL; char* path = NULL;
char* str = NULL; char* str = NULL;