[arch-commits] Commit in scribus/repos (3 files)

[Evangelos Foutras]

    Date: Thursday, January 30, 2020 @ 16:58:08
  Author: foutrelis
Revision: 560119

archrelease: copy trunk to community-staging-x86_64

Added:
  scribus/repos/community-staging-x86_64/
  scribus/repos/community-staging-x86_64/PKGBUILD
    (from rev 560118, scribus/trunk/PKGBUILD)
  scribus/repos/community-staging-x86_64/scribus-boost-1.71.patch
    (from rev 560118, scribus/trunk/scribus-boost-1.71.patch)

--------------------------+
 PKGBUILD                 |   80 +++++++++++++++++++++++++++++++++++++++++++++
 scribus-boost-1.71.patch |   12 ++++++
 2 files changed, 92 insertions(+)

Copied: scribus/repos/community-staging-x86_64/PKGBUILD (from rev 560118, scribus/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-01-30 16:58:08 UTC (rev 560119)
@@ -0,0 +1,80 @@
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: Ben <ben at benmazer.net>
+
+pkgname=scribus
+pkgver=1.5.5
+pkgrel=6
+pkgdesc="Desktop publishing software"
+arch=(x86_64)
+url="https://www.scribus.net/"
+license=(GPL)
+depends=(qt5-base harfbuzz-icu poppler python2 hunspell podofo openscenegraph
+         libcdr libfreehand libmspub libpagemaker libqxp libvisio libzmf) # graphicsmagick
+makedepends=(cmake boost mesa qt5-tools)
+optdepends=('tk: scripts based on tkinter'
+            'hyphen-lang: hyphenation patterns for desired languages')
+source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc}
+         scribus-boost-1.71.patch
+         scribus-poppler-0.82.patch::"https://github.com/scribusproject/scribus/commit/6db15ec1.patch"
+         scribus-poppler-0.83.patch::"https://github.com/scribusproject/scribus/commit/b51c2bab.patch"
+         scribus-poppler-0.84.patch::"https://github.com/scribusproject/scribus/commit/37425599.patch")
+sha256sums=('7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71'
+            'SKIP'
+            '19e20b11c0bce2dce07a845e31adb9ff1b680746698fa150d4572776513b243e'
+            'a948a5ee53842ffc8acc3f6720291819d55d2ff370c2b46ddffc1122cba07e7f'
+            '5631f5a19565cdbd1290c4e1a2c5a87e56ca0af17017c191dc0c00c97a456b3b'
+            '7c0c13abec2682398591ee66e9ab4547b9e0da66f135dd2357f8977589403694')
+validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA  # Peter Linnell <plinnell at scribus.net>
+              757F5E9B13DD648887AD50092D47C099E782504E  # The Scribus Team (www.scribus.net) <the_scribus_team at scribus.net>
+              6558BE84D27273A438A151198BEA48118AEBEE64) # Craig Bradney <cbradney at zipworld.com.au>
+
+prepare() {
+    cd ${pkgname}-${pkgver}
+
+    # Fix python name
+    sed \
+        -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+        -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+        -i scribus/plugins/scriptplugin/{samples,scripts}/*
+
+    mkdir -p build
+
+    patch -p1 -i ../scribus-boost-1.71.patch # Fix build with boost 1.71
+    patch -p1 -i ../scribus-poppler-0.82.patch # Fix build with poppler 0.82
+    patch -p1 -i ../scribus-poppler-0.83.patch # Fix build with poppler 0.83
+    patch -p1 -i ../scribus-poppler-0.84.patch # Fix build with poppler 0.84
+}
+
+build() {
+    cd ${pkgname}-${pkgver}/build
+    cmake .. \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=None \
+        -DCMAKE_SKIP_RPATH=ON
+        # FS#59800
+        #-DWANT_GRAPHICSMAGICK=1
+    make
+}
+
+package() {
+    cd ${pkgname}-${pkgver}/build
+
+    make DESTDIR="${pkgdir}" install
+
+    cd ..
+
+    install -Dm644 scribus.desktop -t "${pkgdir}"/usr/share/applications
+
+    for i in 16x16 32x32 128x128 256x256 512x512 1024x1024
+    do
+        install -Dm644 resources/iconsets/artwork/icon_${i}.png "${pkgdir}"/usr/share/icons/hicolor/${i}/apps/scribus.png
+    done
+
+    # Use system hyphen
+    rm -rf "${pkgdir}"/usr/share/scribus/dicts/hyph
+    ln -sf /usr/share/hyphen "${pkgdir}"/usr/share/scribus/dicts/hyph
+}

Copied: scribus/repos/community-staging-x86_64/scribus-boost-1.71.patch (from rev 560118, scribus/trunk/scribus-boost-1.71.patch)
===================================================================
--- community-staging-x86_64/scribus-boost-1.71.patch	                        (rev 0)
+++ community-staging-x86_64/scribus-boost-1.71.patch	2020-01-30 16:58:08 UTC (rev 560119)
@@ -0,0 +1,12 @@
+diff --git a/scribus/plugins/tools/2geomtools/CMakeLists.txt b/scribus/plugins/tools/2geomtools/CMakeLists.txt
+index 9b6683cbb..d2e1ee5ea 100644
+--- a/scribus/plugins/tools/2geomtools/CMakeLists.txt
++++ b/scribus/plugins/tools/2geomtools/CMakeLists.txt
+@@ -3,6 +3,6 @@ include_directories(
+   ${CMAKE_SOURCE_DIR}/scribus
+ )
+ 
+-include_directories( ${Boost_INCLUDE_DIR} )
++include_directories( ${Boost_INCLUDE_DIRS} )
+ add_subdirectory (meshdistortion)
+ add_subdirectory (pathalongpath)