aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorS├ębastien Fabbro <bicatali@gentoo.org>2010-03-06 07:19:39 +0000
committerS├ębastien Fabbro <bicatali@gentoo.org>2010-03-06 07:19:39 +0000
commit343ae9adcda3c22f127d20834154cd408e03fc8a (patch)
tree566a5a6bb0fb32f352fd1eced7ee3cf832c5470d /dev-java/flexdock/files
parentsci-mathematics/normaliz QA (diff)
downloadsci-343ae9adcda3c22f127d20834154cd408e03fc8a.tar.gz
sci-343ae9adcda3c22f127d20834154cd408e03fc8a.tar.bz2
sci-343ae9adcda3c22f127d20834154cd408e03fc8a.zip
Added flexdock
Diffstat (limited to 'dev-java/flexdock/files')
-rw-r--r--dev-java/flexdock/files/flexdock-0.5.1-build.patch44
-rw-r--r--dev-java/flexdock/files/flexdock-0.5.1-nativelib.patch21
-rw-r--r--dev-java/flexdock/files/flexdock-0.5.1-nodemo.patch12
3 files changed, 77 insertions, 0 deletions
diff --git a/dev-java/flexdock/files/flexdock-0.5.1-build.patch b/dev-java/flexdock/files/flexdock-0.5.1-build.patch
new file mode 100644
index 000000000..130df6b8d
--- /dev/null
+++ b/dev-java/flexdock/files/flexdock-0.5.1-build.patch
@@ -0,0 +1,44 @@
+diff -urN flexdock-0.5.1-orig/build.xml flexdock-0.5.1/build.xml
+--- flexdock-0.5.1-orig/build.xml 2010-02-22 21:35:43.000000000 -0500
++++ flexdock-0.5.1/build.xml 2010-02-22 21:39:17.000000000 -0500
+@@ -69,6 +69,7 @@
+
+ <path id="rt.classpath">
+ <pathelement location="${bin.dir}"/>
++ <pathelement location="${lib.dir}/commons-logging.jar"/>
+ </path>
+ <path id="rt.classpath.demo">
+ <pathelement location="${bin.dir.demo}"/>
+@@ -118,7 +119,7 @@
+ <condition property="os.unixWithXlib">
+ <and>
+ <os family="unix"/>
+- <available file="/usr/X11R6/include/X11/Xlib.h"/>
++ <available file="/usr/include/X11/Xlib.h"/>
+ </and>
+ </condition>
+ </target>
+@@ -291,11 +292,12 @@
+
+ <exec executable="gcc" failonerror="true">
+ <arg value="-lX11"/>
+- <arg value="-L/usr/X11R6/lib"/>
+- <arg value="-I/usr/X11R6/include"/>
++ <arg value="-L/usr/lib"/>
++ <arg value="-I/usr/include/X11"/>
+ <arg value="-o"/>
+ <arg value="${so.dir}/libRubberBand${library.key}.so"/>
+ <arg value="-shared"/>
++ <arg value="-fPIC"/>
+ <arg value="${c.dir}/RubberBand.c"/>
+ <arg line='${sdk.include.gcc.args}'/> <!-- potentially multiple include dirs -->
+ </exec>
+@@ -313,7 +315,7 @@
+ <isset property="generic.jar"/>
+ </condition>
+ <property name="jar.suffix" value=""/>
+- <property name="jar.excludes" value=""/>
++ <property name="jar.excludes" value="**/*.so"/>
+
+
+ <!-- after this method is called, other targets can use these props -->
diff --git a/dev-java/flexdock/files/flexdock-0.5.1-nativelib.patch b/dev-java/flexdock/files/flexdock-0.5.1-nativelib.patch
new file mode 100644
index 000000000..ae8df8f23
--- /dev/null
+++ b/dev-java/flexdock/files/flexdock-0.5.1-nativelib.patch
@@ -0,0 +1,21 @@
+diff -urN flexdock-0.5.1-orig/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java flexdock-0.5.1/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java
+--- flexdock-0.5.1-orig/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2010-02-22 21:35:42.000000000 -0500
++++ flexdock-0.5.1/src/java/drag/org/flexdock/docking/drag/outline/xlib/XlibRubberBand.java 2010-02-24 23:31:55.000000000 -0500
+@@ -17,7 +17,7 @@
+ *
+ */
+ public class XlibRubberBand extends RubberBand {
+- private static final String NATIVE_RESOURCE_PATH = "org/flexdock/docking/drag/outline/xlib/";
++ private static final String NATIVE_RESOURCE_PATH = "/usr/lib/flexdock/";
+ private static final String NATIVE_RESOURCE = "libRubberBand.so";
+ private static final String NATIVE_RESOURCE_START = "libRubberBand";
+ private static final String NATIVE_RESOURCE_END = ".so";
+@@ -46,7 +46,7 @@
+ String resource = NATIVE_RESOURCE_PATH + NATIVE_RESOURCE_START + key + NATIVE_RESOURCE_END;
+
+ try {
+- ResourceManager.loadLibrary(lib, resource);
++ System.load(resource);
+ // if the library was successfully loaded, then we don't
+ // need to do anything else.
+ return;
diff --git a/dev-java/flexdock/files/flexdock-0.5.1-nodemo.patch b/dev-java/flexdock/files/flexdock-0.5.1-nodemo.patch
new file mode 100644
index 000000000..0324d66bd
--- /dev/null
+++ b/dev-java/flexdock/files/flexdock-0.5.1-nodemo.patch
@@ -0,0 +1,12 @@
+diff -urN flexdock-orig//build.xml flexdock/build.xml
+--- flexdock-orig//build.xml 2010-02-21 23:35:15.000000000 -0500
++++ flexdock/build.xml 2010-02-21 23:35:45.000000000 -0500
+@@ -145,8 +145,6 @@
+ <src path="${java.src.drag}"/>
+ <src path="${java.src.perspective}"/>
+ </javac>
+- <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.4"/>
+- <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.4"/>
+ </target>
+
+