From 8f17a493b29a1308efbcc98f4edebd2e26284243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 21 Sep 2020 22:23:30 +0200 Subject: [PATCH] SMC: remove SMC-data + drop noarch, fix xlint --- srcpkgs/SMC-data | 1 - srcpkgs/SMC/template | 19 ++++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) delete mode 120000 srcpkgs/SMC-data diff --git a/srcpkgs/SMC-data b/srcpkgs/SMC-data deleted file mode 120000 index cc8794649c1..00000000000 --- a/srcpkgs/SMC-data +++ /dev/null @@ -1 +0,0 @@ -SMC \ No newline at end of file diff --git a/srcpkgs/SMC/template b/srcpkgs/SMC/template index 00f9763bfdd..6484c332d53 100644 --- a/srcpkgs/SMC/template +++ b/srcpkgs/SMC/template @@ -1,23 +1,23 @@ -# Template file for 'SMC'. +# Template file for 'SMC' pkgname=SMC version=1.9 -revision=8 +revision=9 wrksrc=${pkgname,,}-${version} build_style=gnu-configure hostmakedepends="automake libtool gettext-devel pkg-config unzip" makedepends="MesaLib-devel boost-devel cegui07-devel gettext-devel SDL_image-devel SDL_mixer-devel SDL_ttf-devel" -depends="SMC-data>=${version}" short_desc="Two-dimensional platform game similar to Super Mario" maintainer="Jürgen Buchmüller " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://www.secretmaryo.org/" distfiles=" - ${SOURCEFORGE_SITE}/smclone/${wrksrc}.tar.bz2 + ${SOURCEFORGE_SITE}/smclone/${pkgname,,}-${version}.tar.bz2 ${SOURCEFORGE_SITE}/smclone/SMC_Music_5.0_high.zip" checksum=" b4194e70d3f1de3da884dd1a11e4f5cec25a205f66a3b85cc9fc1c86289b237d c5bb2e1830c7cbe499c93851f5a02b2b900b4730d2c7a133a44a7b43a297dab8" +replaces="SMC-data>=0" CXXFLAGS="-fpermissive -std=c++11" LDFLAGS="-Wl,--no-as-needed -lX11 -lboost_system" @@ -28,17 +28,10 @@ post_extract() { mv ${XBPS_BUILDDIR}/data/music/* ${wrksrc}/data/music } pre_configure() { + vsed -i configure.ac -e "/AM_INIT_AUTOMAKE/s/)/ subdir-objects)/" NOCONFIGURE=1 ./autogen.sh } post_install() { vinstall ${FILESDIR}/smc.desktop 644 usr/share/applications vinstall ${FILESDIR}/smc.png 644 usr/share/pixmaps } - -SMC-data_package() { - short_desc+=" - data files" - archs=noarch - pkg_install() { - vmove usr/share/smc - } -}