From 7333d524a701d5fcc563b14f53a48b7249532b52 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 9 Mar 2023 07:13:27 +0100 Subject: [PATCH] pkgdiff: new port for 1.7.2 (#7927) --- .../pkgdiff/patches/pkgdiff-1.7.2.patchset | 84 +++++++++++++++++++ dev-util/pkgdiff/pkgdiff-1.7.2.recipe | 41 +++++++++ 2 files changed, 125 insertions(+) create mode 100644 dev-util/pkgdiff/patches/pkgdiff-1.7.2.patchset create mode 100644 dev-util/pkgdiff/pkgdiff-1.7.2.recipe diff --git a/dev-util/pkgdiff/patches/pkgdiff-1.7.2.patchset b/dev-util/pkgdiff/patches/pkgdiff-1.7.2.patchset new file mode 100644 index 000000000..a8b54f684 --- /dev/null +++ b/dev-util/pkgdiff/patches/pkgdiff-1.7.2.patchset @@ -0,0 +1,84 @@ +From fb23681de30df94c26aff58522b505782e8718a9 Mon Sep 17 00:00:00 2001 +From: Peter van Dijk +Date: Tue, 7 Mar 2023 21:26:30 +0000 +Subject: change share/ path to data/ + + +diff --git a/Makefile.pl b/Makefile.pl +index a484883..f7fe23d 100644 +--- a/Makefile.pl ++++ b/Makefile.pl +@@ -148,8 +148,8 @@ sub scenario() + + # paths + my $EXE_PATH = "$PREFIX/bin"; +- my $MODULES_PATH = "$PREFIX/share/$TOOL_SNAME"; +- my $REL_PATH = "../share/$TOOL_SNAME"; ++ my $MODULES_PATH = "$PREFIX/data/$TOOL_SNAME"; ++ my $REL_PATH = "../data/$TOOL_SNAME"; + + if(not -w $PREFIX) + { +diff --git a/pkgdiff.pl b/pkgdiff.pl +index a56cf98..f9e7443 100644 +--- a/pkgdiff.pl ++++ b/pkgdiff.pl +@@ -483,7 +483,7 @@ sub get_Modules() + # tool's directory + abs_path($TOOL_DIR), + # relative path to modules +- abs_path($TOOL_DIR)."/../share/pkgdiff", ++ abs_path($TOOL_DIR)."/../data/pkgdiff", + # system directory + 'MODULES_INSTALL_PATH' + ); +-- +2.37.3 + + +From 03828d10ff151633414b90849a052b40423115f6 Mon Sep 17 00:00:00 2001 +From: Peter van Dijk +Date: Tue, 7 Mar 2023 21:38:00 +0000 +Subject: add support for diffing haiku .hpkg + +(upstreamed for master instead of 1.7.2 at https://github.com/lvc/pkgdiff/pull/58) + +diff --git a/modules/FileType.xml b/modules/FileType.xml +index 59e4882..f29981c 100644 +--- a/modules/FileType.xml ++++ b/modules/FileType.xml +@@ -3780,6 +3780,7 @@ + tar.lz, tlz, zip, zae, tar, lzma, gz + jar, war, ear, xz, 7z, rar, sfx, ace + bz, bz2, zipx ++ hpkg + + + 10 +diff --git a/pkgdiff.pl b/pkgdiff.pl +index f9e7443..d451ed7 100644 +--- a/pkgdiff.pl ++++ b/pkgdiff.pl +@@ -468,7 +468,8 @@ my %ArchiveFormats = ( + "XZ" => ["xz"], + + "JAR" => ["jar", "war", +- "ear"] ++ "ear"], ++ "HPKG" => ["hpkg"] + ); + + my $ARCHIVE_EXT = getArchivePattern(); +@@ -2909,6 +2910,9 @@ sub unpackArchive($$) + elsif($Format eq "JAR") { + $Cmd = "cd \"$OutDir\" && jar -xf \"$Pkg\""; + } ++ elsif($Format eq "HPKG") { ++ $Cmd = "cd \"$OutDir\" && package extract \"$Pkg\""; ++ } + else { + return ""; + } +-- +2.37.3 + diff --git a/dev-util/pkgdiff/pkgdiff-1.7.2.recipe b/dev-util/pkgdiff/pkgdiff-1.7.2.recipe new file mode 100644 index 000000000..efe5034df --- /dev/null +++ b/dev-util/pkgdiff/pkgdiff-1.7.2.recipe @@ -0,0 +1,41 @@ +SUMMARY="Tool for visualizing changes in software packages" +DESCRIPTION=" Package changes analyzer is a tool for visualizing changes in \ +software packages (RPM, DEB, tar.gz, hpkg, .etc). \ +The tool is intended for maintainers who are interested in ensuring \ +compatibility of old and new versions of packages. \ +The tool generates HTML reports to visualize the changes between two packages." +HOMEPAGE="https://lvc.github.io/pkgdiff/" +COPYRIGHT="2012-2016 Andrey Ponomarenko's ABI Laboratory" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://github.com/lvc/pkgdiff/archive/$portVersion.tar.gz" +CHECKSUM_SHA256="d0ef5c8ef04f019f00c3278d988350201becfbe40d04b734defd5789eaa0d321" +SOURCE_FILENAME="pkgdiff-$portVersion.tar.gz" +PATCHES="pkgdiff-$portVersion.patchset" + +ARCHITECTURES="all" + +PROVIDES=" + pkgdiff = $portVersion + cmd:pkgdiff = $portVersion + " +REQUIRES=" + haiku + cmd:awk + cmd:diff + cmd:readelf + cmd:wdiff + " + +BUILD_REQUIRES=" + haiku_devel + " + +BUILD_PREREQUIRES=" + cmd:perl + " + +INSTALL() +{ + perl Makefile.pl --install --prefix=$prefix +}