diff options
author | Matteo Bernardini | 2020-12-12 10:57:01 +0100 |
---|---|---|
committer | Matteo Bernardini | 2020-12-12 10:57:01 +0100 |
commit | b8acbc3289f52e1be54361308115dcf85c4c3326 (patch) | |
tree | 5bac313b2f1772d6e0d57661536ee72c4a672073 /graphics/inkscape | |
parent | eae7f816d4c22b4a7ec5abd27b25812434a9b53a (diff) | |
download | slackbuilds-b8acbc3289f52e1be54361308115dcf85c4c3326.tar.gz |
20201212.1 global branch merge.current-20201212.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'graphics/inkscape')
-rw-r--r-- | graphics/inkscape/README | 2 | ||||
-rw-r--r-- | graphics/inkscape/fix_atomic_rel_error.patch | 10 | ||||
-rw-r--r-- | graphics/inkscape/inkscape.SlackBuild | 66 | ||||
-rw-r--r-- | graphics/inkscape/inkscape.info | 8 |
4 files changed, 58 insertions, 28 deletions
diff --git a/graphics/inkscape/README b/graphics/inkscape/README index 1d9e9dd712..61391c1df2 100644 --- a/graphics/inkscape/README +++ b/graphics/inkscape/README @@ -7,5 +7,3 @@ Creative Commons meta-data, node editing, layers, complex path operations, bitmap tracing, text-on-path, flowed text, direct XML editing, and more. It imports formats such as JPEG, PNG, TIFF, and others and exports PNG as well as multiple vector-based formats. - -Optional dependency: potrace (for bitmap tracing functionality). diff --git a/graphics/inkscape/fix_atomic_rel_error.patch b/graphics/inkscape/fix_atomic_rel_error.patch new file mode 100644 index 0000000000..b298550c5c --- /dev/null +++ b/graphics/inkscape/fix_atomic_rel_error.patch @@ -0,0 +1,10 @@ +--- a/src/ui/tool/node.cpp 2020-05-01 15:18:52.000000000 +0200 ++++ b/src/ui/tool/node.cpp 2020-08-18 01:25:05.266412299 +0200 +@@ -7,6 +7,7 @@ + * Released under GNU GPL v2+, read the file 'COPYING' for more information. + */ + ++#include <atomic> + #include <iostream> + #include <stdexcept> + #include <boost/utility.hpp> diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild index 4471bf3c1b..8dcfee8a4e 100644 --- a/graphics/inkscape/inkscape.SlackBuild +++ b/graphics/inkscape/inkscape.SlackBuild @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=inkscape -VERSION=${VERSION:-0.92.4} +VERSION=${VERSION:-1.0.1} +EXTRAVER=${EXTRAVER:-2020-09-07_3bc2e813f5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,9 +60,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf ${PRGNAM}-${VERSION}_${EXTRAVER} tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION +cd ${PRGNAM}-${VERSION}_${EXTRAVER} chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,31 +70,52 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -./autogen.sh - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS -std=c++11" \ -./configure \ - --enable-strict-build=no \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG +# https://bugs.gentoo.org/737596 +patch -p1 < $CWD/fix_atomic_rel_error.patch + +# strip invalid tag +sed -i /url/d org.inkscape.Inkscape.appdata.xml.in + +# https://bugs.launchpad.net/inkscape/+bug/314381 +# a couple of files have executable bits set, +# despite not being executable +find . -name '*.cpp' | xargs chmod -x +find . -name '*.h' | xargs chmod -x +# Fix end of line encodings +dos2unix -k -q share/extensions/*.py + +# Fix man page location: +sed -i CMakeScripts/Pod2man.cmake -e "s/SHARE_INSTALL/CMAKE_INSTALL_PREFIX/g" + +mkdir -p build +cd build + # imagemagick >= 7.x is unsupported yet, so use GraphicsMagick + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DINKSCAPE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + -DBUILD_SHARED_LIBS=ON \ + -DWITH_DBUS=ON \ + -DWITH_GRAPHICS_MAGICK=ON \ + -DWITH_IMAGE_MAGICK=OFF \ + .. + make + make install DESTDIR=$PKG +cd .. find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING* INSTALL NEWS README TRANSLATORS doc/* \ + AUTHORS COPYING* README* TRANSLATORS LICENSES *.md doc/* \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc -name "Makefile*" -exec rm {} \; diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info index 39fe0759fd..8152727d53 100644 --- a/graphics/inkscape/inkscape.info +++ b/graphics/inkscape/inkscape.info @@ -1,10 +1,10 @@ PRGNAM="inkscape" -VERSION="0.92.4" +VERSION="1.0.1" HOMEPAGE="http://www.inkscape.org/" -DOWNLOAD="https://inkscape.org/gallery/item/13330/inkscape-0.92.4.tar.bz2" -MD5SUM="ac30f6d5747fd9c620c00dad500f414f" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/inkscape-1.0.1.tar.xz" +MD5SUM="daefc5212b72e49eff41a7681fd5e993" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="lxml numpy" +REQUIRES="GraphicsMagick gdl dos2unix double-conversion libcdr lxml numpy potrace pstoedit scour" MAINTAINER="Fernando Lopez Jr." EMAIL="fernando.lopezjr@gmail.com" |