Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index


On Tue, Jun 05, 2012 at 10:30:18PM +0200, Thomas Arnhold wrote:
Hi,

I've fixed my introduced regression:

on master: 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=76dcd76509ec0b2078a95f282e09696a8e91cbb0

And with these two attachments for 3-5 and 3-6 branch. Would be nice
if someone could check and sign it.

I backported this to my 3.5.4:

Seems to miss a dependency on svtools:

[ build CXX ] vcl/unx/generic/app/saldisp
R=/home/rene/Debian/Pakete/LibreOffice && S=$R/libreoffice-3.5.4 && O=$S/solver/unxlngx6.pro && 
W=$S/workdir/unxlngx6.pro &&  mkdir -p $W/CxxObject/vcl/unx/generic/app/ 
$W/Dep/CxxObject/vcl/unx/generic/app/ && x86_64-linux-gnu-g++ -DCPPU_ENV=gcc3 -DENABLE_GRAPHITE 
-DENABLE_GTK -DENABLE_KDE4 -DGCC -DGXX_INCLUDE_PATH=/usr/include/c++/4.7 
-DHAVE_GCC_VISIBILITY_FEATURE -DHAVE_THREADSAFE_STATICS -DLINUX -DNDEBUG -DOPTIMIZE 
-DOSL_DEBUG_LEVEL=0 -DPRODUCT -DSOLAR_JAVA -DSUPD=350 -DUNIX -DUNX -DVCL -DX86_64 
-D_FORTIFY_SOURCE=2 -D_PTHREADS -D_REENTRANT   -D_XSALSET_LIBNAME=\"libspalo.so\" 
-DVCLPLUG_GEN_IMPLEMENTATION  -DUSE_RANDR  -DUSE_XINERAMA_XORG   -Wall -Wendif-labels -Wextra 
-fmessage-length=0 -fno-common -pipe  -fPIC -Wshadow -Wsign-promo -Woverloaded-virtual 
-Wno-non-virtual-dtor  -fvisibility=hidden  -fvisibility-inlines-hidden  -std=c++0x  -ggdb2   
-fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -DEXCEPTIONS_ON 
-fexceptions -fno-enforce-eh-specs  -O2 -c $S/vcl/unx/generic/app/saldisp.cxx -o 
$W/CxxObject/vcl/unx/generic/app/saldisp.o -MMD -MT $W/CxxObject/vcl/unx/generic/app/saldisp.o -MP 
-MF $W/Dep/CxxObject/vcl/unx/generic/app/saldisp.d -I$S/vcl/unx/generic/app/ -I$O/inc/stl 
-I$O/inc/external -I$O/inc -I$S/solenv/inc/unxlngx6 -I$S/solenv/inc -I$S/res 
-I/usr/lib/jvm/java-6-openjdk-amd64/include -I/usr/lib/jvm/java-6-openjdk-amd64/include/linux 
-I/usr/lib/jvm/java-6-openjdk-amd64/include/native_threads/include -I$S/vcl/inc -I$S/solenv/inc 
-I$O/inc  -I$O/inc/offapi -I$O/inc/udkapi -I/usr/include/freetype2   -I/usr/include/cairo 
-I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 
-I/usr/include/freetype2 -I/usr/include/libpng12
/home/rene/Debian/Pakete/LibreOffice/libreoffice-3.5.4/vcl/unx/generic/app/saldisp.cxx:73:32: fatal 
error: svtools/langhelp.hxx: No such file or directory
compilation terminated.

Patch against -3-5:

rene@frodo:~/Debian/Pakete/LibreOffice/libreoffice-3.5.4/vcl$ diff -u prj/build.lst 
prj/build.lst-old
--- vcl/prj/build.lst       2012-06-10 14:59:37.176818073 +0200
+++ vcl/prj/build.lst-old   2012-06-10 14:59:26.024762767 +0200
@@ -1,4 +1,4 @@
-vc     vcl     :       TRANSLATIONS:translations apple_remote BOOST:boost DESKTOP:rsc sot 
ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil
ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools DESKTOP:l10ntools icc cpputools 
svl LIBXSLT:libxslt CAIRO:cairo NULL
+vc     vcl     :       TRANSLATIONS:translations apple_remote BOOST:boost DESKTOP:rsc sot 
ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil
ridljar X11_EXTENSIONS:x11_extensions offapi basegfx basebmp tools DESKTOP:l10ntools icc cpputools 
svl LIBXSLT:libxslt CAIRO:cairo svtools NULL
 vc     vcl                                                                             usr1    -   
    all     vc_mkout NULL
 vc     vcl\prj                                                                 nmake   -       all 
    vc_prj NULL


Regards,

Rene

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.