[ooo-build-commit] Branch 'ooo/master' - 2 commits - jfreereport/patches xpdf/makefile.mk
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Sep 23 17:29:19 PDT 2009
jfreereport/patches/flow-engine.patch | 20 ++++++++--------
jfreereport/patches/flute.patch | 38 ++++++++++++++++----------------
jfreereport/patches/libbase.patch | 38 ++++++++++++++++----------------
jfreereport/patches/libfonts.patch | 20 ++++++++--------
jfreereport/patches/liblayout.patch | 20 ++++++++--------
jfreereport/patches/libloader.patch | 22 +++++++++---------
jfreereport/patches/librepository.patch | 20 ++++++++--------
jfreereport/patches/libserializer.patch | 20 ++++++++--------
jfreereport/patches/libxml.patch | 20 ++++++++--------
xpdf/makefile.mk | 7 +----
10 files changed, 111 insertions(+), 114 deletions(-)
New commits:
commit 2864795ba5971454c7d32057f5f8ead3f90a308c
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Sep 23 12:51:59 2009 +0000
#i10000# line ends converted
diff --git a/jfreereport/patches/flow-engine.patch b/jfreereport/patches/flow-engine.patch
index ca3c84e..13da432 100644
--- a/jfreereport/patches/flow-engine.patch
+++ b/jfreereport/patches/flow-engine.patch
@@ -1,10 +1,10 @@
---- misc/core/build.xml (Revision 6728)
-+++ misc/build/core/build.xml (Arbeitskopie)
-@@ -24,6 +24,6 @@
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
+--- misc/core/build.xml (Revision 6728)
++++ misc/build/core/build.xml (Arbeitskopie)
+@@ -24,6 +24,6 @@
+ <!-- Setup the compile classpath -->
+ <path id="classpath">
+- <fileset dir="lib">
++ <fileset dir="${lib}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
diff --git a/jfreereport/patches/flute.patch b/jfreereport/patches/flute.patch
index 27cca42..aad7756 100644
--- a/jfreereport/patches/flute.patch
+++ b/jfreereport/patches/flute.patch
@@ -1,19 +1,19 @@
---- misc/flute/build.xml (Revision 6820)
-+++ misc/build/flute/build.xml (Arbeitskopie)
-@@ -9,6 +9,7 @@
- <property name="build.doc" value="${build}/api"/>
- <property name="build.lib" value="${build}/lib"/>
- <property name="packagenames" value="org.w3c.flute.*"/>
-+ <property name="lib" value="lib"/>
-
- <!-- Targets -->
- <!-- Prepare build directories -->
-@@ -21,7 +22,7 @@
-
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
+--- misc/flute/build.xml (Revision 6820)
++++ misc/build/flute/build.xml (Arbeitskopie)
+@@ -9,6 +9,7 @@
+ <property name="build.doc" value="${build}/api"/>
+ <property name="build.lib" value="${build}/lib"/>
+ <property name="packagenames" value="org.w3c.flute.*"/>
++ <property name="lib" value="lib"/>
+
+ <!-- Targets -->
+ <!-- Prepare build directories -->
+@@ -21,7 +22,7 @@
+
+ <!-- Setup the compile classpath -->
+ <path id="classpath">
+- <fileset dir="lib">
++ <fileset dir="${lib}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
diff --git a/jfreereport/patches/libbase.patch b/jfreereport/patches/libbase.patch
index 87f79aa..f6a7560 100644
--- a/jfreereport/patches/libbase.patch
+++ b/jfreereport/patches/libbase.patch
@@ -1,19 +1,19 @@
---- misc/libbase/build.xml (Revision 6728)
-+++ misc/build/libbase/build.xml (Arbeitskopie)
-@@ -6,6 +6,7 @@
- <property name="build.classes" value="${build}/classes"/>
- <property name="build.doc" value="${build}/api"/>
- <property name="build.lib" value="${build}/lib"/>
-+ <property name="lib" value="lib"/>
-
- <!-- Targets -->
- <!-- Prepare build directories -->
-@@ -18,7 +19,7 @@
-
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
+--- misc/libbase/build.xml (Revision 6728)
++++ misc/build/libbase/build.xml (Arbeitskopie)
+@@ -6,6 +6,7 @@
+ <property name="build.classes" value="${build}/classes"/>
+ <property name="build.doc" value="${build}/api"/>
+ <property name="build.lib" value="${build}/lib"/>
++ <property name="lib" value="lib"/>
+
+ <!-- Targets -->
+ <!-- Prepare build directories -->
+@@ -18,7 +19,7 @@
+
+ <!-- Setup the compile classpath -->
+ <path id="classpath">
+- <fileset dir="lib">
++ <fileset dir="${lib}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
diff --git a/jfreereport/patches/libfonts.patch b/jfreereport/patches/libfonts.patch
index de09e87..63c5a1a 100644
--- a/jfreereport/patches/libfonts.patch
+++ b/jfreereport/patches/libfonts.patch
@@ -1,10 +1,10 @@
---- misc/libfonts/build.xml (Revision 6728)
-+++ misc/build/libfonts/build.xml (Arbeitskopie)
-@@ -23,6 +23,6 @@
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
+--- misc/libfonts/build.xml (Revision 6728)
++++ misc/build/libfonts/build.xml (Arbeitskopie)
+@@ -23,6 +23,6 @@
+ <!-- Setup the compile classpath -->
+ <path id="classpath">
+- <fileset dir="lib">
++ <fileset dir="${lib}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
diff --git a/jfreereport/patches/liblayout.patch b/jfreereport/patches/liblayout.patch
index a30fdd8..ef9cb5b 100644
--- a/jfreereport/patches/liblayout.patch
+++ b/jfreereport/patches/liblayout.patch
@@ -1,10 +1,10 @@
---- misc/liblayout/build.xml (Revision 6728)
-+++ misc/build/liblayout/build.xml (Arbeitskopie)
-@@ -24,6 +24,6 @@
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
+--- misc/liblayout/build.xml (Revision 6728)
++++ misc/build/liblayout/build.xml (Arbeitskopie)
+@@ -24,6 +24,6 @@
+ <!-- Setup the compile classpath -->
+ <path id="classpath">
+- <fileset dir="lib">
++ <fileset dir="${lib}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
diff --git a/jfreereport/patches/libloader.patch b/jfreereport/patches/libloader.patch
index 67b538f..82a2624 100644
--- a/jfreereport/patches/libloader.patch
+++ b/jfreereport/patches/libloader.patch
@@ -1,11 +1,11 @@
---- misc/libloader/build.xml 2009-02-12 18:01:56.000000000 +0100
-+++ misc/build/libloader/build.xml 2009-02-13 09:57:21.856601684 +0100
-@@ -23,7 +23,7 @@
-
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
+--- misc/libloader/build.xml 2009-02-12 18:01:56.000000000 +0100
++++ misc/build/libloader/build.xml 2009-02-13 09:57:21.856601684 +0100
+@@ -23,7 +23,7 @@
+
+ <!-- Setup the compile classpath -->
+ <path id="classpath">
+- <fileset dir="lib">
++ <fileset dir="${lib}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
diff --git a/jfreereport/patches/librepository.patch b/jfreereport/patches/librepository.patch
index 9fe1e48..8a98159 100644
--- a/jfreereport/patches/librepository.patch
+++ b/jfreereport/patches/librepository.patch
@@ -1,10 +1,10 @@
---- misc/librepository/build.xml (Revision 6728)
-+++ misc/build/librepository/build.xml (Arbeitskopie)
-@@ -24,6 +24,6 @@
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
+--- misc/librepository/build.xml (Revision 6728)
++++ misc/build/librepository/build.xml (Arbeitskopie)
+@@ -24,6 +24,6 @@
+ <!-- Setup the compile classpath -->
+ <path id="classpath">
+- <fileset dir="lib">
++ <fileset dir="${lib}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
diff --git a/jfreereport/patches/libserializer.patch b/jfreereport/patches/libserializer.patch
index b2a610a..830fdb9 100644
--- a/jfreereport/patches/libserializer.patch
+++ b/jfreereport/patches/libserializer.patch
@@ -1,10 +1,10 @@
---- misc/libserializer/build.xml (Revision 6728)
-+++ misc/build/libserializer/build.xml (Arbeitskopie)
-@@ -24,6 +24,6 @@
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
+--- misc/libserializer/build.xml (Revision 6728)
++++ misc/build/libserializer/build.xml (Arbeitskopie)
+@@ -24,6 +24,6 @@
+ <!-- Setup the compile classpath -->
+ <path id="classpath">
+- <fileset dir="lib">
++ <fileset dir="${lib}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
diff --git a/jfreereport/patches/libxml.patch b/jfreereport/patches/libxml.patch
index 70c2aec..50981a4 100644
--- a/jfreereport/patches/libxml.patch
+++ b/jfreereport/patches/libxml.patch
@@ -1,10 +1,10 @@
---- misc/libxml/build.xml (Revision 6728)
-+++ misc/build/libxml/build.xml (Arbeitskopie)
-@@ -24,6 +24,6 @@
- <!-- Setup the compile classpath -->
- <path id="classpath">
-- <fileset dir="lib">
-+ <fileset dir="${lib}">
- <include name="*.jar" />
- </fileset>
- </path>
+--- misc/libxml/build.xml (Revision 6728)
++++ misc/build/libxml/build.xml (Arbeitskopie)
+@@ -24,6 +24,6 @@
+ <!-- Setup the compile classpath -->
+ <path id="classpath">
+- <fileset dir="lib">
++ <fileset dir="${lib}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
commit 8b79b20bb3d991e4559211bd6a0572dbd213043d
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Sep 23 11:33:25 2009 +0000
#i10000# #i105297# use common configure action
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index ec1c6ed..337c0a2 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -80,16 +80,13 @@ LDFLAGS:=$(ARCH_FLAGS)
.EXPORT : CFLAGS CXXFLAGS LDFLAGS
.ENDIF
-.IF "$(OS)"=="MACOSX"
CONFIGURE_ACTION=configure
CONFIGURE_FLAGS+=--without-x --without-libpaper-library --without-t1-library --enable-multithreaded --enable-exceptions
-.IF "$(CPU)"=="P"
+
+.IF "$(OS)$(CPU)"=="MACOSXP"
CXXFLAGS+=-malign-natural
.EXPORT: CXXFLAGS
.ENDIF
-.ELSE
-CONFIGURE_ACTION=./configure --without-libpaper-library --without-t1-library --without-x --enable-multithreaded --enable-exceptions
-.ENDIF
BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
.ELSE
More information about the ooo-build-commit
mailing list