[Git][java-team/openchemlib][master] 2 commits: Refresh javafx.patch.

[Andrius Merkys (@merkys)]

Andrius Merkys pushed to branch master at Debian Java Maintainers / openchemlib


Commits:
c45d563f by Andrius Merkys at 2026-02-23T04:15:55-05:00
Refresh javafx.patch.

- - - - -
a961a5d8 by Andrius Merkys at 2026-02-23T04:17:47-05:00
Refresh libtablelayout-java.patch.

- - - - -


2 changed files:

- debian/patches/javafx.patch
- debian/patches/libtablelayout-java.patch


Changes:

=====================================
debian/patches/javafx.patch
=====================================
@@ -5,25 +5,20 @@ Author: Andrius Merkys <merkys at debian.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -121,6 +121,21 @@
-             <version>4.13.1</version>
-             <scope>test</scope>
-         </dependency>
-+        <dependency>
-+            <groupId>org.openjfx</groupId>
-+            <artifactId>javafx-base</artifactId>
-+            <version>11</version>
-+        </dependency>
-+        <dependency>
-+            <groupId>org.openjfx</groupId>
-+            <artifactId>javafx-controls</artifactId>
-+            <version>11</version>
-+        </dependency>
-+        <dependency>
-+            <groupId>org.openjfx</groupId>
-+            <artifactId>javafx-graphics</artifactId>
-+            <version>11</version>
-+        </dependency>
-     </dependencies>
- 
-     <build>
+@@ -112,6 +112,16 @@
+                     <artifactId>javafx-web</artifactId>
+                     <version>${javafx.version}</version>
+                 </dependency>
++                <dependency>
++                    <groupId>org.openjfx</groupId>
++                    <artifactId>javafx-base</artifactId>
++                    <version>${javafx.version}</version>
++                </dependency>
++                <dependency>
++                    <groupId>org.openjfx</groupId>
++                    <artifactId>javafx-graphics</artifactId>
++                    <version>${javafx.version}</version>
++                </dependency>
+             </dependencies>            
+         </profile>
+     </profiles>


=====================================
debian/patches/libtablelayout-java.patch
=====================================
@@ -4,50 +4,17 @@ Author: Andrius Merkys <merkys at debian.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -136,6 +136,10 @@
-             <artifactId>javafx-graphics</artifactId>
-             <version>11</version>
-         </dependency>
-+        <dependency>
-+            <groupId>org.debian</groupId>
-+            <artifactId>tablelayout</artifactId>
-+        </dependency>
-     </dependencies>
- 
-     <build>
---- a/src/main/java/com/actelion/research/gui/JAtomLabelDialog.java
-+++ b/src/main/java/com/actelion/research/gui/JAtomLabelDialog.java
-@@ -35,7 +35,7 @@
- 
- import com.actelion.research.chem.ExtendedMolecule;
- import com.actelion.research.chem.Molecule;
--import info.clearthought.layout.TableLayout;
-+import org.debian.tablelayout.TableLayout;
- 
- import javax.swing.*;
- import java.awt.*;
---- a/src/main/java/com/actelion/research/gui/JAtomQueryFeatureDialog.java
-+++ b/src/main/java/com/actelion/research/gui/JAtomQueryFeatureDialog.java
-@@ -36,7 +36,7 @@
- import com.actelion.research.chem.ExtendedMolecule;
- import com.actelion.research.chem.Molecule;
- import com.actelion.research.gui.hidpi.HiDPIHelper;
--import info.clearthought.layout.TableLayout;
-+import org.debian.tablelayout.TableLayout;
- 
- import javax.swing.*;
- import java.awt.*;
---- a/src/main/java/com/actelion/research/gui/JBondQueryFeatureDialog.java
-+++ b/src/main/java/com/actelion/research/gui/JBondQueryFeatureDialog.java
-@@ -35,7 +35,7 @@
- 
- import com.actelion.research.chem.ExtendedMolecule;
- import com.actelion.research.chem.Molecule;
--import info.clearthought.layout.TableLayout;
-+import org.debian.tablelayout.TableLayout;
- 
- import javax.swing.*;
- import java.awt.*;
+@@ -122,6 +122,10 @@
+                     <artifactId>javafx-graphics</artifactId>
+                     <version>${javafx.version}</version>
+                 </dependency>
++                <dependency>
++                    <groupId>org.debian</groupId>
++                    <artifactId>tablelayout</artifactId>
++                </dependency>
+             </dependencies>            
+         </profile>
+     </profiles>
 --- a/src/main/java/com/actelion/research/gui/JTextDrawingObjectDialog.java
 +++ b/src/main/java/com/actelion/research/gui/JTextDrawingObjectDialog.java
 @@ -34,7 +34,7 @@
@@ -115,8 +82,8 @@ Forwarded: not-needed
  	int PREFERRED = (int)TableLayout.PREFERRED;
 --- a/src/main/java/com/actelion/research/gui/swing/SwingDialog.java
 +++ b/src/main/java/com/actelion/research/gui/swing/SwingDialog.java
-@@ -2,7 +2,7 @@
- 
+@@ -7,7 +7,7 @@
+ import com.actelion.research.gui.editor.SwingEditorPanel;
  import com.actelion.research.gui.generic.*;
  import com.actelion.research.gui.hidpi.HiDPIHelper;
 -import info.clearthought.layout.TableLayout;



View it on GitLab: https://salsa.debian.org/java-team/openchemlib/-/compare/a3641461a1d8f19b065651381d72a184459ef30b...a961a5d81ed2d3baed4596845f747118f2c95298

-- 
View it on GitLab: https://salsa.debian.org/java-team/openchemlib/-/compare/a3641461a1d8f19b065651381d72a184459ef30b...a961a5d81ed2d3baed4596845f747118f2c95298
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/pkg-java-commits/attachments/20260223/32d8e36a/attachment.htm>