[Libreoffice-commits] .: 2 commits - ooo.lst set_soenv.in solenv/inc

[Caolán McNamara]

 ooo.lst            |   17 ++++++++---------
 set_soenv.in       |   19 ++++++++++---------
 solenv/inc/libs.mk |   12 ------------
 3 files changed, 18 insertions(+), 30 deletions(-)

New commits:
commit ae0fa481bc921630d62c147ddf64d649c1edffd7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 31 13:35:21 2011 +0100

    pull correct jfreereport sources

diff --git a/ooo.lst b/ooo.lst
index 3abc28c..979f049 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -39,7 +39,6 @@ af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
 bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
 c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
 ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
-d1a3205871c3c52e8a50c9f18510ae12-libformula.zip
 d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
 d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
 dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz
@@ -56,14 +55,14 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-f7925ba8491fe570e5164d2c72791358-libfonts.zip
-dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip
-a06a496d7a43cbdc35e69dbe678efadb-libloader.zip
-67b42915c8432abf0a922438f00860a2-libxml.zip
-f3e2febd267c8e4b13df00dac211dd6d-flute.zip
-79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip
-8ea307d71d11140574bfb9fcc2487e33-libbase.zip
-5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip
+3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 http://download.go-oo.org/src
commit 31acf8071c5dba5032d53210cf04b80ece0c8546
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 31 12:48:56 2011 +0100

    we only need the java lib path to link bean

diff --git a/set_soenv.in b/set_soenv.in
index 36763dd..1e45bed 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -79,7 +79,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
      $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI,
      $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
      $MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
-     $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB,
+     $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $JAVALIB,
      $SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL,
      $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME,
      $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
@@ -1355,11 +1355,12 @@ if ($platform =~ m/solaris/)
    $SOLARLIB         .= $L.$USR_LOCAL.$LIB.
                         $L.$USR_DT.$LIB.
                         $L.$USR_OPENWIN.$LIB.
-                        $L.'$JAVA_HOME'.$LIB.
+                        $L.$XLIB;
+
+   $JAVALIB          =  $L.'$JAVA_HOME'.$LIB.
                         $L.$JRELIBDIR.
                         $L.$JRETOOLKITDIR.
-                        $L.$JRETHREADDIR.
-                        $L.$XLIB;
+                        $L.$JRETHREADDIR;
 }
 elsif ($platform =~ m/linux|netbsd|aix|freebsd|openbsd|dragonfly/)
 {  $SOLARLIB          = $L.$par_dir.$LIB.
@@ -1369,14 +1370,13 @@ elsif ($platform =~ m/linux|netbsd|aix|freebsd|openbsd|dragonfly/)
    if ($platform =~ m/openbsd/) {
       $SOLARLIB       .= $L.$USR_LOCAL.$LIB;
    }
-   $SOLARLIB         .= $L.'$JAVA_HOME'.$LIB64.
-                        $L.$JRELIBDIR.
-                        $L.$JRETOOLKITDIR.
-                        $L.$JRETHREADDIR;
-
    if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" ) {
       $SOLARLIB       .= $L.$XLIB;
    }
+   $JAVALIB           = $L.'$JAVA_HOME'.$LIB64.
+                        $L.$JRELIBDIR.
+                        $L.$JRETOOLKITDIR.
+                        $L.$JRETHREADDIR;
 }
 elsif ($platform =~ m/cygwin|os2/)
 {  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
@@ -1804,6 +1804,7 @@ ToFile( "SOLAREXTRAINC",     $SOLAREXTRAINC,     "e" );
 ToFile( "SOLAREXTRALIB",     $SOLAREXTRALIB,     "e" );
 ToFile( "PATH",              $PATH,              "e" );
 ToFile( "SOLARLIB",          $SOLARLIB,          "e" );
+ToFile( "JAVALIB",           $JAVALIB,           "e" );
 ToFile( "SOLARINC",          $SOLARINC,          "e" );
 ToFile( "COMP_ENV",          $COMP_ENV,          "e" );
 ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index b0000a2..52dfada 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -202,19 +202,7 @@ ZLIB3RDLIB=-lz
 ZLIB3RDLIB=-lzlib
 .ENDIF
 .IF "$(SYSTEM_JPEG)"=="YES"
-.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX" && \
-	"$(OS)" != "OPENBSD"
-#i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
-.IF "$(OS)" == "FREEBSD"
-JPEG3RDLIB=/usr/local/lib/libjpeg.so
-.ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" == "POWERPC64"
-JPEG3RDLIB=/usr/lib64/libjpeg.so
-.ELSE
-JPEG3RDLIB=/usr/lib/libjpeg.so
-.ENDIF
-.ELSE
 JPEG3RDLIB=-ljpeg
-.ENDIF
 .ELSE
 JPEG3RDLIB=-ljpeglib
 .ENDIF