summaryrefslogtreecommitdiff
path: root/sfx2/source/bastyp/sfxhtml.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <stephan.bergmann@allotropia.de>2025-01-29 11:12:52 +0100
committerStephan Bergmann <stephan.bergmann@allotropia.de>2025-01-29 14:45:54 +0100
commit375c3952c09feb328b08a874e7658b4c7ca90d57 (patch)
tree34f7128adeff35e90fb1b25fe51863813395ecd2 /sfx2/source/bastyp/sfxhtml.cxx
parent2a1c9972dafc961267c436a95f8a1fd4898dacfd (diff)
Revert "remove unnecessary cairo soname patch" HEADmaster
This reverts commit 3500c44bccafd442e50da604287342708506bb5c. Reason for revert: At least for Linux --without-system-cairo builds, this causes workdir/UnpackedTarball/cairo/src/.libs/libcairo.so (which is the lib that other libs like Library_drawinglayer and Library_vcl will link against) to have an SONAME of libcairo.so.2 (instead of libcairo-lo.so.2), so at runtime libs like instdir/program/libdrawinglayerlo.so and instdir/program/libvcllo.so will have a NEEDED of libcairo.so.2 (instead of libcairo-lo.so.2), so will pick up whatever system libcairo.so.2 (/usr/lib64/libcairo.so.2 from cairo-1.18.2-2.fc41.x86_64, in my case) instead of instdir/program/libcairo-lo.so.2, which caused e.g. CppunitTest_vcl_bitmap_render_test CPPUNIT_TEST_NAME=BitmapRenderTest::testTdf113918 to happen to fail for me with > [_RUN_____] BitmapRenderTest::testTdf113918 > warn:vcl.gdi:2234659:2234659:vcl/headless/CairoCommon.cxx:1619: unsupported SvpSalGraphics::drawAlphaBitmap case > vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx:100:BitmapRenderTest::testTdf113918 > equality assertion failed > - Expected: rgba[ffffffff] > - Actual : rgba[008000ff] Change-Id: I9a2a64197185b7c057352c3fb7f3e3f6dbcf70db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180884 Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/bastyp/sfxhtml.cxx')
0 files changed, 0 insertions, 0 deletions