Fixup

Change-Id: Ib3f16476efd9898c0404f8821c26e8e61946b7bc

12 files changed, 47 insertions, 20 deletions

diff --git a/bin/run b/bin/run
index 523da3c0e178..3692eee7b80a 100755
--- a/bin/run
+++ b/bin/run
@@ -22,6 +22,7 @@ setdefaults()
     done
 
     exedir="${dir}"/workdir/LinkTarget/Executable
+    exedir="${dir}"/instdir/program
     export URE_BOOTSTRAP=file://"${dir}"/instdir/program/fundamentalrc
 }
 
diff --git a/cppu/meson.build b/cppu/meson.build
index 0ac31d2a86a1..3bbd1fba57cc 100644
--- a/cppu/meson.build
+++ b/cppu/meson.build
@@ -1,4 +1,4 @@
-cppu_lib = shared_library('cppulo',
+cppu_lib = shared_library('uno_cppu',
   'source/cppu/compat.cxx',
   'source/cppu/cppu_opt.cxx',
   'source/threadpool/current.cxx',
@@ -21,9 +21,15 @@ cppu_lib = shared_library('cppulo',
   'source/uno/sequence.cxx',
   udk_fake_h,
   include_directories: [main_inc, udkh_inc],
-  cpp_args: ['-DLIBO_INTERNAL_ONLY',
-             '-DCPPU_DLLIMPLEMENTATION'],
-  link_with: [salhelper_lib, sal_lib],
+  cpp_args: [
+    '-DCPPU_DLLIMPLEMENTATION',
+    '-DLIBO_INTERNAL_ONLY',
+  ],
+  link_with: [
+    sal_lib,
+    salhelper_lib,
+  ],
+  soversion : '3',
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/cppuhelper/meson.build b/cppuhelper/meson.build
index 58c161b628f4..815971f20a6c 100644
--- a/cppuhelper/meson.build
+++ b/cppuhelper/meson.build
@@ -6,7 +6,7 @@ temp_hack = static_library('cppuuno',
   include_directories: [main_inc, udkh_inc, offapi_inc, cpphelper_uno_inc],
 )
 
-cppuhelper_lib = shared_library('cppuhelperlo',
+cppuhelper_lib = shared_library('uno_cppuhelpergcc3',
   'source/access_control.cxx',
   'source/bootstrap.cxx',
   'source/compat.cxx',
@@ -33,7 +33,10 @@ cppuhelper_lib = shared_library('cppuhelperlo',
   'source/findsofficepath.c',
   udk_fake_h, off_fake_h, cppuhelper_fake_h,
   include_directories: [main_inc, udkh_inc, offapi_inc, cpphelper_uno_inc],
-  cpp_args: ['-DCPPUHELPER_DLLIMPLEMENTATION', '-DLIBO_INTERNAL_ONLY'],
+  cpp_args: [
+    '-DCPPUHELPER_DLLIMPLEMENTATION',
+    '-DLIBO_INTERNAL_ONLY',
+  ],
   link_with: [
     cppu_lib,
     reg_lib,
@@ -43,6 +46,7 @@ cppuhelper_lib = shared_library('cppuhelperlo',
     unoidl_lib,
     xmlreader_lib
   ],
+  soversion : '3',
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/desktop/meson.build b/desktop/meson.build
index 13e38de7c7a6..102b5c0ac2cd 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -78,7 +78,7 @@ sofficeapp_lib = shared_library('sofficeapp',
   install: true,
 )
 
-soffice_bin = executable('soffice', 'source/app/main.c',
+soffice_bin = executable('soffice.bin', 'source/app/main.c',
   include_directories: [main_inc],
   link_with: [sofficeapp_lib, sal_lib],
   install: true,
diff --git a/i18npool/breakgen.py b/i18npool/breakgen.py
index c38b4385671a..70cc3b1c07f1 100755
--- a/i18npool/breakgen.py
+++ b/i18npool/breakgen.py
@@ -26,7 +26,7 @@ rc = subprocess.call(['genbrk',
 if rc != 0:
     sys.exit(rc)
 
-rc = subprocess.call(['genccode',
+rc = subprocess.call(['/usr/sbin/genccode',
                       '-n',
                       'OpenOffice',
                       '-d',
diff --git a/i18npool/oogen.py b/i18npool/oogen.py
index 5b53552cb196..fd16fc4b519c 100755
--- a/i18npool/oogen.py
+++ b/i18npool/oogen.py
@@ -27,7 +27,7 @@ line.brk
 sent.brk
 ''')
 
-rc = subprocess.call(['gencmn',
+rc = subprocess.call(['/usr/sbin/gencmn',
                       '-n',
                       'OpenOffice',
                       '-t',
diff --git a/meson.build b/meson.build
index ebef7c09dd83..99c773588c44 100644
--- a/meson.build
+++ b/meson.build
@@ -100,6 +100,9 @@ lex_bin = find_program('flex')
 bison_bin = find_program('bison')
 xslt_bin = find_program('xsltproc')
 gentokens_bin = find_program('solenv/bin/generate-tokens.py')
+gencmn_bin = find_program('gencmn', '/usr/sbin/gencmn')
+genccode_bin = find_program('genccode', '/usr/sbin/genccode')
+genbrk_bin = find_program('genbrk', '/usr/sbin/genbrk')
 
 cppunit_dep = dependency('cppunit')
 langtag_dep = dependency('liblangtag')
@@ -150,7 +153,7 @@ raptor2_dep = dependency('raptor2')
 rasqal_dep = dependency('rasqal')
 librdf_dep = cpp.find_library('rdf')
 curl_dep = dependency('libcurl')
-python3_dep = dependency('python3')
+python3_dep = dependency('python3-embed')
 odbc_dep = declare_dependency(include_directories: 'external/unixODBC/inc')
 hunspell_dep = dependency('hunspell')
 hyphen_dep = cpp.find_library('hyphen')
diff --git a/pyuno/meson.build b/pyuno/meson.build
index 9341ccb09b66..7d22b7cac505 100644
--- a/pyuno/meson.build
+++ b/pyuno/meson.build
@@ -14,7 +14,12 @@ pyuno_lib = shared_library('pyuno',
   cpp_args: ['-DLO_DLLIMPLEMENTATION_PYUNO',
              '-DLIBO_INTERNAL_ONLY'],
   include_directories: [main_inc, udkh_inc, 'inc'],
-  link_with: [cppu_lib, cppuhelper_lib, sal_lib, salhelper_lib],
+  link_with: [
+    cppu_lib,
+    cppuhelper_lib,
+    sal_lib,
+    salhelper_lib,
+  ],
   dependencies: [python3_dep],
   install: true,
 )
diff --git a/sal/meson.build b/sal/meson.build
index 61ff8f6136ee..ecaf43dc289d 100644
--- a/sal/meson.build
+++ b/sal/meson.build
@@ -68,7 +68,7 @@ else
   system_link_args = []
 endif
 
-sal_lib = shared_library('sallo',
+sal_lib = shared_library('uno_sal',
   'rtl/alloc_arena.cxx',
   'rtl/alloc_cache.cxx',
   'rtl/alloc_fini.cxx',
@@ -121,6 +121,7 @@ sal_lib = shared_library('sallo',
     osx_frameworks_dep,
     thread_dep,
   ],
+  soversion : '3',
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/salhelper/meson.build b/salhelper/meson.build
index 8e9e4b007e79..d639378ad859 100644
--- a/salhelper/meson.build
+++ b/salhelper/meson.build
@@ -1,13 +1,18 @@
-salhelper_lib = shared_library('salhelperlo',
+salhelper_lib = shared_library('uno_salhelpergcc3',
   'source/condition.cxx',
   'source/dynload.cxx',
   'source/simplereferenceobject.cxx',
   'source/thread.cxx',
   'source/timer.cxx',
   include_directories: [main_inc],
-  cpp_args: ['-DLIBO_INTERNAL_ONLY',
-             '-DSALHELPER_DLLIMPLEMENTATION'],
-  link_with: sal_lib,
+  cpp_args: [
+    '-DLIBO_INTERNAL_ONLY',
+    '-DSALHELPER_DLLIMPLEMENTATION',
+  ],
+  link_with: [
+    sal_lib,
+  ],
+  soversion : '3',
   gnu_symbol_visibility: 'hidden',
   install: true,
 )
diff --git a/vcl/meson.build b/vcl/meson.build
index ea4614d72f01..d65df1190c97 100644
--- a/vcl/meson.build
+++ b/vcl/meson.build
@@ -422,7 +422,7 @@ vcl_lib = shared_library('vcllo',
              '-DDLLIMPLEMENTATION_UITEST',
              '-DCUI_DLL_NAME="libcuilo.so"',
              '-DGLM_ENABLE_EXPERIMENTAL',
-             '-DDESKTOP_DETECTOR_DLL_NAME="libdesktopdetector.so"',
+             '-DDESKTOP_DETECTOR_DLL_NAME="libdesktop_detectorlo.so"',
              '-DTK_DLL_NAME="libtklo.so"'],
   link_with: [
     basegfx_lib,
@@ -636,7 +636,7 @@ executable('vcldemo',
   ],
 )
 
-desktopdetector_lib = shared_library('desktopdetector',
+desktopdetector_lib = shared_library('desktop_detectorlo',
   'unx/generic/desktopdetect/desktopdetector.cxx',
   udk_fake_h, off_fake_h,
   cpp_args: ['-DLIBO_INTERNAL_ONLY'],
@@ -654,7 +654,9 @@ desktopdetector_lib = shared_library('desktopdetector',
     cppu_lib,
     sal_lib,
   ],
-  dependencies: [x11_dep],
+  dependencies: [
+    x11_core_dep,
+  ],
   install: true,
 )
 
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 583d421b0dac..abe2133ec24d 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -561,7 +561,7 @@ void* Qt5Instance::CreateGStreamerSink(const SystemChildWindow* pWindow)
 
     return pVideosink;
 #else
-    (void*)pWindow;
+    Q_UNUSED(pWindow);
     return nullptr;
 #endif
 }