freeciv: update to 2.6.5.
By ericonr: - remove gtk2 version, since gtk2 is deprecated - use '>=' instead of '-' for versioning, to avoid ambiguous parsing
This commit is contained in:
parent
b01d4faff5
commit
7690ac87fd
2 changed files with 15 additions and 39 deletions
|
@ -1,20 +0,0 @@
|
||||||
--- a/client/gui-qt/canvas.cpp 2020-02-15 16:49:02.000000000 +0100
|
|
||||||
+++ b/client/gui-qt/canvas.cpp 2020-09-01 19:25:35.075928695 +0200
|
|
||||||
@@ -18,6 +18,7 @@
|
|
||||||
// Qt
|
|
||||||
#include <QFontMetrics>
|
|
||||||
#include <QPainter>
|
|
||||||
+#include <QPainterPath>
|
|
||||||
|
|
||||||
// qt-client
|
|
||||||
#include "canvas.h"
|
|
||||||
--- a/client/gui-qt/dialogs.cpp 2020-02-15 16:49:02.000000000 +0100
|
|
||||||
+++ b/client/gui-qt/dialogs.cpp 2020-09-01 19:25:42.242929065 +0200
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
#include <QMessageBox>
|
|
||||||
#include <QMouseEvent>
|
|
||||||
#include <QPainter>
|
|
||||||
+#include <QPainterPath>
|
|
||||||
#include <QRadioButton>
|
|
||||||
#include <QRect>
|
|
||||||
#include <QSignalMapper>
|
|
|
@ -1,55 +1,51 @@
|
||||||
# Template file for 'freeciv'
|
# Template file for 'freeciv'
|
||||||
pkgname=freeciv
|
pkgname=freeciv
|
||||||
version=2.6.2
|
version=2.6.5
|
||||||
revision=1
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all
|
configure_args="--disable-static --enable-fcdb=sqlite3 --enable-fcmp=all"
|
||||||
--enable-client=all"
|
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="pkg-config"
|
||||||
makedepends="SDL2_gfx-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel gtk+-devel
|
makedepends="SDL2_gfx-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel
|
||||||
gtk+3-devel libXaw-devel libcurl-devel lua53-devel"
|
gtk+3-devel libXaw-devel libcurl-devel lua53-devel"
|
||||||
short_desc="Free and Open Source empire-building strategy game - server/data"
|
short_desc="Free and Open Source empire-building strategy game - server/data"
|
||||||
maintainer="bra1nwave <bra1nwave@protonmail.com>"
|
maintainer="bra1nwave <bra1nwave@protonmail.com>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="http://freeciv.org/"
|
homepage="http://freeciv.org/"
|
||||||
|
changelog="https://freeciv.fandom.com/wiki/NEWS-${version}"
|
||||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
|
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
|
||||||
checksum=6181ef3d3c76264383aabbe0eaf1550d8a65ca42639e6c17cc2938165e176c8f
|
checksum=2e64e1c74dae12acb17bbf5daa980efc7e9fd57820afed5135319ca95291ec59
|
||||||
|
|
||||||
|
_clients="gtk3,sdl2,xaw"
|
||||||
subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl freeciv-xaw"
|
subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl freeciv-xaw"
|
||||||
if [ -z "$CROSS_BUILD" ]; then
|
if [ -z "$CROSS_BUILD" ]; then
|
||||||
|
_clients+=",qt"
|
||||||
makedepends+=" qt5-devel"
|
makedepends+=" qt5-devel"
|
||||||
subpackages+=" freeciv-qt5"
|
subpackages+=" freeciv-qt5"
|
||||||
fi
|
fi
|
||||||
|
configure_args+=" --enable-client=${_clients}"
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
rm ${DESTDIR}/usr/bin/*stub*
|
|
||||||
rm ${DESTDIR}/usr/lib/*.a
|
rm ${DESTDIR}/usr/lib/*.a
|
||||||
}
|
}
|
||||||
|
|
||||||
freeciv-gtk2_package() {
|
freeciv-gtk2_package() {
|
||||||
short_desc="Free and Open Source empire-building strategy game - GTK+ client"
|
build_style=meta
|
||||||
depends="${sourcepkg}-${version}_${revision}"
|
short_desc="Freeciv GTK+3 client (transitional dummy package)"
|
||||||
pkg_install() {
|
depends="freeciv-gtk3>=${version}_${revision}"
|
||||||
vmove "usr/bin/*gtk2*"
|
|
||||||
vmove "usr/share/appdata/*gtk2*"
|
|
||||||
vmove "usr/share/man/man6/*gtk2*"
|
|
||||||
vmove "usr/share/applications/*gtk2*"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
freeciv-gtk3_package() {
|
freeciv-gtk3_package() {
|
||||||
short_desc="Free and Open Source empire-building strategy game - GTK+3 client"
|
short_desc="Free and Open Source empire-building strategy game - GTK+3 client"
|
||||||
depends="${sourcepkg}-${version}_${revision}"
|
depends="${sourcepkg}>=${version}_${revision}"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove "usr/bin/*gtk3*"
|
vmove "usr/bin/*gtk3*"
|
||||||
vmove "usr/share/appdata/*gtk3*"
|
vmove "usr/share/appdata/*gtk3*"
|
||||||
vmove "usr/share/man/man6/*gtk3*"
|
vmove "usr/share/man/man6/*gtk3*"
|
||||||
vmove "usr/share/applications/*gtk3*"
|
vmove "usr/share/applications/*gtk3*"
|
||||||
vmove "usr/share/applications/freeciv.desktop"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
freeciv-qt5_package() {
|
freeciv-qt5_package() {
|
||||||
short_desc="Free and Open Source empire-building strategy game - Qt5 client"
|
short_desc="Free and Open Source empire-building strategy game - Qt5 client"
|
||||||
depends="${sourcepkg}-${version}_${revision}"
|
depends="${sourcepkg}>=${version}_${revision}"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove "usr/bin/*qt*"
|
vmove "usr/bin/*qt*"
|
||||||
vmove "usr/share/appdata/*qt*"
|
vmove "usr/share/appdata/*qt*"
|
||||||
|
@ -59,7 +55,7 @@ freeciv-qt5_package() {
|
||||||
}
|
}
|
||||||
freeciv-sdl_package() {
|
freeciv-sdl_package() {
|
||||||
short_desc="Free and Open Source empire-building strategy game - SDL2 client"
|
short_desc="Free and Open Source empire-building strategy game - SDL2 client"
|
||||||
depends="${sourcepkg}-${version}_${revision}"
|
depends="${sourcepkg}>=${version}_${revision}"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove "usr/bin/*sdl*"
|
vmove "usr/bin/*sdl*"
|
||||||
vmove "usr/share/appdata/*sdl*"
|
vmove "usr/share/appdata/*sdl*"
|
||||||
|
@ -69,7 +65,7 @@ freeciv-sdl_package() {
|
||||||
}
|
}
|
||||||
freeciv-xaw_package() {
|
freeciv-xaw_package() {
|
||||||
short_desc="Free and Open Source empire-building strategy game - X11 client"
|
short_desc="Free and Open Source empire-building strategy game - X11 client"
|
||||||
depends="${sourcepkg}-${version}_${revision}"
|
depends="${sourcepkg}>=${version}_${revision}"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove "usr/bin/*xaw*"
|
vmove "usr/bin/*xaw*"
|
||||||
vmove "usr/share/man/man6/*xaw*"
|
vmove "usr/share/man/man6/*xaw*"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue