diff options
| author | Danny Rawlins <monster.romster@gmail.com> | 2020-07-11 16:15:55 +1000 |
|---|---|---|
| committer | Danny Rawlins <monster.romster@gmail.com> | 2020-07-11 16:28:16 +1000 |
| commit | fd45c0b77359a945d5cf6a2715f17ec9970fc99d (patch) | |
| tree | c8a1cebd86d3c2fc2626a66f43babecfe2a08b32 | |
| parent | 511d7d643c8a9cfd91ae900b098ea14cc5932b5a (diff) | |
| download | contrib-fd45c0b77359a945d5cf6a2715f17ec9970fc99d.tar.gz contrib-fd45c0b77359a945d5cf6a2715f17ec9970fc99d.tar.xz | |
scribus: clean up
| -rw-r--r-- | scribus/.signature | 6 | ||||
| -rw-r--r-- | scribus/Pkgfile | 38 |
2 files changed, 20 insertions, 24 deletions
diff --git a/scribus/.signature b/scribus/.signature index 89177ab1a..fa60bfb44 100644 --- a/scribus/.signature +++ b/scribus/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32/LwaeIMNdeltnogcOco6LpkPwcrRKa0itAHhhOLs90TMgING1Tc3iqYv3o3Xu+BV8fUFTf8DOayZAzxJpnUgw= -SHA256 (Pkgfile) = 317eb30d23aad38c6b1ebc6f0f584a816d5c05c4c3c422646c15e07437458edd +RWSagIOpLGJF34wfrF38We5c6pfKI59i8C0j/l2I27w4aMl28Jz5qeaFxDLU3M38/MFO7GtUuXVFg1/xhl3G0fuCa+CcAiqxDwM= +SHA256 (Pkgfile) = ba75c68fc8da080a846ee791872df4cb7d5fa4efc97134f7699d216d15a41a51 SHA256 (.footprint) = 833e7fc010236a1ab333bd103b2d72b50fa75565c720ad10b54274d6de0678a1 SHA256 (scribus-1.5.5.tar.xz) = 7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71 SHA256 (6db15ec1.patch) = a948a5ee53842ffc8acc3f6720291819d55d2ff370c2b46ddffc1122cba07e7f @@ -9,4 +9,4 @@ SHA256 (37425599.patch) = 7c0c13abec2682398591ee66e9ab4547b9e0da66f135dd2357f897 SHA256 (17d6a983.patch) = 0378bb9f945df0368fba4372c540440e39ecab7d7e102111419b0db871283922 SHA256 (scribus-boost-1.71.patch) = 19e20b11c0bce2dce07a845e31adb9ff1b680746698fa150d4572776513b243e SHA256 (scribus-poppler-0.86.patch) = ac660067894effdde20e92c2f32095336707a7f6f3f277316498999096f65445 -SHA256 (poppler-0.82.0.tar.xz) = 234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df +SHA256 (poppler-0.90.0.tar.xz) = 94edb0ad3330b74d22caac807aa501e9cc61cbf45a8010625670428b51989685 diff --git a/scribus/Pkgfile b/scribus/Pkgfile index 4876ff740..30de6fbb2 100644 --- a/scribus/Pkgfile +++ b/scribus/Pkgfile @@ -12,13 +12,11 @@ source=(https://downloads.sourceforge.net/$name/$name-$version.tar.xz https://github.com/scribusproject/scribus/commit/37425599.patch https://github.com/scribusproject/scribus/commit/17d6a983.patch scribus-boost-1.71.patch scribus-poppler-0.86.patch - https://poppler.freedesktop.org/poppler-0.82.0.tar.xz) + https://poppler.freedesktop.org/poppler-0.90.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 - cmake -Spoppler-0.82.0 -Bbuild -GNinja \ + cmake -Spoppler-0.90.0 -Bbuild-poppler -GNinja \ -DCMAKE_INSTALL_PREFIX=$SRC/poppler \ -DCMAKE_INSTALL_LIBDIR=$SRC/poppler/lib \ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ @@ -31,10 +29,11 @@ poppler() { -DENABLE_CMS=lcms2 \ -DENABLE_LIBOPENJPEG=none \ -DWITH_NSS3=OFF - cmake --build build - cmake --install build - install -D -t $PKG/usr/lib/ $SRC/poppler/lib/libpoppler.so.92 + cmake --build build-poppler + cmake --install build-poppler + + install -D -t $PKG/usr/lib/ $SRC/poppler/lib/libpoppler.so.101 export CXXFLAGS+=" -I$SRC/poppler/include -I$SRC/poppler/include/poppler" export PKG_CONFIG_PATH="$SRC/poppler/lib/pkgconfig:$PKG_CONFIG_PATH" @@ -45,32 +44,29 @@ build() { # 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 - + [ ! -e '/usr/lib/libpoppler.so.101' ] && poppler # https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/scribus - patch -Np1 -d $name-$version -i $SRC/6db15ec1.patch - patch -Np1 -d $name-$version -i $SRC/b51c2bab.patch - patch -Np1 -d $name-$version -i $SRC/37425599.patch - patch -Np1 -d $name-$version -i $SRC/scribus-poppler-0.86.patch - patch -Np1 -d $name-$version -i $SRC/scribus-boost-1.71.patch - patch -Np1 -d $name-$version -i $SRC/17d6a983.patch + patch -p1 -d $name-$version -i $SRC/6db15ec1.patch + patch -p1 -d $name-$version -i $SRC/b51c2bab.patch + patch -p1 -d $name-$version -i $SRC/37425599.patch + patch -p1 -d $name-$version -i $SRC/scribus-poppler-0.86.patch + patch -p1 -d $name-$version -i $SRC/scribus-boost-1.71.patch + patch -p1 -d $name-$version -i $SRC/17d6a983.patch - # clean up poppler build dir if there is one - [[ -e build ]] && rm -rf build || true sed \ -e 's|#!/usr/bin/python|#!/usr/bin/python3|' \ -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \ -i $name-$version/scribus/plugins/scriptplugin/{samples,scripts}/* + cmake -S$name-$version -Bbuild -GNinja \ -DCMAKE_INSTALL_PREFIX=/usr \ -Wno-dev cmake --build build DESTDIR=$PKG cmake --install build - rm -rf $PKG/usr/share/man/de - rm -rf $PKG/usr/share/man/pl - rm -rf $PKG/usr/share/doc - find $PKG \(\ + rm -r $PKG/usr/share/man/?? + rm -r $PKG/usr/share/doc + find $PKG \( \ -iname '*changelog*' -o \ -iname '*news*' -o \ -iname '*todo*' -o \ |