From ecb9fdd0b1b963455c475d93cf7a7837a8c2d186 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 11 Aug 2022 12:16:35 -0400 Subject: [PATCH 1/2] cegui: drop unused dependencies in makedepends. The only package currently depending on cegui (TSC) doesn't require these and they are both EOL: - Drop python-devel, since configure output shows that it wasn't even building the python extension modules due to some issue with Boost-python. - Drop gtk2 (gtk+-devel) since it is only used for samples, and TSC only required freetype2, which is now included separately instead of pulled in in dependency tree of gtk+-devel. --- srcpkgs/cegui/template | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template index 070fa66aff81..d09494b2c66b 100644 --- a/srcpkgs/cegui/template +++ b/srcpkgs/cegui/template @@ -1,7 +1,7 @@ # Template file for 'cegui' pkgname=cegui version=0.8.7.20190225 -revision=5 +revision=6 _githash=bfc6a841de45b8e63040d33b9cccc67745337f4e wrksrc="${pkgname}-${_githash}" build_style=cmake @@ -10,12 +10,11 @@ configure_args="-DOpenGL_GL_PREFERENCE=GLVND \ -DCEGUI_SAMPLES_ENABLED=OFF" make_build_args="all html" hostmakedepends="graphviz doxygen dejavu-fonts-ttf gd glm perl pkg-config" -makedepends="libglvnd-devel SDL2-devel SDL2_image-devel libxml2-devel boost-devel - devil-devel glfw-devel glm ois-devel silly-devel fribidi-devel lua53-devel minizip-devel +makedepends="libglvnd-devel SDL2-devel SDL2_image-devel libxml2-devel + boost-devel devil-devel glfw-devel glm ois-devel silly-devel fribidi-devel + lua53-devel minizip-devel freetype-devel $(vopt_if irrlicht irrlicht-devel) - $(vopt_if ogre libogre-devel) - $(vopt_if python python-devel) - $(vopt_if gtk gtk+-devel)" + $(vopt_if ogre libogre-devel)" short_desc="Crazy Eddie's Graphical User Interface" maintainer="Orphaned " license="MIT" @@ -24,10 +23,9 @@ distfiles="https://github.com/cegui/cegui/archive/${_githash}.tar.gz" checksum=70156257313b81d068d6592887157dd16b91d7bc0dfdcba02a96ed371d329e64 replaces="cegui-data>=0 cegui-sample>=0" -build_options="gtk irrlicht ogre python" +build_options="irrlicht ogre" desc_option_irrlicht="Enable support for Irrlicht" desc_option_ogre="Enable support for Ogre" -build_options_default="gtk python" if [ -z "$CROSS_BUILD" ]; then # irrlicht interface fails to cross compile From f90f229d339db3a7b7dac542faaa3d87354aabb4 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 11 Aug 2022 13:34:36 -0400 Subject: [PATCH 2/2] cegui07: drop unused python/python-devel in *depends. --- srcpkgs/cegui07/template | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template index 3fa7f80a2ea7..c5cc5ca950e8 100644 --- a/srcpkgs/cegui07/template +++ b/srcpkgs/cegui07/template @@ -1,18 +1,17 @@ # Template file for 'cegui07' pkgname=cegui07 version=0.7.9 -revision=8 +revision=9 wrksrc="CEGUI-${version}" build_style=gnu-configure configure_args="--disable-samples" make_build_args="all html" hostmakedepends="automake dejavu-fonts-ttf doxygen glm graphviz libtool - pkg-config python" + pkg-config" makedepends="boost-devel devil-devel freeimage-devel freetype-devel fribidi-devel glfw-devel libxml2-devel lua51-devel minizip-devel ois-devel pcre-devel silly-devel tinyxml-devel toluapp-devel - $(vopt_if irrlicht 'irrlicht-devel') - $(vopt_if python 'python-devel')" + $(vopt_if irrlicht 'irrlicht-devel')" depends="cegui07-data" short_desc="Crazy Eddie's Graphical User Interface (0.7.x)" maintainer="Orphaned " @@ -21,18 +20,10 @@ homepage="http://cegui.org.uk/" distfiles="${SOURCEFORGE_SITE}/crayzedsgui/CEGUI%20Mk-2/${version}/CEGUI-${version}.tar.gz" checksum=7c3b264def08b46de749c2acaba363e907479d924612436f3bd09da2e474bb8c -build_options="irrlicht python" +build_options="irrlicht" desc_option_irrlicht="Enable support for Irrlicht" build_options_default="irrlicht" -if [ -z "$CROSS_BUILD" ]; then - # XXX: boost-python is not available when cross building - build_options_default+=" python" -fi - -# Make configure find python and freetype2 -CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7" - pre_configure() { # Silence doxygen sed -i doc/doxygen/Makefile.am \