Replacing the patch with the one I'm attaching seems to fix it... But not sure of the consequences...
Hope it helps someone... *Flávio Moringa* Project Leader Caixa Mágica Software Energia Open Source Rua Soeiro Pereira Gomes, Lote 1 - 4.º B, Edifício Espanha, 1600-196 Lisboa - Portugal Tel.: +351 217 921 260 Fax: +351 217 921 261 http://www.caixamagica.pt https://twitter.com/flaviomoringa https://www.facebook.com/flaviomoringa<https://www.facebook.com/flavio.moringa> http://pt.linkedin.com/in/flaviomoringa http://people.caixamagica.pt/flaviomoringa 2013/8/8 Flavio Moringa <flavio.mori...@caixamagica.pt> > I guys, > > I'm trying to do a custom Windows build of LibreOffice 4.1.0.4 (The stable > release). > > First I had an lpsolve error that seemed to be caused by this: > https://bugs.freedesktop.org/show_bug.cgi?id=66826 > > And so I applied this patch: > > http://cgit.freedesktop.org/libreoffice/core/commit/?id=f1e7eeb83c18bce720d49e0e55704abd09ab96f7&h=libreoffice-4-1 > > But now the lp_solve_5.5-windows.patch patch actually fails: > [build PAT] lpsolve > S=C:/libreoffice-4.1.0.4 && O=$S/solver/wntmsci13.pro && W=$S/workdir/ > wntmsci13.pro && ( cd $W/UnpackedTarball/lpsolve && for p in > $S/lpsolve/lp_solve_5.5-windows.patch; do pl=3; s=${p##*.}; case "$s" in > [0-9]) pl="$s"; ;; esac ; /usr/bin/patch --binary -f -s "-p$pl" < "$p"; if > test "$?" -ne 0; then echo "Patch FAILED: $p"; exit 1; fi; done && > touch $W/UnpackedTarball/lpsolve.done ) || ( touch > $W/UnpackedTarball/lpsolve.prepare && exit 1 ) > 1 out of 1 hunk FAILED -- saving rejects to file lpsolve55/cgcc.bat.rej > 1 out of 1 hunk FAILED -- saving rejects to file lpsolve55/lpsolve.rc.rej > 1 out of 1 hunk FAILED -- saving rejects to file lpsolve55/cvc6.bat.rej > Patch FAILED: C:/libreoffice-4.1.0.4/lpsolve/lp_solve_5.5-windows.patch > make[1]: *** [C:/libreoffice-4.1.0.4/workdir/ > wntmsci13.pro/UnpackedTarball/lpsolve.done] Error 1 > > > cgcc.bat.rej shows this, and I'm totally clueless: > > $ cat ./workdir/ > wntmsci13.pro/UnpackedTarball/lpsolve/lpsolve55/cgcc.bat.rej > *** cgcc.bat Sun Jun 12 04:27:28 2005 > --- lpsolve55/cgcc.bat Sun Dec 14 07:55:19 2008 > *************** > *** 7,14 **** > > set c=gcc > > ! rem rc lpsolve.rc > ! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL > -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin > -enable-stdcall-fixup -D_USRDLL -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP > -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% > ..\lp_solve.def -o lpsolve55.dll > > %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL > -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 > -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL > -DRoleIsExternalInvEngine %src% -o liblpsolve55.so > > --- 7,14 ---- > > set c=gcc > > ! windres lpsolve.rc lpsolve_res.obj > ! %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL > -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -mno-cygwin > -enable-stdcall-fixup -mthreads %lpsolve_LDFLAGS% -D_USRDLL -DWIN32 > -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL > -DRoleIsExternalInvEngine %src% lpsolve_res.obj ..\lp_solve.def > %lpsolve_LIBS% -o lpsolve55.dll > > %c% -DINLINE=static -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL > -I../bfp/bfp_LUSOL/LUSOL -I../colamd -s -O3 -shared -D_USRDLL -DWIN32 > -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL > -DRoleIsExternalInvEngine %src% -o liblpsolve55.so > > > I'm using VS 2010 Express... Any thoughts? > > Thanks for helping out. > > *Flávio Moringa* > Project Leader > > > > Caixa Mágica Software > Energia Open Source > Rua Soeiro Pereira Gomes, Lote 1 - 4.º B, > Edifício Espanha, 1600-196 Lisboa - Portugal > Tel.: +351 217 921 260 Fax: +351 217 921 261 > http://www.caixamagica.pt > https://twitter.com/flaviomoringa > https://www.facebook.com/flaviomoringa<https://www.facebook.com/flavio.moringa> > http://pt.linkedin.com/in/flaviomoringa > http://people.caixamagica.pt/flaviomoringa > >
lp_solve_5.5-windows.patch2
Description: Binary data
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
