CVS commit: pkgsrc/converters

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/converters
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Wed, 7 Jun 2017 14:33:24 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Jun  7 14:33:24 UTC 2017

Modified Files:
        pkgsrc/converters/p5-Sereal-Decoder: distinfo
        pkgsrc/converters/p5-Sereal-Encoder: distinfo
        pkgsrc/converters/p5-Unicode-Collate: distinfo
        pkgsrc/converters/p5-Unicode-Normalize: distinfo
Added Files:
        pkgsrc/converters/p5-Sereal-Decoder/patches: patch-Decoder.xs
        pkgsrc/converters/p5-Sereal-Encoder/patches: patch-Encoder.xs
        pkgsrc/converters/p5-Unicode-Collate/patches: patch-Makefile.PL
        pkgsrc/converters/p5-Unicode-Normalize/patches: patch-Makefile.PL

Log Message:
Fix build with Perl 5.26.0


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/converters/p5-Sereal-Decoder/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/converters/p5-Sereal-Decoder/patches/patch-Decoder.xs
cvs rdiff -u -r1.7 -r1.8 pkgsrc/converters/p5-Sereal-Encoder/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/converters/p5-Sereal-Encoder/patches/patch-Encoder.xs
cvs rdiff -u -r1.16 -r1.17 pkgsrc/converters/p5-Unicode-Collate/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/converters/p5-Unicode-Collate/patches/patch-Makefile.PL
cvs rdiff -u -r1.7 -r1.8 pkgsrc/converters/p5-Unicode-Normalize/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/converters/p5-Unicode-Normalize/patches/patch-Makefile.PL

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/converters/p5-Sereal-Decoder/distinfo
diff -u pkgsrc/converters/p5-Sereal-Decoder/distinfo:1.7 pkgsrc/converters/p5-Sereal-Decoder/distinfo:1.8
--- pkgsrc/converters/p5-Sereal-Decoder/distinfo:1.7    Sun Dec 11 20:30:35 2016
+++ pkgsrc/converters/p5-Sereal-Decoder/distinfo        Wed Jun  7 14:33:23 2017
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2016/12/11 20:30:35 wiedi Exp $
+$NetBSD: distinfo,v 1.8 2017/06/07 14:33:23 ryoon Exp $
 
 SHA1 (Sereal-Decoder-3.014.tar.gz) = 79962f925b2f7dc3920c913d0b033da860a84012
 RMD160 (Sereal-Decoder-3.014.tar.gz) = bc15b504e216305349fd5192f337202d93e21480
 SHA512 (Sereal-Decoder-3.014.tar.gz) = 00ac49d18033fa177fa12d36b0527f327eaed54c96a065783da6c209db24764b4487464312a933ac24d51d94ef79293c0cb1aa938f6e4704a3b0a11b30151e22
 Size (Sereal-Decoder-3.014.tar.gz) = 369546 bytes
+SHA1 (patch-Decoder.xs) = eee3fdd7b81dfdc8494cc0aaac33ca0a26b44e96
 SHA1 (patch-snappy_csnappy__internal__userspace.h) = 604f36231909881d4c424c06cd0b6065b4912006

Index: pkgsrc/converters/p5-Sereal-Encoder/distinfo
diff -u pkgsrc/converters/p5-Sereal-Encoder/distinfo:1.7 pkgsrc/converters/p5-Sereal-Encoder/distinfo:1.8
--- pkgsrc/converters/p5-Sereal-Encoder/distinfo:1.7    Thu Dec 15 01:53:34 2016
+++ pkgsrc/converters/p5-Sereal-Encoder/distinfo        Wed Jun  7 14:33:24 2017
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2016/12/15 01:53:34 wiedi Exp $
+$NetBSD: distinfo,v 1.8 2017/06/07 14:33:24 ryoon Exp $
 
 SHA1 (Sereal-Encoder-3.014.tar.gz) = 8cda51758cd1d22aa307efe8c85423511a12884a
 RMD160 (Sereal-Encoder-3.014.tar.gz) = bef412b1dd0fa8510decd5a048d8bbaf922999cf
 SHA512 (Sereal-Encoder-3.014.tar.gz) = 4891cb9189abe77012d14ba778156806f9d1708bce73015ce4d1d06ce4aa62abd0f9af4f98a64c547e55fa2298770f45aa2b0b99cc00e8e0f6a022df84bb41b8
 Size (Sereal-Encoder-3.014.tar.gz) = 377995 bytes
+SHA1 (patch-Encoder.xs) = 4a0265facb06f768cf73db8f78782b117d37b00c
 SHA1 (patch-snappy_csnappy__internal__userspace.h) = 604f36231909881d4c424c06cd0b6065b4912006

Index: pkgsrc/converters/p5-Unicode-Collate/distinfo
diff -u pkgsrc/converters/p5-Unicode-Collate/distinfo:1.16 pkgsrc/converters/p5-Unicode-Collate/distinfo:1.17
--- pkgsrc/converters/p5-Unicode-Collate/distinfo:1.16  Sun Dec 11 00:39:39 2016
+++ pkgsrc/converters/p5-Unicode-Collate/distinfo       Wed Jun  7 14:33:24 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2016/12/11 00:39:39 wen Exp $
+$NetBSD: distinfo,v 1.17 2017/06/07 14:33:24 ryoon Exp $
 
 SHA1 (Unicode-Collate-1.19.tar.gz) = ab9680d5e1bd23b87e03c70593c40cfdc09a30f2
 RMD160 (Unicode-Collate-1.19.tar.gz) = 94c9580d75d19b5f1abaf470a5d7472873352387
 SHA512 (Unicode-Collate-1.19.tar.gz) = 580bca6e96dd474b223ec9f971d6b8a4fc96d1bbffdc278dfa679d511455940e088f19069647715c2ae7c8e52972a59107cbc6d1bf3537de1c314feab2f4c21b
 Size (Unicode-Collate-1.19.tar.gz) = 886811 bytes
+SHA1 (patch-Makefile.PL) = b87caafb75d18bdb9c6c5462b2f6842c4bcc7aa8

Index: pkgsrc/converters/p5-Unicode-Normalize/distinfo
diff -u pkgsrc/converters/p5-Unicode-Normalize/distinfo:1.7 pkgsrc/converters/p5-Unicode-Normalize/distinfo:1.8
--- pkgsrc/converters/p5-Unicode-Normalize/distinfo:1.7 Wed Apr 13 21:10:11 2016
+++ pkgsrc/converters/p5-Unicode-Normalize/distinfo     Wed Jun  7 14:33:24 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2016/04/13 21:10:11 markd Exp $
+$NetBSD: distinfo,v 1.8 2017/06/07 14:33:24 ryoon Exp $
 
 SHA1 (Unicode-Normalize-1.25.tar.gz) = 607ada7ef05bc1644f7f08d8899fc60988ea4f7e
 RMD160 (Unicode-Normalize-1.25.tar.gz) = 0a05087451efde87f497c97f33e65891336b4b91
 SHA512 (Unicode-Normalize-1.25.tar.gz) = f28c19e0293cf75cc0aab669ae0a0543f6a1a39e1e50ff32ab37abd8e85efc73e8b9075e581212b6da576ecbf8c0e9ddb7b9b352674aa3a04c77f9aaf4717866
 Size (Unicode-Normalize-1.25.tar.gz) = 40530 bytes
+SHA1 (patch-Makefile.PL) = 8124fac4b9786ae579d8013a560ae067648965a7

Added files:

Index: pkgsrc/converters/p5-Sereal-Decoder/patches/patch-Decoder.xs
diff -u /dev/null pkgsrc/converters/p5-Sereal-Decoder/patches/patch-Decoder.xs:1.1
--- /dev/null   Wed Jun  7 14:33:24 2017
+++ pkgsrc/converters/p5-Sereal-Decoder/patches/patch-Decoder.xs        Wed Jun  7 14:33:23 2017
@@ -0,0 +1,67 @@
+$NetBSD: patch-Decoder.xs,v 1.1 2017/06/07 14:33:23 ryoon Exp $
+
+* Fix build with Perl 5.26.0
+  Like devel/p5-Params-Classify/patches/patch-lib_Params_Classify.xs
+
+--- Decoder.xs.orig    2015-11-27 00:15:01.000000000 +0000
++++ Decoder.xs
+@@ -19,6 +19,26 @@
+ #ifndef PERL_ARGS_ASSERT_CROAK_XS_USAGE
+ #define PERL_ARGS_ASSERT_CROAK_XS_USAGE assert(cv); assert(params)
+ 
++#ifndef OpHAS_SIBLING
++#  define OpHAS_SIBLING(o)            (cBOOL((o)->op_sibling))
++#endif
++
++#ifndef OpSIBLING
++#  define OpSIBLING(o)                        (0 + (o)->op_sibling)
++#endif
++
++#ifndef OpMORESIB_set
++#  define OpMORESIB_set(o, sib)               ((o)->op_sibling = (sib))
++#endif
++
++#ifndef OpLASTSIB_set
++#  define OpLASTSIB_set(o, parent)    ((o)->op_sibling = NULL)
++#endif
++
++#ifndef OpMAYBESIB_set
++#  define OpMAYBESIB_set(o, sib, parent)      ((o)->op_sibling = (sib))
++#endif
++
+ /* prototype to pass -Wmissing-prototypes */
+ STATIC void
+ S_croak_xs_usage(pTHX_ const CV *const cv, const char *const params);
+@@ -193,17 +213,17 @@ THX_ck_entersub_args_sereal_decoder(pTHX
+ 
+     entersubop = ck_entersub_args_proto(entersubop, namegv, (SV*)cv);
+     pushop = cUNOPx(entersubop)->op_first;
+-    if ( ! pushop->op_sibling )
++    if ( ! OpHAS_SIBLING(pushop) )
+         pushop = cUNOPx(pushop)->op_first;
+-    firstargop = pushop->op_sibling;
++    firstargop = OpSIBLING(pushop);
+ 
+-    for (cvop = firstargop; cvop->op_sibling; cvop = cvop->op_sibling) ;
++    for (cvop = firstargop; OpHAS_SIBLING(cvop); cvop = OpSIBLING(cvop)) ;
+ 
+     lastargop = pushop;
+     for (
+         arity = 0, lastargop = pushop, argop = firstargop;
+         argop != cvop;
+-        lastargop = argop, argop = argop->op_sibling
++        lastargop = argop, argop = OpSIBLING(argop)
+     ){
+         arity++;
+     }
+@@ -222,8 +242,8 @@ THX_ck_entersub_args_sereal_decoder(pTHX
+     if (arity > min_arity)
+         opopt |= OPOPT_OUTARG_HEADER;
+ 
+-    pushop->op_sibling = cvop;
+-    lastargop->op_sibling = NULL;
++    OpLASTSIB_set(pushop, cvop);
++    OpLASTSIB_set(lastargop, NULL);
+     op_free(entersubop);
+     newop = newUNOP(OP_NULL, 0, firstargop);
+     newop->op_type    = OP_CUSTOM;

Index: pkgsrc/converters/p5-Sereal-Encoder/patches/patch-Encoder.xs
diff -u /dev/null pkgsrc/converters/p5-Sereal-Encoder/patches/patch-Encoder.xs:1.1
--- /dev/null   Wed Jun  7 14:33:24 2017
+++ pkgsrc/converters/p5-Sereal-Encoder/patches/patch-Encoder.xs        Wed Jun  7 14:33:24 2017
@@ -0,0 +1,65 @@
+$NetBSD: patch-Encoder.xs,v 1.1 2017/06/07 14:33:24 ryoon Exp $
+
+* Fix build with Perl 5.26.0
+  Like devel/p5-Params-Classify/patches/patch-lib_Params_Classify.xs
+
+--- Encoder.xs.orig    2015-11-27 01:30:50.000000000 +0000
++++ Encoder.xs
+@@ -20,6 +20,27 @@
+ # define GvCV_set(gv, cv) (GvCV(gv) = (cv))
+ #endif
+ 
++#ifndef OpHAS_SIBLING
++#  define OpHAS_SIBLING(o)            (cBOOL((o)->op_sibling))
++#endif
++
++#ifndef OpSIBLING
++#  define OpSIBLING(o)                        (0 + (o)->op_sibling)
++#endif
++
++#ifndef OpMORESIB_set
++#  define OpMORESIB_set(o, sib)               ((o)->op_sibling = (sib))
++#endif
++
++#ifndef OpLASTSIB_set
++#  define OpLASTSIB_set(o, parent)    ((o)->op_sibling = NULL)
++#endif
++
++#ifndef OpMAYBESIB_set
++#  define OpMAYBESIB_set(o, sib, parent)      ((o)->op_sibling = (sib))
++#endif
++
++
+ #if defined(cv_set_call_checker) && defined(XopENTRY_set)
+ # define USE_CUSTOM_OPS 1
+ #else
+@@ -88,14 +109,14 @@ THX_ck_entersub_args_sereal_encode_with_
+ 
+   entersubop = ck_entersub_args_proto(entersubop, namegv, ckobj);
+   pushop = cUNOPx(entersubop)->op_first;
+-  if (!pushop->op_sibling)
++  if (!OpHAS_SIBLING(pushop))
+     pushop = cUNOPx(pushop)->op_first;
+-  firstargop = pushop->op_sibling;
++  firstargop = OpSIBLING(pushop);
+ 
+-  for (cvop = firstargop; cvop->op_sibling; cvop = cvop->op_sibling) ;
++  for (cvop = firstargop; OpHAS_SIBLING(cvop); cvop = OpSIBLING(cvop)) ;
+ 
+   for (arity = 0, lastargop = pushop, argop = firstargop; argop != cvop;
+-       lastargop = argop, argop = argop->op_sibling)
++       lastargop = argop, argop = OpSIBLING(argop))
+   {
+     arity++;
+   }
+@@ -106,8 +127,8 @@ THX_ck_entersub_args_sereal_encode_with_
+   /* If we get here, we can replace the entersub with a suitable
+    * sereal_encode_with_object custom OP. */
+ 
+-  pushop->op_sibling = cvop;
+-  lastargop->op_sibling = NULL;
++  OpLASTSIB_set(pushop, cvop);
++  OpLASTSIB_set(lastargop, NULL);
+   op_free(entersubop);
+   newop = newUNOP(OP_NULL, 0, firstargop);
+   newop->op_type    = OP_CUSTOM;

Index: pkgsrc/converters/p5-Unicode-Collate/patches/patch-Makefile.PL
diff -u /dev/null pkgsrc/converters/p5-Unicode-Collate/patches/patch-Makefile.PL:1.1
--- /dev/null   Wed Jun  7 14:33:24 2017
+++ pkgsrc/converters/p5-Unicode-Collate/patches/patch-Makefile.PL      Wed Jun  7 14:33:24 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.PL,v 1.1 2017/06/07 14:33:24 ryoon Exp $
+
+* FIx build with Perl 5.26.0
+
+--- Makefile.PL.orig   2016-12-03 00:33:01.000000000 +0000
++++ Makefile.PL
+@@ -6,7 +6,7 @@ my $clean = {};
+ if (-f "Collate.xs") {
+     print "Making header files for XS...\n";
+ 
+-    do 'mkheader' or die $@ || "mkheader: $!";
++    do './mkheader' or die $@ || "mkheader: $!";
+ 
+     $clean = { FILES => 'ucatbl.h' };
+ }

Index: pkgsrc/converters/p5-Unicode-Normalize/patches/patch-Makefile.PL
diff -u /dev/null pkgsrc/converters/p5-Unicode-Normalize/patches/patch-Makefile.PL:1.1
--- /dev/null   Wed Jun  7 14:33:24 2017
+++ pkgsrc/converters/p5-Unicode-Normalize/patches/patch-Makefile.PL    Wed Jun  7 14:33:24 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.PL,v 1.1 2017/06/07 14:33:24 ryoon Exp $
+
+* Fix build with Perl 5.26.0
+
+--- Makefile.PL.orig   2015-12-16 02:02:23.000000000 +0000
++++ Makefile.PL
+@@ -8,7 +8,7 @@ my $mm_ver = ExtUtils::MakeMaker->VERSIO
+ if (-f "Normalize.xs") {
+     print STDERR "Making header files for XS...\n";
+ 
+-    do 'mkheader' or die $@ || "mkheader: $!";
++    do './mkheader' or die $@ || "mkheader: $!";
+ 
+     $clean = { FILES => 'unfcan.h unfcmb.h unfcmp.h unfcpt.h unfexc.h' };
+ }

Prev by Date: CVS commit: pkgsrc/comms
Next by Date: CVS commit: pkgsrc/databases
Previous by Thread: CVS commit: pkgsrc/comms
Next by Thread: CVS commit: pkgsrc/databases
Indexes:

Home | Main Index | Thread Index | Old Index