Page MenuHomeSolus
Files F11047352

D8814.id21277.diff
No OneTemporary
Actions

D8814.id21277.diff
View Options

diff --git a/files/pdfsam.desktop b/files/pdfsam.desktop
--- a/files/pdfsam.desktop
+++ b/files/pdfsam.desktop
@@ -3,8 +3,8 @@
Type=Application
Name=PDFsam Basic
Comment=Open source desktop application to split, merge, rotate and mix PDF files
-Exec=/usr/share/pdfsam/bin/pdfsam.sh %F
+Exec=/usr/bin/pdfsam %F
Icon=pdfsam
MimeType=application/pdf
Terminal=false
-Categories=Office;
\ No newline at end of file
+Categories=Office;
diff --git a/files/pdfsam.sh b/files/pdfsam.sh
--- a/files/pdfsam.sh
+++ b/files/pdfsam.sh
@@ -1,118 +1,3 @@
#!/bin/sh
-# This file is part of the PDF Split And Merge Basic source code
-# Copyright 2015 by Andrea Vacondio (andrea.vacondio@gmail.com).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`/"$link"
- fi
-done
-
-PRGDIR=`dirname "$PRG"`
-BASEDIR=`cd "$PRGDIR/.." >/dev/null; pwd`
-
-# OS specific support. $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-case "`uname`" in
- CYGWIN*) cygwin=true ;;
- Darwin*) darwin=true
- if [ -z "$JAVA_VERSION" ] ; then
- JAVA_VERSION="CurrentJDK"
- else
- echo "Using Java version: $JAVA_VERSION"
- fi
- if [ -z "$JAVA_HOME" ]; then
- if [ -x "/usr/libexec/java_home" ]; then
- JAVA_HOME=`/usr/libexec/java_home`
- else
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
- fi
- fi
- ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
- if [ -r /etc/gentoo-release ] ; then
- JAVA_HOME=`java-config --jre-home`
- fi
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-# If a specific java binary isn't specified search for the standard 'java' binary
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- else
- JAVACMD=`which java`
- fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
- echo "Error: JAVA_HOME is not defined correctly." 1>&2
- echo " We cannot execute $JAVACMD" 1>&2
- exit 1
-fi
-
-CLASSPATH="$BASEDIR"/etc:"$BASEDIR"/pdfsam-community.jar
-
-ENDORSED_DIR=
-if [ -n "$ENDORSED_DIR" ] ; then
- CLASSPATH=$BASEDIR/$ENDORSED_DIR/*:$CLASSPATH
-fi
-
-if [ -n "$CLASSPATH_PREFIX" ] ; then
- CLASSPATH=$CLASSPATH_PREFIX:$CLASSPATH
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- [ -n "$HOME" ] && HOME=`cygpath --path --windows "$HOME"`
- [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"`
-fi
-
-exec "$JAVACMD" $JAVA_OPTS -Xmx256M \
- -classpath "$CLASSPATH" \
- -Dapp.name="pdfsam-basic" \
- -splash:"$BASEDIR"/resources/splash.gif \
- -Dapp.pid="$$" \
- -Dapp.repo="$REPO" \
- -Dapp.home="$BASEDIR" \
- -Dbasedir="$BASEDIR" \
- -Dprism.text=t2k \
- -Dprism.lcdtext=false \
- org.pdfsam.community.App \
- "$@"
\ No newline at end of file
+exec /usr/lib64/openjdk-8/bin/java -jar /usr/share/pdfsam/pdfsam.jar "$@"
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : pdfsam
version : 3.3.7
-release : 3
+release : 4
source :
- https://github.com/torakiki/pdfsam/archive/v3.3.7.tar.gz : 6ebd654b84f5e85a240984aaf22f719f877ee9c9a69370594d5933a486f17cdd
license : AGPL-3.0-only
@@ -11,27 +11,17 @@
PDFsam Basic, a free, open source, multi-platform software designed to split, merge, extract pages, mix and rotate PDF files.
builddeps :
- apache-maven
- - openjdk-8-devel
- openjfx-8
rundeps :
- openjfx-8
- - openjdk-8
networking : yes
+setup : |
+ sed 's|http://|https://|' -i pom.xml
build : |
export MAVEN_OPTS="-Dmaven.repo.local=./m2"
mvn -DskipTests=true -Pbasic-release package
install : |
- install -Dm 00744 pdfsam-community/target/pdfsam-community-$version.jar $installdir/usr/share/pdfsam/pdfsam-community.jar
- ## icons
- pushd pdfsam-community/src
- for sz in 16 24 32 48 64 96 128 256 512; do
- install -Dm 00644 main/resources/images/community/${sz}x${sz}.png $installdir/usr/share/icons/hicolor/${sz}x${sz}/apps/pdfsam.png
- done
- install -Dm 00644 deb/icon.svg $installdir/usr/share/icons/hicolor/scalable/apps/pdfsam.svg
- install -Dm 00644 main/resources/images/community/splash.gif $installdir/usr/share/pdfsam/resources/splash.gif
- ## etc
- install -Dm 00644 main/etc/logback.xml $installdir/usr/share/pdfsam/etc/logback.xml
- ## desktop entry
- install -Dm 00644 $pkgfiles/pdfsam.desktop $installdir/usr/share/applications/pdfsam.desktop
- ## script
- install -Dm 00755 $pkgfiles/pdfsam.sh $installdir/usr/share/pdfsam/bin/pdfsam.sh
+ install -Dm00644 pdfsam-community/target/pdfsam-community-$version.jar $installdir/usr/share/pdfsam/pdfsam.jar
+ install -Dm00644 pdfsam-community/src/deb/icon.svg $installdir/usr/share/icons/hicolor/scalable/apps/pdfsam.svg
+ install -Dm00755 $pkgfiles/pdfsam.sh $installdir/usr/bin/pdfsam
+ install -Dm00644 $pkgfiles/pdfsam.desktop -t $installdir/usr/share/applications
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,15 +2,15 @@
<Source>
<Name>pdfsam</Name>
<Packager>
- <Name>Philipp Trulson</Name>
- <Email>philipp@trulson.de</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Packager>
<License>AGPL-3.0-only</License>
<PartOf>office</PartOf>
<Summary xml:lang="en">PDFsam Basic, a free, open source, multi-platform software designed to split, merge, extract pages, mix and rotate PDF files.</Summary>
<Description xml:lang="en">PDFsam Basic, a free, open source, multi-platform software designed to split, merge, extract pages, mix and rotate PDF files.
</Description>
- <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
</Source>
<Package>
<Name>pdfsam</Name>
@@ -19,30 +19,19 @@
</Description>
<PartOf>office</PartOf>
<Files>
+ <Path fileType="executable">/usr/bin/pdfsam</Path>
<Path fileType="data">/usr/share/applications/pdfsam.desktop</Path>
- <Path fileType="data">/usr/share/icons/hicolor/128x128/apps/pdfsam.png</Path>
- <Path fileType="data">/usr/share/icons/hicolor/16x16/apps/pdfsam.png</Path>
- <Path fileType="data">/usr/share/icons/hicolor/24x24/apps/pdfsam.png</Path>
- <Path fileType="data">/usr/share/icons/hicolor/256x256/apps/pdfsam.png</Path>
- <Path fileType="data">/usr/share/icons/hicolor/32x32/apps/pdfsam.png</Path>
- <Path fileType="data">/usr/share/icons/hicolor/48x48/apps/pdfsam.png</Path>
- <Path fileType="data">/usr/share/icons/hicolor/512x512/apps/pdfsam.png</Path>
- <Path fileType="data">/usr/share/icons/hicolor/64x64/apps/pdfsam.png</Path>
- <Path fileType="data">/usr/share/icons/hicolor/96x96/apps/pdfsam.png</Path>
<Path fileType="data">/usr/share/icons/hicolor/scalable/apps/pdfsam.svg</Path>
- <Path fileType="data">/usr/share/pdfsam/bin/pdfsam.sh</Path>
- <Path fileType="data">/usr/share/pdfsam/etc/logback.xml</Path>
- <Path fileType="data">/usr/share/pdfsam/pdfsam-community.jar</Path>
- <Path fileType="data">/usr/share/pdfsam/resources/splash.gif</Path>
+ <Path fileType="data">/usr/share/pdfsam/pdfsam.jar</Path>
</Files>
</Package>
<History>
- <Update release="3">
- <Date>2018-10-23</Date>
+ <Update release="4">
+ <Date>2020-05-05</Date>
<Version>3.3.7</Version>
<Comment>Packaging update</Comment>
- <Name>Philipp Trulson</Name>
- <Email>philipp@trulson.de</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Update>
</History>
-</PISI>
\ No newline at end of file
+</PISI>

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 3:18 PM (3 h, 2 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5800978
Default Alt Text
D8814.id21277.diff (9 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.