From bcde5985c5a188a70218681ad8c76356519bf79e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 3 Aug 2018 14:05:37 +0200 Subject: [PATCH] media-gfx: code style. --- media-gfx/digikam/digikam-5.9.0.recipe | 2 +- media-gfx/grafx2/grafx2-2.5.recipe | 2 +- media-gfx/krita/krita-4.1.0.recipe | 3 +-- media-gfx/librecad/librecad-2.1.3.recipe | 2 +- media-gfx/nomacs/nomacs-3.8.0.recipe | 10 ++++------ media-gfx/opentoonz/opentoonz-1.1.2.recipe | 5 +++-- media-gfx/povray/povray-3.7.0.4.recipe | 10 +++++----- media-gfx/qrencode/qrencode_kdl-3.4.4.recipe | 1 + .../sane_backends/sane_backends-1.0.25.recipe | 14 ++++++-------- .../sane_backends/sane_backends-1.0.27.recipe | 7 ++++--- 10 files changed, 27 insertions(+), 29 deletions(-) diff --git a/media-gfx/digikam/digikam-5.9.0.recipe b/media-gfx/digikam/digikam-5.9.0.recipe index deec82b84..36b5e85b9 100644 --- a/media-gfx/digikam/digikam-5.9.0.recipe +++ b/media-gfx/digikam/digikam-5.9.0.recipe @@ -9,8 +9,8 @@ LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://github.com/KDE/digikam/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="8757f92da30f26b6c9eb51e6b6bb81edbe257fce72f540cc04917b32de4655ea" -ADDITIONAL_FILES="digikam.rdef.in" PATCHES="digikam-5.9.0.patchset" +ADDITIONAL_FILES="digikam.rdef.in" ARCHITECTURES="x86 ?x86_64" SECONDARY_ARCHITECTURES="?x86" diff --git a/media-gfx/grafx2/grafx2-2.5.recipe b/media-gfx/grafx2/grafx2-2.5.recipe index b730cd0a3..ea8ae6a7d 100644 --- a/media-gfx/grafx2/grafx2-2.5.recipe +++ b/media-gfx/grafx2/grafx2-2.5.recipe @@ -10,9 +10,9 @@ COPYRIGHT="1995-2001 Sunset Design LICENSE="GNU GPL v2" REVISION="3" SOURCE_URI="https://gitlab.com/GrafX2/grafX2/-/archive/v2.5/grafX2-v2.5.tar.bz2" +CHECKSUM_SHA256="0a9742b660f3fb3e88c45f67f70c4b4626629fd178eb75451f3693b2e4746667" SOURCE_DIR="grafX2-v2.5" PATCHES="grafx2-$portVersion.patchset" -CHECKSUM_SHA256="0a9742b660f3fb3e88c45f67f70c4b4626629fd178eb75451f3693b2e4746667" ARCHITECTURES="x86_gcc2 x86_64" diff --git a/media-gfx/krita/krita-4.1.0.recipe b/media-gfx/krita/krita-4.1.0.recipe index 2be9ccab1..d731c0f41 100644 --- a/media-gfx/krita/krita-4.1.0.recipe +++ b/media-gfx/krita/krita-4.1.0.recipe @@ -9,8 +9,8 @@ LICENSE="GNU LGPL v2" REVISION="2" SOURCE_URI="https://download.kde.org/stable/krita/$portVersion/krita-$portVersion.tar.gz" CHECKSUM_SHA256="78792df8165b986b806dcf9960a2679f683f2263e06f3ad5a24b0f78d8f27ed5" -ADDITIONAL_FILES="krita.rdef.in" PATCHES="krita-$portVersion.patchset" +ADDITIONAL_FILES="krita.rdef.in" ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -19,7 +19,6 @@ PROVIDES=" krita$secondaryArchSuffix = $portVersion app:Krita$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix diff --git a/media-gfx/librecad/librecad-2.1.3.recipe b/media-gfx/librecad/librecad-2.1.3.recipe index 47b090b22..57e700d0c 100644 --- a/media-gfx/librecad/librecad-2.1.3.recipe +++ b/media-gfx/librecad/librecad-2.1.3.recipe @@ -9,8 +9,8 @@ LICENSE="GNU GPL v2" REVISION="4" SOURCE_URI="https://github.com/LibreCAD/LibreCAD/archive/$portVersion.tar.gz" CHECKSUM_SHA256="74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06" -PATCHES="librecad-$portVersion.patchset" SOURCE_DIR="LibreCAD-$portVersion" +PATCHES="librecad-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/media-gfx/nomacs/nomacs-3.8.0.recipe b/media-gfx/nomacs/nomacs-3.8.0.recipe index f43d79280..d0ae36217 100644 --- a/media-gfx/nomacs/nomacs-3.8.0.recipe +++ b/media-gfx/nomacs/nomacs-3.8.0.recipe @@ -9,14 +9,13 @@ COPYRIGHT="2011-2013 Markus Diem LICENSE="GNU LGPL v3" REVISION="2" SOURCE_URI_1="https://github.com/nomacs/nomacs/archive/3.8.0.tar.gz" -SOURCE_URI_2="https://github.com/nomacs/nomacs-plugins/archive/3.8.0.tar.gz" -SOURCE_FILENAME_1="nomacs-$portVersion.tar.gz" -SOURCE_FILENAME_2="nomacs-plugins-$portVersion.tar.gz" CHECKSUM_SHA256_1="f43ad1507f2890db2fbaa0cb110de3ac5efe754cf2e7a053eaabfed4d5e06845" +SOURCE_FILENAME_1="nomacs-$portVersion.tar.gz" +SOURCE_URI_2="https://github.com/nomacs/nomacs-plugins/archive/3.8.0.tar.gz" CHECKSUM_SHA256_2="5a700b27990fb72ae8582e69143389d0cf9c9313f9b361348b9bb8339b3dabdc" - -ADDITIONAL_FILES="nomacs.rdef.in" +SOURCE_FILENAME_2="nomacs-plugins-$portVersion.tar.gz" PATCHES="nomacs-$portVersion.patchset" +ADDITIONAL_FILES="nomacs.rdef.in" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -25,7 +24,6 @@ PROVIDES=" nomacs$secondaryArchSuffix = $portVersion app:Nomacs$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libexiv2$secondaryArchSuffix diff --git a/media-gfx/opentoonz/opentoonz-1.1.2.recipe b/media-gfx/opentoonz/opentoonz-1.1.2.recipe index 27717f6d4..13af3dc2f 100644 --- a/media-gfx/opentoonz/opentoonz-1.1.2.recipe +++ b/media-gfx/opentoonz/opentoonz-1.1.2.recipe @@ -4,9 +4,9 @@ DWANGO (http://dwango.co.jp/english/). It is based on Toonz Studio \ Ghibli Version, originally developed in Italy by \ Digital Video, Inc. (http://www.toonz.com/), and customized by \ Studio Ghibli (http://www.ghibli.jp/) over many years of production." -LICENSE="BSD (3-clause)" -COPYRIGHT="2016, DWANGO Co., Ltd." HOMEPAGE="https://github.com/opentoonz/opentoonz/" +COPYRIGHT="2016, DWANGO Co., Ltd." +LICENSE="BSD (3-clause)" REVISION="2" SOURCE_URI="$HOMEPAGE/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="e9943abbd49befb5c8963fd7cb744b6c5b93a4faa02c8564610b848d189ea029" @@ -47,6 +47,7 @@ REQUIRES=" lib:libSDL2_2.0$secondaryArchSuffix lib:libz$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libboost_system$secondaryArchSuffix diff --git a/media-gfx/povray/povray-3.7.0.4.recipe b/media-gfx/povray/povray-3.7.0.4.recipe index 842d0460c..3ca36e4f4 100644 --- a/media-gfx/povray/povray-3.7.0.4.recipe +++ b/media-gfx/povray/povray-3.7.0.4.recipe @@ -15,6 +15,11 @@ PATCHES="povray-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +GLOBAL_WRITABLE_FILES=" + settings/povray/3.7/povray.conf keep-old + settings/povray/3.7/povray.ini keep-old + " + PROVIDES=" povray$secondaryArchSuffix = $portVersion cmd:povray = $portVersion @@ -36,11 +41,6 @@ REQUIRES=" lib:libz$secondaryArchSuffix " -GLOBAL_WRITABLE_FILES=" - settings/povray/3.7/povray.conf keep-old - settings/povray/3.7/povray.ini keep-old - " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libboost_system$secondaryArchSuffix diff --git a/media-gfx/qrencode/qrencode_kdl-3.4.4.recipe b/media-gfx/qrencode/qrencode_kdl-3.4.4.recipe index 017f06c7e..dbde202e5 100644 --- a/media-gfx/qrencode/qrencode_kdl-3.4.4.recipe +++ b/media-gfx/qrencode/qrencode_kdl-3.4.4.recipe @@ -34,6 +34,7 @@ PROVIDES_devel=" REQUIRES_devel=" haiku " + BUILD_PREREQUIRES=" haiku_devel cmd:gcc diff --git a/media-gfx/sane_backends/sane_backends-1.0.25.recipe b/media-gfx/sane_backends/sane_backends-1.0.25.recipe index da99fc9e1..72015812a 100644 --- a/media-gfx/sane_backends/sane_backends-1.0.25.recipe +++ b/media-gfx/sane_backends/sane_backends-1.0.25.recipe @@ -15,14 +15,17 @@ This package includes scanners backends, the command line frontend scanimage, \ the saned server and the sane-find-scanner utility, along with their \ documentation. " - HOMEPAGE="http://www.sane-project.org" -LICENSE="GNU LGPL v2" COPYRIGHT="David Mosberger-Tang, Andy Beck" +LICENSE="GNU LGPL v2" +REVISION="5" SOURCE_URI="https://alioth.debian.org/frs/download.php/file/4146/sane-backends-$portVersion.tar.gz" CHECKSUM_SHA256="a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c" SOURCE_DIR="sane-backends-$portVersion" -REVISION="5" +PATCHES=" + sane_backends-$portVersion.patchset + sane_disable_libusb_context.patchset + " ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -76,11 +79,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -PATCHES=" - sane_backends-$portVersion.patchset - sane_disable_libusb_context.patchset - " - BUILD() { libtoolize --force --copy --install diff --git a/media-gfx/sane_backends/sane_backends-1.0.27.recipe b/media-gfx/sane_backends/sane_backends-1.0.27.recipe index 8bb2ab1da..9856f51cc 100644 --- a/media-gfx/sane_backends/sane_backends-1.0.27.recipe +++ b/media-gfx/sane_backends/sane_backends-1.0.27.recipe @@ -20,9 +20,6 @@ REVISION="4" SOURCE_URI="https://alioth.debian.org/frs/download.php/file/4224/sane-backends-$portVersion.tar.gz" CHECKSUM_SHA256="293747bf37275c424ebb2c833f8588601a60b2f9653945d5a3194875355e36c9" SOURCE_DIR="sane-backends-$portVersion" -GLOBAL_WRITABLE_FILES=" - settings/sane.d directory keep-old - " PATCHES=" sane_backends-$portVersion.patchset " @@ -30,6 +27,10 @@ PATCHES=" ARCHITECTURES="?x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="?x86_gcc2 x86" +GLOBAL_WRITABLE_FILES=" + settings/sane.d directory keep-old + " + PROVIDES=" sane_backends$secondaryArchSuffix = $portVersion cmd:gamma4scanimage$secondaryArchSuffix = $portVersion