[Libreoffice-commits] .: 2 commits - reportbuilder/java reportbuilder/util xpdf/xpdf-3.02.patch

[Jan Holesovsky]

 reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk |    2 
 reportbuilder/java/com/sun/star/report/pentaho/makefile.mk           |    2 
 reportbuilder/java/com/sun/star/report/util/makefile.mk              |    2 
 reportbuilder/util/makefile.mk                                       |   28 +++++-----
 xpdf/xpdf-3.02.patch                                                 |    4 -
 5 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 57826b92af62f92c6984eda28cab83848ad8e211
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Sep 22 19:49:59 2011 +0200

    Fix reportbuilder build with MinGW.

diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
index a245264..eacd1c5 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
@@ -37,7 +37,7 @@ PACKAGE = com$/sun$/star$/report$/function$/metadata
 .IF "$(SYSTEM_JFREEREPORT)" == "YES"
 EXTRAJARFILES = $(LIBBASE_JAR) $(LIBFORMULA_JAR)
 .ELSE
-.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
+.INCLUDE :  $(OUTDIR)/bin/jfreereport_version.mk
 JARFILES += \
     libbase-$(LIBBASE_VERSION).jar                      \
     libformula-$(LIBFORMULA_VERSION).jar
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
index 1f1aeb5..9f1ef3a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
@@ -39,7 +39,7 @@ JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
 .IF "$(SYSTEM_JFREEREPORT)" == "YES"
 EXTRAJARFILES += $(FLUTE_JAR) $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR) $(LIBLOADER_JAR) $(SAC_JAR) $(LIBLAYOUT_JAR) $(LIBSERIALIZER_JAR) $(LIBFONTS_JAR) $(LIBFORMULA_JAR) $(LIBREPOSITORY_JAR)
 .ELSE
-.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
+.INCLUDE :  $(OUTDIR)/bin/jfreereport_version.mk
 JARFILES += \
     flute-$(FLUTE_VERSION).jar				            \
     libserializer-$(LIBSERIALIZER_VERSION).jar			\
diff --git a/reportbuilder/java/com/sun/star/report/util/makefile.mk b/reportbuilder/java/com/sun/star/report/util/makefile.mk
index 6cc9a14..84f2bf9 100644
--- a/reportbuilder/java/com/sun/star/report/util/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/util/makefile.mk
@@ -37,7 +37,7 @@ PACKAGE = com$/sun$/star$/report$/util
 .IF "$(SYSTEM_JFREEREPORT)" == "YES"
 EXTRAJARFILES   = $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR)
 .ELSE
-.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
+.INCLUDE :  $(OUTDIR)/bin/jfreereport_version.mk
 JARFILES += \
     libbase-$(LIBBASE_VERSION).jar                      \
     libxml-$(LIBXML_VERSION).jar						\
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index d78cfa6..71ae1b3 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -87,26 +87,26 @@ COMPONENT_HELP= \
 # .jar files from solver
 COMPONENT_EXTJARFILES = \
     $(EXTENSIONDIR)$/sun-report-builder.jar 					\
-    $(EXTENSIONDIR)$/reportbuilderwizard.jar
+    $(OUTDIR)$/bin$/reportbuilderwizard.jar
 
 .IF "$(SYSTEM_JFREEREPORT)" != "YES"
-.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
+.INCLUDE :  $(OUTDIR)/bin/jfreereport_version.mk
 COMPONENT_EXTJARFILES += \
-    $(EXTENSIONDIR)$/flute-$(FLUTE_VERSION).jar				            \
-    $(EXTENSIONDIR)$/libserializer-$(LIBSERIALIZER_VERSION).jar			\
-    $(EXTENSIONDIR)$/libbase-$(LIBBASE_VERSION).jar                     \
-    $(EXTENSIONDIR)$/libfonts-$(LIBFONTS_VERSION).jar					\
-    $(EXTENSIONDIR)$/libformula-$(LIBFORMULA_VERSION).jar						\
-    $(EXTENSIONDIR)$/liblayout-$(LIBLAYOUT_VERSION).jar					\
-    $(EXTENSIONDIR)$/libloader-$(LIBLOADER_VERSION).jar					\
-    $(EXTENSIONDIR)$/librepository-$(LIBREPOSITORY_VERSION).jar			\
-    $(EXTENSIONDIR)$/libxml-$(LIBXML_VERSION).jar						\
-    $(EXTENSIONDIR)$/flow-engine-$(FLOW_ENGINE_VERSION).jar 	        \
-    $(EXTENSIONDIR)$/sac.jar
+    $(OUTDIR)$/bin$/flute-$(FLUTE_VERSION).jar				            \
+    $(OUTDIR)$/bin$/libserializer-$(LIBSERIALIZER_VERSION).jar			\
+    $(OUTDIR)$/bin$/libbase-$(LIBBASE_VERSION).jar                     \
+    $(OUTDIR)$/bin$/libfonts-$(LIBFONTS_VERSION).jar					\
+    $(OUTDIR)$/bin$/libformula-$(LIBFORMULA_VERSION).jar						\
+    $(OUTDIR)$/bin$/liblayout-$(LIBLAYOUT_VERSION).jar					\
+    $(OUTDIR)$/bin$/libloader-$(LIBLOADER_VERSION).jar					\
+    $(OUTDIR)$/bin$/librepository-$(LIBREPOSITORY_VERSION).jar			\
+    $(OUTDIR)$/bin$/libxml-$(LIBXML_VERSION).jar						\
+    $(OUTDIR)$/bin$/flow-engine-$(FLOW_ENGINE_VERSION).jar 	        \
+    $(OUTDIR)$/bin$/sac.jar
 .ENDIF
 .IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
 COMPONENT_EXTJARFILES += \
-    $(EXTENSIONDIR)$/commons-logging-1.1.1.jar
+    $(OUTDIR)$/bin$/commons-logging-1.1.1.jar
 .ENDIF
 
 COMPONENT_MANIFEST_GENERIC:=TRUE
commit b1e6bdeac38ba8533aaaf85c18cf9df9a11177af
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Sep 22 19:42:11 2011 +0200

    Use the right 'ar' and 'ranlib' when building with MinGW.

diff --git a/xpdf/xpdf-3.02.patch b/xpdf/xpdf-3.02.patch
index 9477f7a..9bf67f0 100644
--- a/xpdf/xpdf-3.02.patch
+++ b/xpdf/xpdf-3.02.patch
@@ -1084,8 +1084,8 @@
  SPLASHLIBDIR = ../splash
  
  CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @freetype2_CFLAGS@ @Sgm_CFLAGS@ @Xm_CFLAGS@ @Xt_CFLAGS@ @Xp_CFLAGS@ @Xext_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @libpaper_CFLAGS@ @X_CFLAGS@
-+AR = ar rc
-+RANLIB = ranlib
++AR = @AR@
++RANLIB = @RANLIB@
  
  LDFLAGS = @LDFLAGS@