mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-15 05:37:01 +02:00
ufoai: remove package
Package was marked broken for 5 years and uninstallable in the repos for who knows how long. Uses gtk+2.
This commit is contained in:
parent
ab47576797
commit
9a7483a6df
8 changed files with 2 additions and 205 deletions
|
@ -853,6 +853,8 @@ replaces="
|
||||||
traverso<=0.49.6_2
|
traverso<=0.49.6_2
|
||||||
ttyload-git<=20141117_4
|
ttyload-git<=20141117_4
|
||||||
tuxc<=1.1_3
|
tuxc<=1.1_3
|
||||||
|
ufoai-radiant<=2.5_3
|
||||||
|
ufoai<=2.5_3
|
||||||
ufraw-gimp<=0.43.3_2
|
ufraw-gimp<=0.43.3_2
|
||||||
ulozto-downloader<=3.5.2_2
|
ulozto-downloader<=3.5.2_2
|
||||||
unicorn-python<=1.0.2_2
|
unicorn-python<=1.0.2_2
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
ufoai
|
|
|
@ -1,39 +0,0 @@
|
||||||
With gcc6 this logic error needs to be fixed. I think
|
|
||||||
the intention here was to continue, if FS_CheckFile() fails.
|
|
||||||
|
|
||||||
--- a/src/client/battlescape/events/e_main.cpp 2014-06-05 06:18:39.000000000 +0200
|
|
||||||
+++ b/src/client/battlescape/events/e_main.cpp 2017-01-25 16:18:47.764221448 +0100
|
|
||||||
@@ -221,7 +221,7 @@
|
|
||||||
return sound;
|
|
||||||
|
|
||||||
for (int i = 1; i <= 99; i++) {
|
|
||||||
- if (!FS_CheckFile("sounds/%s%02i", sound, i) == -1)
|
|
||||||
+ if (!FS_CheckFile("sounds/%s%02i", sound, i))
|
|
||||||
continue;
|
|
||||||
sound[length] = '\0';
|
|
||||||
Q_strcat(sound, size, "%02i", rand() % i + 1);
|
|
||||||
|
|
||||||
With gcc6 the checks for narrowing integer types are very strict.
|
|
||||||
Explicitly cast the flag combinations to int.
|
|
||||||
--- a/src/client/battlescape/cl_particle.cpp 2014-06-05 06:18:39.000000000 +0200
|
|
||||||
+++ b/src/client/battlescape/cl_particle.cpp 2017-01-25 16:23:44.737146135 +0100
|
|
||||||
@@ -144,12 +144,17 @@
|
|
||||||
V_UNTYPED, V_UNTYPED, V_UNTYPED,
|
|
||||||
V_VECS, V_VECS,
|
|
||||||
V_VECS, V_VECS,
|
|
||||||
- PTL_ONLY_ONE_TYPE | V_FLOAT, PTL_ONLY_ONE_TYPE | V_FLOAT, PTL_ONLY_ONE_TYPE | V_FLOAT,
|
|
||||||
+ static_cast<int>(PTL_ONLY_ONE_TYPE | V_FLOAT),
|
|
||||||
+ static_cast<int>(PTL_ONLY_ONE_TYPE | V_FLOAT),
|
|
||||||
+ static_cast<int>(PTL_ONLY_ONE_TYPE | V_FLOAT),
|
|
||||||
V_VECS, V_VECS,
|
|
||||||
0, 0, 0,
|
|
||||||
|
|
||||||
0,
|
|
||||||
- PTL_ONLY_ONE_TYPE | V_STRING, PTL_ONLY_ONE_TYPE | V_STRING, PTL_ONLY_ONE_TYPE | V_STRING, PTL_ONLY_ONE_TYPE | V_STRING
|
|
||||||
+ static_cast<int>(PTL_ONLY_ONE_TYPE | V_STRING),
|
|
||||||
+ static_cast<int>(PTL_ONLY_ONE_TYPE | V_STRING),
|
|
||||||
+ static_cast<int>(PTL_ONLY_ONE_TYPE | V_STRING),
|
|
||||||
+ static_cast<int>(PTL_ONLY_ONE_TYPE | V_STRING)
|
|
||||||
};
|
|
||||||
CASSERT(lengthof(pc_types) == PC_NUM_PTLCMDS);
|
|
||||||
|
|
|
@ -1,39 +0,0 @@
|
||||||
--- a/src/tools/radiant/libs/gtkutil/glfont.cpp 2020-10-10 12:51:38.707431160 +0700
|
|
||||||
+++ b/src/tools/radiant/libs/gtkutil/glfont.cpp 2020-10-10 12:51:59.843621038 +0700
|
|
||||||
@@ -26,35 +26,7 @@
|
|
||||||
|
|
||||||
GLFont glfont_create (const std::string& font_string)
|
|
||||||
{
|
|
||||||
- GLuint font_list_base = glGenLists(256);
|
|
||||||
- gint font_height = 0;
|
|
||||||
-
|
|
||||||
- PangoFontDescription* font_desc = pango_font_description_from_string(font_string.c_str());
|
|
||||||
-
|
|
||||||
- PangoFont* font = gdk_gl_font_use_pango_font(font_desc, 0, 256, font_list_base);
|
|
||||||
-
|
|
||||||
- if (font != 0) {
|
|
||||||
- PangoFontMetrics* font_metrics = pango_font_get_metrics(font, 0);
|
|
||||||
-
|
|
||||||
- font_height = pango_font_metrics_get_ascent(font_metrics) + pango_font_metrics_get_descent(font_metrics);
|
|
||||||
- font_height = PANGO_PIXELS(font_height);
|
|
||||||
-
|
|
||||||
- pango_font_metrics_unref(font_metrics);
|
|
||||||
- } else {
|
|
||||||
- globalErrorStream() << "Failed to initialize font " << font_string << "\n";
|
|
||||||
- pango_font_description_free(font_desc);
|
|
||||||
- return GLFont(-1, -1);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- pango_font_description_free(font_desc);
|
|
||||||
-
|
|
||||||
- // fix for pango/gtkglext metrix bug
|
|
||||||
- if (font_height > 16)
|
|
||||||
- font_height = 16;
|
|
||||||
-
|
|
||||||
- globalOutputStream() << "Use font " << font_string << "\n";
|
|
||||||
-
|
|
||||||
- return GLFont(font_list_base, font_height);
|
|
||||||
+ return GLFont(-1, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
void glfont_release (GLFont& font)
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/src/tools/radiant/radiant/stacktrace.cpp 2014-06-05 06:18:39.000000000 +0200
|
|
||||||
+++ b/src/tools/radiant/radiant/stacktrace.cpp 2015-10-30 10:51:24.956710075 +0100
|
|
||||||
@@ -24,7 +24,7 @@
|
|
||||||
|
|
||||||
#include "environment.h"
|
|
||||||
|
|
||||||
-#ifdef __linux__
|
|
||||||
+#ifdef __GLIBC__
|
|
||||||
#include <execinfo.h>
|
|
||||||
|
|
||||||
void write_stack_trace (TextOutputStream& outputStream)
|
|
|
@ -1,15 +0,0 @@
|
||||||
--- a/src/client/renderer/r_program.h 2014-06-05 06:18:39.000000000 +0200
|
|
||||||
+++ b/src/client/renderer/r_program.h 2017-01-25 16:15:42.467269009 +0100
|
|
||||||
@@ -30,8 +30,12 @@
|
|
||||||
char name[MAX_QPATH];
|
|
||||||
} r_shader_t;
|
|
||||||
|
|
||||||
+#if !defined(GL_UNIFORM)
|
|
||||||
#define GL_UNIFORM 1
|
|
||||||
+#endif
|
|
||||||
+#if !defined(GL_ATTRIBUTE)
|
|
||||||
#define GL_ATTRIBUTE 2
|
|
||||||
+#endif
|
|
||||||
/* program variables */
|
|
||||||
typedef struct r_progvar_s {
|
|
||||||
GLint type;
|
|
|
@ -1,17 +0,0 @@
|
||||||
SDL_opengl.h dosen't have the nessecary headers. GL/gl.h has the parts
|
|
||||||
of SDL_opengl.h needed for SDL_opengl_glext.h, then include
|
|
||||||
SDL_opengl_glext.h which has the *f functions.
|
|
||||||
|
|
||||||
--- a/src/client/renderer/r_gl.h 2020-10-08 07:50:29.818581990 +1100
|
|
||||||
+++ b/src/client/renderer/r_gl.h 2020-10-08 07:52:16.805006133 +1100
|
|
||||||
@@ -29,7 +29,8 @@
|
|
||||||
#include "../../ports/android/r_gles_android.h"
|
|
||||||
#include <stdlib.h>
|
|
||||||
#else
|
|
||||||
-#include <SDL_opengl.h>
|
|
||||||
+#include <GL/gl.h>
|
|
||||||
+#include <SDL_opengl_glext.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
inline void R_DrawArrays (GLint first, GLsizei count) {
|
|
||||||
|
|
|
@ -1,83 +0,0 @@
|
||||||
# Template file for 'ufoai'
|
|
||||||
pkgname=ufoai
|
|
||||||
version=2.5
|
|
||||||
revision=3
|
|
||||||
create_wrksrc=yes
|
|
||||||
build_style=gnu-makefile
|
|
||||||
hostmakedepends="pkg-config gettext"
|
|
||||||
makedepends="MesaLib-devel glu-devel libjpeg-turbo-devel
|
|
||||||
libvorbis-devel libopenal-devel xvidcore-devel libtheora-devel
|
|
||||||
SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel libcurl-devel
|
|
||||||
gtkglext-devel gtksourceview2-devel"
|
|
||||||
depends="ca-certificates"
|
|
||||||
short_desc="UFO Alien Invasion"
|
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
|
||||||
license="GPL-2.0-or-later"
|
|
||||||
homepage="http://ufoai.org/"
|
|
||||||
distfiles="
|
|
||||||
${SOURCEFORGE_SITE}/${pkgname}/UFO_AI%202.x/${version}/${pkgname}-${version}-source.tar.bz2
|
|
||||||
${SOURCEFORGE_SITE}/${pkgname}/UFO_AI%202.x/${version}/${pkgname}-${version}-data.tar"
|
|
||||||
checksum="0c7cc3bc9efeb276f71cbe6ee8ff7c76f98d183de79f1a069fa63059cf182a8f
|
|
||||||
5e706a424aff6a2ea30a4c798129d6304e897387eadf808528129b512b7dcdb0"
|
|
||||||
replaces="ufoai-data>=0"
|
|
||||||
ignore_elf_dirs="/usr/share/ufoai"
|
|
||||||
broken="game doesn't work"
|
|
||||||
|
|
||||||
# suppress a lot of warnings
|
|
||||||
CXXFLAGS="-Wno-cast-align -Wno-cast-qual -Wno-inline"
|
|
||||||
LDFLAGS="-lX11"
|
|
||||||
|
|
||||||
post_extract() {
|
|
||||||
cd ${wrksrc}
|
|
||||||
mv ufoai-${version}-source/* .
|
|
||||||
}
|
|
||||||
do_configure() {
|
|
||||||
# Further reduce amount of warnings
|
|
||||||
sed -i build/platforms/linux.mk \
|
|
||||||
-e"s;_BSD_SOURCE;_DEFAULT_SOURCE;g"
|
|
||||||
|
|
||||||
# Disable building of maps and models
|
|
||||||
sed -i Makefile \
|
|
||||||
-e "s;include build/maps.mk;#&;" \
|
|
||||||
-e "s;include build/models.mk;#&;"
|
|
||||||
|
|
||||||
./configure --prefix=/usr \
|
|
||||||
--bindir=/usr/bin \
|
|
||||||
--datadir=/usr/share/ufoai \
|
|
||||||
--localedir=/usr/share/ufoai/base/i18n \
|
|
||||||
--enable-uforadiant \
|
|
||||||
--enable-release
|
|
||||||
}
|
|
||||||
do_build() {
|
|
||||||
make ${makejobs}
|
|
||||||
make ${makejobs} lang
|
|
||||||
make ${makejobs} uforadiant
|
|
||||||
}
|
|
||||||
post_install() {
|
|
||||||
local f
|
|
||||||
for f in ufo ufoai ufoai-safe ufoded uforadiant; do
|
|
||||||
if [ -f debian/$f.desktop ]; then
|
|
||||||
vinstall debian/$f.desktop 644 usr/share/applications
|
|
||||||
fi
|
|
||||||
if [ -f debian/$f.xpm ]; then
|
|
||||||
vinstall debian/$f.xpm 644 usr/share/pixmaps
|
|
||||||
fi
|
|
||||||
if [ -f debian/$f.6 ]; then
|
|
||||||
vman debian/$f.6
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
# adjust desktop files
|
|
||||||
sed -i ${DESTDIR}/usr/share/applications/* -e "s;/usr/games/;;"
|
|
||||||
}
|
|
||||||
|
|
||||||
ufoai-radiant_package() {
|
|
||||||
short_desc+=" - map editor"
|
|
||||||
depends="${sourcepkg}>=${version}_${revision}"
|
|
||||||
pkg_install() {
|
|
||||||
vmove usr/bin/uforadiant
|
|
||||||
vmove usr/share/ufoai/radiant
|
|
||||||
vmove usr/share/applications/uforadiant.desktop
|
|
||||||
vmove usr/share/man/man6/uforadiant.6
|
|
||||||
vmove usr/share/pixmaps/uforadiant.xpm
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Add table
Reference in a new issue