games-strategy/freeciv: Drop 2.6.2
Closes: https://bugs.gentoo.org/769164 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
parent
31124a323e
commit
da8940e3d8
|
|
@ -1,2 +1 @@
|
|||
DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302 SHA512 b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3
|
||||
DIST freeciv-2.6.4.tar.bz2 52087948 BLAKE2B 00392974707d9a11e626ac7855fcb27780492b7bead020f6849726ad39833d9ada288bad7245664f8446d0905f027dccc205ee6c943361ba9ba455c55c52cd04 SHA512 4dca3a09f4538ce865f5bfef2fa0cdd00b21e30d80bd24343a6d77564bb5239101254155295ccc18593af6f9a32b77ecb8d50c38d0710a37960372e9b1227221
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
From 87f4abf81d530b825d0af772d95fd1ea78503e64 Mon Sep 17 00:00:00 2001
|
||||
From: Marko Lindqvist <cazfi74@gmail.com>
|
||||
Date: Tue, 7 Apr 2020 13:22:14 +0300
|
||||
Subject: [PATCH] Include <QPainterPath> where needed
|
||||
|
||||
This fixes Qt-client build on OpenEmbedded
|
||||
|
||||
See hrm Bug #868060
|
||||
|
||||
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
|
||||
---
|
||||
client/gui-qt/canvas.cpp | 1 +
|
||||
client/gui-qt/dialogs.cpp | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/client/gui-qt/canvas.cpp b/client/gui-qt/canvas.cpp
|
||||
index 24291bc183..00fa1b8f52 100644
|
||||
--- a/client/gui-qt/canvas.cpp
|
||||
+++ b/client/gui-qt/canvas.cpp
|
||||
@@ -18,6 +18,7 @@
|
||||
// Qt
|
||||
#include <QFontMetrics>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
|
||||
// qt-client
|
||||
#include "canvas.h"
|
||||
diff --git a/client/gui-qt/dialogs.cpp b/client/gui-qt/dialogs.cpp
|
||||
index e0f9de31d4..4b3254c496 100644
|
||||
--- a/client/gui-qt/dialogs.cpp
|
||||
+++ b/client/gui-qt/dialogs.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <QMessageBox>
|
||||
#include <QMouseEvent>
|
||||
#include <QPainter>
|
||||
+#include <QPainterPath>
|
||||
#include <QRadioButton>
|
||||
#include <QRect>
|
||||
#include <QSignalMapper>
|
||||
|
|
@ -1,190 +0,0 @@
|
|||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
MY_PV="${PV/_beta/-beta}"
|
||||
MY_PV="${MY_PV/_rc/-RC}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
inherit desktop flag-o-matic qmake-utils xdg
|
||||
|
||||
DESCRIPTION="multiplayer strategy game (Civilization Clone)"
|
||||
HOMEPAGE="http://www.freeciv.org/"
|
||||
|
||||
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
|
||||
SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
|
||||
KEYWORDS="~amd64 ~ppc64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
|
||||
|
||||
# postgres isn't yet really supported by upstream
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
!dedicated? (
|
||||
x11-base/xorg-proto
|
||||
nls? ( sys-devel/gettext )
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
app-arch/bzip2
|
||||
app-arch/xz-utils
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
auth? (
|
||||
!mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
|
||||
mysql? ( dev-db/mysql-connector-c:0= )
|
||||
sqlite? ( dev-db/sqlite:3 )
|
||||
)
|
||||
dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
|
||||
!dedicated? (
|
||||
media-libs/libpng:0
|
||||
gtk? ( x11-libs/gtk+:2 )
|
||||
mapimg? ( media-gfx/imagemagick:= )
|
||||
modpack? ( x11-libs/gtk+:2 )
|
||||
nls? ( virtual/libintl )
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtwidgets:5
|
||||
)
|
||||
!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
|
||||
sdl? (
|
||||
media-libs/libsdl2[video]
|
||||
media-libs/sdl2-gfx
|
||||
media-libs/sdl2-image[png]
|
||||
media-libs/sdl2-ttf
|
||||
)
|
||||
server? ( aimodules? ( sys-devel/libtool:2 ) )
|
||||
sound? (
|
||||
media-libs/libsdl2[sound]
|
||||
media-libs/sdl2-mixer[vorbis]
|
||||
)
|
||||
)
|
||||
readline? ( sys-libs/readline:0= )
|
||||
system-lua? ( >=dev-lang/lua-5.3:= )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-qt515.patch" #728254
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use !dedicated && use !server ; then
|
||||
ewarn "Disabling server USE flag will make it impossible"
|
||||
ewarn "to start local games, but you will still be able to"
|
||||
ewarn "join multiplayer games."
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# install the .desktop in /usr/share/applications
|
||||
# install the icons in /usr/share/pixmaps
|
||||
sed -i \
|
||||
-e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
|
||||
-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
|
||||
-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
|
||||
client/Makefile.in \
|
||||
server/Makefile.in \
|
||||
tools/Makefile.in \
|
||||
data/icons/Makefile.in || die
|
||||
sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myclient=() mydatabase=() myeconfargs=()
|
||||
|
||||
if use auth ; then
|
||||
if ! use mysql && ! use sqlite ; then
|
||||
einfo "No database backend chosen, defaulting"
|
||||
einfo "to mysql!"
|
||||
mydatabase=( mysql )
|
||||
else
|
||||
use mysql && mydatabase+=( mysql )
|
||||
use sqlite && mydatabase+=( sqlite3 )
|
||||
fi
|
||||
else
|
||||
mydatabase=( no )
|
||||
fi
|
||||
|
||||
if use dedicated ; then
|
||||
myclient=( no )
|
||||
myeconfargs+=(
|
||||
--enable-server
|
||||
--enable-freeciv-manual=html
|
||||
)
|
||||
else
|
||||
if use !sdl && use !gtk && ! use qt5 ; then
|
||||
einfo "No client backend given, defaulting to"
|
||||
einfo "gtk2 client!"
|
||||
myclient=( gtk2 )
|
||||
else
|
||||
use sdl && myclient+=( sdl2 )
|
||||
use gtk && myclient+=( gtk2 )
|
||||
if use qt5 ; then
|
||||
local -x MOCCMD=$(qt5_get_bindir)/moc
|
||||
myclient+=( qt )
|
||||
append-cxxflags -std=c++11
|
||||
fi
|
||||
fi
|
||||
myeconfargs+=(
|
||||
$(use_enable server)
|
||||
$(use_enable server freeciv-manual html )
|
||||
)
|
||||
fi
|
||||
|
||||
myeconfargs+=(
|
||||
--enable-aimodules="$(usex aimodules "yes" "no")"
|
||||
--enable-client="${myclient[*]}"
|
||||
--enable-fcdb="${mydatabase[*]}"
|
||||
--enable-fcmp="$(usex modpack "gtk2" "no")"
|
||||
# disabling shared libs will break aimodules USE flag
|
||||
--enable-shared
|
||||
--localedir=/usr/share/locale
|
||||
--with-appdatadir="${EPREFIX}"/usr/share/metainfo
|
||||
$(use_enable ipv6)
|
||||
$(use_enable mapimg)
|
||||
$(use_enable nls)
|
||||
$(use_enable sound sdl-mixer)
|
||||
$(use_enable system-lua sys-lua)
|
||||
$(use_with readline)
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
if use dedicated ; then
|
||||
rm -rf "${ED}"/usr/share/pixmaps || die
|
||||
rm -f "${ED}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}* || die
|
||||
else
|
||||
if use server ; then
|
||||
# Create and install the html manual. It can't be done for dedicated
|
||||
# servers, because the 'freeciv-manual' tool is then not built. Also
|
||||
# delete freeciv-manual from the GAMES_BINDIR, because it's useless.
|
||||
# Note: to have it localized, it should be ran from _postinst, or
|
||||
# something like that, but then it's a PITA to avoid orphan files...
|
||||
./tools/freeciv-manual || die
|
||||
docinto html
|
||||
dodoc classic*.html
|
||||
fi
|
||||
if use sdl ; then
|
||||
make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
|
||||
else
|
||||
rm -f "${ED}"/usr/share/man/man6/freeciv-sdl*
|
||||
fi
|
||||
rm -f "${ED}"/usr/share/man/man6/freeciv-xaw*
|
||||
fi
|
||||
find "${ED}" -name "freeciv-manual*" -delete || die
|
||||
|
||||
rm -f "${ED}/usr/$(get_libdir)"/*.a || die
|
||||
find "${ED}" -type f -name "*.la" -delete || die
|
||||
}
|
||||
Loading…
Reference in New Issue