mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
games-puzzle/kiki: Remove last-rited pkg
This commit is contained in:
Michał Górny
@@ -1 +0,0 @@
|
||||
DIST kiki-1.0.2-src.tgz 3366523 SHA256 7651f57543ce61c22bcc01daf6a68e0ab31ba353f9b2fbc067e323bbba6e1246 SHA512 9e5976fee8abcfc8226a158560ead409a68c0eb72d4b5138b10a4fe4ca1fb720972075c4c67f080856a2830fb039fc33151160736bda0b1121c23d9cf4e209c3 WHIRLPOOL 4c7454a43a1bdef285acffad1003f489c753d7afc2aab20b5363db75b906459c00918a9764c2bceb87587bc9b0c28893b166caa7f16e4d1738fe3958082f6d43
|
||||
@@ -1,45 +0,0 @@
|
||||
--- a/kodilib/linux/Makefile
|
||||
+++ b/kodilib/linux/Makefile
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
INCLUDES = $(KODI_INCLUDES) $(X11_INCLUDES) $(SDL_INCLUDES)
|
||||
|
||||
-CXXFLAGS = $(INCLUDES) $(SDL_CFLAGS)
|
||||
+CXXFLAGS += $(INCLUDES) $(SDL_CFLAGS)
|
||||
|
||||
src = \
|
||||
$(KODISRCDIR)/handler/KEventHandler.cpp \
|
||||
--- a/linux/Makefile
|
||||
+++ b/linux/Makefile
|
||||
@@ -14,11 +14,7 @@
|
||||
|
||||
GLLIBS = -lglut -lGLU -lGL
|
||||
|
||||
-PYTHONHOME = /usr/lib/python$(PYTHON_VERSION)/
|
||||
-PYTHONLIBS = $(PYTHONHOME)/config/libpython$(PYTHON_VERSION).a -lutil \
|
||||
- $(PYTHONHOME)/lib-dynload/math.so \
|
||||
- $(PYTHONHOME)/lib-dynload/time.so \
|
||||
- $(PYTHONHOME)/lib-dynload/_random.so
|
||||
+PYTHONLIBS = -lpython$(PYTHON_VERSION) -lutil
|
||||
|
||||
# change this, if the kodilib directory isn't parallel to the kiki directory
|
||||
|
||||
@@ -46,7 +42,7 @@
|
||||
|
||||
INCLUDES = $(KIKI_INCLUDES) $(X11_INCLUDES) $(PYTHON_INCLUDES)
|
||||
|
||||
-CXXFLAGS = $(INCLUDES) $(SDLCFLAGS)
|
||||
+CXXFLAGS += $(INCLUDES) $(SDLCFLAGS)
|
||||
|
||||
src = \
|
||||
$(KIKISRC)/base/KikiAction.cpp \
|
||||
@@ -105,8 +101,7 @@
|
||||
obj = $(src:.cpp=.o)
|
||||
|
||||
kiki: $(KIKISRC)/../SWIG/KikiPy_wrap.cpp $(obj)
|
||||
- -(cd ../SWIG; swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i; cp kiki.py ../py)
|
||||
- $(CXX) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)
|
||||
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)
|
||||
|
||||
obj-clean:
|
||||
$(RM) -f $(obj)
|
||||
@@ -1,19 +0,0 @@
|
||||
--- a/src/main/main.cpp.orig 2003-04-11 14:42:29.000000000 +0100
|
||||
+++ b/src/main/main.cpp 2006-07-06 19:37:55.000000000 +0100
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <math.h>
|
||||
|
||||
#include <SDL.h>
|
||||
+#include <GL/glut.h>
|
||||
#include "KikiController.h"
|
||||
|
||||
// __________________________________________________________________________________________________
|
||||
@@ -19,6 +20,8 @@
|
||||
int width, height;
|
||||
SDL_Surface * screen;
|
||||
|
||||
+ glutInit(&argc, argv);
|
||||
+
|
||||
// initialize SDL
|
||||
if ( SDL_Init(SDL_INIT_VIDEO | SDL_INIT_VIDEO) < 0 ) // SDL_INIT_TIMER
|
||||
{
|
||||
@@ -1,10 +0,0 @@
|
||||
--- a/src/main/KikiPythonWidget.h.old 2006-05-07 23:14:09.000000000 +0200
|
||||
+++ b/src/main/KikiPythonWidget.h 2006-05-07 23:17:20.000000000 +0200
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "KikiPos.h"
|
||||
#include <KTextField.h>
|
||||
|
||||
+class KikiPython;
|
||||
class KikiPythonWidget : public KTextField
|
||||
{
|
||||
friend class KikiPython;
|
||||
@@ -1,56 +0,0 @@
|
||||
--- kiki/kodilib/src/handler/KPickable.h.orig 2003-04-09 05:56:01.000000000 +0300
|
||||
+++ kiki/kodilib/src/handler/KPickable.h 2008-10-18 17:23:42.000000000 +0300
|
||||
@@ -9,6 +9,8 @@
|
||||
#include "KIntrospection.h"
|
||||
#include <vector>
|
||||
|
||||
+#include <limits.h>
|
||||
+
|
||||
#define DEBUG_PICKING false
|
||||
|
||||
class KPickable;
|
||||
--- kiki/kodilib/src/tools/KIntrospection.h.orig 2003-04-09 05:56:03.000000000 +0300
|
||||
+++ kiki/kodilib/src/tools/KIntrospection.h 2008-10-18 17:22:03.000000000 +0300
|
||||
@@ -11,6 +11,7 @@
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
+#include <cstring>
|
||||
|
||||
// --------------------------------------------------------------------------------------------------------
|
||||
class KClassInfo
|
||||
--- kiki/kodilib/src/tools/KStringTools.cpp.orig 2003-04-14 00:42:13.000000000 +0300
|
||||
+++ kiki/kodilib/src/tools/KStringTools.cpp 2008-10-18 17:25:48.000000000 +0300
|
||||
@@ -6,9 +6,10 @@
|
||||
#include "KStringTools.h"
|
||||
#include "KVector.h"
|
||||
|
||||
-#include <sys/types.h> // INT_MAX
|
||||
#include <stdio.h>
|
||||
|
||||
+#include <limits.h> // INT_MAX
|
||||
+
|
||||
// --------------------------------------------------------------------------------------------------------
|
||||
void kStringInsertStringBehindTags ( std::string & str, const std::string & insertString,
|
||||
const std::string & tag )
|
||||
--- kiki/kodilib/src/tools/KStringTools.h.orig 2003-04-09 05:56:04.000000000 +0300
|
||||
+++ kiki/kodilib/src/tools/KStringTools.h 2008-10-18 17:22:49.000000000 +0300
|
||||
@@ -7,6 +7,7 @@
|
||||
#define __KStringTools
|
||||
|
||||
#include <string>
|
||||
+#include <cstring>
|
||||
#include <vector>
|
||||
#include <stdarg.h>
|
||||
|
||||
--- kiki/kodilib/src/tools/KXMLTools.cpp.orig 2003-04-14 00:42:13.000000000 +0300
|
||||
+++ kiki/kodilib/src/tools/KXMLTools.cpp 2008-10-18 17:26:42.000000000 +0300
|
||||
@@ -8,6 +8,8 @@
|
||||
#include "KSeparatedMatrix.h"
|
||||
#include <stdio.h>
|
||||
|
||||
+#include <cstdlib>
|
||||
+
|
||||
// --------------------------------------------------------------------------------------------------------
|
||||
std::string kXMLTag ( const std::string & name, const std::string & attributes, int depth )
|
||||
{
|
||||
@@ -1,22 +0,0 @@
|
||||
--- SWIG/KikiPy_wrap.cpp.old 2011-04-20 14:48:38.000000000 +0200
|
||||
+++ SWIG/KikiPy_wrap.cpp 2011-04-20 15:15:08.000000000 +0200
|
||||
@@ -12968,7 +12968,7 @@
|
||||
void *argp1 = 0 ;
|
||||
int res1 = 0 ;
|
||||
PyObject * obj0 = 0 ;
|
||||
- std::string *result = 0 ;
|
||||
+ std::string result ;
|
||||
|
||||
if (!PyArg_ParseTuple(args,(char *)"O:KikiText_getText",&obj0)) SWIG_fail;
|
||||
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_KikiText, 0 | 0 );
|
||||
@@ -12976,8 +12976,8 @@
|
||||
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "KikiText_getText" "', argument " "1"" of type '" "KikiText const *""'");
|
||||
}
|
||||
arg1 = reinterpret_cast< KikiText * >(argp1);
|
||||
- result = (std::string *) &((KikiText const *)arg1)->getText();
|
||||
- resultobj = SWIG_From_std_string(static_cast< std::string >(*result));
|
||||
+ result = ((KikiText const *)arg1)->getText();
|
||||
+ resultobj = SWIG_From_std_string(static_cast< std::string >(result));
|
||||
return resultobj;
|
||||
fail:
|
||||
return NULL;
|
||||
@@ -1,76 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit python-single-r1 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Fun 3D puzzle game using SDL/OpenGL"
|
||||
HOMEPAGE="http://kiki.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/kiki/${P}-src.tgz"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="
|
||||
media-libs/libsdl[opengl]
|
||||
media-libs/sdl-image
|
||||
media-libs/sdl-mixer
|
||||
virtual/opengl
|
||||
virtual/glu
|
||||
media-libs/freeglut
|
||||
${PYTHON_DEPS}"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-lang/swig"
|
||||
|
||||
S=${WORKDIR}/${PN}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-gcc41.patch
|
||||
"${FILESDIR}"/${P}-freeglut.patch
|
||||
"${FILESDIR}"/${P}-gcc43.patch
|
||||
"${FILESDIR}"/${P}-build.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
rm -f py/runkiki || die
|
||||
|
||||
# Change the hard-coded data dir for sounds, etc...
|
||||
sed -i \
|
||||
-e "s:kiki_home += /;:kiki_home = /usr/share/${PN}/;:g" \
|
||||
-e "s:KConsole\:\:printf(\"WARNING \:\: environment variable KIKI_HOME not set ...\");::g" \
|
||||
-e "s:KConsole\:\:printf(\" ... assuming resources in current directory\");::g" \
|
||||
src/main/KikiController.cpp || die
|
||||
|
||||
# Bug 139570
|
||||
cd SWIG || die
|
||||
swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i || die
|
||||
cp -f kiki.py ../py || die
|
||||
eapply "${FILESDIR}"/${P}-gcc46.patch
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export AR CXX
|
||||
|
||||
emake -C kodilib/linux
|
||||
emake -C linux PYTHON_VERSION="${EPYTHON#python}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin linux/kiki
|
||||
|
||||
insinto /usr/share/${PN}
|
||||
doins -r sound
|
||||
|
||||
python_moduleinto ${PN}
|
||||
python_domodule py/.
|
||||
|
||||
dodoc Readme.txt Thanks.txt
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>games@gentoo.org</email>
|
||||
<name>Gentoo Games Project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">kiki</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -297,11 +297,6 @@ media-fonts/acroread-asianfonts
|
||||
# Revdeps need patching.
|
||||
>=media-gfx/libopenraw-0.1.0
|
||||
|
||||
# David Seifert <soap@gentoo.org> (18 Feb 2017)
|
||||
# Awful codebase, pointer-to-int-casts, SDL1
|
||||
# Masked for removal in 30 days
|
||||
games-puzzle/kiki
|
||||
|
||||
# Kent Fredric <kentnl@gentoo.org> (04 Feb 2017)
|
||||
# Unsecure versions that have been only restored to tree
|
||||
# to resolve compatibility problems with mail-filter/amavisd-new
|
||||
|
||||
Reference in New Issue
Block a user