[med-svn] [Git][med-team/king][master] 6 commits: Removing old, unused patches

Pierre Gruet (@pgt) gitlab at salsa.debian.org
Wed Feb 2 21:51:27 GMT 2022


Pierre Gruet pushed to branch master at Debian Med / king


Commits:
c13b7684 by Pierre Gruet at 2022-02-02T22:12:37+01:00
Removing old, unused patches

- - - - -
9aac3e3e by Pierre Gruet at 2022-02-02T22:13:36+01:00
Removing .so and .jnilib files when repacking

- - - - -
fd71f669 by Pierre Gruet at 2022-02-02T22:15:39+01:00
New upstream version 2.24+dfsg2
- - - - -
2c1503cc by Pierre Gruet at 2022-02-02T22:16:19+01:00
Update upstream source from tag 'upstream/2.24+dfsg2'

Update to upstream version '2.24+dfsg2'
with Debian dir e321f3f4734ccc4ea2c52be4eac4832ac9945390
- - - - -
e1778722 by Pierre Gruet at 2022-02-02T22:49:04+01:00
Building native lib (not included in the package at the moment, still) through d/rules

- - - - -
66d25183 by Pierre Gruet at 2022-02-02T22:51:14+01:00
Updating changelog

- - - - -


8 changed files:

- debian/changelog
- debian/copyright
- − debian/patches/java7-compat.patch
- debian/patches/series
- − debian/patches/use_jogl2.patch
- debian/rules
- − quickies/native/libnativespeed.jnilib
- − quickies/native/libnativespeed.so


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,6 @@
-king (2.24+dfsg-1) UNRELEASED; urgency=medium
+king (2.24+dfsg2-1) UNRELEASED; urgency=medium
 
   [ Andreas Tille ]
-  * New upstream version
   * Upstream moved to Github
   * Update Files-Excluded
   * Remove trailing whitespace in debian/rules (routine-update)
@@ -14,7 +13,19 @@ king (2.24+dfsg-1) UNRELEASED; urgency=medium
   * Update d/p/use_debian_packaged_jars.patch to use more jars needed
   * d/control: Add B-D on libpdfbox2-java and libfontbox-java
 
- -- Andreas Tille <tille at debian.org>  Sat, 29 Jan 2022 01:01:12 +0530
+  [ Pierre Gruet ]
+  * Team upload
+  * New upstream version 2.24+dfsg2
+  * Adding dependencies to perform the build with newest upstream version
+  * Refreshing patches
+  * Changing the path of the built jar in d/king.jlibs file
+  * Building pdf docs from lyx and tex files, building reproducibly
+  * Removing doc-base files of vanished doc files
+  * Removing .so and .jnilib files when repacking
+  * Building native lib (not included in the package at the moment, still)
+    through d/rules
+
+ -- Pierre Gruet <pgt at debian.org>  Wed, 02 Feb 2022 22:49:11 +0100
 
 king (2.23.161103+dfsg2-1) unstable; urgency=medium
 


=====================================
debian/copyright
=====================================
@@ -23,6 +23,8 @@ Files-Excluded: *.jar
                 king/resource/king/images/*24.gif
                 .gitignore
                 */old
+                **/*.jnilib
+                **/*.so
 
 Files: *
 Copyright: 2002-2016 Ian W. Davis <ian.w.davis at gmail.com>


=====================================
debian/patches/java7-compat.patch deleted
=====================================
@@ -1,54 +0,0 @@
-Description: Fix FTBFS with Java7
- Java7 provides javax.swing.Painter, which makes "Painter" ambiguous
- unless king.core.Painter is explcitly imported.
-
---- a/king/src/king/ToolBox.java
-+++ b/king/src/king/ToolBox.java
-@@ -2,6 +2,7 @@
- //{{{ Package, imports
- package king;
- import king.core.*;
-+import king.core.Painter;
- 
- import java.awt.*;
- import java.awt.event.*;
---- a/king/src/king/ToolServices.java
-+++ b/king/src/king/ToolServices.java
-@@ -2,6 +2,7 @@
- //{{{ Package, imports
- package king;
- import king.core.*;
-+import king.core.Painter;
- import king.points.*;
- 
- import java.awt.*;
---- a/king/src/king/BasicTool.java
-+++ b/king/src/king/BasicTool.java
-@@ -2,6 +2,7 @@
- //{{{ Package, imports
- package king;
- import king.core.*;
-+import king.core.Painter;
- 
- import java.awt.*;
- import java.awt.event.*;
---- a/king/src/king/KinCanvas.java
-+++ b/king/src/king/KinCanvas.java
-@@ -2,6 +2,7 @@
- //{{{ Package, imports
- package king;
- import king.core.*;
-+import king.core.Painter;
- import king.painters.*;
- 
- import java.awt.*;
---- a/king/src/king/tool/draw/DrawingTool.java
-+++ b/king/src/king/tool/draw/DrawingTool.java
-@@ -3,6 +3,7 @@
- package king.tool.draw;
- import king.*;
- import king.core.*;
-+import king.core.Painter;
- import king.points.*;
- 
- import java.awt.*;


=====================================
debian/patches/series
=====================================
@@ -1,6 +1,4 @@
 use_debian_packaged_jars.patch
-java7-compat.patch
-## use_jogl2.patch - fails to build
 ignore_appbundler.patch
 ignore_rdcvis.jar.patch
 using_free_iconset.patch


=====================================
debian/patches/use_jogl2.patch deleted
=====================================
@@ -1,546 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Wed, 16 Jan 2013 10:05:10 +0100
-Description: This is an attempt to replace libjogl-java by libjogl2-java
- Unfortunately it is not that simple and the build fails.  Here is the
- part of the build log:
- .
- compile-jogl:
-    [javac] /tmp/buildd/king-2.21.120420/king/build.xml:99: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
-    [javac] Compiling 3 source files to /tmp/buildd/king-2.21.120420/king/build
-    [javac] warning: [options] bootstrap class path not set in conjunction with -source 1.5
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/JoglCanvas.java:62: error: cannot find symbol
-    [javac]     GLCanvas    canvas;
-    [javac]     ^
-    [javac]   symbol:   class GLCanvas
-    [javac]   location: class JoglCanvas
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:18: error: package com.sun.opengl.util does not exist
-    [javac] import com.sun.opengl.util.*; // for GLUT
-    [javac] ^
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:59: error: cannot find symbol
-    [javac]     protected GLUT      glut;
-    [javac]               ^
-    [javac]   symbol:   class GLUT
-    [javac]   location: class JoglEngine3D
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglPainter.java:19: error: package com.sun.opengl.util does not exist
-    [javac] import com.sun.opengl.util.*; // for GLUT
-    [javac] ^
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglPainter.java:37: error: cannot find symbol
-    [javac]     GLUT        glut;
-    [javac]     ^
-    [javac]   symbol:   class GLUT
-    [javac]   location: class JoglPainter
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/JoglCanvas.java:52: error: JoglCanvas is not abstract and does not override abstract method dispose(GLAutoDrawable) in GLEventListener
-    [javac] public class JoglCanvas extends JPanel implements GLEventListener, Transformable, MouseListener
-    [javac]        ^
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/JoglCanvas.java:91: error: constructor GLCapabilities in class GLCapabilities cannot be applied to given types;
-    [javac]         GLCapabilities capabilities = new GLCapabilities();
-    [javac]                                       ^
-    [javac]   required: GLProfile
-    [javac]   found: no arguments
-    [javac]   reason: actual and formal argument lists differ in length
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/JoglCanvas.java:99: error: cannot find symbol
-    [javac]         canvas = new GLCanvas(capabilities);
-    [javac]                      ^
-    [javac]   symbol:   class GLCanvas
-    [javac]   location: class JoglCanvas
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/JoglCanvas.java:128: error: cannot find symbol
-    [javac]             gl.glRasterPos2d(0, -dim.height); // for getting the logo to display in correct spot
-    [javac]               ^
-    [javac]   symbol:   method glRasterPos2d(int,int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/JoglCanvas.java:136: error: cannot find symbol
-    [javac]             gl.glDrawPixels(dim.width, dim.height,
-    [javac]               ^
-    [javac]   symbol:   method glDrawPixels(int,int,int,int,ByteBuffer)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/JoglCanvas.java:164: error: cannot find symbol
-    [javac]         gl.glMatrixMode(GL.GL_PROJECTION);
-    [javac]                           ^
-    [javac]   symbol:   variable GL_PROJECTION
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/JoglCanvas.java:165: error: cannot find symbol
-    [javac]         gl.glLoadIdentity();
-    [javac]           ^
-    [javac]   symbol:   method glLoadIdentity()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:61: error: cannot find symbol
-    [javac]     protected int       currFont = GLUT.BITMAP_HELVETICA_12;
-    [javac]                                    ^
-    [javac]   symbol:   variable GLUT
-    [javac]   location: class JoglEngine3D
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:98: error: cannot find symbol
-    [javac]             gl.glDeleteLists(ballDL, 1);
-    [javac]               ^
-    [javac]   symbol:   method glDeleteLists(int,int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:124: error: cannot find symbol
-    [javac]         this.glut   = new GLUT();
-    [javac]                           ^
-    [javac]   symbol:   class GLUT
-    [javac]   location: class JoglEngine3D
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:138: error: cannot find symbol
-    [javac]         gl.glEnable(gl.GL_POINT_SMOOTH);
-    [javac]                       ^
-    [javac]   symbol:   variable GL_POINT_SMOOTH
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:186: error: cannot find symbol
-    [javac]         gl.glMatrixMode(GL.GL_MODELVIEW);
-    [javac]                           ^
-    [javac]   symbol:   variable GL_MODELVIEW
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:187: error: cannot find symbol
-    [javac]         gl.glPushMatrix();
-    [javac]           ^
-    [javac]   symbol:   method glPushMatrix()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:188: error: cannot find symbol
-    [javac]         gl.glLoadIdentity();
-    [javac]           ^
-    [javac]   symbol:   method glLoadIdentity()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:191: error: cannot find symbol
-    [javac]         gl.glMultMatrixd(new double[] {
-    [javac]           ^
-    [javac]   symbol:   method glMultMatrixd(double[],int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:201: error: cannot find symbol
-    [javac]         gl.glEnable(GL.GL_NORMALIZE);
-    [javac]                       ^
-    [javac]   symbol:   variable GL_NORMALIZE
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:202: error: cannot find symbol
-    [javac]         gl.glEnable(GL.GL_LIGHT0);
-    [javac]                       ^
-    [javac]   symbol:   variable GL_LIGHT0
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:208: error: cannot find symbol
-    [javac]         gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT, new float[] {a, a, a, 1}, 0);
-    [javac]                        ^
-    [javac]   symbol:   variable GL_LIGHT0
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:208: error: cannot find symbol
-    [javac]         gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT, new float[] {a, a, a, 1}, 0);
-    [javac]                                      ^
-    [javac]   symbol:   variable GL_AMBIENT
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:209: error: cannot find symbol
-    [javac]         gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE, new float[] {d, d, d, 1}, 0);
-    [javac]                        ^
-    [javac]   symbol:   variable GL_LIGHT0
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:209: error: cannot find symbol
-    [javac]         gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE, new float[] {d, d, d, 1}, 0);
-    [javac]                                      ^
-    [javac]   symbol:   variable GL_DIFFUSE
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:210: error: cannot find symbol
-    [javac]         gl.glLightfv(GL.GL_LIGHT0, GL.GL_SPECULAR, new float[] {s, s, s, 1}, 0);
-    [javac]                        ^
-    [javac]   symbol:   variable GL_LIGHT0
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:210: error: cannot find symbol
-    [javac]         gl.glLightfv(GL.GL_LIGHT0, GL.GL_SPECULAR, new float[] {s, s, s, 1}, 0);
-    [javac]                                      ^
-    [javac]   symbol:   variable GL_SPECULAR
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:214: error: cannot find symbol
-    [javac]         gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION,
-    [javac]                        ^
-    [javac]   symbol:   variable GL_LIGHT0
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:214: error: cannot find symbol
-    [javac]         gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION,
-    [javac]                                      ^
-    [javac]   symbol:   variable GL_POSITION
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:216: error: cannot find symbol
-    [javac]         gl.glLightModelfv(GL.GL_LIGHT_MODEL_AMBIENT, new float[] {0, 0, 0, 1}, 0); // default is ???
-    [javac]                             ^
-    [javac]   symbol:   variable GL_LIGHT_MODEL_AMBIENT
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:217: error: cannot find symbol
-    [javac]         gl.glLightModeli(GL.GL_LIGHT_MODEL_LOCAL_VIEWER, GL.GL_FALSE); // supposedly more efficient
-    [javac]                            ^
-    [javac]   symbol:   variable GL_LIGHT_MODEL_LOCAL_VIEWER
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:218: error: cannot find symbol
-    [javac]         gl.glLightModeli(GL.GL_LIGHT_MODEL_TWO_SIDE, GL.GL_TRUE); // will be needed for ribbons!
-    [javac]                            ^
-    [javac]   symbol:   variable GL_LIGHT_MODEL_TWO_SIDE
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:221: error: cannot find symbol
-    [javac]         gl.glEnable(GL.GL_COLOR_MATERIAL); // color will be taken from color statements
-    [javac]                       ^
-    [javac]   symbol:   variable GL_COLOR_MATERIAL
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:222: error: cannot find symbol
-    [javac]         gl.glColorMaterial(GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE); // must be enabled to work!
-    [javac]                                                    ^
-    [javac]   symbol:   variable GL_AMBIENT_AND_DIFFUSE
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:225: error: cannot find symbol
-    [javac]         gl.glMaterialfv(GL.GL_FRONT_AND_BACK, GL.GL_SPECULAR, new float[] {1,1,1,1}, 0);
-    [javac]                                                 ^
-    [javac]   symbol:   variable GL_SPECULAR
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:226: error: cannot find symbol
-    [javac]         gl.glMaterialf(GL.GL_FRONT_AND_BACK, GL.GL_SHININESS, 80f);
-    [javac]                                                ^
-    [javac]   symbol:   variable GL_SHININESS
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:227: error: cannot find symbol
-    [javac]         gl.glPopMatrix();
-    [javac]           ^
-    [javac]   symbol:   method glPopMatrix()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:351: error: cannot find symbol
-    [javac]         gl.glMatrixMode(GL.GL_PROJECTION);  
-    [javac]                           ^
-    [javac]   symbol:   variable GL_PROJECTION
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:352: error: cannot find symbol
-    [javac]         gl.glLoadIdentity();
-    [javac]           ^
-    [javac]   symbol:   method glLoadIdentity()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:405: error: cannot find symbol
-    [javac]         if(usePerspective)  gl.glFrustum(left, right, bottom, top, near, far);
-    [javac]                               ^
-    [javac]   symbol:   method glFrustum(double,double,double,double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:406: error: cannot find symbol
-    [javac]         else                gl.glOrtho(left, right, bottom, top, near, far);
-    [javac]                               ^
-    [javac]   symbol:   method glOrtho(double,double,double,double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:417: error: cannot find symbol
-    [javac]         gl.glMatrixMode(GL.GL_MODELVIEW);  
-    [javac]                           ^
-    [javac]   symbol:   variable GL_MODELVIEW
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:418: error: cannot find symbol
-    [javac]         gl.glLoadIdentity();
-    [javac]           ^
-    [javac]   symbol:   method glLoadIdentity()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:421: error: cannot find symbol
-    [javac]         gl.glMultMatrixd(new double[] {
-    [javac]           ^
-    [javac]   symbol:   method glMultMatrixd(double[],int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:429: error: cannot find symbol
-    [javac]         gl.glMultMatrixd(new double[] {
-    [javac]           ^
-    [javac]   symbol:   method glMultMatrixd(double[],int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:435: error: cannot find symbol
-    [javac]         gl.glScaled(zoom3D, zoom3D, zoom3D); // scale
-    [javac]           ^
-    [javac]   symbol:   method glScaled(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:436: error: cannot find symbol
-    [javac]         gl.glTranslated(-cx, -cy, -cz); // center
-    [javac]           ^
-    [javac]   symbol:   method glTranslated(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:439: error: cannot find symbol
-    [javac]         gl.glEnable(GL.GL_FOG);
-    [javac]                       ^
-    [javac]   symbol:   variable GL_FOG
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:440: error: cannot find symbol
-    [javac]         gl.glFogi(GL.GL_FOG_MODE, GL.GL_LINEAR);
-    [javac]                     ^
-    [javac]   symbol:   variable GL_FOG_MODE
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:441: error: cannot find symbol
-    [javac]         gl.glFogf(GL.GL_FOG_START, (float) near);
-    [javac]                     ^
-    [javac]   symbol:   variable GL_FOG_START
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:443: error: cannot find symbol
-    [javac]         gl.glFogf(GL.GL_FOG_END, (float) (farFog));
-    [javac]                     ^
-    [javac]   symbol:   variable GL_FOG_END
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:444: error: cannot find symbol
-    [javac]         gl.glFogfv(GL.GL_FOG_COLOR, clearColor, 0);
-    [javac]                      ^
-    [javac]   symbol:   variable GL_FOG_COLOR
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:547: error: cannot find symbol
-    [javac]         gl.glBegin(GL.GL_LINE_STRIP);
-    [javac]           ^
-    [javac]   symbol:   method glBegin(int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:552: error: cannot find symbol
-    [javac]                 gl.glEnd();
-    [javac]                   ^
-    [javac]   symbol:   method glEnd()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:553: error: cannot find symbol
-    [javac]                 gl.glBegin(GL.GL_LINE_STRIP);
-    [javac]                   ^
-    [javac]   symbol:   method glBegin(int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:572: error: cannot find symbol
-    [javac]             gl.glVertex3d(p.getX(), p.getY(), p.getZ());
-    [javac]               ^
-    [javac]   symbol:   method glVertex3d(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:574: error: cannot find symbol
-    [javac]         gl.glEnd();
-    [javac]           ^
-    [javac]   symbol:   method glEnd()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:587: error: cannot find symbol
-    [javac]         gl.glPointSize(currWidth+0.5f);
-    [javac]           ^
-    [javac]   symbol:   method glPointSize(float)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:588: error: cannot find symbol
-    [javac]         gl.glBegin(GL.GL_POINTS);
-    [javac]           ^
-    [javac]   symbol:   method glBegin(int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:607: error: cannot find symbol
-    [javac]             gl.glVertex3d(p.getX(), p.getY(), p.getZ());
-    [javac]               ^
-    [javac]   symbol:   method glVertex3d(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:609: error: cannot find symbol
-    [javac]         gl.glEnd();
-    [javac]           ^
-    [javac]   symbol:   method glEnd()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:638: error: cannot find symbol
-    [javac]             gl.glPushMatrix();
-    [javac]               ^
-    [javac]   symbol:   method glPushMatrix()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:639: error: cannot find symbol
-    [javac]             gl.glTranslated(p.getX(), p.getY(), p.getZ());
-    [javac]               ^
-    [javac]   symbol:   method glTranslated(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:640: error: cannot find symbol
-    [javac]             gl.glScaled(radius, radius, radius);
-    [javac]               ^
-    [javac]   symbol:   method glScaled(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:645: error: cannot find symbol
-    [javac]             gl.glPopMatrix();
-    [javac]               ^
-    [javac]   symbol:   method glPopMatrix()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:659: error: cannot find symbol
-    [javac]             ballDL = gl.glGenLists(maxDepth+1);
-    [javac]                        ^
-    [javac]   symbol:   method glGenLists(int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:664: error: cannot find symbol
-    [javac]                     gl.glNewList(ballDL+i, GL.GL_COMPILE);
-    [javac]                                              ^
-    [javac]   symbol:   variable GL_COMPILE
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:665: error: cannot find symbol
-    [javac]                     gl.glEnable(GL.GL_LIGHTING); // lines and points aren't lit
-    [javac]                                   ^
-    [javac]   symbol:   variable GL_LIGHTING
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:666: error: cannot find symbol
-    [javac]                     gl.glBegin(GL.GL_TRIANGLES);
-    [javac]                       ^
-    [javac]   symbol:   method glBegin(int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:669: error: cannot find symbol
-    [javac]                     gl.glEnd();
-    [javac]                       ^
-    [javac]   symbol:   method glEnd()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:670: error: cannot find symbol
-    [javac]                     gl.glDisable(GL.GL_LIGHTING);
-    [javac]                                    ^
-    [javac]   symbol:   variable GL_LIGHTING
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:671: error: cannot find symbol
-    [javac]                     gl.glEndList();
-    [javac]                       ^
-    [javac]   symbol:   method glEndList()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:677: error: cannot find symbol
-    [javac]             gl.glCallList(ballDL+depth);
-    [javac]               ^
-    [javac]   symbol:   method glCallList(int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:681: error: cannot find symbol
-    [javac]             gl.glEnable(GL.GL_LIGHTING); // lines and points aren't lit
-    [javac]                           ^
-    [javac]   symbol:   variable GL_LIGHTING
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:682: error: cannot find symbol
-    [javac]             gl.glBegin(GL.GL_TRIANGLES);
-    [javac]               ^
-    [javac]   symbol:   method glBegin(int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:685: error: cannot find symbol
-    [javac]             gl.glEnd();
-    [javac]               ^
-    [javac]   symbol:   method glEnd()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:686: error: cannot find symbol
-    [javac]             gl.glDisable(GL.GL_LIGHTING);
-    [javac]                            ^
-    [javac]   symbol:   variable GL_LIGHTING
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:697: error: cannot find symbol
-    [javac]             gl.glNormal3d(v1.getX(), v1.getY(), v1.getZ());
-    [javac]               ^
-    [javac]   symbol:   method glNormal3d(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:698: error: cannot find symbol
-    [javac]             gl.glVertex3d(v1.getX(), v1.getY(), v1.getZ());
-    [javac]               ^
-    [javac]   symbol:   method glVertex3d(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:699: error: cannot find symbol
-    [javac]             gl.glNormal3d(v2.getX(), v2.getY(), v2.getZ());
-    [javac]               ^
-    [javac]   symbol:   method glNormal3d(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:700: error: cannot find symbol
-    [javac]             gl.glVertex3d(v2.getX(), v2.getY(), v2.getZ());
-    [javac]               ^
-    [javac]   symbol:   method glVertex3d(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:701: error: cannot find symbol
-    [javac]             gl.glNormal3d(v3.getX(), v3.getY(), v3.getZ());
-    [javac]               ^
-    [javac]   symbol:   method glNormal3d(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:702: error: cannot find symbol
-    [javac]             gl.glVertex3d(v3.getX(), v3.getY(), v3.getZ());
-    [javac]               ^
-    [javac]   symbol:   method glVertex3d(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:736: error: cannot find symbol
-    [javac]             gl.glRasterPos3d(p.getX(), p.getY(), p.getZ());
-    [javac]               ^
-    [javac]   symbol:   method glRasterPos3d(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:749: error: cannot find symbol
-    [javac]         gl.glEnable(GL.GL_LIGHTING); // lines and points aren't lit
-    [javac]                       ^
-    [javac]   symbol:   variable GL_LIGHTING
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:750: error: cannot find symbol
-    [javac]         gl.glBegin(GL.GL_TRIANGLE_STRIP);
-    [javac]           ^
-    [javac]   symbol:   method glBegin(int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:757: error: cannot find symbol
-    [javac]                 gl.glEnd();
-    [javac]                   ^
-    [javac]   symbol:   method glEnd()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:760: error: cannot find symbol
-    [javac]                 gl.glBegin(GL.GL_TRIANGLE_STRIP);
-    [javac]                   ^
-    [javac]   symbol:   method glBegin(int)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:780: error: cannot find symbol
-    [javac]                     if(!ribbonNormals) gl.glNormal3d(-work1.getX(), -work1.getY(), -work1.getZ());
-    [javac]                                          ^
-    [javac]   symbol:   method glNormal3d(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:783: error: cannot find symbol
-    [javac]                 else gl.glNormal3d(work1.getX(), work1.getY(), work1.getZ());
-    [javac]                        ^
-    [javac]   symbol:   method glNormal3d(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:786: error: cannot find symbol
-    [javac]             gl.glVertex3d(p.getX(), p.getY(), p.getZ());
-    [javac]               ^
-    [javac]   symbol:   method glVertex3d(double,double,double)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:792: error: cannot find symbol
-    [javac]         gl.glEnd();
-    [javac]           ^
-    [javac]   symbol:   method glEnd()
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:793: error: cannot find symbol
-    [javac]         gl.glDisable(GL.GL_LIGHTING);
-    [javac]                        ^
-    [javac]   symbol:   variable GL_LIGHTING
-    [javac]   location: interface GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:804: error: cannot find symbol
-    [javac]             gl.glColor4f( c.getRed()/255f, c.getGreen()/255f, c.getBlue()/255f, c.getAlpha()/255f );
-    [javac]               ^
-    [javac]   symbol:   method glColor4f(float,float,float,float)
-    [javac]   location: variable gl of type GL
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:831: error: cannot find symbol
-    [javac]         if(sz <= 10)        currFont = GLUT.BITMAP_HELVETICA_10;
-    [javac]                                        ^
-    [javac]   symbol:   variable GLUT
-    [javac]   location: class JoglEngine3D
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:832: error: cannot find symbol
-    [javac]         else if(sz <= 14)   currFont = GLUT.BITMAP_HELVETICA_12;
-    [javac]                                        ^
-    [javac]   symbol:   variable GLUT
-    [javac]   location: class JoglEngine3D
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:833: error: cannot find symbol
-    [javac]         else                currFont = GLUT.BITMAP_HELVETICA_18;
-    [javac]                                        ^
-    [javac]   symbol:   variable GLUT
-    [javac]   location: class JoglEngine3D
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:841: error: cannot find symbol
-    [javac]         if(currFont == GLUT.BITMAP_HELVETICA_10)        return 10;
-    [javac]                        ^
-    [javac]   symbol:   variable GLUT
-    [javac]   location: class JoglEngine3D
-    [javac] /tmp/buildd/king-2.21.120420/king/src/king/painters/JoglEngine3D.java:842: error: cannot find symbol
-    [javac]         else if(currFont == GLUT.BITMAP_HELVETICA_12)   return 12;
-    [javac]                             ^
-    [javac]   symbol:   variable GLUT
-    [javac]   location: class JoglEngine3D
-    [javac] 100 errors
-    [javac] 1 warning
-    [javac] Compile failed; see the compiler error output for details.
-
-
---- a/king/Manifest.mf
-+++ b/king/Manifest.mf
-@@ -1,3 +1,3 @@
- Main-Class: king.KingMain
--Class-Path: itext.jar jogl.jar
-+Class-Path: itext.jar jogl2.jar
- 
---- a/king/build.xml
-+++ b/king/build.xml
-@@ -102,7 +102,7 @@
-          <classpath>
-             <pathelement location="${build}"/>
-             <pathelement location="../driftwood/build"/>
--            <pathelement location="/usr/share/java/jogl.jar"/>
-+            <pathelement location="/usr/share/java/jogl2.jar"/>
-          </classpath>
-     </javac>
- </target>
-@@ -126,7 +126,7 @@
-         <zipfileset dir="../molikin/dist/" includes="molikin/"/> 
-         <zipfileset dir="../lib/" prefix="lib/">
-             <include name="/usr/share/java/itext.jar"/>
--            <include name="/usr/share/java/jogl.jar"/>
-+            <include name="/usr/share/java/jogl2.jar"/>
-         </zipfileset>
-     </zip>
-     <zip basedir="${dist}"
-@@ -164,7 +164,7 @@
-     <mkdir dir="${dist}/javadocs"/>
-     <javadoc packagenames="driftwood.*,Jama.*,king.*"
-         sourcepath="src:../driftwood/src"
--        classpath="../lib:/usr/share/java/itext.jar:/usr/share/java/jogl.jar"
-+        classpath="../lib:/usr/share/java/itext.jar:/usr/share/java/jogl2.jar"
-         destdir="${dist}/javadocs" access="protected" source="1.5"
-         breakiterator="true" noqualifier="all"
-         version="true" use="true" author="true"


=====================================
debian/rules
=====================================
@@ -17,6 +17,9 @@ override_dh_auto_configure:
 	        mv *.png ../../king/resource/king/images/
 
 override_dh_auto_build:
+	# Build the native lib
+	cd quickies/native/ && \
+	        gcc -shared -I/usr/lib/jvm/default-java/include/ -I/usr/lib/jvm/default-java/include/linux NativeSpeed.c -o libnativespeed.so
 	# Build the pdf docs from lyx and tex files.
 	debian/makePdfDoc
 	# create backups of original buildnum resources to enable building twice in a row
@@ -55,6 +58,7 @@ override_dh_auto_clean:
 	find . -name "*.class" -delete
 	rm -rf lib
 	rm -rf king/plugins
+	-rm quickies/native/libnativespeed.so
 
 override_dh_compress:
 	dh_compress --exclude=.pdf


=====================================
quickies/native/libnativespeed.jnilib deleted
=====================================
Binary files a/quickies/native/libnativespeed.jnilib and /dev/null differ


=====================================
quickies/native/libnativespeed.so deleted
=====================================
Binary files a/quickies/native/libnativespeed.so and /dev/null differ



View it on GitLab: https://salsa.debian.org/med-team/king/-/compare/f164a6aff85875960a18697cb032882ecbf2369a...66d2518329213c5e27122093c0c5d0b6178c4dfc

-- 
View it on GitLab: https://salsa.debian.org/med-team/king/-/compare/f164a6aff85875960a18697cb032882ecbf2369a...66d2518329213c5e27122093c0c5d0b6178c4dfc
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220202/fb7e24c6/attachment-0001.htm>


More information about the debian-med-commit mailing list