[notify] scribus: 1.4.8 -> 1.5.5; new dependencies (boost, harfbuzz-icu, hunspell, qt5); removed qt4 as a dependency; corrected mandir

scribus/.signature

@@ -1,5 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31pXoybEX970cBftETiAyuTUNHhjmjeHfn82b9CHmsSmzDLq6EVRHh1Tdf2rt6zVLo58oMZDoOr1HzLUOx4Q3gE=
-SHA256 (Pkgfile) = 29907485bd7293e211f400a64791273c2c3a08f12dac58b8bf5f257093a6102c
-SHA256 (.footprint) = ac2871afacab6c8bf4d8df54792e9adc8a29717a1a8f26b7ff94f449453f00cf
-SHA256 (scribus-1.4.8.tar.xz) = 22253bb5994023f39608b37c57c7cd0280059fd97d2a4d71d4011aeeeb18042f
+RWSagIOpLGJF31Zj5BlZ3CD3XIZVAYP4hg40rBZF/XhRk0KVFAyPOv0mDHKEhrUAH72tDe1mbK7woXcL9+TrlAfvKWVmVBMkOgM=
+SHA256 (Pkgfile) = 160cbb2cfad82942724e35129a23b96d211a5c9b46ac09835216acf5aa778aa8
+SHA256 (.footprint) = 240f0ff314d31e0ca57ae578f4c86e5f646cce020b1e1bf44963cd933a384db3
+SHA256 (scribus-1.5.5.tar.xz) = 7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71
+SHA256 (6db15ec1.patch) = a948a5ee53842ffc8acc3f6720291819d55d2ff370c2b46ddffc1122cba07e7f
+SHA256 (poppler-0.82.0.tar.xz) = 234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df

scribus/Pkgfile

@@ -1,28 +1,64 @@
 # Description: layout tool
 # URL:         http://scribus.net
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Depends on:  qt4, libart_lgpl, cairo, cups
+# Depends on:  boost cups harfbuzz-icu hunspell libart_lgpl qt5
 
 name=scribus
-version=1.4.8
+version=1.5.5
 release=1
-source=(http://download.sourceforge.net/$name/$name-$version.tar.xz)
-source=(http://sourceforge.net/projects/scribus/files/scribus/$version/scribus-$version.tar.xz)
+source=(https://downloads.sourceforge.net/$name/$name-$version.tar.xz
+  https://github.com/scribusproject/scribus/commit/6db15ec1.patch
+  https://poppler.freedesktop.org/poppler-0.82.0.tar.xz)
+
+# snatched from contrib/inkscape, thx romster :>
+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"
+  cd $SRC
+}
 
 build() {
-   cd $name-$version
+  # build a static poppler to use with the build
+  # scribus is using the internal poppler api which
+  # is known to break every other release
+  poppler
+  cd $name-$version
+  # fix building against poppler 0.82.0
+  patch -Np1 -i $SRC/6db15ec1.patch
+  sed \
+    -e 's|#!/usr/bin/python|#!/usr/bin/python3|' \
+    -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \
+    -i scribus/plugins/scriptplugin/{samples,scripts}/*
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr
 
-   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MAN_DIR=/usr/man
+  make
+  make DESTDIR=$PKG install
 
-   make && make DESTDIR=$PKG install
-   
-   #CMAKE_MAN_DIR seems to be ignored..
-   rm -rf $PKG/usr/share/man/de
-   mv $PKG/usr/share/man $PKG/usr
-
-   rm -rf $PKG/usr/share/man
-   rm -rf $PKG/usr/man/pl
-   rm -rf $PKG/usr/share/doc
-   rm -rf $PKG/usr/share/$name/scripts/{ChangeLog,NEWS,TODO}
-   rm -rf $PKG/usr/share/scribus/dicts/README_*
+  rm -rf $PKG/usr/share/man/de
+  rm -rf $PKG/usr/share/man/pl
+  rm -rf $PKG/usr/share/doc
+  rm -rf $PKG/usr/share/$name/scripts/{ChangeLog,NEWS,TODO}
+  rm -rf $PKG/usr/share/scribus/dicts/README_*
 }