Ticket #71162: xar.diff

File xar.diff, 4.0 KB (added by ryandesign (Ryan Carsten Schmidt), 15 months ago)

work in progress

  • archivers/xar/Portfile 

    diff --git a/archivers/xar/Portfile b/archivers/xar/Portfile
index 918e4a29cd8..c8253469217 100644
    a b PortSystem 1.0 
    44PortGroup           clang_dependency 1.0
    55PortGroup           github 1.0
    66
    7 platform darwin {
    8     if {${os.major} <= 22} {
    9         set apple_version   498
    10     } else {
    11         set apple_version   501
    12     }
    13 }
    14 
    15 github.setup        apple-oss-distributions xar ${apple_version} xar-
    16 version             1.8.0.${apple_version}
    17 revision            0
     7github.setup        apple-oss-distributions xar 501 xar-
     8version             1.8.0.${github.version}
     9revision            1
     10checksums           rmd160  9a30fb4730de5bb8d70ff2692d7276d7f586ef50 \
     11                    sha256  6a9257017243c78d37e3788717259e53ffd33d93c740c12754e8527943fe892d \
     12                    size    224936
    1813
    1914categories          archivers sysutils
    2015license             BSD
    … … description xar is the eXtensible ARchiver 
    2217long_description    {*}${description}
    2318maintainers         {mps @Schamschula} openmaintainer
    2419
    25 distname            ${name}-${apple_version}
    26 
    2720worksrcdir          ${distname}/xar
    2821
    29 platform darwin {
    30     if {${os.major} <= 22} {
    31         checksums   rmd160  0471deb9e01c91658feb4ea120772f7478f5c350 \
    32                     sha256  34f2e97c6786d2994af30fd72447ff1ac53f4052391a1030424da291f26c44f4 \
    33                     size    224456
    34 
    35         # see: https://trac.macports.org/ticket/64837
    36         patchfiles  patch-src-xar_internal.h.old.diff
    37     } else {
    38         checksums   rmd160  9a30fb4730de5bb8d70ff2692d7276d7f586ef50 \
    39                     sha256  6a9257017243c78d37e3788717259e53ffd33d93c740c12754e8527943fe892d \
    40                     size    224936
    41 
    42         # see: https://trac.macports.org/ticket/64837
    43         patchfiles  patch-src-xar_internal.h.diff
    44     }
    45 }
    46 
    47 depends_build       port:pkgconfig \
    48                     port:automake
     22depends_build       port:automake \
     23                    path:bin/pkg-config:pkgconfig
    4924
    5025depends_lib         path:lib/libssl.dylib:openssl \
    5126                    port:bzip2 \
    … … patchfiles-append patch-stdout.diff 
    7146# see: https://trac.macports.org/ticket/64826
    7247patchfiles-append   patch-include-xar.h.in.diff
    7348
     49# see: https://trac.macports.org/ticket/64837
     50patchfiles          patch-src-xar_internal.h.diff
     51
    7452# see: https://trac.macports.org/ticket/65128
    7553patchfiles-append   patch-lib-filetree.c.diff
    7654
    … … post-patch { 
    8563}
    8664
    8765use_autoconf        yes
     66
     67# https://trac.macports.org/ticket/71162
     68configure.cppflags-append \
     69                    -DXARSIG_BUILDING_WITH_XAR

  • archivers/xar/files/patch-lib-filetree.c.diff 

    diff --git a/archivers/xar/files/patch-lib-filetree.c.diff b/archivers/xar/files/patch-lib-filetree.c.diff
index 6c528b8feae..7eee71d849c 100644
    a b  
    1 --- lib/filetree.c.orig 2022-05-03 23:39:20.000000000 -0500
    2 +++ lib/filetree.c      2022-05-08 06:01:32.000000000 -0500
    3 @@ -740,7 +740,8 @@
     1--- lib/filetree.c.orig 2024-09-24 15:39:21.000000000 -0500
     2+++ lib/filetree.c      2024-10-23 20:06:12.000000000 -0500
     3@@ -752,7 +752,8 @@
    44        size_t fspath1_size = 0, fspath2_size = 0;
    55        size_t ns1_size = 0, ns2_size = 0;
    66        const struct __xar_file_t * child1 = NULL, * child2 = NULL;

  • archivers/xar/files/patch-stdout.diff 

    diff --git a/archivers/xar/files/patch-stdout.diff b/archivers/xar/files/patch-stdout.diff
index ec211bed758..37f92f96e31 100644
    a b https://github.com/mackyle/xar/commit/ddea2e4b53b6b2cfdd0d13c6beaac0978330c2a2 2 
    106106 
    107107--- src/xar.c.orig      2022-03-10 05:12:27.000000000 -0600
    108108+++ src/xar.c   2022-03-10 05:39:41.000000000 -0600
    109 @@ -53,8 +53,10 @@
    110  #include "config.h"
    111  #include "../lib/filetree.h"
     109@@ -55,6 +55,7 @@
    112110 #include "util.h"
    113 +#include "xar.h"
    114111 #define SYMBOLIC 1
    115112 #define NUMERIC  2
    116113+#define XAR_OPT_EXTRACTSTDOUT  "extract-stdout" /* Extract data to stdout instead of file (true/false) */