Re: [PR PATCH] [Updated] fpc: update to version 3.2.2

[f-fr <f-fr@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1327 bytes --]

There is an updated pull request by f-fr against master on the void-packages repository

https://github.com/f-fr/void-packages fpc
https://github.com/void-linux/void-packages/pull/54095

fpc: update to version 3.2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

#### Changes
- this PR also changes the `fpc-src` package, which is now a subpackage of `fpc`. The sources are extracted from exactly the same file, so this is a natural choice (and it ensures that both packages have the same version).

A patch file from https://github.com/void-linux/void-packages/pull/54095.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fpc-54095.patch --]
[-- Type: text/x-diff, Size: 5130 bytes --]

From 0a7ddb81d7fb4f44d5239c843871b5cbc48d89ce Mon Sep 17 00:00:00 2001
From: Frank Fischer <frank-fischer@shadow-soft.de>
Date: Sat, 25 Jan 2025 09:10:26 +0100
Subject: [PATCH] fpc: update to version 3.2.2

---
 srcpkgs/fpc-src                 |  1 +
 srcpkgs/fpc-src/template        | 16 ----------------
 srcpkgs/fpc/patches/ppc64.patch | 15 +++------------
 srcpkgs/fpc/template            | 23 +++++++++++++++--------
 4 files changed, 19 insertions(+), 36 deletions(-)
 create mode 120000 srcpkgs/fpc-src
 delete mode 100644 srcpkgs/fpc-src/template

diff --git a/srcpkgs/fpc-src b/srcpkgs/fpc-src
new file mode 120000
index 00000000000000..c09ca2f14bfff2
--- /dev/null
+++ b/srcpkgs/fpc-src
@@ -0,0 +1 @@
+fpc
\ No newline at end of file
diff --git a/srcpkgs/fpc-src/template b/srcpkgs/fpc-src/template
deleted file mode 100644
index 7ac97ba438f192..00000000000000
--- a/srcpkgs/fpc-src/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'fpc-src'
-pkgname=fpc-src
-version=3.2.0
-revision=1
-short_desc="Source code for FreePascal compiler"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.0-or-later"
-homepage="https://www.freepascal.org"
-distfiles="ftp://ftp.freepascal.org/pub/fpc/dist/${version}/source/fpcbuild-${version}.tar.gz"
-checksum=f9b914eace989a023fb953da203dc0d973b44487568b4138c7d5b9613d7d6838
-nostrip=yes
-
-do_install() {
-	vmkdir usr/lib/fpc/src
-	vcopy fpcsrc/* usr/lib/fpc/src
-}
diff --git a/srcpkgs/fpc/patches/ppc64.patch b/srcpkgs/fpc/patches/ppc64.patch
index 624f6cdc0fbf4b..a69c105cdbdb13 100644
--- a/srcpkgs/fpc/patches/ppc64.patch
+++ b/srcpkgs/fpc/patches/ppc64.patch
@@ -1,14 +1,6 @@
-commit 5120237db67c066764563df36fcf171699ff7c6f
-Author: q66 <daniel@octaforge.org>
-Date:   Mon Apr 5 01:50:14 2021 +0200
-
-    always use elfv2 abi by default on ppc64
-
-diff --git fpcsrc/compiler/options.pas fpcsrc/compiler/options.pas
-index 2cc36670..c35cc785 100644
---- fpcbuild-3.2.0/fpcsrc/compiler/options.pas
-+++ fpcbuild-3.2.0/fpcsrc/compiler/options.pas
-@@ -4299,13 +4299,8 @@ begin
+--- fpcbuild-3.2.2/fpcsrc/compiler/options.pas      2025-01-24 14:32:37.789605380 +0100
++++ fpcbuild-3.2.2/fpcsrc/compiler/options.pas      2025-01-24 14:33:32.402495333 +0100
+@@ -4324,13 +4324,8 @@
       likely to fail in spectacular ways" }
    if not option.ABISetExplicitly then
      begin
@@ -22,4 +14,3 @@ index 2cc36670..c35cc785 100644
 -        target_info.abi:=abi_powerpc_sysv
      end;
  {$endif}
- 
diff --git a/srcpkgs/fpc/template b/srcpkgs/fpc/template
index ce6a0c01cb173a..7aac80ae1eedbc 100644
--- a/srcpkgs/fpc/template
+++ b/srcpkgs/fpc/template
@@ -1,6 +1,6 @@
 # Template file for 'fpc'
 pkgname=fpc
-version=3.2.0
+version=3.2.2
 revision=1
 archs="x86_64* i686* ppc64le ppc64 ppc"
 build_wrksrc="${pkgname}build-${version}"
@@ -11,27 +11,27 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://freepascal.org/"
 distfiles="${SOURCEFORGE_SITE}/freepascal/Source/${version}/${pkgname}build-${version}.tar.gz"
-checksum=f9b914eace989a023fb953da203dc0d973b44487568b4138c7d5b9613d7d6838
+checksum="85ef993043bb83f999e2212f1bca766eb71f6f973d362e2290475dbaaf50161f"
 case "$XBPS_TARGET_MACHINE" in
 x86_64*)
 	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}-1.x86_64.rpm"
-	checksum+=" 1f74e1ad3ced2dd67688fdb92edd42e73cdc31ef96056f8739449d70a9306f2c"
+	checksum+=" c99548926f98537debd9f63af0fa3b1b357adfb21059bef358650ecffa988328"
 	;;
 i686*)
 	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}-1.i686.rpm"
-	checksum+=" 05c5600c9461362a08df100cf50ca125cb2b4d5bfe4da48cf8c144f2bf4617a2"
+	checksum+=" f83e1e94b87de850d94d1902eed909bd363db1301a806ae22c75c436107bb6ff"
 	;;
 ppc64le*)
 	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}.powerpc64le-linux.tar"
-	checksum+=" 9bf59ae3d336f0de4624c63e4e892ea95de4be2ca66182d185defc50b69b65f3"
+	checksum+=" 83c57d7caecfaa69fe817f6d26750aa3a08c5436f7c64bf87dead81d62a5e38a"
 	;;
 ppc64*)
 	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}.powerpc64-linux.tar"
-	checksum+=" b7700e126ae37f32ee03c6113c4d07c8b97e451022419387a1da7744dfaa7e25"
+	checksum+=" 0aa0310163a48c7e3d63a314ab26669142efe47543bbac32ca6164ef4829c775"
 	;;
 ppc*)
 	distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}.powerpc-linux.tar"
-	checksum+=" cd35d8f520ddcd3020862658b9a5273724dbaab1e265d5e227cefb59173de81d"
+	checksum+=" 8ac0227f0e7ec74c0118991dd4b814683715a5e2dd9267c029faaf94eaf50dfe"
 	;;
 esac
 # TODO: figure out cross-build and how to unwrap the ARM .tar.
@@ -89,5 +89,12 @@ do_install() {
 		$DESTDIR/usr/lib/fpc/${version}/samplecfg \
 			$DESTDIR/usr/lib/fpc/${version} $DESTDIR/etc
 	sed -i "s,${DESTDIR},,g" $DESTDIR/etc/*.cfg $DESTDIR/etc/fppkg/default $DESTDIR/usr/lib/fpc/${version}/ide/text/*
-	vlicense fpcsrc/rtl/COPYING.FPC
+}
+
+fpc-src_package() {
+	short_desc="Source code for FreePascal compiler"
+	pkg_install() {
+		vmkdir usr/lib/fpc/src
+		vcopy fpcsrc/* usr/lib/fpc/src
+	}
 }