* Re: [PR PATCH] [Updated] fpc 3.2.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23113@inbox.vuxu.org>
@ 2020-09-27 18:11 ` leahneukirchen
2020-09-27 18:27 ` leahneukirchen
` (2 subsequent siblings)
3 siblings, 0 replies; 4+ messages in thread
From: leahneukirchen @ 2020-09-27 18:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 902 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages fpc320
https://github.com/void-linux/void-packages/pull/23113
fpc 3.2.0
Not merged as it breaks hedgewars:
```
...
uWorld.pas(1863,17) Note: Call to subroutine "procedure untint;" marked as inline is not inlined
uWorld.pas(1214,5) Fatal: Internal error 200306031
Fatal: Compilation aborted
Error: /usr/bin/ppcx64 returned an error exitcode
make[2]: *** [hedgewars/CMakeFiles/hwengine.dir/build.make:153: hedgewars/CMakeFiles/hwengine.dir/hwengine.o] Error 1
```
A patch file from https://github.com/void-linux/void-packages/pull/23113.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fpc320-23113.patch --]
[-- Type: text/x-diff, Size: 5786 bytes --]
From 9dff3cfd514565cd83a3e405cc16ab85c4e70fc6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 21 Jun 2020 14:45:23 +0200
Subject: [PATCH 1/3] fpc: update to 3.2.0.
---
srcpkgs/fpc/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/fpc/template b/srcpkgs/fpc/template
index e3be538a313..723689e29a9 100644
--- a/srcpkgs/fpc/template
+++ b/srcpkgs/fpc/template
@@ -1,7 +1,7 @@
# Template file for 'fpc'
pkgname=fpc
-version=3.0.4
-revision=2
+version=3.2.0
+revision=1
create_wrksrc=yes
build_wrksrc="${pkgname}build-${version}"
conf_files="/etc/fpc.cfg /etc/fppkg.cfg"
@@ -9,18 +9,18 @@ hostmakedepends="rpmextract"
makedepends="ncurses-devel zlib-devel expat-devel"
short_desc="Free Pascal Compiler"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2, LGPL-2.1, FPC-FPR"
+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=f66514e6f2c2e4e1bccccb4d554c24b77682ed61c87811ae5dd210f421855e76
+checksum=f9b914eace989a023fb953da203dc0d973b44487568b4138c7d5b9613d7d6838
case "$XBPS_TARGET_MACHINE" in
x86_64*)
distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}-1.x86_64.rpm"
- checksum+=" c7b75f09174a502d8dd776fbfabcad3e4360494fd635445185159b21001d65f1"
+ checksum+=" 1f74e1ad3ced2dd67688fdb92edd42e73cdc31ef96056f8739449d70a9306f2c"
;;
i686*)
distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}-1.i686.rpm"
- checksum+=" a8f1ea31c63e8cd96dbdecf02af97311f14629babe58b4bd18ecfa094a13ad45"
+ checksum+=" 05c5600c9461362a08df100cf50ca125cb2b4d5bfe4da48cf8c144f2bf4617a2"
;;
esac
# TODO: figure out cross-build and how to unwrap the ARM .tar.
@@ -57,7 +57,7 @@ do_install() {
PATH=$DESTDIR/usr/bin:$PATH \
$DESTDIR/usr/lib/fpc/${version}/samplecfg \
$DESTDIR/usr/lib/fpc/${version} $DESTDIR/etc
- sed -i "s,${DESTDIR},,g" $DESTDIR/etc/*.cfg $DESTDIR/etc/fppkg/* $DESTDIR/usr/lib/fpc/${version}/ide/text/*
+ sed -i "s,${DESTDIR},,g" $DESTDIR/etc/*.cfg $DESTDIR/etc/fppkg/default $DESTDIR/usr/lib/fpc/${version}/ide/text/*
vlicense fpcsrc/rtl/COPYING.FPC
}
From 6f4b57a4e9e4574f318b49c4736410d0d28749b2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 21 Jun 2020 15:09:35 +0200
Subject: [PATCH 2/3] fpc-src: update to 3.2.0.
---
srcpkgs/fpc-src/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fpc-src/template b/srcpkgs/fpc-src/template
index 477b62368b6..a7222171578 100644
--- a/srcpkgs/fpc-src/template
+++ b/srcpkgs/fpc-src/template
@@ -1,6 +1,6 @@
# Template file for 'fpc-src'
pkgname=fpc-src
-version=3.0.4
+version=3.2.0
revision=1
wrksrc="fpcbuild-${version}"
short_desc="Source code for FreePascal compiler"
@@ -8,7 +8,7 @@ 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=f66514e6f2c2e4e1bccccb4d554c24b77682ed61c87811ae5dd210f421855e76
+checksum=f9b914eace989a023fb953da203dc0d973b44487568b4138c7d5b9613d7d6838
nostrip=yes
do_install() {
From 22890b8eee4191e2d4da4274589d66b4e0998ad4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 27 Sep 2020 17:26:46 +0200
Subject: [PATCH 3/3] hedgewars: rebuild for fpc-3.2.0.
---
srcpkgs/hedgewars/patches/fpc-3.2.0.patch | 13 +++++++++++++
srcpkgs/hedgewars/patches/qt.patch | 10 ++++++++++
srcpkgs/hedgewars/template | 5 ++---
3 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/hedgewars/patches/fpc-3.2.0.patch
create mode 100644 srcpkgs/hedgewars/patches/qt.patch
diff --git a/srcpkgs/hedgewars/patches/fpc-3.2.0.patch b/srcpkgs/hedgewars/patches/fpc-3.2.0.patch
new file mode 100644
index 00000000000..6409399f74c
--- /dev/null
+++ b/srcpkgs/hedgewars/patches/fpc-3.2.0.patch
@@ -0,0 +1,13 @@
+--- hedgewars/uWorld.pas
++++ hedgewars/uWorld.pas
+@@ -1168,8 +1168,8 @@ procedure RenderAttackBar();
+ procedure ShiftWorld(Dir: LongInt); inline;
+ begin
+ preShiftWorldDx:= WorldDx;
+- WorldDx:= WorldDx + LongInt(Dir * LongInt(playWidth));
+-
++ Dir := Dir * LongInt(playWidth);
++ WorldDx:= WorldDx + Dir;
+ end;
+
+ procedure UnshiftWorld(); inline;
diff --git a/srcpkgs/hedgewars/patches/qt.patch b/srcpkgs/hedgewars/patches/qt.patch
new file mode 100644
index 00000000000..4d1cb16a7c4
--- /dev/null
+++ b/srcpkgs/hedgewars/patches/qt.patch
@@ -0,0 +1,10 @@
+--- QTfrontend/ui/page/pagegamestats.cpp.orig
++++ QTfrontend/ui/page/pagegamestats.cpp
+@@ -22,6 +22,7 @@
+ #include <QGraphicsScene>
+ #include <QGroupBox>
+ #include <QSizePolicy>
++#include <QPainterPath>
+
+ #include "pagegamestats.h"
+ #include "team.h"
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index 40cdb1086b4..ed711da0cbe 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -1,7 +1,7 @@
# Template file for 'hedgewars'
pkgname=hedgewars
version=1.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-src-${version}"
build_style=cmake
configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname}
@@ -37,7 +37,7 @@ case $XBPS_TARGET_MACHINE in
esac
if [ -n "$_use_c_engine" ]; then
- hostmakedepends+=" glew-devel libatomic-devel ghc"
+ hostmakedepends+=" glew-devel libatomic-devel ghc clang"
configure_args+=" -DBUILD_ENGINE_C=1"
nopie_files+=" /usr/bin/hedgewars"
fi
@@ -56,7 +56,6 @@ post_install() {
hedgewars-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/hedgewars/Data
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] fpc 3.2.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23113@inbox.vuxu.org>
2020-09-27 18:11 ` [PR PATCH] [Updated] fpc 3.2.0 leahneukirchen
@ 2020-09-27 18:27 ` leahneukirchen
2020-09-28 11:36 ` leahneukirchen
2020-09-28 12:57 ` [PR PATCH] [Merged]: " leahneukirchen
3 siblings, 0 replies; 4+ messages in thread
From: leahneukirchen @ 2020-09-27 18:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 902 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages fpc320
https://github.com/void-linux/void-packages/pull/23113
fpc 3.2.0
Not merged as it breaks hedgewars:
```
...
uWorld.pas(1863,17) Note: Call to subroutine "procedure untint;" marked as inline is not inlined
uWorld.pas(1214,5) Fatal: Internal error 200306031
Fatal: Compilation aborted
Error: /usr/bin/ppcx64 returned an error exitcode
make[2]: *** [hedgewars/CMakeFiles/hwengine.dir/build.make:153: hedgewars/CMakeFiles/hwengine.dir/hwengine.o] Error 1
```
A patch file from https://github.com/void-linux/void-packages/pull/23113.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fpc320-23113.patch --]
[-- Type: text/x-diff, Size: 5906 bytes --]
From 63d9cba0170c2b614476982c4e61e3b7f4b31806 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 21 Jun 2020 14:45:23 +0200
Subject: [PATCH 1/3] fpc: update to 3.2.0.
---
srcpkgs/fpc/template | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/fpc/template b/srcpkgs/fpc/template
index e3be538a313..b161c898dc8 100644
--- a/srcpkgs/fpc/template
+++ b/srcpkgs/fpc/template
@@ -1,7 +1,8 @@
# Template file for 'fpc'
pkgname=fpc
-version=3.0.4
-revision=2
+version=3.2.0
+revision=1
+archs="x86_64* i686*"
create_wrksrc=yes
build_wrksrc="${pkgname}build-${version}"
conf_files="/etc/fpc.cfg /etc/fppkg.cfg"
@@ -9,24 +10,23 @@ hostmakedepends="rpmextract"
makedepends="ncurses-devel zlib-devel expat-devel"
short_desc="Free Pascal Compiler"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2, LGPL-2.1, FPC-FPR"
+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=f66514e6f2c2e4e1bccccb4d554c24b77682ed61c87811ae5dd210f421855e76
+checksum=f9b914eace989a023fb953da203dc0d973b44487568b4138c7d5b9613d7d6838
case "$XBPS_TARGET_MACHINE" in
x86_64*)
distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}-1.x86_64.rpm"
- checksum+=" c7b75f09174a502d8dd776fbfabcad3e4360494fd635445185159b21001d65f1"
+ checksum+=" 1f74e1ad3ced2dd67688fdb92edd42e73cdc31ef96056f8739449d70a9306f2c"
;;
i686*)
distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}-1.i686.rpm"
- checksum+=" a8f1ea31c63e8cd96dbdecf02af97311f14629babe58b4bd18ecfa094a13ad45"
+ checksum+=" 05c5600c9461362a08df100cf50ca125cb2b4d5bfe4da48cf8c144f2bf4617a2"
;;
esac
# TODO: figure out cross-build and how to unwrap the ARM .tar.
nocross=yes
nopie=yes
-archs="x86_64* i686*"
post_extract() {
# relative links needed
@@ -57,7 +57,6 @@ do_install() {
PATH=$DESTDIR/usr/bin:$PATH \
$DESTDIR/usr/lib/fpc/${version}/samplecfg \
$DESTDIR/usr/lib/fpc/${version} $DESTDIR/etc
- sed -i "s,${DESTDIR},,g" $DESTDIR/etc/*.cfg $DESTDIR/etc/fppkg/* $DESTDIR/usr/lib/fpc/${version}/ide/text/*
+ sed -i "s,${DESTDIR},,g" $DESTDIR/etc/*.cfg $DESTDIR/etc/fppkg/default $DESTDIR/usr/lib/fpc/${version}/ide/text/*
vlicense fpcsrc/rtl/COPYING.FPC
}
-
From 6a731dd6e7bd5c93fb8d3d98fcb3cb04652e14d2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 21 Jun 2020 15:09:35 +0200
Subject: [PATCH 2/3] fpc-src: update to 3.2.0.
---
srcpkgs/fpc-src/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fpc-src/template b/srcpkgs/fpc-src/template
index 477b62368b6..a7222171578 100644
--- a/srcpkgs/fpc-src/template
+++ b/srcpkgs/fpc-src/template
@@ -1,6 +1,6 @@
# Template file for 'fpc-src'
pkgname=fpc-src
-version=3.0.4
+version=3.2.0
revision=1
wrksrc="fpcbuild-${version}"
short_desc="Source code for FreePascal compiler"
@@ -8,7 +8,7 @@ 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=f66514e6f2c2e4e1bccccb4d554c24b77682ed61c87811ae5dd210f421855e76
+checksum=f9b914eace989a023fb953da203dc0d973b44487568b4138c7d5b9613d7d6838
nostrip=yes
do_install() {
From 6f553374f2b4857a51aa41429dbc1de8252c5bea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 27 Sep 2020 17:26:46 +0200
Subject: [PATCH 3/3] hedgewars: rebuild for fpc-3.2.0.
---
srcpkgs/hedgewars/patches/fpc-3.2.0.patch | 13 +++++++++++++
srcpkgs/hedgewars/patches/qt.patch | 10 ++++++++++
srcpkgs/hedgewars/template | 5 ++---
3 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/hedgewars/patches/fpc-3.2.0.patch
create mode 100644 srcpkgs/hedgewars/patches/qt.patch
diff --git a/srcpkgs/hedgewars/patches/fpc-3.2.0.patch b/srcpkgs/hedgewars/patches/fpc-3.2.0.patch
new file mode 100644
index 00000000000..6409399f74c
--- /dev/null
+++ b/srcpkgs/hedgewars/patches/fpc-3.2.0.patch
@@ -0,0 +1,13 @@
+--- hedgewars/uWorld.pas
++++ hedgewars/uWorld.pas
+@@ -1168,8 +1168,8 @@ procedure RenderAttackBar();
+ procedure ShiftWorld(Dir: LongInt); inline;
+ begin
+ preShiftWorldDx:= WorldDx;
+- WorldDx:= WorldDx + LongInt(Dir * LongInt(playWidth));
+-
++ Dir := Dir * LongInt(playWidth);
++ WorldDx:= WorldDx + Dir;
+ end;
+
+ procedure UnshiftWorld(); inline;
diff --git a/srcpkgs/hedgewars/patches/qt.patch b/srcpkgs/hedgewars/patches/qt.patch
new file mode 100644
index 00000000000..4d1cb16a7c4
--- /dev/null
+++ b/srcpkgs/hedgewars/patches/qt.patch
@@ -0,0 +1,10 @@
+--- QTfrontend/ui/page/pagegamestats.cpp.orig
++++ QTfrontend/ui/page/pagegamestats.cpp
+@@ -22,6 +22,7 @@
+ #include <QGraphicsScene>
+ #include <QGroupBox>
+ #include <QSizePolicy>
++#include <QPainterPath>
+
+ #include "pagegamestats.h"
+ #include "team.h"
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index 40cdb1086b4..ed711da0cbe 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -1,7 +1,7 @@
# Template file for 'hedgewars'
pkgname=hedgewars
version=1.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-src-${version}"
build_style=cmake
configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname}
@@ -37,7 +37,7 @@ case $XBPS_TARGET_MACHINE in
esac
if [ -n "$_use_c_engine" ]; then
- hostmakedepends+=" glew-devel libatomic-devel ghc"
+ hostmakedepends+=" glew-devel libatomic-devel ghc clang"
configure_args+=" -DBUILD_ENGINE_C=1"
nopie_files+=" /usr/bin/hedgewars"
fi
@@ -56,7 +56,6 @@ post_install() {
hedgewars-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/hedgewars/Data
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] fpc 3.2.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23113@inbox.vuxu.org>
2020-09-27 18:11 ` [PR PATCH] [Updated] fpc 3.2.0 leahneukirchen
2020-09-27 18:27 ` leahneukirchen
@ 2020-09-28 11:36 ` leahneukirchen
2020-09-28 12:57 ` [PR PATCH] [Merged]: " leahneukirchen
3 siblings, 0 replies; 4+ messages in thread
From: leahneukirchen @ 2020-09-28 11:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 902 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages fpc320
https://github.com/void-linux/void-packages/pull/23113
fpc 3.2.0
Not merged as it breaks hedgewars:
```
...
uWorld.pas(1863,17) Note: Call to subroutine "procedure untint;" marked as inline is not inlined
uWorld.pas(1214,5) Fatal: Internal error 200306031
Fatal: Compilation aborted
Error: /usr/bin/ppcx64 returned an error exitcode
make[2]: *** [hedgewars/CMakeFiles/hwengine.dir/build.make:153: hedgewars/CMakeFiles/hwengine.dir/hwengine.o] Error 1
```
A patch file from https://github.com/void-linux/void-packages/pull/23113.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fpc320-23113.patch --]
[-- Type: text/x-diff, Size: 5926 bytes --]
From fdf36db6ffe95e3f6924a015abe2472278806fd6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 21 Jun 2020 14:45:23 +0200
Subject: [PATCH 1/3] fpc: update to 3.2.0.
---
srcpkgs/fpc/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/fpc/template b/srcpkgs/fpc/template
index e3be538a313..7cf3e9adffe 100644
--- a/srcpkgs/fpc/template
+++ b/srcpkgs/fpc/template
@@ -1,7 +1,8 @@
# Template file for 'fpc'
pkgname=fpc
-version=3.0.4
-revision=2
+version=3.2.0
+revision=1
+archs="x86_64* i686*"
create_wrksrc=yes
build_wrksrc="${pkgname}build-${version}"
conf_files="/etc/fpc.cfg /etc/fppkg.cfg"
@@ -9,24 +10,24 @@ hostmakedepends="rpmextract"
makedepends="ncurses-devel zlib-devel expat-devel"
short_desc="Free Pascal Compiler"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2, LGPL-2.1, FPC-FPR"
+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=f66514e6f2c2e4e1bccccb4d554c24b77682ed61c87811ae5dd210f421855e76
+checksum=f9b914eace989a023fb953da203dc0d973b44487568b4138c7d5b9613d7d6838
case "$XBPS_TARGET_MACHINE" in
x86_64*)
distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}-1.x86_64.rpm"
- checksum+=" c7b75f09174a502d8dd776fbfabcad3e4360494fd635445185159b21001d65f1"
+ checksum+=" 1f74e1ad3ced2dd67688fdb92edd42e73cdc31ef96056f8739449d70a9306f2c"
;;
i686*)
distfiles+=" ${SOURCEFORGE_SITE}/freepascal/Linux/${version}/${pkgname}-${version}-1.i686.rpm"
- checksum+=" a8f1ea31c63e8cd96dbdecf02af97311f14629babe58b4bd18ecfa094a13ad45"
+ checksum+=" 05c5600c9461362a08df100cf50ca125cb2b4d5bfe4da48cf8c144f2bf4617a2"
;;
esac
# TODO: figure out cross-build and how to unwrap the ARM .tar.
nocross=yes
nopie=yes
-archs="x86_64* i686*"
+noverifyrdeps=yes
post_extract() {
# relative links needed
@@ -57,7 +58,6 @@ do_install() {
PATH=$DESTDIR/usr/bin:$PATH \
$DESTDIR/usr/lib/fpc/${version}/samplecfg \
$DESTDIR/usr/lib/fpc/${version} $DESTDIR/etc
- sed -i "s,${DESTDIR},,g" $DESTDIR/etc/*.cfg $DESTDIR/etc/fppkg/* $DESTDIR/usr/lib/fpc/${version}/ide/text/*
+ sed -i "s,${DESTDIR},,g" $DESTDIR/etc/*.cfg $DESTDIR/etc/fppkg/default $DESTDIR/usr/lib/fpc/${version}/ide/text/*
vlicense fpcsrc/rtl/COPYING.FPC
}
-
From c64825384027885aedbe2a52ebd3400ea2b8330f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 21 Jun 2020 15:09:35 +0200
Subject: [PATCH 2/3] fpc-src: update to 3.2.0.
---
srcpkgs/fpc-src/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fpc-src/template b/srcpkgs/fpc-src/template
index 477b62368b6..a7222171578 100644
--- a/srcpkgs/fpc-src/template
+++ b/srcpkgs/fpc-src/template
@@ -1,6 +1,6 @@
# Template file for 'fpc-src'
pkgname=fpc-src
-version=3.0.4
+version=3.2.0
revision=1
wrksrc="fpcbuild-${version}"
short_desc="Source code for FreePascal compiler"
@@ -8,7 +8,7 @@ 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=f66514e6f2c2e4e1bccccb4d554c24b77682ed61c87811ae5dd210f421855e76
+checksum=f9b914eace989a023fb953da203dc0d973b44487568b4138c7d5b9613d7d6838
nostrip=yes
do_install() {
From 38cd95da2433ec1ea04a29daa0b59dbafb7cadbc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 27 Sep 2020 17:26:46 +0200
Subject: [PATCH 3/3] hedgewars: rebuild for fpc-3.2.0.
---
srcpkgs/hedgewars/patches/fpc-3.2.0.patch | 13 +++++++++++++
srcpkgs/hedgewars/patches/qt.patch | 10 ++++++++++
srcpkgs/hedgewars/template | 5 ++---
3 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/hedgewars/patches/fpc-3.2.0.patch
create mode 100644 srcpkgs/hedgewars/patches/qt.patch
diff --git a/srcpkgs/hedgewars/patches/fpc-3.2.0.patch b/srcpkgs/hedgewars/patches/fpc-3.2.0.patch
new file mode 100644
index 00000000000..6409399f74c
--- /dev/null
+++ b/srcpkgs/hedgewars/patches/fpc-3.2.0.patch
@@ -0,0 +1,13 @@
+--- hedgewars/uWorld.pas
++++ hedgewars/uWorld.pas
+@@ -1168,8 +1168,8 @@ procedure RenderAttackBar();
+ procedure ShiftWorld(Dir: LongInt); inline;
+ begin
+ preShiftWorldDx:= WorldDx;
+- WorldDx:= WorldDx + LongInt(Dir * LongInt(playWidth));
+-
++ Dir := Dir * LongInt(playWidth);
++ WorldDx:= WorldDx + Dir;
+ end;
+
+ procedure UnshiftWorld(); inline;
diff --git a/srcpkgs/hedgewars/patches/qt.patch b/srcpkgs/hedgewars/patches/qt.patch
new file mode 100644
index 00000000000..4d1cb16a7c4
--- /dev/null
+++ b/srcpkgs/hedgewars/patches/qt.patch
@@ -0,0 +1,10 @@
+--- QTfrontend/ui/page/pagegamestats.cpp.orig
++++ QTfrontend/ui/page/pagegamestats.cpp
+@@ -22,6 +22,7 @@
+ #include <QGraphicsScene>
+ #include <QGroupBox>
+ #include <QSizePolicy>
++#include <QPainterPath>
+
+ #include "pagegamestats.h"
+ #include "team.h"
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index 40cdb1086b4..ed711da0cbe 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -1,7 +1,7 @@
# Template file for 'hedgewars'
pkgname=hedgewars
version=1.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-src-${version}"
build_style=cmake
configure_args="-DNOSERVER=1 -DDATA_INSTALL_DIR=/usr/share/${pkgname}
@@ -37,7 +37,7 @@ case $XBPS_TARGET_MACHINE in
esac
if [ -n "$_use_c_engine" ]; then
- hostmakedepends+=" glew-devel libatomic-devel ghc"
+ hostmakedepends+=" glew-devel libatomic-devel ghc clang"
configure_args+=" -DBUILD_ENGINE_C=1"
nopie_files+=" /usr/bin/hedgewars"
fi
@@ -56,7 +56,6 @@ post_install() {
hedgewars-data_package() {
short_desc+=" - data files"
- archs=noarch
pkg_install() {
vmove usr/share/hedgewars/Data
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: fpc 3.2.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23113@inbox.vuxu.org>
` (2 preceding siblings ...)
2020-09-28 11:36 ` leahneukirchen
@ 2020-09-28 12:57 ` leahneukirchen
3 siblings, 0 replies; 4+ messages in thread
From: leahneukirchen @ 2020-09-28 12:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 733 bytes --]
There's a merged pull request on the void-packages repository
fpc 3.2.0
https://github.com/void-linux/void-packages/pull/23113
Description:
Not merged as it breaks hedgewars:
```
...
uWorld.pas(1863,17) Note: Call to subroutine "procedure untint;" marked as inline is not inlined
uWorld.pas(1214,5) Fatal: Internal error 200306031
Fatal: Compilation aborted
Error: /usr/bin/ppcx64 returned an error exitcode
make[2]: *** [hedgewars/CMakeFiles/hwengine.dir/build.make:153: hedgewars/CMakeFiles/hwengine.dir/hwengine.o] Error 1
```
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-28 12:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23113@inbox.vuxu.org>
2020-09-27 18:11 ` [PR PATCH] [Updated] fpc 3.2.0 leahneukirchen
2020-09-27 18:27 ` leahneukirchen
2020-09-28 11:36 ` leahneukirchen
2020-09-28 12:57 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).