diff --git a/srcpkgs/freeciv-qt6 b/srcpkgs/freeciv-qt6 new file mode 120000 index 00000000000..5c9f356a808 --- /dev/null +++ b/srcpkgs/freeciv-qt6 @@ -0,0 +1 @@ +freeciv \ No newline at end of file diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template index 827b30f5e11..833b45f44b3 100644 --- a/srcpkgs/freeciv/template +++ b/srcpkgs/freeciv/template @@ -1,10 +1,10 @@ # Template file for 'freeciv' pkgname=freeciv -version=3.0.7 -revision=2 +version=3.1.3 +revision=1 build_style=gnu-configure configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config gettext" makedepends="SDL2_gfx-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel gtk+3-devel libcurl-devel lua53-devel" short_desc="Free and Open Source empire-building strategy game - server/data" @@ -13,7 +13,7 @@ license="GPL-2.0-or-later" homepage="https://www.freeciv.org/" changelog="https://www.freeciv.org/wiki/NEWS" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=f6e606f17ed03d971272883f1a4879f5c1c2c247f64b8edefa6a25c8a2a8dac4 +checksum=741086fa94574374c7c27480f77ee68e5b538bfb2eff85004fa8c87b312c7f2f nopie_files="/usr/bin/freeciv-ruledit" # gtk3.22 is a client supporting gtk+>=3.22 @@ -21,8 +21,8 @@ _clients="gtk3.22,sdl2" subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl freeciv-xaw" if [ -z "$CROSS_BUILD" ]; then _clients+=",qt" - makedepends+=" qt5-devel" - subpackages+=" freeciv-qt5" + makedepends+=" qt6-base-devel" + subpackages+=" freeciv-qt5 freeciv-qt6" fi configure_args+=" --enable-client=${_clients}" @@ -46,15 +46,9 @@ freeciv-gtk3_package() { } } freeciv-qt5_package() { - short_desc="Free and Open Source empire-building strategy game - Qt5 client" - depends="${sourcepkg}>=${version}_${revision}" - nopie_files="/usr/bin/freeciv-mp-qt" - pkg_install() { - vmove "usr/bin/*qt*" - vmove "usr/share/metainfo/*qt*" - vmove "usr/share/man/man6/*qt*" - vmove "usr/share/applications/*qt*" - } + build_style=meta + short_desc="Freeciv - Qt5 client (transitional dummy package)" + depends="freeciv-qt6>=${version}_${revision}" } freeciv-sdl_package() { short_desc="Free and Open Source empire-building strategy game - SDL2 client" @@ -71,3 +65,15 @@ freeciv-xaw_package() { short_desc="Freeciv GTK+3 client (transitional dummy package)" depends="freeciv-gtk3>=${version}_${revision}" } + +freeciv-qt6_package() { + short_desc="Free and Open Source empire-building strategy game - Qt6 client" + depends="${sourcepkg}>=${version}_${revision}" + nopie_files="/usr/bin/freeciv-mp-qt" + pkg_install() { + vmove "usr/bin/*qt*" + vmove "usr/share/metainfo/*qt*" + vmove "usr/share/man/man6/*qt*" + vmove "usr/share/applications/*qt*" + } +}