* [gentoo-commits] repo/gentoo:master commit in: dev-games/cegui/, dev-games/cegui/files/
@ 2018-01-31 0:14 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-01-31 0:14 UTC (permalink / raw
To: gentoo-commits
commit: 96c12e8961a79e7169ba777f2698c86205f66c88
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 31 00:12:24 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 31 00:12:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c12e89
dev-games/cegui: Drop old
Closes: https://bugs.gentoo.org/642496
Package-Manager: Portage-2.3.21, Repoman-2.3.6
dev-games/cegui/Manifest | 2 -
dev-games/cegui/cegui-0.6.2b.ebuild | 94 --------------------------
dev-games/cegui/files/cegui-0.6.2b-dups.patch | 12 ----
dev-games/cegui/files/cegui-0.6.2b-gcc43.patch | 10 ---
dev-games/cegui/files/cegui-0.6.2b-gcc46.patch | 10 ---
5 files changed, 128 deletions(-)
diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index db3d26de83e..8f032e272ef 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -1,3 +1 @@
-DIST CEGUI-0.6.2-DOCS.tar.gz 18396638 BLAKE2B d8638de6c13a6ae645c90345fad84dfd6a333d4e8047ccf67359e92b834da46d19612fce87eb0a071f35e4697eb9f2caf795e339f27d27a21b38b32eb5ffb101 SHA512 56ded923f21f18d837d71425e06fe8675a2efa979edde461a9e4e558c213cbb79ff8eeb576211da6ade56526ccdd9644a7a45b3619058615388e3882f96b9fb4
-DIST CEGUI-0.6.2b.tar.gz 2628081 BLAKE2B 0f6d8e50e67dd849624a9c90fd050b0befe4f6a90a446a72d91ece853d291a99221d11f7dc891874958421d129c4d9f1059dccb276b37be050bfc8f5ca35528a SHA512 52ed7e7a97024138af957815a396dda74b650e7c53542d2d48c5eb95335bec270abca3685c49b05078f4338079334df6bfbcec75e9b7eb21ee40bdbff5f57b20
DIST cegui-0.8.7.tar.bz2 18114465 BLAKE2B cf0a4867f0e32c6a6b585821c915dc1fbd532e0f95effe28f6d3e4f1a2bccd23f47c7c33a3115befdf8b3f094d49a5af042d28c1e1fbb88e7c7f6da7f3fa173b SHA512 271ff2a1e19f46c7d40cbc210bc665666e45b56cd0efea460db4d08df134d929337846eaf923db1b915597965aab27ad39512d6567cc63ef883555cbff542e56
diff --git a/dev-games/cegui/cegui-0.6.2b.ebuild b/dev-games/cegui/cegui-0.6.2b.ebuild
deleted file mode 100644
index 0913935294e..00000000000
--- a/dev-games/cegui/cegui-0.6.2b.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=CEGUI-${PV%b}
-DESCRIPTION="Crazy Eddie's GUI System"
-HOMEPAGE="http://www.cegui.org.uk/"
-SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}b.tar.gz
- doc? ( mirror://sourceforge/crayzedsgui/${MY_P}-DOCS.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug devil directfb doc examples expat irrlicht lua opengl xerces-c xml"
-
-RDEPEND="dev-libs/libpcre
- media-libs/freetype:2
- devil? ( media-libs/devil )
- directfb? ( dev-libs/DirectFB )
- expat? ( dev-libs/expat )
- irrlicht? ( dev-games/irrlicht )
- lua? (
- dev-lang/lua:0
- dev-lua/toluapp
- )
- opengl? (
- virtual/opengl
- media-libs/freeglut
- media-libs/glew:=
- )
- xerces-c? ( dev-libs/xerces-c )
- xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gcc43.patch \
- "${FILESDIR}"/${P}-dups.patch \
- "${FILESDIR}"/${P}-gcc46.patch
- sed -i \
- -e 's/ILvoid/void/g' \
- ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp || die
- if use examples ; then
- cp -r Samples Samples.clean || die
- rm -f $(find Samples.clean -name 'Makefile*') || die
- rm -rf Samples.clean/bin || die
- fi
- eautoreconf #220040
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable devil) \
- $(use_enable directfb directfb-renderer) \
- $(use_enable examples samples) \
- $(use_enable expat) \
- $(use_enable irrlicht irrlicht-renderer) \
- $(use_enable lua external-toluapp) \
- $(use_enable lua lua-module) \
- $(use_enable lua toluacegui) \
- $(use_enable opengl external-glew) \
- $(use_enable opengl opengl-renderer) \
- $(use_enable xerces-c) \
- $(use_enable xml libxml) \
- --enable-static \
- --enable-tga \
- --enable-tinyxml \
- --disable-corona \
- --disable-dependency-tracking \
- --disable-external-tinyxml \
- --disable-freeimage \
- --disable-samples \
- --disable-silly \
- --without-gtk2 \
- --without-ogre-renderer
-}
-
-src_install() {
- default
- if use doc ; then
- dohtml -r documentation/api_reference
- dodoc documentation/*.pdf
- fi
- if use examples ; then
- insinto /usr/share/doc/${PF}/Samples
- doins -r Samples.clean/*
- fi
-}
diff --git a/dev-games/cegui/files/cegui-0.6.2b-dups.patch b/dev-games/cegui/files/cegui-0.6.2b-dups.patch
deleted file mode 100644
index a4d80c4347d..00000000000
--- a/dev-games/cegui/files/cegui-0.6.2b-dups.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur _orig_CEGUI-0.6.2/include/elements/Makefile.am CEGUI-0.6.2/include/elements/Makefile.am
---- _orig_CEGUI-0.6.2/include/elements/Makefile.am 2008-01-02 15:26:05.000000000 +0100
-+++ CEGUI-0.6.2/include/elements/Makefile.am 2010-07-11 13:12:16.786338068 +0200
-@@ -21,8 +21,6 @@
- CEGUIItemListBaseProperties.h \
- CEGUIItemListbox.h \
- CEGUIItemListboxProperties.h \
-- CEGUIListHeader.h \
-- CEGUIListHeaderProperties.h \
- CEGUIListbox.h \
- CEGUIListboxItem.h \
- CEGUIListboxProperties.h \
diff --git a/dev-games/cegui/files/cegui-0.6.2b-gcc43.patch b/dev-games/cegui/files/cegui-0.6.2b-gcc43.patch
deleted file mode 100644
index 09695626cef..00000000000
--- a/dev-games/cegui/files/cegui-0.6.2b-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- RendererModules/directfbRenderer/directfb-renderer.h
-+++ RendererModules/directfbRenderer/directfb-renderer.h
-@@ -28,6 +28,7 @@
- #include "CEGUIBase.h"
- #include <directfb.h>
-
-+#include <algorithm>
- #include <vector>
- #include <list>
-
diff --git a/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch b/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch
deleted file mode 100644
index 88f8fccfc20..00000000000
--- a/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cegui/include/CEGUIString.h.old 2011-04-27 14:33:25.862856070 +0200
-+++ cegui/include/CEGUIString.h 2011-04-27 14:33:49.780351908 +0200
-@@ -34,6 +34,7 @@
- #include <string>
- #include <string.h>
- #include <stdexcept>
-+#include <cstddef>
-
- // Start of CEGUI namespace section
- namespace CEGUI
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/cegui/, dev-games/cegui/files/
@ 2018-01-31 0:14 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-01-31 0:14 UTC (permalink / raw
To: gentoo-commits
commit: 7dac17e60ff82f818465642833e69e101a9e8b27
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 31 00:11:49 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 31 00:11:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dac17e6
dev-games/cegui: Fix build with ICU 59
Thanks-to: Lars Wendler (Polynomial-C) <polynomial-c <AT> gentoo.org>
Closes: https://bugs.gentoo.org/618968
Package-Manager: Portage-2.3.21, Repoman-2.3.6
dev-games/cegui/cegui-0.8.7.ebuild | 4 +++-
dev-games/cegui/files/cegui-0.8.7-icu-59.patch | 11 +++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/dev-games/cegui/cegui-0.8.7.ebuild b/dev-games/cegui/cegui-0.8.7.ebuild
index 95a092f7492..179c88599c4 100644
--- a/dev-games/cegui/cegui-0.8.7.ebuild
+++ b/dev-games/cegui/cegui-0.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -56,6 +56,8 @@ DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
opengl? ( media-libs/glm )"
+PATCHES=( "${FILESDIR}"/${P}-icu-59.patch )
+
src_configure() {
# http://www.cegui.org.uk/mantis/view.php?id=991
append-ldflags $(no-as-needed)
diff --git a/dev-games/cegui/files/cegui-0.8.7-icu-59.patch b/dev-games/cegui/files/cegui-0.8.7-icu-59.patch
new file mode 100644
index 00000000000..e64dfc97ab5
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.8.7-icu-59.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,7 +72,7 @@
+
+ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang"))
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+ elseif (NOT CMAKE_VERSION VERSION_LESS "3.1")
+ set (CMAKE_C_STANDARD_REQUIRED TRUE)
+ set (CMAKE_C_STANDARD "99")
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-31 0:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-31 0:14 [gentoo-commits] repo/gentoo:master commit in: dev-games/cegui/, dev-games/cegui/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-01-31 0:14 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox