saulteafarmer/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Stirling-Tools/Stirling-PDF.git synced 2025-06-16 12:35:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2463 from reecebrowne/bug/fix_merge

Browse Source 
Add missing pdflib
This commit is contained in:
Anthony Stirling 2024-12-16 14:11:36 +00:00 committed by GitHub
commit 63eb94c0a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
build.gradle
View File

@ -23,11 +23,11 @@ ext {
lombokVersion = "1.18.36" lombokVersion = "1.18.36"
bouncycastleVersion = "1.79" bouncycastleVersion = "1.79"
springSecuritySamlVersion = "6.4.1" springSecuritySamlVersion = "6.4.1"
openSamlVersion = "4.3.2" openSamlVersion = "4.3.2"
} }
group = "stirling.software" group = "stirling.software"
version = "0.36.2" version = "0.36.3"
java { java {
@ -44,7 +44,7 @@ repositories {
} }
maven { url "https://build.shibboleth.net/maven/releases" } maven { url "https://build.shibboleth.net/maven/releases" }
maven { url "https://maven.pkg.github.com/jcefmaven/jcefmaven" } maven { url "https://maven.pkg.github.com/jcefmaven/jcefmaven" }
} }
licenseReport { licenseReport {
@ -68,12 +68,12 @@ sourceSets {
exclude "stirling/software/SPDF/model/User.java" exclude "stirling/software/SPDF/model/User.java"
exclude "stirling/software/SPDF/repository/**" exclude "stirling/software/SPDF/repository/**"
} }
if (System.getenv("STIRLING_PDF_DESKTOP_UI") == "false") { if (System.getenv("STIRLING_PDF_DESKTOP_UI") == "false") {
exclude "stirling/software/SPDF/UI/impl/**" exclude "stirling/software/SPDF/UI/impl/**"
} }
} }
} }
} }
@ -104,7 +104,7 @@ jpackage {
icon = "src/main/resources/static/favicon.ico" icon = "src/main/resources/static/favicon.ico"
// JVM Options // JVM Options
javaOptions = [ javaOptions = [
@ -115,12 +115,12 @@ jpackage {
"--add-opens", "java.base/java.lang=ALL-UNNAMED", "--add-opens", "java.base/java.lang=ALL-UNNAMED",
"--add-opens", "java.desktop/java.awt.event=ALL-UNNAMED", "--add-opens", "java.desktop/java.awt.event=ALL-UNNAMED",
"--add-opens", "java.desktop/sun.awt=ALL-UNNAMED" "--add-opens", "java.desktop/sun.awt=ALL-UNNAMED"
] ]
verbose = true verbose = true
destination = "${projectDir}/build/jpackage" destination = "${projectDir}/build/jpackage"
// Windows-specific configuration // Windows-specific configuration
@ -150,16 +150,16 @@ jpackage {
macAppCategory = "public.app-category.productivity" macAppCategory = "public.app-category.productivity"
macSign = false // Enable signing macSign = false // Enable signing
macAppStore = false // Not targeting App Store initially macAppStore = false // Not targeting App Store initially
//installDir = "Applications" //installDir = "Applications"
// Add license and other documentation to DMG // Add license and other documentation to DMG
/*macDmgContent = [ /*macDmgContent = [
"README.md", "README.md",
"LICENSE", "LICENSE",
"CHANGELOG.md" "CHANGELOG.md"
]*/ ]*/
// Enable Mac-specific entitlements // Enable Mac-specific entitlements
//macEntitlements = "entitlements.plist" // You'll need to create this file //macEntitlements = "entitlements.plist" // You'll need to create this file
} }
@ -169,7 +169,7 @@ jpackage {
appVersion = project.version appVersion = project.version
icon = "src/main/resources/static/favicon.png" icon = "src/main/resources/static/favicon.png"
type = "deb" // Can also use "rpm" for Red Hat-based systems type = "deb" // Can also use "rpm" for Red Hat-based systems
// Debian package configuration // Debian package configuration
//linuxPackageName = "stirlingpdf" //linuxPackageName = "stirlingpdf"
linuxDebMaintainer = "support@stirlingpdf.com" linuxDebMaintainer = "support@stirlingpdf.com"
@ -177,9 +177,9 @@ jpackage {
linuxAppCategory = "Office" linuxAppCategory = "Office"
linuxAppRelease = "1" linuxAppRelease = "1"
linuxPackageDeps = true linuxPackageDeps = true
installDir = "/opt/Stirling-PDF" installDir = "/opt/Stirling-PDF"
// RPM-specific settings // RPM-specific settings
//linuxRpmLicenseType = "MIT" //linuxRpmLicenseType = "MIT"
} }
@ -212,7 +212,7 @@ launch4j {
icon = "${projectDir}/src/main/resources/static/favicon.ico" icon = "${projectDir}/src/main/resources/static/favicon.ico"
outfile="Stirling-PDF.exe" outfile="Stirling-PDF.exe"
if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') { if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') {
headerType = "gui" headerType = "gui"
} else { } else {
@ -222,15 +222,15 @@ launch4j {
errTitle="Encountered error, Do you have Java 21?" errTitle="Encountered error, Do you have Java 21?"
downloadUrl="https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.exe" downloadUrl="https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.exe"
if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') { if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') {
variables=["BROWSER_OPEN=true", "STIRLING_PDF_DESKTOP_UI=true"] variables=["BROWSER_OPEN=true", "STIRLING_PDF_DESKTOP_UI=true"]
} else { } else {
variables=["BROWSER_OPEN=true"] variables=["BROWSER_OPEN=true"]
} }
jreMinVersion="17" jreMinVersion="17"
mutexName="Stirling-PDF" mutexName="Stirling-PDF"
@ -276,7 +276,7 @@ dependencies {
implementation "org.openjfx:javafx-controls:21" implementation "org.openjfx:javafx-controls:21"
implementation "org.openjfx:javafx-swing:21" implementation "org.openjfx:javafx-swing:21"
} }
//security updates //security updates
implementation "org.springframework:spring-webmvc:6.2.0" implementation "org.springframework:spring-webmvc:6.2.0"
@ -301,7 +301,7 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion" implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion"
implementation "org.springframework.session:spring-session-core:$springBootVersion" implementation "org.springframework.session:spring-session-core:$springBootVersion"
implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5' implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
// Don't upgrade h2database // Don't upgrade h2database
runtimeOnly "com.h2database:h2:2.3.232" runtimeOnly "com.h2database:h2:2.3.232"

1
src/main/resources/templates/merge-pdfs.html
View File

@ -5,6 +5,7 @@
<head> <head>
<th:block th:insert="~{fragments/common :: head(title=#{merge.title}, header=#{merge.header})}"></th:block> <th:block th:insert="~{fragments/common :: head(title=#{merge.title}, header=#{merge.header})}"></th:block>
<link rel="stylesheet" th:href="@{'/css/merge.css'}"> <link rel="stylesheet" th:href="@{'/css/merge.css'}">
<script th:src="@{'/js/thirdParty/pdf-lib.min.js'}"></script>
</head> </head>
<body> <body>