Blame libreoffice-buildfix.patch
|
 |
8076325 |
--- a/solenv/inc/postset.mk 2010-09-29 12:55:57.000000000 +0100
|
|
|
8076325 |
+++ b/solenv/inc/postset.mk 2010-09-29 12:58:29.000000000 +0100
|
|
|
8076325 |
@@ -33,15 +33,13 @@
|
|
|
8076325 |
# Complete list of all supported ISO codes
|
|
|
8076325 |
completelangiso=af \
|
|
|
8076325 |
ar \
|
|
|
8076325 |
-as-IN \
|
|
|
8076325 |
+as \
|
|
|
8076325 |
be-BY \
|
|
|
8076325 |
bo \
|
|
|
8076325 |
bg \
|
|
|
8076325 |
br \
|
|
|
8076325 |
brx \
|
|
|
8076325 |
bn \
|
|
|
8076325 |
-bn-BD \
|
|
|
8076325 |
-bn-IN \
|
|
|
8076325 |
bs \
|
|
|
8076325 |
ca \
|
|
 |
4853df6 |
cs \
|
|
|
4853df6 |
@@ -65,7 +63,6 @@
|
|
|
8076325 |
gd \
|
|
|
8076325 |
gl \
|
|
|
8076325 |
gu \
|
|
|
8076325 |
-gu-IN \
|
|
|
8076325 |
he \
|
|
|
4853df6 |
hi \
|
|
|
8076325 |
hr \
|
|
|
4853df6 |
@@ -91,8 +88,8 @@
|
|
|
8076325 |
mn \
|
|
|
8076325 |
mni \
|
|
|
8076325 |
ms \
|
|
|
8076325 |
-ml-IN \
|
|
|
8076325 |
-mr-IN \
|
|
|
8076325 |
+ml \
|
|
|
8076325 |
+mr \
|
|
|
8076325 |
my \
|
|
|
8076325 |
ne \
|
|
|
8076325 |
nb \
|
|
|
4853df6 |
@@ -102,7 +99,7 @@
|
|
|
8076325 |
ns \
|
|
|
8076325 |
om \
|
|
|
8076325 |
oc \
|
|
|
8076325 |
-or-IN \
|
|
|
8076325 |
+or \
|
|
|
8076325 |
pap \
|
|
|
8076325 |
pa-IN \
|
|
|
8076325 |
pl \
|
|
|
4853df6 |
@@ -126,16 +123,16 @@
|
|
|
8076325 |
sv \
|
|
|
8076325 |
sw \
|
|
|
8076325 |
sw-TZ \
|
|
|
8076325 |
-te-IN \
|
|
|
8076325 |
-ti-ER \
|
|
|
8076325 |
-ta-IN \
|
|
|
8076325 |
+te \
|
|
|
8076325 |
+ti \
|
|
|
8076325 |
+ta \
|
|
|
8076325 |
th \
|
|
|
8076325 |
tn \
|
|
|
8076325 |
tr \
|
|
|
8076325 |
ts \
|
|
|
8076325 |
tg \
|
|
|
8076325 |
ug \
|
|
|
8076325 |
-ur-IN \
|
|
|
8076325 |
+ur \
|
|
|
8076325 |
uk \
|
|
|
8076325 |
uz \
|
|
|
8076325 |
ve \
|
|
|
bd100d6 |
--- a/configure.in
|
|
|
bd100d6 |
+++ b/configure.in
|
|
|
bd100d6 |
@@ -3815,12 +3815,6 @@ if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
|
|
|
bd100d6 |
SYSTEM_CPPUNIT=YES
|
|
|
bd100d6 |
# might work for earlier, too but go sure
|
|
|
bd100d6 |
PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.0 )
|
|
|
bd100d6 |
- AC_MSG_CHECKING([STL compatibility])
|
|
|
bd100d6 |
- if test "$WITH_STLPORT" != "no"; then
|
|
|
bd100d6 |
- AC_MSG_ERROR([to use system cppunit you need to use --without-stlport])
|
|
|
bd100d6 |
- else
|
|
|
bd100d6 |
- AC_MSG_RESULT([OK])
|
|
|
bd100d6 |
- fi
|
|
|
bd100d6 |
else
|
|
|
bd100d6 |
AC_MSG_RESULT([internal])
|
|
|
bd100d6 |
SYSTEM_CPPUNIT=NO
|