From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- games-puzzle/magiccube4d/Manifest | 8 ++++ .../files/magiccube4d-2.2-64bit-ptr.patch | 53 ++++++++++++++++++++++ .../magiccube4d/files/magiccube4d-2.2-gcc41.patch | 22 +++++++++ .../files/magiccube4d-2.2-ldflags.patch | 15 ++++++ .../files/magiccube4d-EventHandler.patch | 11 +++++ games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild | 44 ++++++++++++++++++ games-puzzle/magiccube4d/metadata.xml | 8 ++++ 7 files changed, 161 insertions(+) create mode 100644 games-puzzle/magiccube4d/Manifest create mode 100644 games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch create mode 100644 games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch create mode 100644 games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch create mode 100644 games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch create mode 100644 games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild create mode 100644 games-puzzle/magiccube4d/metadata.xml (limited to 'games-puzzle/magiccube4d') diff --git a/games-puzzle/magiccube4d/Manifest b/games-puzzle/magiccube4d/Manifest new file mode 100644 index 000000000000..97074b4f57d1 --- /dev/null +++ b/games-puzzle/magiccube4d/Manifest @@ -0,0 +1,8 @@ +AUX magiccube4d-2.2-64bit-ptr.patch 1406 BLAKE2B 7741efef6045568adfb19b9cf64191ff682969dbcc4b12fdbbe62c55a9f4a4ae87a1208ad56fbd9ae8c331a33a79cde2ad28296da2a72d0c54810d1e183334ed SHA512 eb684cca4f6f02903c71e970146f6c110d9634ce2f1416e64bdf258b85264c79eaaa9b869f05ddb116373d908f4d0d2675c87d275ab79f76b21f77c5ce1c1563 +AUX magiccube4d-2.2-gcc41.patch 885 BLAKE2B 42990103d195d793e1b10efa573179373202de3d798168b309c14e96a868a80171501d63993e0adff569c8f5a072c55f312431b2eb0deab9f0f9dbb88fef7489 SHA512 2ac9eed48b4598b006ce866c319075eb6b06e8119890db28a0a88d6c680949606d89f5aa113a946c565a4abae529d07d22c7def72dd17beb810ea2f555833d69 +AUX magiccube4d-2.2-ldflags.patch 501 BLAKE2B 2abc1cf4e4b9d210634fae3da618848d21b818d006d30d67a316e750f4e9c77bb2ab8097fc07a1a34aace7efb64f5b3845d8975aa65e7ed83de662eb2dff7968 SHA512 76183b674fa09d330edb82e3c72b605b992a6fe24273c55a45d819ad08854869a7a73ae2ab0d03c14cd872fb13fc0836b75c8d17e3828559bb49d0064caa41b6 +AUX magiccube4d-EventHandler.patch 429 BLAKE2B 7572ff178552f47fe12012f6d6a822a2e2d2d63115eb14fce6ecc8bf489a7ab3c04a7f028d7a514d8de9adca27e6032051b0930386e7d40db08378ad16690a4c SHA512 e11bc6d31a41dca68b450773f575ff1708426daf1f8750117de81592f7050cebe9ea61385e24bd09186d166d764b2d00351b203552eb9d1c2a10be03b3be4f03 +DIST magiccube4d.gif 20739 BLAKE2B feaf1911e483bff7244476000c75b34794911fe279772b8f5d46ee8bd4125881fb71aaab0ebac891fd0a5db38b746c940991bf5fe9e1ad8a678240b2d6cddf82 SHA512 7a8902710eaa78a6580f024a86bfa1828870dc873a4fef30a7d4fa197a67cd1dde162d6d1d1ba0bea4307c13198d52505fb1a1fa3f6d10b3914af42d7c0ebd49 +DIST mc4d-src-2_2.tgz 144645 BLAKE2B 5b29963d056961ce425f7644b14c35e44ce94bc7be6ea5f3fbbb4048478366951005eb8e91fe7cb12e6f1424ad55add31493e0ad3a4ab18eea9e747f940c35f3 SHA512 19491460bada93b4ee2010004128279cb88ab866a5a8c791080d59fa86e5bacf966d7dab0c9b3074e94b77611ae341480d19b384079e83df549ef25e592b12a6 +EBUILD magiccube4d-2.2-r1.ebuild 1028 BLAKE2B d8a43720dd54d430685c2ef90bb4425a764dab690af518c9ed524ba85b830604728f94735d6cf6a678edee6ddfea87d08fff6873e0a13b6b61c16dac8fd61dd9 SHA512 ffcb0d692bca7fb0684cb93f3d1d7eb809f2ddf20d196e6c949f5d4cbef5895ad7e3e5cbc1e63bcb7a778a74c9d4876595d14182c24a18c9f6884f720fce9d08 +MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch new file mode 100644 index 000000000000..7fbd52871887 --- /dev/null +++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch @@ -0,0 +1,53 @@ +diff -Nru magiccube4d-src-2_2.orig/EventHandler.cpp magiccube4d-src-2_2/EventHandler.cpp +--- magiccube4d-src-2_2.orig/EventHandler.cpp 2007-09-30 12:01:46.503967712 +0200 ++++ magiccube4d-src-2_2/EventHandler.cpp 2007-09-30 12:03:23.489172011 +0200 +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "MagicCube.h" + #include "Puzzlest.h" +@@ -415,7 +416,7 @@ + void + EventHandler::undo_cb(void* argp) + { +- int arg = (int) argp; ++ int arg = (intptr_t) argp; + struct stickerspec grip; + int dir; + int slicesmask; +@@ -461,7 +462,7 @@ + void + EventHandler::redo_cb(void* argp) + { +- int arg = (int) argp; ++ int arg = (intptr_t) argp; + struct stickerspec grip; + int dir; + int slicesmask; +@@ -507,7 +508,7 @@ + void + EventHandler::scramble_cb(void *arg = NULL) + { +- int n = (int)arg; ++ int n = (intptr_t)arg; + struct stickerspec grip; + int i, previous_face = -1; + int ngrips = NFACES * 3 * 3 * 3; +@@ -855,12 +856,12 @@ + void + EventHandler::newPuzzle_cb(void* arg) + { +- if ((int)arg == preferences.getLength()) ++ if ((intptr_t)arg == preferences.getLength()) + { + reset_cb(0); + return; + } +- preferences.setLength((int)arg); ++ preferences.setLength((intptr_t)arg); + int length = preferences.getLength(); + + polymgr->reset(length); diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch new file mode 100644 index 000000000000..8e2aaf2b5fcd --- /dev/null +++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch @@ -0,0 +1,22 @@ +--- a/EventHandler.h.old 2006-05-19 22:11:48.000000000 +0200 ++++ b/EventHandler.h 2006-05-19 22:11:58.000000000 +0200 +@@ -165,7 +165,7 @@ + + int number_of_reference_stickers_needed; + int (*reference_stickers_needed)[4]; +- void (EventHandler::*what_to_do_after_got_reference_stickers) (void *arg = NULL); ++ void (EventHandler::*what_to_do_after_got_reference_stickers) (void *arg); + void* cur_ui_data; + + bool quick_mode; +--- a/Machine.h.old 2006-05-19 22:12:17.000000000 +0200 ++++ b/Machine.h 2006-05-19 22:12:29.000000000 +0200 +@@ -31,7 +31,7 @@ + { + public: + typedef void (EventHandler::*event_handler)(EventHandler::Event*, +- void *arg = 0); ++ void *arg); + virtual ~Machine() {}; + + static Machine* createMachine(EventHandler*, int& argc, char *argv[], diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch new file mode 100644 index 000000000000..73d1b4a59dca --- /dev/null +++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch @@ -0,0 +1,15 @@ +--- a/Makefile.in.old 2010-10-15 10:38:48.000000000 +0200 ++++ b/Makefile.in 2010-10-15 10:39:07.000000000 +0200 +@@ -72,10 +72,10 @@ + $(CXX) -c $(CXXFLAGS) $< + + $(TARGET): $(OBJS) +- $(CXX) -o $(TARGET) $(OBJS) $(LIBDIRS) $(LIBS) ++ $(CXX) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBDIRS) $(LIBS) + + $(TARGET).static: $(OBJS) +- $(CXX) -static -o $(TARGET).static $(OBJS) $(LIBDIRS) $(LIBS) ++ $(CXX) $(LDFLAGS) -static -o $(TARGET).static $(OBJS) $(LIBDIRS) $(LIBS) + + Vec.h: vec_h.c + $(CC) -o vec_h vec_h.c diff --git a/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch b/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch new file mode 100644 index 000000000000..d242438d8d05 --- /dev/null +++ b/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch @@ -0,0 +1,11 @@ +--- a/EventHandler.cpp.old 2004-11-04 22:58:13.735812448 +1100 ++++ b/EventHandler.cpp 2004-11-04 22:57:03.176539088 +1100 +@@ -326,7 +326,7 @@ + number_of_reference_stickers_needed--; + reference_stickers_needed++; + if (number_of_reference_stickers_needed == 0) +- (this->*what_to_do_after_got_reference_stickers)(); ++ (this->*what_to_do_after_got_reference_stickers)(NULL); + } + } + diff --git a/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild b/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild new file mode 100644 index 000000000000..5f9eac856d8f --- /dev/null +++ b/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit desktop + +MY_PV="${PV/./_}" +DESCRIPTION="Four-dimensional analog of Rubik's cube" +HOMEPAGE="http://www.superliminal.com/cube/cube.htm" +SRC_URI="http://www.superliminal.com/cube/mc4d-src-${MY_PV}.tgz + http://superliminal.com/cube/cube_transp.gif -> ${PN}.gif" + +LICENSE="free-noncomm" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="x11-libs/libXaw" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}-src-${MY_PV}" + +src_prepare() { + default + eapply "${FILESDIR}"/${PN}-EventHandler.patch \ + "${FILESDIR}/${P}"-gcc41.patch \ + "${FILESDIR}/${P}"-64bit-ptr.patch \ + "${FILESDIR}"/${P}-ldflags.patch + sed -i \ + -e "s:-Werror::" \ + configure \ + || die "sed failed" +} + +src_compile() { + emake DFLAGS="${CFLAGS}" +} + +src_install() { + dobin magiccube4d + dodoc ChangeLog MagicCube4D-unix.txt readme-unix.txt Intro.txt + doicon "${DISTDIR}"/${PN}.gif + make_desktop_entry ${PN} "Magic Cube 4D" /usr/share/pixmaps/${PN}.gif +} diff --git a/games-puzzle/magiccube4d/metadata.xml b/games-puzzle/magiccube4d/metadata.xml new file mode 100644 index 000000000000..78274e0fa550 --- /dev/null +++ b/games-puzzle/magiccube4d/metadata.xml @@ -0,0 +1,8 @@ + + + + + games@gentoo.org + Gentoo Games Project + + -- cgit v1.2.3