From e92dc4b5db48f117bf5b9b652cff74f8d7a4086c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 3 Aug 2018 15:13:34 +0200 Subject: [PATCH] dev-libs: code style. --- dev-libs/atk/atk-2.23.4.recipe | 2 -- dev-libs/glib/glib2-2.48.2.recipe | 1 - dev-libs/glib/glib2-2.53.1.recipe | 1 - dev-libs/glib/glib2-2.53.5.recipe | 1 - dev-libs/gnulib/gnulib-2013_12_17.recipe | 1 + dev-libs/kdiagram/kdiagram-2.6.0.recipe | 2 -- dev-libs/kproperty/kproperty-3.1.0.recipe | 3 --- dev-libs/kreport/kreport-3.1.0.recipe | 3 --- dev-libs/libiodbc/libiodbc-3.52.12.recipe | 1 + dev-libs/liboil/liboil-0.3.17.recipe | 1 - dev-libs/libsigc++/libsigc++-2.4.1.recipe | 1 - dev-libs/libtar/libtar-1.2.20.recipe | 2 ++ dev-libs/zziplib/zziplib-0.13.67.recipe | 3 ++- 13 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dev-libs/atk/atk-2.23.4.recipe b/dev-libs/atk/atk-2.23.4.recipe index fccb03baa..73261cb8e 100644 --- a/dev-libs/atk/atk-2.23.4.recipe +++ b/dev-libs/atk/atk-2.23.4.recipe @@ -21,7 +21,6 @@ PROVIDES=" atk$secondaryArchSuffix = $portVersion lib:libatk_1.0 = 0.22313.1 compat >= 0 " - REQUIRES=" haiku$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix @@ -44,7 +43,6 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libglib_2.0$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:autoconf cmd:awk diff --git a/dev-libs/glib/glib2-2.48.2.recipe b/dev-libs/glib/glib2-2.48.2.recipe index 30539daca..7a8cd8908 100644 --- a/dev-libs/glib/glib2-2.48.2.recipe +++ b/dev-libs/glib/glib2-2.48.2.recipe @@ -70,7 +70,6 @@ PROVIDES_devel=" devel:libgobject_2.0$secondaryArchSuffix = 0.4800.2 compat >= 0 devel:libgthread_2.0$secondaryArchSuffix = 0.4800.2 compat >= 0 " - REQUIRES_devel=" glib2$secondaryArchSuffix == $portVersion base devel:libffi$secondaryArchSuffix diff --git a/dev-libs/glib/glib2-2.53.1.recipe b/dev-libs/glib/glib2-2.53.1.recipe index 26b96e7f2..cfea4e2f2 100644 --- a/dev-libs/glib/glib2-2.53.1.recipe +++ b/dev-libs/glib/glib2-2.53.1.recipe @@ -71,7 +71,6 @@ PROVIDES_devel=" devel:libgobject_2.0$secondaryArchSuffix = 0.5301.0 compat >= 0 devel:libgthread_2.0$secondaryArchSuffix = 0.5301.0 compat >= 0 " - REQUIRES_devel=" glib2$secondaryArchSuffix == $portVersion base devel:libffi$secondaryArchSuffix diff --git a/dev-libs/glib/glib2-2.53.5.recipe b/dev-libs/glib/glib2-2.53.5.recipe index aa69ba4ba..86fc9e525 100644 --- a/dev-libs/glib/glib2-2.53.5.recipe +++ b/dev-libs/glib/glib2-2.53.5.recipe @@ -71,7 +71,6 @@ PROVIDES_devel=" devel:libgobject_2.0$secondaryArchSuffix = 0.5305.0 compat >= 0 devel:libgthread_2.0$secondaryArchSuffix = 0.5305.0 compat >= 0 " - REQUIRES_devel=" glib2$secondaryArchSuffix == $portVersion base devel:libffi$secondaryArchSuffix diff --git a/dev-libs/gnulib/gnulib-2013_12_17.recipe b/dev-libs/gnulib/gnulib-2013_12_17.recipe index 700921c60..4b69b90a3 100644 --- a/dev-libs/gnulib/gnulib-2013_12_17.recipe +++ b/dev-libs/gnulib/gnulib-2013_12_17.recipe @@ -16,6 +16,7 @@ REVISION="1" SOURCE_URI="https://github.com/coreutils/gnulib/archive/6cc32c63e80bc1a30c521b2f07f2b54909b59892.tar.gz" CHECKSUM_SHA256="fa9f4b8756b303e45703b7b62f552ea02d97fe4b38c197fa115f4133bb777ca7" SOURCE_DIR="gnulib-6cc32c63e80bc1a30c521b2f07f2b54909b59892" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/dev-libs/kdiagram/kdiagram-2.6.0.recipe b/dev-libs/kdiagram/kdiagram-2.6.0.recipe index f8ee0afff..03132ebce 100644 --- a/dev-libs/kdiagram/kdiagram-2.6.0.recipe +++ b/dev-libs/kdiagram/kdiagram-2.6.0.recipe @@ -17,7 +17,6 @@ PROVIDES=" lib:libKChart$secondaryArchSuffix = $portVersion lib:libKGantt$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix @@ -31,7 +30,6 @@ PROVIDES_devel=" devel:libKChart$secondaryArchSuffix = $portVersion devel:libKGantt$secondaryArchSuffix = $portVersion " - REQUIRES_devel=" kdiagram$secondaryArchSuffix == $portVersion base " diff --git a/dev-libs/kproperty/kproperty-3.1.0.recipe b/dev-libs/kproperty/kproperty-3.1.0.recipe index 8d8cde60b..96a2ec54e 100644 --- a/dev-libs/kproperty/kproperty-3.1.0.recipe +++ b/dev-libs/kproperty/kproperty-3.1.0.recipe @@ -16,7 +16,6 @@ PROVIDES=" lib:libKPropertyCore3$secondaryArchSuffix = $portVersion compat >= 3 lib:libKPropertyWidgets3$secondaryArchSuffix = $portVersion compat >= 3 " - REQUIRES=" haiku$secondaryArchSuffix lib:libKF5ConfigCore$secondaryArchSuffix @@ -32,7 +31,6 @@ PROVIDES_devel=" devel:libKPropertyCore3$secondaryArchSuffix = $portVersion compat >= 3 devel:libKPropertyWidgets3$secondaryArchSuffix = $portVersion compat >= 3 " - REQUIRES_devel=" kproperty$secondaryArchSuffix == $portVersion base " @@ -47,7 +45,6 @@ BUILD_REQUIRES=" devel:libKF5WidgetsAddons$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix >= 5.7 " - BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix diff --git a/dev-libs/kreport/kreport-3.1.0.recipe b/dev-libs/kreport/kreport-3.1.0.recipe index 7535c52b4..418be1c6f 100644 --- a/dev-libs/kreport/kreport-3.1.0.recipe +++ b/dev-libs/kreport/kreport-3.1.0.recipe @@ -20,7 +20,6 @@ PROVIDES=" kreport$secondaryArchSuffix = $portVersion lib:libKReport3$secondaryArchSuffix = $portVersion compat >= 3 " - REQUIRES=" haiku$secondaryArchSuffix lib:libKF5ConfigCore$secondaryArchSuffix @@ -38,7 +37,6 @@ PROVIDES_devel=" kreport${secondaryArchSuffix}_devel = $portVersion devel:libKReport3$secondaryArchSuffix = $portVersion compat >= 3 " - REQUIRES_devel=" kreport$secondaryArchSuffix == $portVersion base " @@ -55,7 +53,6 @@ BUILD_REQUIRES=" devel:libQt5Core$secondaryArchSuffix >= 5.7 devel:libQt5WebKitWidgets$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix diff --git a/dev-libs/libiodbc/libiodbc-3.52.12.recipe b/dev-libs/libiodbc/libiodbc-3.52.12.recipe index 6f860b7c9..3f7bf3534 100644 --- a/dev-libs/libiodbc/libiodbc-3.52.12.recipe +++ b/dev-libs/libiodbc/libiodbc-3.52.12.recipe @@ -37,6 +37,7 @@ PROVIDES_devel=" REQUIRES_devel=" libiodbc$secondaryArchSuffix == $portVersion base " + BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix diff --git a/dev-libs/liboil/liboil-0.3.17.recipe b/dev-libs/liboil/liboil-0.3.17.recipe index 8d591d60b..ebbe50282 100644 --- a/dev-libs/liboil/liboil-0.3.17.recipe +++ b/dev-libs/liboil/liboil-0.3.17.recipe @@ -38,7 +38,6 @@ BUILD_REQUIRES=" haiku_devel devel:libglib_2.0 " - BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf diff --git a/dev-libs/libsigc++/libsigc++-2.4.1.recipe b/dev-libs/libsigc++/libsigc++-2.4.1.recipe index 7b6386cb9..4a1bfb86f 100644 --- a/dev-libs/libsigc++/libsigc++-2.4.1.recipe +++ b/dev-libs/libsigc++/libsigc++-2.4.1.recipe @@ -5,7 +5,6 @@ global or a member function, regardless of whether it is static or virtual. It also contains adaptor classes for connection of dissimilar callbacks and \ has an ease of use unmatched by other C++ callback libraries." - HOMEPAGE="http://libsigc.sourceforge.net/stable.shtml" COPYRIGHT="2002-2015 The libsigc++ Development Team" LICENSE="GNU LGPL v2.1" diff --git a/dev-libs/libtar/libtar-1.2.20.recipe b/dev-libs/libtar/libtar-1.2.20.recipe index 563d10cd8..a48a80b7d 100644 --- a/dev-libs/libtar/libtar-1.2.20.recipe +++ b/dev-libs/libtar/libtar-1.2.20.recipe @@ -28,6 +28,7 @@ PROVIDES=" REQUIRES=" haiku${secondaryArchSuffix} " + PROVIDES_devel=" libtar${secondaryArchSuffix}_devel = $portVersion devel:libtar$secondaryArchSuffix = 0.0.0 @@ -35,6 +36,7 @@ PROVIDES_devel=" REQUIRES_devel=" libtar$secondaryArchSuffix == $portVersion base " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " diff --git a/dev-libs/zziplib/zziplib-0.13.67.recipe b/dev-libs/zziplib/zziplib-0.13.67.recipe index a348c5c63..8bf8d2805 100644 --- a/dev-libs/zziplib/zziplib-0.13.67.recipe +++ b/dev-libs/zziplib/zziplib-0.13.67.recipe @@ -8,7 +8,6 @@ LICENSE="GNU LGPL v2.1 REVISION="2" SOURCE_URI="https://github.com/gdraheim/zziplib/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="1278178bdabac832da6bbf161033d890d335a2e38493c5af553ff5ce7b9b0220" - PATCHES="zziplib-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -67,10 +66,12 @@ BUILD_PREREQUIRES=" cmd:xmlto cmd:zip " + PATCH() { sed -i 's/\--export-dynamic/\-export-dynamic/' configure.ac } + BUILD() { libtoolize -fci