From 837f4345017ffa68516ddf0d53e2d97f70d7b45d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 29 Nov 2020 18:56:41 +0700 Subject: [PATCH 1/4] flare-engine: remove noarch --- srcpkgs/flare-engine-data | 1 - srcpkgs/flare-engine/template | 13 +++---------- 2 files changed, 3 insertions(+), 11 deletions(-) delete mode 120000 srcpkgs/flare-engine-data diff --git a/srcpkgs/flare-engine-data b/srcpkgs/flare-engine-data deleted file mode 120000 index 4403870ed17..00000000000 --- a/srcpkgs/flare-engine-data +++ /dev/null @@ -1 +0,0 @@ -flare-engine \ No newline at end of file diff --git a/srcpkgs/flare-engine/template b/srcpkgs/flare-engine/template index 707157f38d9..5bf9f073b61 100644 --- a/srcpkgs/flare-engine/template +++ b/srcpkgs/flare-engine/template @@ -1,11 +1,11 @@ # Template file for 'flare-engine' pkgname=flare-engine version=1.11 -revision=1 +revision=2 build_style=cmake configure_args="-DBINDIR=/usr/bin -DDATADIR=share/flare" makedepends="SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel" -depends="flare-engine-data>=${version}_${revision} desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Free/libre action roleplaying engine (engine only)" maintainer="Diogo Leal " license="GPL-3.0-or-later" @@ -13,11 +13,4 @@ homepage="http://flarerpg.org/" changelog="https://raw.githubusercontent.com/flareteam/flare-engine/master/RELEASE_NOTES.txt" distfiles="https://github.com/flareteam/flare-engine/archive/v${version}.tar.gz" checksum=035ffd936d9e120dc2eb792779a0b7ff64574d4a29a1124946deaf7946d1059d - -flare-engine-data_package() { - short_desc+=" - data" - archs=noarch - pkg_install() { - vmove usr/share/flare - } -} +replaces="flare-engine-data>=0" From 0693602eba02afe04ad79f24e993919e1187b85e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 29 Nov 2020 18:56:43 +0700 Subject: [PATCH 2/4] freedroidRPG: remove noarch --- srcpkgs/freedroidRPG-data | 1 - srcpkgs/freedroidRPG/template | 14 +++----------- 2 files changed, 3 insertions(+), 12 deletions(-) delete mode 120000 srcpkgs/freedroidRPG-data diff --git a/srcpkgs/freedroidRPG-data b/srcpkgs/freedroidRPG-data deleted file mode 120000 index d5d81bcaf86..00000000000 --- a/srcpkgs/freedroidRPG-data +++ /dev/null @@ -1 +0,0 @@ -freedroidRPG \ No newline at end of file diff --git a/srcpkgs/freedroidRPG/template b/srcpkgs/freedroidRPG/template index 8d4fbd70207..e3e7a01fd33 100644 --- a/srcpkgs/freedroidRPG/template +++ b/srcpkgs/freedroidRPG/template @@ -1,20 +1,20 @@ # Template file for 'freedroidRPG' pkgname=freedroidRPG version=0.16.1 -revision=1 +revision=2 wrksrc=${pkgname,,}-${version} build_style=gnu-configure hostmakedepends="pkg-config python" makedepends="SDL_gfx-devel SDL_image-devel SDL_mixer-devel libjpeg-turbo-devel libvorbis-devel lua53-devel libpng-devel" -depends="${pkgname}-data>=${version}_${revision}" short_desc="Role playing game featuring Tux and evil robots" maintainer="Jürgen Buchmüller " -license="GPL-3" +license="GPL-2.0-or-later" homepage="http://www.freedroid.org/" distfiles="http://ftp.osuosl.org/pub/freedroid/${pkgname}-${version%.*}/${pkgname}-${version}.tar.gz" checksum=426df175034b12095e7498fd80c907e507667c960ee1da331d9e5566d1b09358 python_version=2 +replaces="freedroidRPG-data>=0" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then configure_args+=" --disable-backtrace" @@ -41,11 +41,3 @@ post_install() { sed -i ${PKGDESTDIR}/usr/share/applications/${pkgname,,}.desktop \ -e "/^Exec/s;=${pkgname};=${script};" } - -freedroidRPG-data_package() { - short_desc+=" - data files" - archs=noarch - pkg_install() { - vmove usr/share/freedroidrpg - } -} From c138b0ee3e2aedb4ec4f69c39217b81ce86c9974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 29 Nov 2020 18:56:56 +0700 Subject: [PATCH 3/4] WiringPi: remove noarch --- srcpkgs/WiringPi/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/WiringPi/template b/srcpkgs/WiringPi/template index 562506c41b5..243956c2bca 100644 --- a/srcpkgs/WiringPi/template +++ b/srcpkgs/WiringPi/template @@ -1,12 +1,12 @@ # Template file for 'WiringPi' pkgname=WiringPi version=0.0.20200408 -revision=1 +revision=2 _githash=50b7c5ed7d238a637db7d9c73978466eb022a8de _sover=2.60 -build_style=meta -wrksrc="${pkgname}-${_githash}" archs="arm*" +wrksrc="${pkgname}-${_githash}" +build_style=meta depends="libwiringPi-${version}_${revision} libwiringPi-dev-${version}_${revision} WiringPi-gpio-${version}_${revision} @@ -18,7 +18,7 @@ homepage="http://wiringpi.com/" distfiles="https://github.com/WiringPi/WiringPi/archive/${_githash}.tar.gz" checksum=ba83290d3c5e4cd3fd470321ab2a85133334014532e5f275ef4d699ccaf72fc5 -CFLAGS="-Wno-unused-result -I. -I../wiringPi -I../devLib" +CFLAGS="-fcommon -Wno-unused-result -I. -I../wiringPi -I../devLib" do_configure() { find -name Makefile -exec sed -i "{}" \ @@ -104,9 +104,7 @@ WiringPi-gpio_package() { WiringPi-examples_package() { short_desc+=" - examples" - archs="noarch" pkg_install() { vmove usr/share/examples } } - From 2272655268f936d05385d8d79eddaa67157e7600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 29 Nov 2020 23:45:36 +0700 Subject: [PATCH 4/4] fsharp: update to 10.2.3. --- srcpkgs/fsharp/template | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/srcpkgs/fsharp/template b/srcpkgs/fsharp/template index ef9f9b4ccbd..2f8df9d02fb 100644 --- a/srcpkgs/fsharp/template +++ b/srcpkgs/fsharp/template @@ -1,10 +1,10 @@ # Template file for 'fsharp' pkgname=fsharp -version=10.2.1 +version=10.2.3 revision=1 -archs=noarch -lib32disabled=yes build_style=gnu-makefile +make_build_args="monocmd=/usr/bin/mono" +make_install_args="monocmd=/usr/bin/mono" hostmakedepends="msbuild-bin" makedepends="mono-devel" depends="mono" @@ -13,5 +13,9 @@ maintainer="Wojciech Nawrocki " license="Apache-2.0" homepage="http://fsharp.org" distfiles="https://github.com/fsharp/fsharp/archive/${version}.tar.gz" -checksum=4192652a162349ac6b4e053853d46cc7ba5469c0e552c78a1159dc9744a8f83b -broken="fssrgen.fsx(337,28): error FS0041" +checksum=527e4bad7a6d71668e905608c82db7c6eda44d9fd2ed9ce3c758e291e024cc4d +lib32disabled=yes + +if [ "$XBPS_LIBC" = musl ]; then + broken="mono crash on sgen-stw.c:69, not able to found stack_end" +fi