[jabref/f18] Update patch files

mef mef at fedoraproject.org
Mon Dec 17 15:20:36 UTC 2012


commit 21a47de9fa9bf66b824e0e6afdbf796d1be3f3ae
Author: Mary Ellen Foster <mefoster at gmail.com>
Date:   Mon Dec 17 15:20:27 2012 +0000

    Update patch files

 jabref-2.4.2-remove-windows.patch                  |   39 -
 jabref-2.8-jgoodies.patch                          | 1122 --------------------
 jabref-2.8b-antlr.patch                            |   53 -
 jabref-2.9-ayatana.patch                           |   25 +
 ...8-build_xml.patch => jabref-2.9-build_xml.patch |   31 +-
 5 files changed, 44 insertions(+), 1226 deletions(-)
---
diff --git a/jabref-2.9-ayatana.patch b/jabref-2.9-ayatana.patch
new file mode 100644
index 0000000..e499766
--- /dev/null
+++ b/jabref-2.9-ayatana.patch
@@ -0,0 +1,25 @@
+--- jabref-2.9.orig/src/java/net/sf/jabref/JabRefFrame.java	2012-12-15 15:38:15.000000000 +0000
++++ jabref-2.9/src/java/net/sf/jabref/JabRefFrame.java	2012-12-17 14:56:15.864586036 +0000
+@@ -40,8 +40,6 @@
+ import javax.swing.event.ChangeEvent;
+ import javax.swing.event.ChangeListener;
+ 
+-import org.java.ayatana.ApplicationMenu;
+-
+ import net.sf.jabref.export.*;
+ import net.sf.jabref.external.ExternalFileTypeEditor;
+ import net.sf.jabref.external.PushToApplicationButton;
+@@ -550,13 +548,6 @@
+                 }
+             }
+         });
+-
+-        // The following sets up integration with Unity's global menu, but currently (Nov 18, 2012)
+-        // this doesn't work with OpenJDK 6 (leads to crash), only with 7.
+-        String javaVersion = System.getProperty("java.version", null);
+-        if (javaVersion.compareTo("1.7") >= 0)
+-            ApplicationMenu.tryInstall(this);
+-
+     }
+ 
+     public void setWindowTitle() {
diff --git a/jabref-2.8-build_xml.patch b/jabref-2.9-build_xml.patch
similarity index 50%
rename from jabref-2.8-build_xml.patch
rename to jabref-2.9-build_xml.patch
index 41cdd1f..a2d162a 100644
--- a/jabref-2.8-build_xml.patch
+++ b/jabref-2.9-build_xml.patch
@@ -1,6 +1,6 @@
---- jabref-2.8/build.xml.orig	2012-05-25 12:28:51.525135263 +0100
-+++ jabref-2.8/build.xml	2012-05-25 12:29:22.228034973 +0100
-@@ -230,7 +230,7 @@
+--- jabref-2.9.orig/build.xml	2012-12-13 15:55:26.000000000 +0000
++++ jabref-2.9/build.xml	2012-12-17 15:08:57.595005283 +0000
+@@ -237,7 +237,7 @@
  	</target>
  
  	<!-- Jars up project -->
@@ -9,23 +9,30 @@
  		<mkdir dir="${build.lib}" />
          
  		<mkdir dir="${build.tmp}" />
-@@ -343,10 +343,11 @@
+@@ -273,10 +273,6 @@
+ 				<include name="jgoodies.txt" />
+ 				<include name="README" />
+ 			</fileset>
+-			<manifest>
+-				<attribute name="Main-Class" value="net.sf.jabref.JabRefMain" />
+-                <attribute name="Class-Path" value="." />
+-			</manifest>
+ 		</jar>
+ 
+ 	</target>
+@@ -354,7 +350,7 @@
  	<!-- Creates javadocs -->
  	<target name="javadocs" depends="compile" description="Generates the javadocs">
  		<mkdir dir="${build.javadocs}" />
--		<javadoc sourcepath="${java.dir}" destdir="${build.javadocs}" author="true" version="true" windowtitle="JabRef API" link="http://java.sun.com/j2se/1.4.1/docs/api/">
-+		<javadoc sourcepath="${java.dir}" destdir="${build.javadocs}" author="true" version="true" windowtitle="JabRef API" link="http://java.sun.com/j2se/1.4.1/docs/api/" encoding="utf-8" excludepackagenames="tests.*">
+-		<javadoc sourcepath="${java.dir}" destdir="${build.javadocs}" author="true" version="true" windowtitle="JabRef API" link="http://docs.oracle.com/javase/6/docs/api/">
++		<javadoc sourcepath="${java.dir}" destdir="${build.javadocs}" author="true" version="true" windowtitle="JabRef API" link="http://docs.oracle.com/javase/6/docs/api/" encoding="ISO-8859-1" docencoding="UTF-8" excludepackagenames="tests.*">
  
  			<fileset dir="${java.dir}" defaultexcludes="yes">
  				<include name="**/*.java" />
-+                                <exclude name="**/tests/**" />
- 			</fileset>
- 
- 			<classpath refid="classpath" />
-@@ -653,6 +654,4 @@
+@@ -595,6 +591,4 @@
  		</jalopy>
  	</target>
  
--	<taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
+-	<taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
 -
  </project>


More information about the scm-commits mailing list