From 0e1cc087a86787fe3aa57f51f55e41dd4497b8dd Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Tue, 16 Jan 2018 19:24:42 +0100 Subject: [PATCH] perl-Text-Bidi: fix build fribidi_uint32 has been renamed in https://github.com/fribidi/fribidi/commit/90325b276006f2cf344c77f00db541437345cff9 . --- .../patches/fribidi-type-fix.patch | 47 +++++++++++++++++++ srcpkgs/perl-Text-Bidi/template | 4 +- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/perl-Text-Bidi/patches/fribidi-type-fix.patch diff --git a/srcpkgs/perl-Text-Bidi/patches/fribidi-type-fix.patch b/srcpkgs/perl-Text-Bidi/patches/fribidi-type-fix.patch new file mode 100644 index 00000000000..557ad18177e --- /dev/null +++ b/srcpkgs/perl-Text-Bidi/patches/fribidi-type-fix.patch @@ -0,0 +1,47 @@ +--- private.c.orig 2018-01-16 19:16:59.014506195 +0100 ++++ private.c 2018-01-16 19:21:35.115406026 +0100 +@@ -2389,7 +2389,7 @@ + *_global_p_len = (FriBidiStrIndex)(size1/sizeof(FriBidiCharType)); + arg1 = (FriBidiCharType *)(buf1); + +- result = fribidi_get_par_direction((fribidi_uint32 const *)arg1,arg2); ++ result = fribidi_get_par_direction((uint32_t const *)arg1,arg2); + ST(argvi) = SWIG_From_unsigned_SS_long SWIG_PERL_CALL_ARGS_1((unsigned long)(result)); argvi++ ; + + +@@ -2455,7 +2455,7 @@ + Newx(*temp4, ((*_global_p_len) + 1), FriBidiLevel); + + _saved[0] = ST(1); +- result = (FriBidiLevel)fribidi_get_par_embedding_levels((fribidi_uint32 const *)arg1,arg2,arg3,arg4); ++ result = (FriBidiLevel)fribidi_get_par_embedding_levels((uint32_t const *)arg1,arg2,arg3,arg4); + ST(argvi) = SWIG_From_signed_SS_char SWIG_PERL_CALL_ARGS_1((signed char)(result)); argvi++ ; + if (SWIG_IsTmpObj(res3)) { + if (argvi >= items) EXTEND(sp,1); ST(argvi) = SWIG_From_unsigned_SS_long SWIG_PERL_CALL_ARGS_1((*arg3)); argvi++ ; +@@ -2555,7 +2555,7 @@ + Newx(*temp6, ((*_global_p_len) + 1), FriBidiLevel); + + _saved[0] = ST(5); +- result = (FriBidiLevel)fribidi_reorder_line(arg1,(fribidi_uint32 const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8); ++ result = (FriBidiLevel)fribidi_reorder_line(arg1,(uint32_t const *)arg2,arg3,arg4,arg5,arg6,arg7,arg8); + ST(argvi) = SWIG_From_signed_SS_char SWIG_PERL_CALL_ARGS_1((signed char)(result)); argvi++ ; + + // printf("Pushing into arg6\n"); +@@ -2629,7 +2629,7 @@ + + _saved[0] = ST(1); + _saved[1] = ST(2); +- fribidi_join_arabic((fribidi_uint32 const *)arg1,arg2,(signed char const *)arg3,arg4); ++ fribidi_join_arabic((uint32_t const *)arg1,arg2,(signed char const *)arg3,arg4); + ST(argvi) = sv_newmortal(); + + +@@ -2894,7 +2894,7 @@ + + _saved[0] = ST(5); + _saved[1] = ST(6); +- result = (FriBidiLevel)reorder_map(arg1,(fribidi_uint32 const *)arg2,arg3,arg4,arg5,arg6,arg7); ++ result = (FriBidiLevel)reorder_map(arg1,(uint32_t const *)arg2,arg3,arg4,arg5,arg6,arg7); + ST(argvi) = SWIG_From_signed_SS_char SWIG_PERL_CALL_ARGS_1((signed char)(result)); argvi++ ; + + MXPUSHUA(arg6, (*_global_p_len)) diff --git a/srcpkgs/perl-Text-Bidi/template b/srcpkgs/perl-Text-Bidi/template index 619fbc619b6..0e4262d749d 100644 --- a/srcpkgs/perl-Text-Bidi/template +++ b/srcpkgs/perl-Text-Bidi/template @@ -1,11 +1,11 @@ # Template file for 'perl-Text-Bidi' pkgname=perl-Text-Bidi version=2.12 -revision=2 +revision=3 wrksrc="${pkgname#*-}-${version}" build_style=perl-module hostmakedepends="perl fribidi-devel" -makedepends="perl fribidi-devel" +makedepends="perl fribidi-devel perl-ExtUtils-PkgConfig" depends="perl" noarch=yes short_desc="Text::Bidi - Unicode bidi algorithm using libfribidi"