Skip to content

Commits on Source 11

Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ 74d9a64c
pdfsam (3.3.7-1) UNRELEASED; urgency=medium
pdfsam (3.3.7-1) unstable; urgency=medium
* Update maven rule for fontawesomefx
* Update d/rules and link to the correct fontawesomefx-fontawesome jar file.
* New upstream version 3.3.7.
* Switch to compat level 11.
* Update debian/copyright
* New upstream version 3.3.7
-- Markus Koschany <apo@debian.org> Fri, 12 Oct 2018 13:24:49 +0200
* Add javafx.patch and port PDFsam to use OpenJFX 11. (Closes: #886394)
* Add fontawesomefx.patch and make PDFsam compatible with version 9.1.2 of
fontawesomefx.
* Add libcommons-csv-java to B-D.
* Declare compliance with Debian Policy 4.2.1.
* Update pdfsam-bin.patch and work around Debian bug #910764. Use
-Djdk.gtk.version=2.
-- Markus Koschany <apo@debian.org> Wed, 24 Oct 2018 20:45:43 +0200
pdfsam (3.3.5-1) unstable; urgency=medium
......
debian/control
View file @ 74d9a64c
......@@ -27,7 +27,7 @@ Build-Depends:
libsejda-java (>= 3.2.56),
libslf4j-java (>= 1.7.21),
maven-debian-helper,
openjfx
openjfx (>= 11)
Standards-Version: 4.2.1
Vcs-Git: https://anonscm.debian.org/git/pkg-java/pdfsam.git
Vcs-Browser: https://anonscm.debian.org/git/pkg-java/pdfsam.git
......@@ -42,7 +42,7 @@ Depends:
liblogback-java,
libsambox-java (>= 1.1.41),
libsejda-java (>= 3.2.56),
openjfx,
openjfx (>= 11),
${maven:Depends},
${misc:Depends}
Suggests:
......
debian/patches/fontawesomefx.patch
View file @ 74d9a64c
From: Markus Koschany <apo@debian.org>
Date: Fri, 12 Oct 2018 14:24:54 +0200
Date: Wed, 24 Oct 2018 00:06:23 +0200
Subject: fontawesomefx
Port PDFSam to fontawesomefx 9.1.2.
Forwarded: no
Forwarded: https://github.com/torakiki/pdfsam/issues/310
---
pdfsam-core/pom.xml | 5 +++++
pdfsam-fx/pom.xml | 5 +++++
......@@ -18,7 +18,8 @@ Forwarded: no
.../java/org/pdfsam/ui/selection/PasswordFieldPopup.java | 4 ++--
.../org/pdfsam/ui/selection/multiple/SelectionTable.java | 5 +++--
.../pdfsam/ui/selection/single/SingleSelectionPane.java | 4 ++--
.../src/main/java/org/pdfsam/ui/banner/BannerButton.java | 5 +++--
.../main/java/org/pdfsam/configuration/StylesConfig.java | 2 +-
.../src/main/java/org/pdfsam/ui/banner/BannerButton.java | 6 ++++--
.../java/org/pdfsam/ui/dashboard/AboutDashboadItem.java | 4 ++--
.../java/org/pdfsam/ui/dashboard/ModulesDashboardItem.java | 4 ++--
.../org/pdfsam/ui/dashboard/PreferencesDashboardItem.java | 4 ++--
......@@ -28,15 +29,15 @@ Forwarded: no
pdfsam-gui/src/main/java/org/pdfsam/ui/news/News.java | 8 +++++---
pdfsam-gui/src/main/java/org/pdfsam/ui/news/NewsPanel.java | 4 ++--
.../main/java/org/pdfsam/ui/notification/Notification.java | 4 ++--
22 files changed, 68 insertions(+), 48 deletions(-)
23 files changed, 70 insertions(+), 49 deletions(-)
diff --git a/pdfsam-core/pom.xml b/pdfsam-core/pom.xml
index be9505c..654bc89 100644
index d5bc19a..3e68278 100644
--- a/pdfsam-core/pom.xml
+++ b/pdfsam-core/pom.xml
@@ -76,5 +76,10 @@
<version>11</version>
<classifier>linux</classifier>
@@ -62,5 +62,10 @@
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
</dependency>
+ <dependency>
+ <groupId>de.jensd</groupId>
......@@ -46,12 +47,12 @@ index be9505c..654bc89 100644
</dependencies>
</project>
diff --git a/pdfsam-fx/pom.xml b/pdfsam-fx/pom.xml
index 9972811..8597954 100644
index eb63905..981084c 100644
--- a/pdfsam-fx/pom.xml
+++ b/pdfsam-fx/pom.xml
@@ -91,5 +91,10 @@
<type>test-jar</type>
<scope>test</scope>
@@ -95,5 +95,10 @@
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
</dependency>
+ <dependency>
+ <groupId>de.jensd</groupId>
......@@ -61,26 +62,25 @@ index 9972811..8597954 100644
</dependencies>
</project>
diff --git a/pdfsam-fx/src/main/java/org/pdfsam/ui/commons/UrlButton.java b/pdfsam-fx/src/main/java/org/pdfsam/ui/commons/UrlButton.java
index 962030c..6fef71c 100644
index 962030c..226ad7f 100644
--- a/pdfsam-fx/src/main/java/org/pdfsam/ui/commons/UrlButton.java
+++ b/pdfsam-fx/src/main/java/org/pdfsam/ui/commons/UrlButton.java
@@ -26,7 +26,7 @@ import static org.sejda.eventstudio.StaticStudio.eventStudio;
@@ -26,7 +26,8 @@ import static org.sejda.eventstudio.StaticStudio.eventStudio;
import org.pdfsam.ui.support.Style;
import de.jensd.fx.glyphs.GlyphIcons;
-import de.jensd.fx.glyphs.GlyphsDude;
+import de.jensd.fx.glyphs.GlyphsFactory;
+import de.jensd.fx.glyphs.fontawesome.utils.FontAwesomeIconFactory;
import javafx.scene.control.Button;
/**
@@ -71,8 +71,9 @@ public class UrlButton extends Button {
require(isNotBlank(url), "URL cannot be blank");
@@ -72,7 +73,7 @@ public class UrlButton extends Button {
UrlButton button = new UrlButton(text);
button.setOnAction(e -> eventStudio().broadcast(new OpenUrlRequest(url)));
+ GlyphsFactory glyph = new GlyphsFactory(text);
if (nonNull(icon)) {
- GlyphsDude.setIcon(button, icon);
+ glyph.setIcon(button, icon);
+ FontAwesomeIconFactory.get().setIcon(button, icon);
}
if (nonNull(style) && style.length > 0) {
button.getStyleClass().addAll(style);
......@@ -256,26 +256,25 @@ index 092b0c6..ff026d2 100644
@Override
diff --git a/pdfsam-fx/src/main/java/org/pdfsam/ui/selection/LoadingStatusIndicatorUpdater.java b/pdfsam-fx/src/main/java/org/pdfsam/ui/selection/LoadingStatusIndicatorUpdater.java
index 2b0e356..c91d3a5 100644
index 2b0e356..975a2b3 100644
--- a/pdfsam-fx/src/main/java/org/pdfsam/ui/selection/LoadingStatusIndicatorUpdater.java
+++ b/pdfsam-fx/src/main/java/org/pdfsam/ui/selection/LoadingStatusIndicatorUpdater.java
@@ -28,7 +28,7 @@ import java.util.function.Consumer;
@@ -28,7 +28,8 @@ import java.util.function.Consumer;
import org.pdfsam.pdf.PdfDescriptorLoadingStatus;
import de.jensd.fx.glyphs.GlyphIcons;
-import de.jensd.fx.glyphs.GlyphsDude;
+import de.jensd.fx.glyphs.GlyphsFactory;
+import de.jensd.fx.glyphs.fontawesome.utils.FontAwesomeIconFactory;
import javafx.scene.control.ContentDisplay;
import javafx.scene.control.Labeled;
import javafx.scene.control.Tooltip;
@@ -52,8 +52,9 @@ public class LoadingStatusIndicatorUpdater implements Consumer<PdfDescriptorLoad
public void accept(PdfDescriptorLoadingStatus t) {
@@ -53,7 +54,7 @@ public class LoadingStatusIndicatorUpdater implements Consumer<PdfDescriptorLoad
GlyphIcons icon = Optional.ofNullable(t).map(PdfDescriptorLoadingStatus::getIcon).orElse(null);
+ GlyphsFactory glyph = new GlyphsFactory(LoadingStatusIndicatorUpdater.class);
if (nonNull(icon)) {
- GlyphsDude.setIcon(indicator, icon, ContentDisplay.CENTER);
+ glyph.setIcon(indicator, icon, ContentDisplay.CENTER);
+ FontAwesomeIconFactory.get().setIcon(indicator, icon, ContentDisplay.CENTER);
} else {
indicator.setGraphic(null);
}
......@@ -350,28 +349,42 @@ index 43d2ba9..671780f 100644
item.setDisable(true);
return item;
}
diff --git a/pdfsam-gui/src/main/java/org/pdfsam/configuration/StylesConfig.java b/pdfsam-gui/src/main/java/org/pdfsam/configuration/StylesConfig.java
index c9da0b5..9d3d31b 100644
--- a/pdfsam-gui/src/main/java/org/pdfsam/configuration/StylesConfig.java
+++ b/pdfsam-gui/src/main/java/org/pdfsam/configuration/StylesConfig.java
@@ -48,7 +48,7 @@ public class StylesConfig {
requireNotNull(theme, "Theme cannot be null");
LOG.debug(DefaultI18nContext.getInstance().i18n("Installing theme {0}.", theme.friendlyName()));
theme.styleSheets().stream().map(s -> this.getClass().getResource(s).toExternalForm()).forEach(styles::add);
- styles.add(this.getClass().getResource(GlyphsStyle.DEFAULT.getStylePath()).toExternalForm());
+ //styles.add(this.getClass().getResource(GlyphsStyle.DEFAULT.getStylePath()).toExternalForm());
if (!Platform.isSupported(ConditionalFeature.TRANSPARENT_WINDOW)) {
styles.add(this.getClass().getResource("/themes/transparent-incapable.css").toExternalForm());
LOG.info("Transparent windows not supported by the platform");
diff --git a/pdfsam-gui/src/main/java/org/pdfsam/ui/banner/BannerButton.java b/pdfsam-gui/src/main/java/org/pdfsam/ui/banner/BannerButton.java
index 37451f6..8b94bc4 100644
index 37451f6..c9f6b4e 100644
--- a/pdfsam-gui/src/main/java/org/pdfsam/ui/banner/BannerButton.java
+++ b/pdfsam-gui/src/main/java/org/pdfsam/ui/banner/BannerButton.java
@@ -19,7 +19,7 @@
@@ -19,7 +19,8 @@
package org.pdfsam.ui.banner;
import de.jensd.fx.glyphs.GlyphIcons;
-import de.jensd.fx.glyphs.GlyphsDude;
+import de.jensd.fx.glyphs.GlyphsFactory;
+import de.jensd.fx.glyphs.fontawesome.utils.FontAwesomeIconFactory;
import javafx.scene.control.Button;
/**
@@ -29,8 +29,9 @@ import javafx.scene.control.Button;
@@ -29,8 +30,9 @@ import javafx.scene.control.Button;
*
*/
class BannerButton extends Button {
+ GlyphsFactory glyphs = new GlyphsFactory(BannerButton.class);
+
BannerButton(GlyphIcons icon) {
getStyleClass().addAll("pdfsam-toolbar-button");
- setGraphic(GlyphsDude.createIcon(icon, "28.0"));
+ setGraphic(glyphs.createIcon(icon, "28.0"));
+ setGraphic(FontAwesomeIconFactory.get().createIcon(icon, "28.0"));
}
}
diff --git a/pdfsam-gui/src/main/java/org/pdfsam/ui/dashboard/AboutDashboadItem.java b/pdfsam-gui/src/main/java/org/pdfsam/ui/dashboard/AboutDashboadItem.java
......
debian/patches/javafx.patch
View file @ 74d9a64c
......@@ -4,88 +4,57 @@ Subject: javafx
Depend on OpenJFX 11.
Forwarded: no
Forwarded: https://github.com/torakiki/pdfsam/issues/310
---
pdfsam-core/pom.xml | 18 ++++++++++++++++++
pdfsam-gui/pom.xml | 12 ++++++++++++
pom.xml | 16 ++++++++++++++++
3 files changed, 46 insertions(+)
pdfsam-core/pom.xml | 4 ++++
pdfsam-fx/pom.xml | 4 ++++
pdfsam-gui/pom.xml | 8 ++++++++
3 files changed, 16 insertions(+)
diff --git a/pdfsam-core/pom.xml b/pdfsam-core/pom.xml
index 6120c0f..be9505c 100644
index 6120c0f..d5bc19a 100644
--- a/pdfsam-core/pom.xml
+++ b/pdfsam-core/pom.xml
@@ -58,5 +58,23 @@
@@ -58,5 +58,9 @@
<groupId>jdepend</groupId>
<artifactId>jdepend</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-base</artifactId>
+ <version>11</version>
+ <classifier>linux</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-fxml</artifactId>
+ <version>11</version>
+ <classifier>linux</classifier>
+ <artifactId>javafx-controls</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/pdfsam-fx/pom.xml b/pdfsam-fx/pom.xml
index 9972811..eb63905 100644
--- a/pdfsam-fx/pom.xml
+++ b/pdfsam-fx/pom.xml
@@ -91,5 +91,9 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-graphics</artifactId>
+ <version>11</version>
+ <classifier>linux</classifier>
+ <artifactId>javafx-controls</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/pdfsam-gui/pom.xml b/pdfsam-gui/pom.xml
index 8663424..08b5f5d 100644
index 8663424..b3f5662 100644
--- a/pdfsam-gui/pom.xml
+++ b/pdfsam-gui/pom.xml
@@ -123,6 +123,18 @@
@@ -123,6 +123,14 @@
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-graphics</artifactId>
+ <version>11</version>
+ <classifier>linux</classifier>
+ <artifactId>javafx-controls</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-media</artifactId>
+ <version>11</version>
+ <classifier>linux</classifier>
+ </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/pom.xml b/pom.xml
index 738839d..a7e51a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -311,6 +311,22 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-base</artifactId>
+ <version>11</version>
+ <classifier>linux</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-fxml</artifactId>
+ <version>11</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-graphics</artifactId>
+ <version>11</version>
+ </dependency>
</dependencyManagement>
<dependencies>
debian/patches/pdfsam-bin.patch
View file @ 74d9a64c
......@@ -6,11 +6,11 @@ Customize the start script for Debian.
Forwarded: not-needed
---
pdfsam-community/src/assembly/resources/bin/pdfsam.sh | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
.../src/assembly/resources/bin/pdfsam.sh | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/pdfsam-community/src/assembly/resources/bin/pdfsam.sh b/pdfsam-community/src/assembly/resources/bin/pdfsam.sh
index fe9f37b..c14771e 100644
index fe9f37b..fc37baa 100644
--- a/pdfsam-community/src/assembly/resources/bin/pdfsam.sh
+++ b/pdfsam-community/src/assembly/resources/bin/pdfsam.sh
@@ -16,22 +16,7 @@
......@@ -46,3 +46,10 @@ index fe9f37b..c14771e 100644
ENDORSED_DIR=
if [ -n "$ENDORSED_DIR" ] ; then
@@ -114,5 +99,6 @@ exec "$JAVACMD" $JAVA_OPTS -Xmx256M \
-Dbasedir="$BASEDIR" \
-Dprism.text=t2k \
-Dprism.lcdtext=false \
+ -Djdk.gtk.version=2 \
org.pdfsam.community.App \
"$@"
debian/rules
View file @ 74d9a64c
......@@ -5,8 +5,8 @@ LINK_JARS += atinject-jsr330-api sejda-injector fontawesomefx-fontawesome jackso
LINK_JARS += jackson-core hibernate-validator bcmail bcprov fontbox2 sejda-io sambox
LINK_JARS += sejda-core sejda-conversion gettext-commons geronimo-validation-1.0-spec sejda-model
LINK_JARS += commons-io eventstudio commons-lang3 sejda-sambox sejda-fonts sejda-injector
LINK_JARS += jboss-logging jcl-over-slf4j fontawesomefx-materialdesignfont fontawesomefx-materialicons.jar
LINK_JARS += javafx-base javafx-controls javafx-media javafx-graphics
LINK_JARS += jboss-logging jcl-over-slf4j fontawesomefx-materialdesignfont fontawesomefx-materialicons
LINK_JARS += javafx-base javafx-controls javafx-media javafx-graphics fontawesomefx-commons
%:
dh $@
......