diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-06 13:05:26 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-06 13:05:26 -0500 |
| commit | 801936459fa8cd5d452f875d14da7f34a9117f08 (patch) | |
| tree | b68a8d557f97d432db6933f487ebdff842eee600 /apache-commons/patches | |
| parent | bf202438d88e650b69c9817f003f45aed1f58996 (diff) | |
| parent | f8c7607ea291d7e7d976a9485abc1761627eb654 (diff) | |
Merge remote branch 'extensions/master'MELD_LIBREOFFICE_REPOS
* extensions/master: (978 commits)
get this building for me
Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)
enable l10n of presenter screen
oops Bjoern's .gitattributes link got commited by mistake
enable l10n of presenter screen
Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)
poppler 0.17.0 changed its api for no some reason or other
Branch libreoffice-3-4-2
Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)
Remove component_getImplementationEnvironment
hotfix to include localizations of Presenter screen extension
hotfix to include localizations of Presenter screen extension
Goodbye to CWS_WORK_STAMP
use OString::equalsL
fixing rebase errors
ause130: #i117218# change .idl handling to gnu make
CWS gnumake4: reimplement basegfx_s hack for new build system [hg:c943ed591aff]
Use DESKTOP and NATIVE where appropriate
Version 3.4.1.1, tag libreoffice-3.4.1.1 (3.4.1-rc1)
createFromAscii -> RTL_CONSTASCII_USTRINGPARAM
...
Diffstat (limited to 'apache-commons/patches')
| -rw-r--r-- | apache-commons/patches/codec.patch | 17 | ||||
| -rw-r--r-- | apache-commons/patches/logging.patch | 15 |
2 files changed, 32 insertions, 0 deletions
diff --git a/apache-commons/patches/codec.patch b/apache-commons/patches/codec.patch new file mode 100644 index 000000000000..dea25ad263d2 --- /dev/null +++ b/apache-commons/patches/codec.patch @@ -0,0 +1,17 @@ +--- misc/build/commons-codec-1.3/build.xml-old 2008-01-31 15:28:58.000000000 +0100 ++++ misc/build/commons-codec-1.3/build.xml 2008-01-31 15:29:21.000000000 +0100 +@@ -90,14 +90,12 @@ + </target>
+ <target name="dist" depends="compile,javadoc" description="Create binary distribution">
+ <mkdir dir="${dist.home}"/>
+- <copy file="../LICENSE" todir="${dist.home}"/>
+ <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>
+ <antcall target="jar"/>
+ </target>
+ <target name="jar" depends="compile" description="Create jar">
+ <mkdir dir="${dist.home}"/>
+ <mkdir dir="${build.home}/classes/META-INF"/>
+- <copy file="../LICENSE" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+ <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes" manifest="${build.home}/conf/MANIFEST.MF"/>
+ </target>
+ <target name="install-jar" depends="jar" description="--> Installs jar file in ${lib.repo}">
diff --git a/apache-commons/patches/logging.patch b/apache-commons/patches/logging.patch new file mode 100644 index 000000000000..63b93dcbd6f2 --- /dev/null +++ b/apache-commons/patches/logging.patch @@ -0,0 +1,15 @@ +--- misc/commons-logging-1.1.1-src/build.xml 2007-11-22 00:27:52.000000000 +0100 ++++ misc/build/commons-logging-1.1.1-src/build.xml 2008-06-24 14:23:56.316301736 +0200 +@@ -127,10 +127,10 @@ + <!-- ========== Compiler Defaults ========================================= --> + + <!-- Version of java class files to generate. --> +- <property name="target.version" value="1.1"/> ++ <property name="target.version" value="1.3"/> + + <!-- Version of java source to accept --> +- <property name="source.version" value="1.2"/> ++ <property name="source.version" value="1.3"/> + + <!-- Should Java compilations set the 'debug' compiler option? --> + <property name="compile.debug" value="true"/> |