diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 16:34:30 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 16:34:30 +0200 |
| commit | 8a3e95ab1180baf284530fc49f79ad5d8c258233 (patch) | |
| tree | bef76fc30169b0d91f16e8c46442cc09e9e71873 | |
| parent | 0d4a2744aaeaacf12455ebdd92373dbec8c19d66 (diff) | |
SUSE101
| -rw-r--r-- | patches/dev300/apply | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index 9a3914fb9..7aae13dea 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -1238,6 +1238,20 @@ oooXXXX.partial-revert-ooo95118.diff [ SUSE101 ] sled10-splash.diff, i#123456, pmladek +# fix build with the old autoconf +build-sled10-autoconf.diff +# fix ixon build with internal boost +# FIXME: it is a hack: +# * the tools ixion-parser ixion-sorter require boost/program_options.hpp +# and the related library; we would need jam and some hacks in +# the internal boost to provide it => it might be easier to make +# the ixion-parser ixion-sorter optional; they are not needed in LO +# * AC_PROG_GREP, _AS_ECHO_LOG, _AC_DO_STDERR are not provided by +# autoconf-2.59 +# * change to AC_PREREQ([2.59]) is not valid because the original +# boost.m4 can't be procced by it +build-sled10-ixion-with-internal-boost.diff + [ SUSE112 ] xulrunner-1.9.1.diff, ccheney @@ -1576,22 +1590,6 @@ SectionOwner => jholesov # Not looking too well, but might be useful? toolbar-decorations-vcl-nwf.diff -[ SUSE101 ] -# fix build with the old autoconf -build-sled10-autoconf.diff -# fix ixon build with internal boost -# FIXME: it is a hack: -# * the tools ixion-parser ixion-sorter require boost/program_options.hpp -# and the related library; we would need jam and some hacks in -# the internal boost to provide it => it might be easier to make -# the ixion-parser ixion-sorter optional; they are not needed in LO -# * AC_PROG_GREP, _AS_ECHO_LOG, _AC_DO_STDERR are not provided by -# autoconf-2.59 -# * change to AC_PREREQ([2.59]) is not valid because the original -# boost.m4 can't be procced by it -build-sled10-ixion-with-internal-boost.diff - - [ GSoC2010 ] # Patches from GSoC 2010 students. maths_baseline_fix.diff, i#972, spiso |