diff --git a/dev-libs/fribidi/fribidi-0.19.7.recipe b/dev-libs/fribidi/fribidi-0.19.7.recipe deleted file mode 100644 index 967cc0128..000000000 --- a/dev-libs/fribidi/fribidi-0.19.7.recipe +++ /dev/null @@ -1,90 +0,0 @@ -SUMMARY="A free implementation of the unicode bidirectional algorithm" -DESCRIPTION=" -This is GNU FriBidi. The Free Implementation of the Unicode Bidirectional \ -Algorithm. One of the missing links stopping the penetration of free software \ -in Middle East is the lack of support for the Arabic and Hebrew alphabets. In \ -order to have proper Arabic and Hebrew support, the BiDi algorithm should have \ -been implemented. It is our hope that this library will stimulate more free \ -software in the Middle Eastern countries. -" -HOMEPAGE="https://github.com/fribidi/fribidi" -COPYRIGHT="2004 Sharif FarsiWeb, Inc - 2001,2002 Behdad Esfahbod - 1999,2000 Dov Grobgeld" -LICENSE="GNU LGPL v2.1" -REVISION="4" -SOURCE_URI="https://github.com/fribidi/fribidi/releases/download/$portVersion/fribidi-$portVersion.tar.bz2" -CHECKSUM_SHA256="08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PROVIDES=" - fribidi$secondaryArchSuffix = $portVersion - cmd:fribidi$secondaryArchSuffix = $portVersion compat >= 0.19 - lib:libfribidi$secondaryArchSuffix = 0.3.6 compat >= 0 - " -REQUIRES=" - haiku$secondaryArchSuffix - " - -PROVIDES_devel=" - fribidi${secondaryArchSuffix}_devel = $portVersion - devel:libfribidi$secondaryArchSuffix = 0.3.6 compat >= 0 - " -REQUIRES_devel=" - fribidi$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -PATCH() -{ - sed -i 's/PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION/#/' configure.ac - sed -i 's/FRIBIDI_USE_GLIB=1/FRIBIDI_USE_GLIB=0/' configure.ac - sed -i 's/FRIBIDI_USE_GLIB=0)/#/' configure.ac - sed -i 's/@MISC_PACKAGES@//' fribidi.pc.in -} - -BUILD() -{ - libtoolize --force --copy --install - aclocal - autoconf - automake --add-missing - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install - - rm $libDir/libfribidi.la - - prepareInstalledDevelLibs \ - libfribidi - - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir -} - -TEST() -{ - make test -} diff --git a/dev-libs/fribidi/fribidi-1.0.5.recipe b/dev-libs/fribidi/fribidi-1.0.7.recipe similarity index 92% rename from dev-libs/fribidi/fribidi-1.0.5.recipe rename to dev-libs/fribidi/fribidi-1.0.7.recipe index 62ca299bf..bc41c02f1 100644 --- a/dev-libs/fribidi/fribidi-1.0.5.recipe +++ b/dev-libs/fribidi/fribidi-1.0.7.recipe @@ -12,10 +12,7 @@ COPYRIGHT="2004-2018 Sharif FarsiWeb, Inc LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://github.com/fribidi/fribidi/releases/download/v$portVersion/fribidi-$portVersion.tar.bz2" -CHECKSUM_SHA256="6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce" -if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then - PATCHES="fribidi-$portVersion.patchset" -fi +CHECKSUM_SHA256="5ab5f21e9f2fc57b4b40f8ea8f14dba78a5cc46d9cf94bc5e00a58e6886a935d" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" diff --git a/dev-libs/fribidi/patches/fribidi-1.0.5.patchset b/dev-libs/fribidi/patches/fribidi-1.0.5.patchset deleted file mode 100644 index 56a67a5dc..000000000 --- a/dev-libs/fribidi/patches/fribidi-1.0.5.patchset +++ /dev/null @@ -1,51 +0,0 @@ -From 1292c4a49b40e9c9399d0f8309edec89030ff8c9 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Tue, 11 Sep 2018 14:07:50 +0200 -Subject: gcc2 fixes for the tests - - -diff --git a/test/unicode-conformance/BidiCharacterTest.c b/test/unicode-conformance/BidiCharacterTest.c -index cf3f676..462e63b 100644 ---- a/test/unicode-conformance/BidiCharacterTest.c -+++ b/test/unicode-conformance/BidiCharacterTest.c -@@ -263,6 +263,7 @@ main (int argc, char **argv) - FriBidiStrIndex *ltor = NULL; - int ltor_len; - int debug = FALSE; -+ int len; - - if (argc < 2) - { -@@ -290,7 +291,7 @@ main (int argc, char **argv) - - while (!feof(channel)) { - fgets(line, LINE_SIZE, channel); -- int len = strlen(line); -+ len = strlen(line); - if (len == LINE_SIZE-1) - die("LINE_SIZE=%d too small at line %d!\n", LINE_SIZE, line_no); - -diff --git a/test/unicode-conformance/BidiTest.c b/test/unicode-conformance/BidiTest.c -index 5f931f1..26c895a 100644 ---- a/test/unicode-conformance/BidiTest.c -+++ b/test/unicode-conformance/BidiTest.c -@@ -271,6 +271,7 @@ main (int argc, char **argv) - int debug = FALSE; - const char *filename; - int next_arg; -+ int len; - - if (argc < 2) - die ("usage: %s [--debug] test-file-name\n", argv[0]); -@@ -289,7 +290,7 @@ main (int argc, char **argv) - - while (!feof(channel)) { - fgets(line, LINE_SIZE, channel); -- int len = strlen(line); -+ len = strlen(line); - if (len == LINE_SIZE-1) - die("LINE_SIZE too small at line %d!\n", line_no); - --- -2.16.4 -