From 1edaf852997cd05116a38eed2166331c5e39c605 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 9 Feb 2017 23:21:17 +0100 Subject: [PATCH] scribus: fix recipe and enable x86_64. * remove rpath, don't remove headers, plugins. --- app-office/scribus/scribus-1.4.4.recipe | 58 +++++++++++++++---------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/app-office/scribus/scribus-1.4.4.recipe b/app-office/scribus/scribus-1.4.4.recipe index 950df5956..2c5efd39f 100644 --- a/app-office/scribus/scribus-1.4.4.recipe +++ b/app-office/scribus/scribus-1.4.4.recipe @@ -9,43 +9,52 @@ versatile PDF creation." HOMEPAGE="http://www.scribus.net" COPYRIGHT="2014 Scribus Team" LICENSE="GNU GPL v2" -SOURCE_URI="http://downloadsurceforge.net/project/scribus/scribus/1.4.4/scribus-1.4.4.tar.xz" +REVISION="2" +SOURCE_URI="http://downloads.sourceforge.net/project/scribus/scribus/1.4.4/scribus-1.4.4.tar.xz" +CHECKSUM_SHA256="a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae" SOURCE_DIR="scribus-1.4.4" -CKECKSUM_MD5="" -REVISION="1" +PATCHES="scribus-1.4.4.patchset" + ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -PATCHES=" - scribus-1.4.4.patchset - " + PROVIDES=" scribus$secondaryArchSuffix = $portVersion app:Scribus " REQUIRES=" haiku$secondaryArchSuffix - libqt4$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix - lib:libtiff$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix - lib:libz$secondaryArchSuffix lib:liblcms2$secondaryArchSuffix + lib:libpodofo$secondaryArchSuffix + lib:libpython2.7$secondaryArchSuffix + lib:libQtCore$secondaryArchSuffix + lib:libQtGui$secondaryArchSuffix + lib:libQtNetwork$secondaryArchSuffix + lib:libQtXml$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix lib:libxml2$secondaryArchSuffix -" + lib:libz$secondaryArchSuffix + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - libqt4${secondaryArchSuffix}_devel - devel:libz$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - devel:libjpeg$secondaryArchSuffix - devel:libtiff$secondaryArchSuffix - devel:libpython2.7 devel:libfreetype$secondaryArchSuffix - devel:libxml2$secondaryArchSuffix - devel:liblcms2$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix - boost${secondaryArchSuffix}_devel + devel:libjpeg$secondaryArchSuffix + devel:liblcms2$secondaryArchSuffix + devel:libpodofo$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix + devel:libpython2.7$secondaryArchSuffix + devel:libQtCore$secondaryArchSuffix + devel:libQtGui$secondaryArchSuffix + devel:libQtNetwork$secondaryArchSuffix + devel:libQtXml$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libboost_system${secondaryArchSuffix} " BUILD_PREREQUIRES=" cmd:cmake @@ -62,7 +71,10 @@ BUILD() -DSHAREDIR=$dataDir \ -DDATA_DIR=$relativeDataDir \ -DAPPLICATION_DATA_DIR=$dataDir \ - -DWANT_CAIRO=false + -DWANT_QTARTHUR=1 \ + -DWANT_DISTROBUILD=1 \ + -DCMAKE_SKIP_RPATH=ON \ + -DLIB_SUFFIX="$secondaryArchSuffix" make $jobArgs } INSTALL() @@ -73,8 +85,6 @@ INSTALL() rm -f $prefix/bin/scribus mv $appsDir/scribus $appsDir/Scribus addAppDeskbarSymlink $appsDir/Scribus Scribus - mkdir -p $includeDir - mv $prefix/include/* $includeDir - rm -rf $prefix/include - rm -rf $prefix/lib + mkdir -p $(dirname $includeDir) + mv $prefix/include $includeDir }