ports/contrib (3.5): inkscape: fix build once and for all for poppler
commit ca35798e0c1d8fa01d012884deabe8dde9873de8 Author: Danny Rawlins <monster.romster@gmail.com> Date: Wed Dec 4 22:52:25 2019 +1100 inkscape: fix build once and for all for poppler diff --git a/inkscape/.footprint b/inkscape/.footprint index 05fcfec3e..9c5e21ce2 100644 --- a/inkscape/.footprint +++ b/inkscape/.footprint @@ -2,6 +2,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/inkscape -rwxr-xr-x root/root usr/bin/inkview +drwxr-xr-x root/root usr/lib/ +-rwxr-xr-x root/root usr/lib/libpoppler.so.92 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/appdata/ -rw-r--r-- root/root usr/share/appdata/inkscape.appdata.xml diff --git a/inkscape/.signature b/inkscape/.signature index 67190d971..bac5fde79 100644 --- a/inkscape/.signature +++ b/inkscape/.signature @@ -1,8 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xGbhwh7p1bdsxBeBh6A0U26SBVwP0XjBM7iu9yuXmc6mtXmVfY3hGydiqWwI2DV5JfBYd51h98IuThMrhuLKg4= -SHA256 (Pkgfile) = ed26e11e2b982632207e4a3e4235f62d9e35fd326e4bf9b89ba794769429c957 -SHA256 (.footprint) = a231855b77d8603f16e2a8754074e97f6c430bf80ac8ccaa02b35814f2f4db2b +RWSagIOpLGJF3yKYkcLPoEca0anqJCMgzaoz9zIUQyfggG6oai9ZAndmgWtRsz8cJ3RWu8yd3vigdThhwaobx83Oedt3CphPCwg= +SHA256 (Pkgfile) = ee85716ce1ef34b7960873cbf55b5d8bfe661273cdbb209449466c4ed8158d96 +SHA256 (.footprint) = 795147c6b14f9a6ca03cf99ac16bbef4145331c7c5d0472eabb805215507f6a6 SHA256 (inkscape-0.92.4.tar.bz2) = 57ec2da8177b36614a513e2822efd73af721e690f7ddc6bd0a5fbb1525b4515e +SHA256 (poppler-0.82.0.tar.xz) = 234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df SHA256 (inkscape-0.92.4-poppler_0_82_0_fixes-1.patch) = 0c35bc0be8d681531233b43123c11bd6d375e8d780b9b78b5ca018c6ae61484e SHA256 (inkscape-0.92.4-use_versioned_ImageMagick6-1.patch) = 7f0e401e359285590f545c1b1225ec98682922d2f82e805c722c2f086be28c4c SHA256 (inkscape-0.92.4-upstream_fixes-1.patch) = 6932d7f140ba0ee4992bdea165f94854a3114d9eac190b7003b18af7f6cf7341 diff --git a/inkscape/Pkgfile b/inkscape/Pkgfile index e86315a4f..e3cc39a1b 100644 --- a/inkscape/Pkgfile +++ b/inkscape/Pkgfile @@ -1,19 +1,49 @@ # Description: An open source SVG editor. # URL: https://www.inkscape.org/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: boehm-gc boost gsl gtkmm poppler-glib popt +# Depends on: boehm-gc boost gsl gtkmm lcms2 popt # Optional: rtmpdump openldap libexif openjade gtk-doc gtkspell brotli imagemagick-compat name=inkscape version=0.92.4 -release=2 +release=3 source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.bz2 + https://poppler.freedesktop.org/poppler-0.82.0.tar.xz inkscape-0.92.4-poppler_0_82_0_fixes-1.patch inkscape-0.92.4-use_versioned_ImageMagick6-1.patch inkscape-0.92.4-upstream_fixes-1.patch) +poppler() { +#-boehm-gc boost gsl gtkmm poppler-glib popt +#+cmake cairo lcms2 boehm-gc boost gsl gtkmm popt + cd poppler-0.82.0 + cmake . \ + -DCMAKE_INSTALL_PREFIX=$SRC/poppler \ + -DCMAKE_INSTALL_LIBDIR=$SRC/poppler/lib \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -DENABLE_UTILS=ON \ + -DENABLE_SPLASH=ON \ + -DENABLE_CPP=ON \ + -DENABLE_GLIB=ON \ + -DENABLE_QT5=OFF \ + -DENABLE_ZLIB=ON \ + -DENABLE_CMS=lcms2 \ + -DENABLE_LIBOPENJPEG=none \ + -DWITH_NSS3=OFF + + make + make install + + install -D -t $PKG/usr/lib/ $SRC/poppler/lib/libpoppler.so.92 + + export CXXFLAGS+=" -I$SRC/poppler/include -I$SRC/poppler/include/poppler" + export PKG_CONFIG_PATH="$SRC/poppler/lib/pkgconfig:$PKG_CONFIG_PATH" +} + build() { - cd $name-$version + poppler + + cd $SRC/$name-$version # fix a problem introduced by Poppler-0.76.1 sed -e 's|new Lexer(xref, obj)|obj|g' -i src/extension/internal/pdfinput/pdf-parser.cpp @@ -27,7 +57,7 @@ build() { ./autogen.sh - export PKG_CONFIG_PATH='/usr/lib/imagemagick6/pkgconfig' + export PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig:$PKG_CONFIG_PATH" export FREETYPE_CONFIG="/usr/bin/pkg-config freetype2" ./configure \
participants (1)
-
crux@crux.nu