Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] cegui: drop unused python-devel in makedepends.
@ 2022-08-11 16:29 TinfoilSubmarine
  2022-08-11 16:37 ` classabbyamp
                   ` (15 more replies)
  0 siblings, 16 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-08-11 16:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1573 bytes --]

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/cegui
https://github.com/void-linux/void-packages/pull/38614

cegui: drop unused python-devel in makedepends.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (ran `TSC` with updated `gecui`)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Another one not actually using `python-devel`. Configure output shows that it wasn't even building the python extension modules due to some issue with Boost-python. The only package depending on this is `TSC` and it doesn't seem to require the python extensions.

A patch file from https://github.com/void-linux/void-packages/pull/38614.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/cegui-38614.patch --]
[-- Type: text/x-diff, Size: 1623 bytes --]

From 1c02076b7357c0b87c19923cf9a05a65754c1645 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 11 Aug 2022 12:16:35 -0400
Subject: [PATCH] cegui: drop unused python-devel in makedepends.

---
 srcpkgs/cegui/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index 070fa66aff81..de507c8b0fd3 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
@@ -14,7 +14,6 @@ makedepends="libglvnd-devel SDL2-devel SDL2_image-devel libxml2-devel boost-deve
  devil-devel glfw-devel glm ois-devel silly-devel fribidi-devel lua53-devel minizip-devel
  $(vopt_if irrlicht irrlicht-devel)
  $(vopt_if ogre libogre-devel)
- $(vopt_if python python-devel)
  $(vopt_if gtk gtk+-devel)"
 short_desc="Crazy Eddie's Graphical User Interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -24,10 +23,10 @@ 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="gtk irrlicht ogre"
 desc_option_irrlicht="Enable support for Irrlicht"
 desc_option_ogre="Enable support for Ogre"
-build_options_default="gtk python"
+build_options_default="gtk"
 
 if [ -z "$CROSS_BUILD" ]; then
 	# irrlicht interface fails to cross compile

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: cegui: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
@ 2022-08-11 16:37 ` classabbyamp
  2022-08-11 16:44 ` classabbyamp
                   ` (14 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-08-11 16:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38614#issuecomment-1212223352

Comment:
re: the conflict found in CI, might be good to deal eith cegui07's python in this PR too

btw: thanks for taking care of these!

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: cegui: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
  2022-08-11 16:37 ` classabbyamp
@ 2022-08-11 16:44 ` classabbyamp
  2022-08-11 17:38 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (13 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-08-11 16:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 244 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38614#issuecomment-1212229398

Comment:
hm, the only thing using cegui07 is what TSC is forked from, which hasn't had a commit in 8 years

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] cegui: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
  2022-08-11 16:37 ` classabbyamp
  2022-08-11 16:44 ` classabbyamp
@ 2022-08-11 17:38 ` TinfoilSubmarine
  2022-08-11 18:39 ` [PR REVIEW] cegui/cegui07: " paper42
                   ` (12 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-08-11 17:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1578 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/cegui
https://github.com/void-linux/void-packages/pull/38614

cegui: drop unused python-devel in makedepends.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (ran `TSC` with updated `gecui`)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Another one not actually using `python-devel`. Configure output shows that it wasn't even building the python extension modules due to some issue with Boost-python. The only package depending on this is `TSC` and it doesn't seem to require the python extensions.

A patch file from https://github.com/void-linux/void-packages/pull/38614.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/cegui-38614.patch --]
[-- Type: text/x-diff, Size: 3575 bytes --]

From 1c02076b7357c0b87c19923cf9a05a65754c1645 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 11 Aug 2022 12:16:35 -0400
Subject: [PATCH 1/2] cegui: drop unused python-devel in makedepends.

---
 srcpkgs/cegui/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index 070fa66aff81..de507c8b0fd3 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
@@ -14,7 +14,6 @@ makedepends="libglvnd-devel SDL2-devel SDL2_image-devel libxml2-devel boost-deve
  devil-devel glfw-devel glm ois-devel silly-devel fribidi-devel lua53-devel minizip-devel
  $(vopt_if irrlicht irrlicht-devel)
  $(vopt_if ogre libogre-devel)
- $(vopt_if python python-devel)
  $(vopt_if gtk gtk+-devel)"
 short_desc="Crazy Eddie's Graphical User Interface"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -24,10 +23,10 @@ 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="gtk irrlicht ogre"
 desc_option_irrlicht="Enable support for Irrlicht"
 desc_option_ogre="Enable support for Ogre"
-build_options_default="gtk python"
+build_options_default="gtk"
 
 if [ -z "$CROSS_BUILD" ]; then
 	# irrlicht interface fails to cross compile

From 81aa1b6a66fa3c0f60518064fc2dcb58db9a69a1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
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 <orphan@voidlinux.org>"
@@ -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 \

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] cegui/cegui07: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
                   ` (2 preceding siblings ...)
  2022-08-11 17:38 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-08-11 18:39 ` paper42
  2022-08-11 18:40 ` paper42
                   ` (11 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-08-11 18:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38614#discussion_r943811732

Comment:
what would dropping gtk2 mean?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] cegui/cegui07: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
                   ` (3 preceding siblings ...)
  2022-08-11 18:39 ` [PR REVIEW] cegui/cegui07: " paper42
@ 2022-08-11 18:40 ` paper42
  2022-08-11 18:59 ` classabbyamp
                   ` (10 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-08-11 18:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38614#discussion_r943811732

Comment:
what would dropping gtk2 from here mean?

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: cegui/cegui07: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
                   ` (4 preceding siblings ...)
  2022-08-11 18:40 ` paper42
@ 2022-08-11 18:59 ` classabbyamp
  2022-08-11 19:09 ` [PR REVIEW] " TinfoilSubmarine
                   ` (9 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-08-11 18:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38614#issuecomment-1212223352

Comment:
re: the conflict found in CI, might be good to deal with cegui07's python in this PR too

btw: thanks for taking care of these!

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] cegui/cegui07: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
                   ` (5 preceding siblings ...)
  2022-08-11 18:59 ` classabbyamp
@ 2022-08-11 19:09 ` TinfoilSubmarine
  2022-08-11 21:13 ` paper42
                   ` (8 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-08-11 19:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/38614#discussion_r943835514

Comment:
http://static.cegui.org.uk/docs/0.8.7/dependencies.html:

>  GTK2 (http://www.gtk.org/)
>  Required to enable the GTK2 based renderer selector used in the samples.

So, probably fine

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] cegui/cegui07: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
                   ` (6 preceding siblings ...)
  2022-08-11 19:09 ` [PR REVIEW] " TinfoilSubmarine
@ 2022-08-11 21:13 ` paper42
  2022-08-12 14:17 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (7 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-08-11 21:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38614#discussion_r943944928

Comment:
ok, let's drop it then

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] cegui/cegui07: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
                   ` (7 preceding siblings ...)
  2022-08-11 21:13 ` paper42
@ 2022-08-12 14:17 ` TinfoilSubmarine
  2022-08-12 14:32 ` TinfoilSubmarine
                   ` (6 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-08-12 14:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1586 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/cegui
https://github.com/void-linux/void-packages/pull/38614

cegui/cegui07: drop unused python-devel in makedepends.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (ran `TSC` with updated `gecui`)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Another one not actually using `python-devel`. Configure output shows that it wasn't even building the python extension modules due to some issue with Boost-python. The only package depending on this is `TSC` and it doesn't seem to require the python extensions.

A patch file from https://github.com/void-linux/void-packages/pull/38614.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/cegui-38614.patch --]
[-- Type: text/x-diff, Size: 3668 bytes --]

From 6da7ac917e78c3bf4c2332fe25157433ecdf0113 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 11 Aug 2022 12:16:35 -0400
Subject: [PATCH 1/2] cegui: drop unused python-devel in makedepends.

---
 srcpkgs/cegui/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index 070fa66aff81..8a85e3253856 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
@@ -13,9 +13,7 @@ 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
  $(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 <orphan@voidlinux.org>"
 license="MIT"
@@ -24,10 +22,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 67f884d718a2d8f7ad95f4c6aacae7f8ddd30ed6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
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 <orphan@voidlinux.org>"
@@ -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 \

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] cegui/cegui07: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
                   ` (8 preceding siblings ...)
  2022-08-12 14:17 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-08-12 14:32 ` TinfoilSubmarine
  2022-08-12 14:33 ` TinfoilSubmarine
                   ` (5 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-08-12 14:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1586 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/cegui
https://github.com/void-linux/void-packages/pull/38614

cegui/cegui07: drop unused python-devel in makedepends.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (ran `TSC` with updated `gecui`)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Another one not actually using `python-devel`. Configure output shows that it wasn't even building the python extension modules due to some issue with Boost-python. The only package depending on this is `TSC` and it doesn't seem to require the python extensions.

A patch file from https://github.com/void-linux/void-packages/pull/38614.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/cegui-38614.patch --]
[-- Type: text/x-diff, Size: 4407 bytes --]

From 76ba2f9849257a05f67e2de13acb148b7bb1ab4f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 11 Aug 2022 12:16:35 -0400
Subject: [PATCH 1/2] cegui: drop unused python-devel 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 <orphan@voidlinux.org>"
 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 8bec68cca8ba9cddb3d0abdba8b6455a92ae5529 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
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 <orphan@voidlinux.org>"
@@ -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 \

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] cegui/cegui07: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
                   ` (9 preceding siblings ...)
  2022-08-12 14:32 ` TinfoilSubmarine
@ 2022-08-12 14:33 ` TinfoilSubmarine
  2022-08-12 21:23 ` classabbyamp
                   ` (4 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-08-12 14:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1586 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/cegui
https://github.com/void-linux/void-packages/pull/38614

cegui/cegui07: drop unused python-devel in makedepends.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (ran `TSC` with updated `gecui`)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Another one not actually using `python-devel`. Configure output shows that it wasn't even building the python extension modules due to some issue with Boost-python. The only package depending on this is `TSC` and it doesn't seem to require the python extensions.

A patch file from https://github.com/void-linux/void-packages/pull/38614.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/cegui-38614.patch --]
[-- Type: text/x-diff, Size: 4407 bytes --]

From ecb9fdd0b1b963455c475d93cf7a7837a8c2d186 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
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 <orphan@voidlinux.org>"
 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 <joel@beckmeyer.us>
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 <orphan@voidlinux.org>"
@@ -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 \

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: cegui/cegui07: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
                   ` (10 preceding siblings ...)
  2022-08-12 14:33 ` TinfoilSubmarine
@ 2022-08-12 21:23 ` classabbyamp
  2022-08-12 22:47 ` [PR REVIEW] " paper42
                   ` (3 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-08-12 21:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 347 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38614#issuecomment-1213530399

Comment:
re: conflict

I'm inclined to say that SMC and cegui07 should be removed. SMC was added in 2015 and hasn't had an update since 2009. Its fork, TSC, has more active development (latest release 2020).

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR REVIEW] cegui/cegui07: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
                   ` (11 preceding siblings ...)
  2022-08-12 21:23 ` classabbyamp
@ 2022-08-12 22:47 ` paper42
  2022-08-15 12:39 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (2 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-08-12 22:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/38614#discussion_r944917972

Comment:
convert all seds to vseds

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] cegui/cegui07: drop unused python-devel in makedepends.
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
                   ` (12 preceding siblings ...)
  2022-08-12 22:47 ` [PR REVIEW] " paper42
@ 2022-08-15 12:39 ` TinfoilSubmarine
  2022-08-15 12:42 ` [PR PATCH] [Updated] cegui: drop unused dependencies in makedepends; SMC/cegui07: remove TinfoilSubmarine
  2022-08-17 15:41 ` [PR PATCH] [Merged]: " classabbyamp
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-08-15 12:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1586 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/cegui
https://github.com/void-linux/void-packages/pull/38614

cegui/cegui07: drop unused python-devel in makedepends.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (ran `TSC` with updated `gecui`)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Another one not actually using `python-devel`. Configure output shows that it wasn't even building the python extension modules due to some issue with Boost-python. The only package depending on this is `TSC` and it doesn't seem to require the python extensions.

A patch file from https://github.com/void-linux/void-packages/pull/38614.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/cegui-38614.patch --]
[-- Type: text/x-diff, Size: 40698 bytes --]

From 7ac72d14734008256ea8c6492627c8149f7934e6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 15 Aug 2022 08:26:16 -0400
Subject: [PATCH 1/3] SMC: remove package

doesn't work with latest upstream version of dependencies, fork `TSC` is
in void-packages already and has more recent updates
---
 srcpkgs/SMC/files/smc.desktop                 |   9 -
 srcpkgs/SMC/files/smc.png                     | Bin 2961 -> 0 bytes
 .../SMC/patches/fix-boost_filesystem.patch    | 112 -----
 srcpkgs/SMC/patches/fix-cegui07.patch         | 437 ------------------
 srcpkgs/SMC/template                          |  37 --
 srcpkgs/removed-packages/template             |   1 +
 6 files changed, 1 insertion(+), 595 deletions(-)
 delete mode 100644 srcpkgs/SMC/files/smc.desktop
 delete mode 100644 srcpkgs/SMC/files/smc.png
 delete mode 100644 srcpkgs/SMC/patches/fix-boost_filesystem.patch
 delete mode 100644 srcpkgs/SMC/patches/fix-cegui07.patch
 delete mode 100644 srcpkgs/SMC/template

diff --git a/srcpkgs/SMC/files/smc.desktop b/srcpkgs/SMC/files/smc.desktop
deleted file mode 100644
index 9b7d84a0c2c0..000000000000
--- a/srcpkgs/SMC/files/smc.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Secret Maryo Chronicles
-Exec=smc
-Icon=smc
-Terminal=false
-Categories=Game;ArcadeGame;
-StartupNotify=false
-
diff --git a/srcpkgs/SMC/files/smc.png b/srcpkgs/SMC/files/smc.png
deleted file mode 100644
index f02af1bfc0fbabca40d331dc05cc8c4d9f4821a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2961
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
D&%%5x

diff --git a/srcpkgs/SMC/patches/fix-boost_filesystem.patch b/srcpkgs/SMC/patches/fix-boost_filesystem.patch
deleted file mode 100644
index 926ffb6afe9c..000000000000
--- a/srcpkgs/SMC/patches/fix-boost_filesystem.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Boost >= 1.5 renamed path::leaf() to path::filename().
-Function path(const string_type&, name_check) was removed,
-thus here we use path(const string_type&).
-
---- a/src/core/filesystem/filesystem.cpp	2015-10-30 19:17:02.512620204 +0100
-+++ b/src/core/filesystem/filesystem.cpp	2015-10-30 19:17:57.036620043 +0100
-@@ -64,7 +64,7 @@
- 
- bool Dir_Exists( const std::string &dir )
- {
--	return fs::exists( fs::path( dir, fs::native ) );
-+	return fs::exists( fs::path( dir ) );
- 
- 	/*struct stat file_info;
- 
-@@ -89,7 +89,7 @@
- 
- bool Create_Directory( const std::string &dir )
- {
--	return fs::create_directory( fs::path( dir, fs::native ) );
-+	return fs::create_directory( fs::path( dir ) );
- }
- 
- size_t Get_File_Size( const std::string &filename )
-@@ -130,7 +130,7 @@
- {
- 	vector<std::string> valid_files;
- 
--	fs::path full_path( dir, fs::native );
-+	fs::path full_path( dir );
- 	fs::directory_iterator end_iter;
- 
- 	// load all available objects
-@@ -142,32 +142,32 @@
- 			if( fs::is_directory( *dir_itr ) )
- 			{
- 				// ignore hidden directories
--				if( dir_itr->path().leaf().find( "." ) == 0 )
-+				if( dir_itr->path().filename().string().find( "." ) == 0 )
- 				{
- 					continue;
- 				}
- 
- 				if( with_directories )
- 				{
--					valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
-+					valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
- 				}
- 
- 				// load all items from the sub-directory
- 				if( search_in_sub_directories )
- 				{
--					vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories );
-+					vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().filename().string(), file_type, with_directories );
- 					valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() );
- 				}
- 			}
- 			// valid file
--			else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos )
-+			else if( file_type.empty() || dir_itr->path().filename().string().rfind( file_type ) != std::string::npos )
- 			{
--				valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
-+				valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
- 			}
- 		}
- 		catch( const std::exception &ex )
- 		{
--			printf( "%s %s\n", dir_itr->path().leaf().c_str(), ex.what() );
-+			printf( "%s %s\n", dir_itr->path().filename().c_str(), ex.what() );
- 		}
- 	}
- 
---- a/src/overworld/world_manager.cpp	2015-10-30 19:17:02.649620204 +0100
-+++ b/src/overworld/world_manager.cpp	2015-10-30 18:30:23.299628497 +0100
-@@ -111,7 +111,7 @@
- void cOverworld_Manager :: Load_Dir( const std::string &dir, bool user_dir /* = 0 */ ) 
- {
- 	// set world directory
--	fs::path full_path( dir, fs::native );
-+	fs::path full_path( dir );
- 	fs::directory_iterator end_iter;
- 
- 	for( fs::directory_iterator dir_itr( full_path ); dir_itr != end_iter; ++dir_itr )
-@@ -118,7 +118,7 @@
- 	{
- 		try
- 		{
--			std::string current_dir = dir_itr->path().leaf();
-+			std::string current_dir = dir_itr->path().filename().string();
- 
- 			// only directories with an existing description
- 			if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )
---- a/src/video/video.cpp	2015-10-30 19:17:02.822620203 +0100
-+++ b/src/video/video.cpp	2015-10-30 19:18:57.493619864 +0100
-@@ -747,7 +747,7 @@
- 		{
- 			try
- 			{
--				fs::remove_all( fs::path( m_imgcache_dir, fs::native ) );
-+				fs::remove_all( fs::path( m_imgcache_dir ) );
- 			}
- 			// could happen if a file is locked or we have no write rights
- 			catch( const std::exception &ex )
-@@ -769,7 +769,7 @@
- 	// no cache available
- 	if( !Dir_Exists( imgcache_dir_active ) )
- 	{
--		fs::create_directories( fs::path( imgcache_dir_active + "/" GAME_PIXMAPS_DIR, fs::native ) );
-+		fs::create_directories( fs::path( imgcache_dir_active + "/" GAME_PIXMAPS_DIR ) );
- 	}
- 	// cache available
- 	else
diff --git a/srcpkgs/SMC/patches/fix-cegui07.patch b/srcpkgs/SMC/patches/fix-cegui07.patch
deleted file mode 100644
index 3fcdb8370a98..000000000000
--- a/srcpkgs/SMC/patches/fix-cegui07.patch
+++ /dev/null
@@ -1,437 +0,0 @@
-diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac
---- a/configure.ac	2009-08-17 15:59:00.000000000 +0200
-+++ b/configure.ac	2011-01-19 00:43:37.809884881 +0100
-@@ -53,7 +53,7 @@
- 	AC_MSG_ERROR([SDL_ttf library not found]))
- 
- # Check for the CEGUI library
--PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0)
-+PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0)
- CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS"
- LIBS="$LIBS $CEGUI_LIBS"
- 
-diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp
---- a/src/core/editor.cpp	2009-08-13 17:11:42.000000000 +0200
-+++ b/src/core/editor.cpp	2011-01-19 00:44:46.734328121 +0100
-@@ -118,16 +118,10 @@
- 	return tmp;
- }
- 
--void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
-+void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
- {
- 	// draw text
--	list_text->draw( position, alpha, clipper );
--}
--
--void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
--{
--	// draw text
--	list_text->draw( cache, targetRect, zBase, alpha, clipper );
-+	list_text->draw( buffer, targetRect, alpha, clipper );
- }
- 
- void cEditor_Item_Object :: Draw_Image( void )
-@@ -533,12 +527,12 @@
- 	if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
- 	{
- 		// Listbox dimension
--		float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
--		float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
-+		float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
-+		float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
- 		// Vertical ScrollBar Position
- 		float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
- 		// font height
--		float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
-+		float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
- 
- 		// draw items
- 		for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
-diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h
---- a/src/core/editor.h	2009-02-18 05:21:30.000000000 +0100
-+++ b/src/core/editor.h	2011-01-19 00:43:37.809884881 +0100
-@@ -62,8 +62,7 @@
- 	*/
- 	virtual	CEGUI::Size getPixelSize( void ) const;
- 	// draw
--	void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
--	void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
-+	void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
- 	// draw image
- 	void Draw_Image( void );
- 
-diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp
---- a/src/core/game_core.cpp	2009-08-16 18:44:42.000000000 +0200
-+++ b/src/core/game_core.cpp	2011-01-19 00:59:02.668958883 +0100
-@@ -265,7 +265,7 @@
- 
- 
- 	// align text
--	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- 	// fixme : Can't handle multiple lines of text
- 	float text_width = font->getTextExtent( text ) * global_downscalex;
- 
-@@ -1182,7 +1182,7 @@
- 	text_default->setText( gui_text );
- 
- 	// align text
--	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- 	float text_width = font->getTextExtent( gui_text ) * global_downscalex;
- 
- 	text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
-@@ -1190,7 +1190,7 @@
- 	text_default->moveToFront();
- 
- 	// set window height
--	text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
-+	text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
- 
- 	while( draw )
- 	{
-diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp
---- a/src/core/main.cpp	2009-05-12 10:36:04.000000000 +0200
-+++ b/src/core/main.cpp	2011-01-19 00:43:37.809884881 +0100
-@@ -444,13 +444,15 @@
- 
- 	if( pGuiSystem )
- 	{
--		delete pGuiSystem;
-+		CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider();
-+		pGuiSystem->destroy();
- 		pGuiSystem = NULL;
-+		delete rp;
- 	}
- 
- 	if( pGuiRenderer )
- 	{
--		delete pGuiRenderer;
-+		pGuiRenderer->destroy( *pGuiRenderer );
- 		pGuiRenderer = NULL;
- 	}
- 
-@@ -507,7 +509,7 @@
- 		}
- 		case SDL_VIDEORESIZE:
- 		{
--			pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
-+			pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
- 			break;
- 		}
- 		case SDL_KEYDOWN:
-diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp
---- a/src/gui/hud.cpp	2009-05-01 15:00:16.000000000 +0200
-+++ b/src/gui/hud.cpp	2011-01-19 00:43:37.816550365 +0100
-@@ -946,7 +946,7 @@
- 		m_text_debug_text->setVisible( 1 );
- 
- 		// update position
--		CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+		CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- 		float text_width = font->getTextExtent( gui_text ) * global_downscalex;
- 
- 		if( text_width > 800.0f )
-diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp
---- a/src/input/mouse.cpp	2009-04-24 21:16:58.000000000 +0200
-+++ b/src/input/mouse.cpp	2011-01-19 00:43:37.813217623 +0100
-@@ -432,17 +432,12 @@
- 
- void cMouseCursor :: Render( void ) const
- {
--	if( !m_active )
--	{
-+	CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-+
-+	if ( m_active == mouse->isVisible() )
- 		return;
--	}
- 
--	// Render CEGUI Mouse
--	pGuiRenderer->setQueueingEnabled( 0 );
--	CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
--	mouse->setVisible( 1 );
--	mouse->draw();
--	mouse->setVisible( 0 );
-+	mouse->setVisible( m_active );
- }
- 
- void cMouseCursor :: Update_Position( void )
-diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp
---- a/src/level/level_settings.cpp	2009-08-07 03:04:28.000000000 +0200
-+++ b/src/level/level_settings.cpp	2011-01-19 01:06:59.064259070 +0100
-@@ -163,8 +163,8 @@
- 	editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
- 	// preview window
- 	CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
--	background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
--	background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
-+	background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
-+	background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
- 
- 	Update_BG_Colors( CEGUI::EventArgs() );
- 
-@@ -555,8 +555,8 @@
- 
- 	// set default rect
- 	CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
--	background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
--	background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
-+	background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
-+	background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
- 
- 	if( !File_Exists( filename ) )
- 	{
-diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp
---- a/src/objects/sprite.cpp	2009-04-18 09:55:06.000000000 +0200
-+++ b/src/objects/sprite.cpp	2011-01-19 00:43:37.813217623 +0100
-@@ -1663,7 +1663,7 @@
- 	window_name->setText( name );
- 	window_name->setTooltipText( tooltip );
- 	// get text width
--	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- 	float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
- 	// all names should have the same width
- 	if( text_width > m_editor_window_name_width )
-diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp
---- a/src/video/video.cpp	2009-07-04 11:46:56.000000000 +0200
-+++ b/src/video/video.cpp	2011-01-19 01:22:45.338524592 +0100
-@@ -103,15 +103,15 @@
- 
- /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
- 
--cFake_Renderer :: cFake_Renderer( void )
--{
--	d_identifierString = "Fake Renderer";
--}
-+//cFake_Renderer :: cFake_Renderer( void )
-+//{
-+//	d_identifierString = "Fake Renderer";
-+//}
- 
--cFake_Renderer :: ~cFake_Renderer( void )
--{
-+//cFake_Renderer :: ~cFake_Renderer( void )
-+//{
- 
--}
-+//}
- 
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
- 
-@@ -158,7 +158,7 @@
- 	std::string log_dump_dir = "/dev/null";
- #endif
- 	// create fake system and renderer
--	pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
-+	pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
- }
- 
- void cVideo :: Delete_CEGUI_Fake( void ) const
-@@ -166,7 +166,7 @@
- 	CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
- 	CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
- 
--	delete pGuiSystem;
-+	pGuiSystem->destroy();
- 	pGuiSystem = NULL;
- 	delete renderer;
- 	delete rp;
-@@ -177,7 +177,7 @@
- 	// create renderer
- 	try
- 	{
--		pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
-+		pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
- 	}
- 	// catch CEGUI Exceptions
- 	catch( CEGUI::Exception &ex )
-@@ -186,10 +186,10 @@
- 		exit( EXIT_FAILURE );
- 	}
- 
--	/* create Resource Provider
--	 * no need to destroy it later since it is handled by the CEGUI renderer
--	*/
--	CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
-+	pGuiRenderer->enableExtraStateSettings(true);
-+
-+	// create Resource Provider
-+	CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
- 
- 	// set Resource Provider directories
- 	rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
-@@ -215,7 +215,7 @@
- 	// create system
- 	try
- 	{
--		pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
-+		pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
- 	}
- 	// catch CEGUI Exceptions
- 	catch( CEGUI::Exception &ex )
-@@ -242,7 +242,7 @@
- 	// load the scheme file, which auto-loads the imageset
- 	try
- 	{
--		CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
-+		CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
- 	}
- 	// catch CEGUI Exceptions
- 	catch( CEGUI::Exception &ex )
-@@ -254,9 +254,7 @@
- 	// default mouse cursor
- 	pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
- 	// force new mouse image
--	CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
--	// hide CEGUI mouse always because we render it manually
--	CEGUI::MouseCursor::getSingleton().hide();
-+	CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
- 	// default tooltip
- 	pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
- 	// create default root window
-@@ -553,7 +551,7 @@
- 		pFont->Restore_Textures();
- 
- 		// send new size to CEGUI
--		pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-+		pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
- 
- 		// check if CEGUI is initialized
- 		bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
-diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h
---- a/src/video/video.h	2009-07-04 10:49:50.000000000 +0200
-+++ b/src/video/video.h	2011-01-19 01:16:42.791283379 +0100
-@@ -23,7 +23,7 @@
- #include "SDL_opengl.h"
- // CEGUI
- #include "CEGUI.h"
--#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
-+#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
- 
- namespace SMC
- {
-@@ -129,31 +129,100 @@
- 	EFFECT_IN_AMOUNT
- };
- 
--/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-+/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
-+// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
-+class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
-+{
-+	void draw() const {}
-+	void setTranslation(const CEGUI::Vector3&) {}
-+	void setRotation(const CEGUI::Vector3&) {}
-+	void setPivot(const CEGUI::Vector3&) {}
-+	void setClippingRegion(const CEGUI::Rect&) {}
-+	void appendVertex(const CEGUI::Vertex&) {}
-+	void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
-+	void setActiveTexture(CEGUI::Texture*) {}
-+	void reset() {}
-+	CEGUI::Texture* getActiveTexture() const { return 0; }
-+	CEGUI::uint getVertexCount() const { return 0; }
-+	CEGUI::uint getBatchCount() const { return 0; }
-+	void setRenderEffect(CEGUI::RenderEffect*) {}
-+	CEGUI::RenderEffect* getRenderEffect() { return 0; }
-+};
- 
--class cFake_Renderer : public CEGUI::Renderer
-+class cFake_Texture : public CEGUI::Texture
-+{
-+public:
-+	cFake_Texture() :
-+	  m_size(1, 1),
-+	  m_scaling(1, 1) {}
-+
-+	const CEGUI::Size& getSize() const { return m_size; }
-+	const CEGUI::Size& getOriginalDataSize() const { return m_size; }
-+	const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
-+	void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
-+	void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
-+	void saveToMemory(void*) {}
-+
-+private:
-+	CEGUI::Size m_size;
-+	CEGUI::Vector2 m_scaling;
-+};
-+
-+class cFake_RenderTarget : public CEGUI::RenderTarget
- {
- public:
--	cFake_Renderer( void );
--	virtual ~cFake_Renderer( void );
-+	cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
-+	void draw(const CEGUI::GeometryBuffer&) {}
-+	void draw(const CEGUI::RenderQueue&) {}
-+	void setArea(const CEGUI::Rect&) {}
-+	const CEGUI::Rect& getArea() const { return m_area; }
-+	bool isImageryCache() const { return false; }
-+	void activate() {}
-+	void deactivate() {}
-+	void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
-+
-+private:
-+	CEGUI::Rect m_area;
-+};
- 
--	virtual	void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
--	virtual	void doRender(void) {};
--	virtual	void clearRenderList(void) {};
--	virtual void setQueueingEnabled(bool setting) {};
--	virtual	CEGUI::Texture *createTexture(void) { return NULL; };
--	virtual	CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
--	virtual	CEGUI::Texture *createTexture(float size) { return NULL; };
--	virtual	void destroyTexture(CEGUI::Texture* texture) {};
--	virtual void destroyAllTextures(void) {};
--	virtual bool isQueueingEnabled(void) const { return 0; };
--	virtual float getWidth(void) const { return 0; };
--	virtual float getHeight(void) const { return 0; };
--	virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
--	virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
--	virtual	unsigned int getMaxTextureSize(void) const { return 0; };
--	virtual	unsigned int getHorzScreenDPI(void) const { return 0; };
--	virtual	unsigned int getVertScreenDPI(void) const { return 0; };
-+class cFake_Renderer : public CEGUI::Renderer
-+{
-+public:
-+	cFake_Renderer( void ) :
-+	  m_size(0, 0),
-+	  m_dpi(0, 0),
-+	  m_identifierString("Fake Renderer"),
-+	  m_root(m_target) {}
-+	~cFake_Renderer( void ) {}
-+
-+	CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
-+	CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
-+	void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
-+	void destroyAllGeometryBuffers() {}
-+	CEGUI::TextureTarget* createTextureTarget() { return 0; }
-+	void destroyTextureTarget(CEGUI::TextureTarget*) {}
-+	void destroyAllTextureTargets() {}
-+	CEGUI::Texture& createTexture() { return m_texture; }
-+	CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
-+	CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
-+	void destroyTexture(CEGUI::Texture&) {}
-+	void destroyAllTextures() {}
-+	void beginRendering() {}
-+	void endRendering() {}
-+	void setDisplaySize(const CEGUI::Size&) {}
-+	const CEGUI::Size& getDisplaySize() const { return m_size; }
-+	const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
-+	CEGUI::uint getMaxTextureSize() const { return 0; }
-+	const CEGUI::String& getIdentifierString() const { return m_identifierString; }
-+
-+private:
-+	CEGUI::Size m_size;
-+	CEGUI::Vector2 m_dpi;
-+	CEGUI::String m_identifierString;
-+	cFake_GeometryBuffer m_geometry;
-+	cFake_Texture m_texture;
-+	cFake_RenderTarget m_target;
-+	CEGUI::RenderingRoot m_root;
- };
- 
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/srcpkgs/SMC/template b/srcpkgs/SMC/template
deleted file mode 100644
index d67469fc18a8..000000000000
--- a/srcpkgs/SMC/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'SMC'
-pkgname=SMC
-version=1.9
-revision=9
-wrksrc=${pkgname,,}-${version}
-build_style=gnu-configure
-hostmakedepends="automake libtool gettext-devel pkg-config unzip"
-makedepends="MesaLib-devel boost-devel cegui07-devel gettext-devel
- SDL_image-devel SDL_mixer-devel SDL_ttf-devel"
-short_desc="Two-dimensional platform game similar to Super Mario"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="http://www.secretmaryo.org/"
-distfiles="
- ${SOURCEFORGE_SITE}/smclone/${pkgname,,}-${version}.tar.bz2
- ${SOURCEFORGE_SITE}/smclone/SMC_Music_5.0_high.zip"
-checksum="
- b4194e70d3f1de3da884dd1a11e4f5cec25a205f66a3b85cc9fc1c86289b237d
- c5bb2e1830c7cbe499c93851f5a02b2b900b4730d2c7a133a44a7b43a297dab8"
-replaces="SMC-data>=0"
-
-CXXFLAGS="-fpermissive -std=c++11"
-LDFLAGS="-Wl,--no-as-needed -lX11 -lboost_system"
-
-post_extract() {
-	# remove CRs from end of line
-	find ${wrksrc}/src -type f -exec sed -i "{}" -e "s;\r$;;" \;
-	mv ${XBPS_BUILDDIR}/data/music/* ${wrksrc}/data/music
-}
-pre_configure() {
-	vsed -i configure.ac -e "/AM_INIT_AUTOMAKE/s/)/ subdir-objects)/"
-	NOCONFIGURE=1 ./autogen.sh
-}
-post_install() {
-	vinstall ${FILESDIR}/smc.desktop 644 usr/share/applications
-	vinstall ${FILESDIR}/smc.png 644 usr/share/pixmaps
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0d1180ad4903..490cf40f8b96 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -13,6 +13,7 @@ replaces="
  MoinMoin<=1.9.11_1
  MultiMC<=0.6.13_1
  Platinum9-theme<=0.0.0.20170720_3
+ SMC<=1.9_9
  Venom<=0.5.5_1
  XorCurses<=0.2.2_1
  acme-client<=0.1.16_5

From 698962e5f140415a202cb5cb42a14d390824eca1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 15 Aug 2022 08:36:28 -0400
Subject: [PATCH 2/3] cegui07: remove package

it was only used for SMC, which was already removed
---
 srcpkgs/cegui07-data                    |  1 -
 srcpkgs/cegui07-devel                   |  1 -
 srcpkgs/cegui07-doc                     |  1 -
 srcpkgs/cegui07/patches/fix-build.patch | 81 ----------------------
 srcpkgs/cegui07/template                | 91 -------------------------
 srcpkgs/cegui07/update                  |  1 -
 srcpkgs/removed-packages/template       |  4 ++
 7 files changed, 4 insertions(+), 176 deletions(-)
 delete mode 120000 srcpkgs/cegui07-data
 delete mode 120000 srcpkgs/cegui07-devel
 delete mode 120000 srcpkgs/cegui07-doc
 delete mode 100644 srcpkgs/cegui07/patches/fix-build.patch
 delete mode 100644 srcpkgs/cegui07/template
 delete mode 100644 srcpkgs/cegui07/update

diff --git a/srcpkgs/cegui07-data b/srcpkgs/cegui07-data
deleted file mode 120000
index f7f02f65ac4c..000000000000
--- a/srcpkgs/cegui07-data
+++ /dev/null
@@ -1 +0,0 @@
-cegui07
\ No newline at end of file
diff --git a/srcpkgs/cegui07-devel b/srcpkgs/cegui07-devel
deleted file mode 120000
index f7f02f65ac4c..000000000000
--- a/srcpkgs/cegui07-devel
+++ /dev/null
@@ -1 +0,0 @@
-cegui07
\ No newline at end of file
diff --git a/srcpkgs/cegui07-doc b/srcpkgs/cegui07-doc
deleted file mode 120000
index f7f02f65ac4c..000000000000
--- a/srcpkgs/cegui07-doc
+++ /dev/null
@@ -1 +0,0 @@
-cegui07
\ No newline at end of file
diff --git a/srcpkgs/cegui07/patches/fix-build.patch b/srcpkgs/cegui07/patches/fix-build.patch
deleted file mode 100644
index 2533061810ad..000000000000
--- a/srcpkgs/cegui07/patches/fix-build.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- a/cegui/include/CEGUISystem.h
-+++ b/cegui/include/CEGUISystem.h
-@@ -1123,12 +1123,6 @@
-            ScriptModule* scriptModule, const String& configFile,
-            const String& logFile);
- 
--    /*!
--    \brief
--        Destructor for System objects.
--    */
--    ~System(void);
--
- 	/*!
- 	\brief
- 		Given Point \a pt, return a pointer to the Window that should receive a mouse input if \a pt is the mouse location.
-@@ -1364,6 +1358,13 @@
-     RenderedStringParser* d_customRenderedStringParser;
-     //! true if mouse click events will be automatically generated.
-     bool d_generateMouseClickEvents;
-+
-+protected:
-+    /*!
-+    \brief
-+        Destructor for System objects.
-+    */
-+    ~System(void);
- };
- 
- } // End of  CEGUI namespace section
---- a/cegui/include/RendererModules/OpenGL/CEGUIOpenGLRenderer.h
-+++ b/cegui/include/RendererModules/OpenGL/CEGUIOpenGLRenderer.h
-@@ -291,12 +291,6 @@
-     */
-     OpenGLRenderer(const Size& display_size, const TextureTargetType tt_type);
- 
--    /*!
--    \brief
--        Destructor for OpenGLRenderer objects
--    */
--    virtual ~OpenGLRenderer();
--
-     //! init the extra GL states enabled via enableExtraStateSettings
-     void setupExtraStates();
- 
-@@ -336,6 +330,13 @@
-     OGLTextureTargetFactory* d_textureTargetFactory;
-     //! What blend mode we think is active.
-     BlendMode d_activeBlendMode;
-+
-+protected:
-+    /*!
-+    \brief
-+        Destructor for OpenGLRenderer objects
-+    */
-+    virtual ~OpenGLRenderer();
-   };
- 
- } // End of  CEGUI namespace section
---- a/cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
-+++ b/cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
-@@ -145,7 +145,7 @@
-                 processElement(childNode->ToElement());
-                 break;
-             case CEGUI_TINYXML_NAMESPACE::TiXmlNode::CEGUI_TINYXML_TEXT:
--                if (childNode->ToText()->Value() != '\0')
-+                if (childNode->ToText()->Value() != NULL)
-                     d_handler->text((utf8*)childNode->ToText()->Value());
-                 break;
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,7 +14,8 @@
- 
- AC_INIT([CEGUI], [CEGUI_RELEASE_VERSION], [http://mantis.cegui.org.uk/], [CEGUI])
- AC_CONFIG_SRCDIR([cegui/src/CEGUIBase.cpp])
--AM_INIT_AUTOMAKE([dist-zip tar-ustar])
-+AM_INIT_AUTOMAKE([dist-zip tar-ustar subdir-objects])
-+AM_SILENT_RULES([yes])
- AC_CONFIG_HEADER([cegui/include/config.h])
- AC_CANONICAL_HOST
- 
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
deleted file mode 100644
index 3fa7f80a2ea7..000000000000
--- a/srcpkgs/cegui07/template
+++ /dev/null
@@ -1,91 +0,0 @@
-# Template file for 'cegui07'
-pkgname=cegui07
-version=0.7.9
-revision=8
-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"
-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')"
-depends="cegui07-data"
-short_desc="Crazy Eddie's Graphical User Interface (0.7.x)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://cegui.org.uk/"
-distfiles="${SOURCEFORGE_SITE}/crayzedsgui/CEGUI%20Mk-2/${version}/CEGUI-${version}.tar.gz"
-checksum=7c3b264def08b46de749c2acaba363e907479d924612436f3bd09da2e474bb8c
-
-build_options="irrlicht python"
-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 \
-		-e 's;$(DOXYGEN) doxyfile;& >/dev/null 2>&1;'
-
-	# Modernize Makefile.am files
-	find . -name Makefile.am -exec sed -i "{}" \
-		-e "1i ACLOCAL_AMFLAGS = -I m4" \
-		-e "s;INCLUDES;AM_CXXFLAGS;g" \;
-
-	# Set AM_CPPFLAGS for the C source in tolua++
-	sed -i cegui/src/ScriptingModules/LuaScriptModule/support/tolua++/Makefile.am \
-		-e "s;AM_CXXFLAGS;AM_CFLAGS;"
-
-	# Modernize configure.ac (enable subdir-objects)
-	sed -i configure.ac \
-		-e "s;dist-zip tar-ustar;& subdir-objects;" \
-		-e "/^AM_INIT_AUTOMAKE.*/a AC_CONFIG_MACRO_DIRS([m4])"
-
-	mkdir -p m4
-	cp doc/COPYING doc/README .
-	touch NEWS AUTHORS ChangeLog
-	autoreconf -if
-}
-post_install() {
-	vlicense COPYING
-	vdoc doc/README
-	vdoc doc/GLEW-LICENSE
-	vdoc doc/PCRE-LICENSE
-	vdoc doc/TinyXML-License
-	vdoc doc/stringencoders-license
-}
-
-cegui07-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/CEGUI
-	}
-}
-cegui07-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmkdir usr/share/doc/${sourcepkg}
-		vcopy ${wrksrc}/doc/doxygen/html usr/share/doc/${sourcepkg}
-	}
-}
-cegui07-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		# Move only the symlink *.so files
-		find ${DESTDIR}/usr/lib/ -type l -exec mv "{}" ${PKGDESTDIR}/usr/lib \;
-	}
-}
diff --git a/srcpkgs/cegui07/update b/srcpkgs/cegui07/update
deleted file mode 100644
index 0341328766e9..000000000000
--- a/srcpkgs/cegui07/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='CEGUI Mk-2/\K0\.7\.[\d]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 490cf40f8b96..272d240a429d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -37,6 +37,10 @@ replaces="
  california<=0.4.0_4
  capstone-python<=4.0.2_3
  captain-ballard<=1.0.0_2
+ cegui07<=0.7.9_8
+ cegui07-data<=0.7.9_8
+ cegui07-devel<=0.7.9_8
+ cegui07-doc<=0.7.9_8
  cgminer<=4.11.1_1
  clamz<=0.5_4
  couchdb<=1.7.1_2

From 48d4676b1f73f4c505b0e041fdfe8e8d3d940e9a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 11 Aug 2022 12:16:35 -0400
Subject: [PATCH 3/3] 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 | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index 070fa66aff81..5a3beea1d514 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 <orphan@voidlinux.org>"
 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
@@ -42,7 +40,7 @@ pre_configure() {
 	cp -p ${FILESDIR}/FindOpenGLES.cmake cmake
 
 	# cmake sets standard to c++03 (which doesn’t know int16_t)
-	sed -i -e "s/-std=c++03//" CMakeLists.txt
+	vsed -i -e "s/-std=c++03//" CMakeLists.txt
 }
 post_install() {
 	local _ver2=${version%.*.*}

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] cegui: drop unused dependencies in makedepends; SMC/cegui07: remove
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
                   ` (13 preceding siblings ...)
  2022-08-15 12:39 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2022-08-15 12:42 ` TinfoilSubmarine
  2022-08-17 15:41 ` [PR PATCH] [Merged]: " classabbyamp
  15 siblings, 0 replies; 17+ messages in thread
From: TinfoilSubmarine @ 2022-08-15 12:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1598 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/cegui
https://github.com/void-linux/void-packages/pull/38614

cegui: drop unused dependencies in makedepends; SMC/cegui07: remove
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (ran `TSC` with updated `gecui`)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Another one not actually using `python-devel`. Configure output shows that it wasn't even building the python extension modules due to some issue with Boost-python. The only package depending on this is `TSC` and it doesn't seem to require the python extensions.

A patch file from https://github.com/void-linux/void-packages/pull/38614.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/cegui-38614.patch --]
[-- Type: text/x-diff, Size: 41827 bytes --]

From 7ac72d14734008256ea8c6492627c8149f7934e6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 15 Aug 2022 08:26:16 -0400
Subject: [PATCH 1/3] SMC: remove package

doesn't work with latest upstream version of dependencies, fork `TSC` is
in void-packages already and has more recent updates
---
 srcpkgs/SMC/files/smc.desktop                 |   9 -
 srcpkgs/SMC/files/smc.png                     | Bin 2961 -> 0 bytes
 .../SMC/patches/fix-boost_filesystem.patch    | 112 -----
 srcpkgs/SMC/patches/fix-cegui07.patch         | 437 ------------------
 srcpkgs/SMC/template                          |  37 --
 srcpkgs/removed-packages/template             |   1 +
 6 files changed, 1 insertion(+), 595 deletions(-)
 delete mode 100644 srcpkgs/SMC/files/smc.desktop
 delete mode 100644 srcpkgs/SMC/files/smc.png
 delete mode 100644 srcpkgs/SMC/patches/fix-boost_filesystem.patch
 delete mode 100644 srcpkgs/SMC/patches/fix-cegui07.patch
 delete mode 100644 srcpkgs/SMC/template

diff --git a/srcpkgs/SMC/files/smc.desktop b/srcpkgs/SMC/files/smc.desktop
deleted file mode 100644
index 9b7d84a0c2c0..000000000000
--- a/srcpkgs/SMC/files/smc.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Secret Maryo Chronicles
-Exec=smc
-Icon=smc
-Terminal=false
-Categories=Game;ArcadeGame;
-StartupNotify=false
-
diff --git a/srcpkgs/SMC/files/smc.png b/srcpkgs/SMC/files/smc.png
deleted file mode 100644
index f02af1bfc0fbabca40d331dc05cc8c4d9f4821a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2961
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
D&%%5x

diff --git a/srcpkgs/SMC/patches/fix-boost_filesystem.patch b/srcpkgs/SMC/patches/fix-boost_filesystem.patch
deleted file mode 100644
index 926ffb6afe9c..000000000000
--- a/srcpkgs/SMC/patches/fix-boost_filesystem.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Boost >= 1.5 renamed path::leaf() to path::filename().
-Function path(const string_type&, name_check) was removed,
-thus here we use path(const string_type&).
-
---- a/src/core/filesystem/filesystem.cpp	2015-10-30 19:17:02.512620204 +0100
-+++ b/src/core/filesystem/filesystem.cpp	2015-10-30 19:17:57.036620043 +0100
-@@ -64,7 +64,7 @@
- 
- bool Dir_Exists( const std::string &dir )
- {
--	return fs::exists( fs::path( dir, fs::native ) );
-+	return fs::exists( fs::path( dir ) );
- 
- 	/*struct stat file_info;
- 
-@@ -89,7 +89,7 @@
- 
- bool Create_Directory( const std::string &dir )
- {
--	return fs::create_directory( fs::path( dir, fs::native ) );
-+	return fs::create_directory( fs::path( dir ) );
- }
- 
- size_t Get_File_Size( const std::string &filename )
-@@ -130,7 +130,7 @@
- {
- 	vector<std::string> valid_files;
- 
--	fs::path full_path( dir, fs::native );
-+	fs::path full_path( dir );
- 	fs::directory_iterator end_iter;
- 
- 	// load all available objects
-@@ -142,32 +142,32 @@
- 			if( fs::is_directory( *dir_itr ) )
- 			{
- 				// ignore hidden directories
--				if( dir_itr->path().leaf().find( "." ) == 0 )
-+				if( dir_itr->path().filename().string().find( "." ) == 0 )
- 				{
- 					continue;
- 				}
- 
- 				if( with_directories )
- 				{
--					valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
-+					valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
- 				}
- 
- 				// load all items from the sub-directory
- 				if( search_in_sub_directories )
- 				{
--					vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories );
-+					vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().filename().string(), file_type, with_directories );
- 					valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() );
- 				}
- 			}
- 			// valid file
--			else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos )
-+			else if( file_type.empty() || dir_itr->path().filename().string().rfind( file_type ) != std::string::npos )
- 			{
--				valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
-+				valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
- 			}
- 		}
- 		catch( const std::exception &ex )
- 		{
--			printf( "%s %s\n", dir_itr->path().leaf().c_str(), ex.what() );
-+			printf( "%s %s\n", dir_itr->path().filename().c_str(), ex.what() );
- 		}
- 	}
- 
---- a/src/overworld/world_manager.cpp	2015-10-30 19:17:02.649620204 +0100
-+++ b/src/overworld/world_manager.cpp	2015-10-30 18:30:23.299628497 +0100
-@@ -111,7 +111,7 @@
- void cOverworld_Manager :: Load_Dir( const std::string &dir, bool user_dir /* = 0 */ ) 
- {
- 	// set world directory
--	fs::path full_path( dir, fs::native );
-+	fs::path full_path( dir );
- 	fs::directory_iterator end_iter;
- 
- 	for( fs::directory_iterator dir_itr( full_path ); dir_itr != end_iter; ++dir_itr )
-@@ -118,7 +118,7 @@
- 	{
- 		try
- 		{
--			std::string current_dir = dir_itr->path().leaf();
-+			std::string current_dir = dir_itr->path().filename().string();
- 
- 			// only directories with an existing description
- 			if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )
---- a/src/video/video.cpp	2015-10-30 19:17:02.822620203 +0100
-+++ b/src/video/video.cpp	2015-10-30 19:18:57.493619864 +0100
-@@ -747,7 +747,7 @@
- 		{
- 			try
- 			{
--				fs::remove_all( fs::path( m_imgcache_dir, fs::native ) );
-+				fs::remove_all( fs::path( m_imgcache_dir ) );
- 			}
- 			// could happen if a file is locked or we have no write rights
- 			catch( const std::exception &ex )
-@@ -769,7 +769,7 @@
- 	// no cache available
- 	if( !Dir_Exists( imgcache_dir_active ) )
- 	{
--		fs::create_directories( fs::path( imgcache_dir_active + "/" GAME_PIXMAPS_DIR, fs::native ) );
-+		fs::create_directories( fs::path( imgcache_dir_active + "/" GAME_PIXMAPS_DIR ) );
- 	}
- 	// cache available
- 	else
diff --git a/srcpkgs/SMC/patches/fix-cegui07.patch b/srcpkgs/SMC/patches/fix-cegui07.patch
deleted file mode 100644
index 3fcdb8370a98..000000000000
--- a/srcpkgs/SMC/patches/fix-cegui07.patch
+++ /dev/null
@@ -1,437 +0,0 @@
-diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac
---- a/configure.ac	2009-08-17 15:59:00.000000000 +0200
-+++ b/configure.ac	2011-01-19 00:43:37.809884881 +0100
-@@ -53,7 +53,7 @@
- 	AC_MSG_ERROR([SDL_ttf library not found]))
- 
- # Check for the CEGUI library
--PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0)
-+PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0)
- CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS"
- LIBS="$LIBS $CEGUI_LIBS"
- 
-diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp
---- a/src/core/editor.cpp	2009-08-13 17:11:42.000000000 +0200
-+++ b/src/core/editor.cpp	2011-01-19 00:44:46.734328121 +0100
-@@ -118,16 +118,10 @@
- 	return tmp;
- }
- 
--void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
-+void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
- {
- 	// draw text
--	list_text->draw( position, alpha, clipper );
--}
--
--void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
--{
--	// draw text
--	list_text->draw( cache, targetRect, zBase, alpha, clipper );
-+	list_text->draw( buffer, targetRect, alpha, clipper );
- }
- 
- void cEditor_Item_Object :: Draw_Image( void )
-@@ -533,12 +527,12 @@
- 	if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
- 	{
- 		// Listbox dimension
--		float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
--		float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
-+		float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
-+		float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
- 		// Vertical ScrollBar Position
- 		float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
- 		// font height
--		float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
-+		float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
- 
- 		// draw items
- 		for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
-diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h
---- a/src/core/editor.h	2009-02-18 05:21:30.000000000 +0100
-+++ b/src/core/editor.h	2011-01-19 00:43:37.809884881 +0100
-@@ -62,8 +62,7 @@
- 	*/
- 	virtual	CEGUI::Size getPixelSize( void ) const;
- 	// draw
--	void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
--	void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
-+	void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
- 	// draw image
- 	void Draw_Image( void );
- 
-diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp
---- a/src/core/game_core.cpp	2009-08-16 18:44:42.000000000 +0200
-+++ b/src/core/game_core.cpp	2011-01-19 00:59:02.668958883 +0100
-@@ -265,7 +265,7 @@
- 
- 
- 	// align text
--	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- 	// fixme : Can't handle multiple lines of text
- 	float text_width = font->getTextExtent( text ) * global_downscalex;
- 
-@@ -1182,7 +1182,7 @@
- 	text_default->setText( gui_text );
- 
- 	// align text
--	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- 	float text_width = font->getTextExtent( gui_text ) * global_downscalex;
- 
- 	text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
-@@ -1190,7 +1190,7 @@
- 	text_default->moveToFront();
- 
- 	// set window height
--	text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
-+	text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
- 
- 	while( draw )
- 	{
-diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp
---- a/src/core/main.cpp	2009-05-12 10:36:04.000000000 +0200
-+++ b/src/core/main.cpp	2011-01-19 00:43:37.809884881 +0100
-@@ -444,13 +444,15 @@
- 
- 	if( pGuiSystem )
- 	{
--		delete pGuiSystem;
-+		CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider();
-+		pGuiSystem->destroy();
- 		pGuiSystem = NULL;
-+		delete rp;
- 	}
- 
- 	if( pGuiRenderer )
- 	{
--		delete pGuiRenderer;
-+		pGuiRenderer->destroy( *pGuiRenderer );
- 		pGuiRenderer = NULL;
- 	}
- 
-@@ -507,7 +509,7 @@
- 		}
- 		case SDL_VIDEORESIZE:
- 		{
--			pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
-+			pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
- 			break;
- 		}
- 		case SDL_KEYDOWN:
-diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp
---- a/src/gui/hud.cpp	2009-05-01 15:00:16.000000000 +0200
-+++ b/src/gui/hud.cpp	2011-01-19 00:43:37.816550365 +0100
-@@ -946,7 +946,7 @@
- 		m_text_debug_text->setVisible( 1 );
- 
- 		// update position
--		CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+		CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- 		float text_width = font->getTextExtent( gui_text ) * global_downscalex;
- 
- 		if( text_width > 800.0f )
-diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp
---- a/src/input/mouse.cpp	2009-04-24 21:16:58.000000000 +0200
-+++ b/src/input/mouse.cpp	2011-01-19 00:43:37.813217623 +0100
-@@ -432,17 +432,12 @@
- 
- void cMouseCursor :: Render( void ) const
- {
--	if( !m_active )
--	{
-+	CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-+
-+	if ( m_active == mouse->isVisible() )
- 		return;
--	}
- 
--	// Render CEGUI Mouse
--	pGuiRenderer->setQueueingEnabled( 0 );
--	CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
--	mouse->setVisible( 1 );
--	mouse->draw();
--	mouse->setVisible( 0 );
-+	mouse->setVisible( m_active );
- }
- 
- void cMouseCursor :: Update_Position( void )
-diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp
---- a/src/level/level_settings.cpp	2009-08-07 03:04:28.000000000 +0200
-+++ b/src/level/level_settings.cpp	2011-01-19 01:06:59.064259070 +0100
-@@ -163,8 +163,8 @@
- 	editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
- 	// preview window
- 	CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
--	background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
--	background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
-+	background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
-+	background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
- 
- 	Update_BG_Colors( CEGUI::EventArgs() );
- 
-@@ -555,8 +555,8 @@
- 
- 	// set default rect
- 	CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
--	background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
--	background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
-+	background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
-+	background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
- 
- 	if( !File_Exists( filename ) )
- 	{
-diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp
---- a/src/objects/sprite.cpp	2009-04-18 09:55:06.000000000 +0200
-+++ b/src/objects/sprite.cpp	2011-01-19 00:43:37.813217623 +0100
-@@ -1663,7 +1663,7 @@
- 	window_name->setText( name );
- 	window_name->setTooltipText( tooltip );
- 	// get text width
--	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- 	float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
- 	// all names should have the same width
- 	if( text_width > m_editor_window_name_width )
-diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp
---- a/src/video/video.cpp	2009-07-04 11:46:56.000000000 +0200
-+++ b/src/video/video.cpp	2011-01-19 01:22:45.338524592 +0100
-@@ -103,15 +103,15 @@
- 
- /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
- 
--cFake_Renderer :: cFake_Renderer( void )
--{
--	d_identifierString = "Fake Renderer";
--}
-+//cFake_Renderer :: cFake_Renderer( void )
-+//{
-+//	d_identifierString = "Fake Renderer";
-+//}
- 
--cFake_Renderer :: ~cFake_Renderer( void )
--{
-+//cFake_Renderer :: ~cFake_Renderer( void )
-+//{
- 
--}
-+//}
- 
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
- 
-@@ -158,7 +158,7 @@
- 	std::string log_dump_dir = "/dev/null";
- #endif
- 	// create fake system and renderer
--	pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
-+	pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
- }
- 
- void cVideo :: Delete_CEGUI_Fake( void ) const
-@@ -166,7 +166,7 @@
- 	CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
- 	CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
- 
--	delete pGuiSystem;
-+	pGuiSystem->destroy();
- 	pGuiSystem = NULL;
- 	delete renderer;
- 	delete rp;
-@@ -177,7 +177,7 @@
- 	// create renderer
- 	try
- 	{
--		pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
-+		pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
- 	}
- 	// catch CEGUI Exceptions
- 	catch( CEGUI::Exception &ex )
-@@ -186,10 +186,10 @@
- 		exit( EXIT_FAILURE );
- 	}
- 
--	/* create Resource Provider
--	 * no need to destroy it later since it is handled by the CEGUI renderer
--	*/
--	CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
-+	pGuiRenderer->enableExtraStateSettings(true);
-+
-+	// create Resource Provider
-+	CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
- 
- 	// set Resource Provider directories
- 	rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
-@@ -215,7 +215,7 @@
- 	// create system
- 	try
- 	{
--		pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
-+		pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
- 	}
- 	// catch CEGUI Exceptions
- 	catch( CEGUI::Exception &ex )
-@@ -242,7 +242,7 @@
- 	// load the scheme file, which auto-loads the imageset
- 	try
- 	{
--		CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
-+		CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
- 	}
- 	// catch CEGUI Exceptions
- 	catch( CEGUI::Exception &ex )
-@@ -254,9 +254,7 @@
- 	// default mouse cursor
- 	pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
- 	// force new mouse image
--	CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
--	// hide CEGUI mouse always because we render it manually
--	CEGUI::MouseCursor::getSingleton().hide();
-+	CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
- 	// default tooltip
- 	pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
- 	// create default root window
-@@ -553,7 +551,7 @@
- 		pFont->Restore_Textures();
- 
- 		// send new size to CEGUI
--		pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-+		pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
- 
- 		// check if CEGUI is initialized
- 		bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
-diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h
---- a/src/video/video.h	2009-07-04 10:49:50.000000000 +0200
-+++ b/src/video/video.h	2011-01-19 01:16:42.791283379 +0100
-@@ -23,7 +23,7 @@
- #include "SDL_opengl.h"
- // CEGUI
- #include "CEGUI.h"
--#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
-+#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
- 
- namespace SMC
- {
-@@ -129,31 +129,100 @@
- 	EFFECT_IN_AMOUNT
- };
- 
--/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-+/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
-+// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
-+class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
-+{
-+	void draw() const {}
-+	void setTranslation(const CEGUI::Vector3&) {}
-+	void setRotation(const CEGUI::Vector3&) {}
-+	void setPivot(const CEGUI::Vector3&) {}
-+	void setClippingRegion(const CEGUI::Rect&) {}
-+	void appendVertex(const CEGUI::Vertex&) {}
-+	void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
-+	void setActiveTexture(CEGUI::Texture*) {}
-+	void reset() {}
-+	CEGUI::Texture* getActiveTexture() const { return 0; }
-+	CEGUI::uint getVertexCount() const { return 0; }
-+	CEGUI::uint getBatchCount() const { return 0; }
-+	void setRenderEffect(CEGUI::RenderEffect*) {}
-+	CEGUI::RenderEffect* getRenderEffect() { return 0; }
-+};
- 
--class cFake_Renderer : public CEGUI::Renderer
-+class cFake_Texture : public CEGUI::Texture
-+{
-+public:
-+	cFake_Texture() :
-+	  m_size(1, 1),
-+	  m_scaling(1, 1) {}
-+
-+	const CEGUI::Size& getSize() const { return m_size; }
-+	const CEGUI::Size& getOriginalDataSize() const { return m_size; }
-+	const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
-+	void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
-+	void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
-+	void saveToMemory(void*) {}
-+
-+private:
-+	CEGUI::Size m_size;
-+	CEGUI::Vector2 m_scaling;
-+};
-+
-+class cFake_RenderTarget : public CEGUI::RenderTarget
- {
- public:
--	cFake_Renderer( void );
--	virtual ~cFake_Renderer( void );
-+	cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
-+	void draw(const CEGUI::GeometryBuffer&) {}
-+	void draw(const CEGUI::RenderQueue&) {}
-+	void setArea(const CEGUI::Rect&) {}
-+	const CEGUI::Rect& getArea() const { return m_area; }
-+	bool isImageryCache() const { return false; }
-+	void activate() {}
-+	void deactivate() {}
-+	void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
-+
-+private:
-+	CEGUI::Rect m_area;
-+};
- 
--	virtual	void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
--	virtual	void doRender(void) {};
--	virtual	void clearRenderList(void) {};
--	virtual void setQueueingEnabled(bool setting) {};
--	virtual	CEGUI::Texture *createTexture(void) { return NULL; };
--	virtual	CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
--	virtual	CEGUI::Texture *createTexture(float size) { return NULL; };
--	virtual	void destroyTexture(CEGUI::Texture* texture) {};
--	virtual void destroyAllTextures(void) {};
--	virtual bool isQueueingEnabled(void) const { return 0; };
--	virtual float getWidth(void) const { return 0; };
--	virtual float getHeight(void) const { return 0; };
--	virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
--	virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
--	virtual	unsigned int getMaxTextureSize(void) const { return 0; };
--	virtual	unsigned int getHorzScreenDPI(void) const { return 0; };
--	virtual	unsigned int getVertScreenDPI(void) const { return 0; };
-+class cFake_Renderer : public CEGUI::Renderer
-+{
-+public:
-+	cFake_Renderer( void ) :
-+	  m_size(0, 0),
-+	  m_dpi(0, 0),
-+	  m_identifierString("Fake Renderer"),
-+	  m_root(m_target) {}
-+	~cFake_Renderer( void ) {}
-+
-+	CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
-+	CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
-+	void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
-+	void destroyAllGeometryBuffers() {}
-+	CEGUI::TextureTarget* createTextureTarget() { return 0; }
-+	void destroyTextureTarget(CEGUI::TextureTarget*) {}
-+	void destroyAllTextureTargets() {}
-+	CEGUI::Texture& createTexture() { return m_texture; }
-+	CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
-+	CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
-+	void destroyTexture(CEGUI::Texture&) {}
-+	void destroyAllTextures() {}
-+	void beginRendering() {}
-+	void endRendering() {}
-+	void setDisplaySize(const CEGUI::Size&) {}
-+	const CEGUI::Size& getDisplaySize() const { return m_size; }
-+	const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
-+	CEGUI::uint getMaxTextureSize() const { return 0; }
-+	const CEGUI::String& getIdentifierString() const { return m_identifierString; }
-+
-+private:
-+	CEGUI::Size m_size;
-+	CEGUI::Vector2 m_dpi;
-+	CEGUI::String m_identifierString;
-+	cFake_GeometryBuffer m_geometry;
-+	cFake_Texture m_texture;
-+	cFake_RenderTarget m_target;
-+	CEGUI::RenderingRoot m_root;
- };
- 
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/srcpkgs/SMC/template b/srcpkgs/SMC/template
deleted file mode 100644
index d67469fc18a8..000000000000
--- a/srcpkgs/SMC/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'SMC'
-pkgname=SMC
-version=1.9
-revision=9
-wrksrc=${pkgname,,}-${version}
-build_style=gnu-configure
-hostmakedepends="automake libtool gettext-devel pkg-config unzip"
-makedepends="MesaLib-devel boost-devel cegui07-devel gettext-devel
- SDL_image-devel SDL_mixer-devel SDL_ttf-devel"
-short_desc="Two-dimensional platform game similar to Super Mario"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="http://www.secretmaryo.org/"
-distfiles="
- ${SOURCEFORGE_SITE}/smclone/${pkgname,,}-${version}.tar.bz2
- ${SOURCEFORGE_SITE}/smclone/SMC_Music_5.0_high.zip"
-checksum="
- b4194e70d3f1de3da884dd1a11e4f5cec25a205f66a3b85cc9fc1c86289b237d
- c5bb2e1830c7cbe499c93851f5a02b2b900b4730d2c7a133a44a7b43a297dab8"
-replaces="SMC-data>=0"
-
-CXXFLAGS="-fpermissive -std=c++11"
-LDFLAGS="-Wl,--no-as-needed -lX11 -lboost_system"
-
-post_extract() {
-	# remove CRs from end of line
-	find ${wrksrc}/src -type f -exec sed -i "{}" -e "s;\r$;;" \;
-	mv ${XBPS_BUILDDIR}/data/music/* ${wrksrc}/data/music
-}
-pre_configure() {
-	vsed -i configure.ac -e "/AM_INIT_AUTOMAKE/s/)/ subdir-objects)/"
-	NOCONFIGURE=1 ./autogen.sh
-}
-post_install() {
-	vinstall ${FILESDIR}/smc.desktop 644 usr/share/applications
-	vinstall ${FILESDIR}/smc.png 644 usr/share/pixmaps
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0d1180ad4903..490cf40f8b96 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -13,6 +13,7 @@ replaces="
  MoinMoin<=1.9.11_1
  MultiMC<=0.6.13_1
  Platinum9-theme<=0.0.0.20170720_3
+ SMC<=1.9_9
  Venom<=0.5.5_1
  XorCurses<=0.2.2_1
  acme-client<=0.1.16_5

From 2166597f8bf50975f5413f4d0140b333411e8d25 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 15 Aug 2022 08:36:28 -0400
Subject: [PATCH 2/3] cegui07: remove package

it was only used for SMC, which was already removed
---
 common/shlibs                           | 14 ----
 srcpkgs/cegui07-data                    |  1 -
 srcpkgs/cegui07-devel                   |  1 -
 srcpkgs/cegui07-doc                     |  1 -
 srcpkgs/cegui07/patches/fix-build.patch | 81 ----------------------
 srcpkgs/cegui07/template                | 91 -------------------------
 srcpkgs/cegui07/update                  |  1 -
 srcpkgs/removed-packages/template       |  4 ++
 8 files changed, 4 insertions(+), 190 deletions(-)
 delete mode 120000 srcpkgs/cegui07-data
 delete mode 120000 srcpkgs/cegui07-devel
 delete mode 120000 srcpkgs/cegui07-doc
 delete mode 100644 srcpkgs/cegui07/patches/fix-build.patch
 delete mode 100644 srcpkgs/cegui07/template
 delete mode 100644 srcpkgs/cegui07/update

diff --git a/common/shlibs b/common/shlibs
index 01f6f2753fc3..4e5e320c7bbb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2404,20 +2404,6 @@ libSILLY.so.1 silly-0.1.0_1
 libkeybinder-3.0.so.0 libkeybinder3-0.3.0_1
 libbrlapi.so.0.8 brltty-6.1_1
 liblouis.so.20 liblouis-3.11.0_1
-libCEGUIBase-0.7.9.so cegui07-0.7.9_1
-libCEGUIFalagardWRBase-0.7.9.so cegui07-0.7.9_1
-libCEGUIDevILImageCodec-0.7.9.so cegui07-0.7.9_1
-libCEGUIExpatParser-0.7.9.so cegui07-0.7.9_1
-libCEGUIOpenGLRenderer-0.7.9.so cegui07-0.7.9_1
-libCEGUIIrrlichtRenderer-0.7.9.so cegui07-0.7.9_1
-libCEGUILibxmlParser-0.7.9.so cegui07-0.7.9_1
-libCEGUILuaScriptModule-0.7.9.so cegui07-0.7.9_1
-libCEGUISILLYImageCodec-0.7.9.so cegui07-0.7.9_1
-libCEGUISTBImageCodec-0.7.9.so cegui07-0.7.9_1
-libCEGUIFreeImageImageCodec-0.7.9.so cegui07-0.7.9_3
-libCEGUITGAImageCodec-0.7.9.so cegui07-0.7.9_1
-libCEGUITinyXMLParser-0.7.9.so cegui07-0.7.9_1
-libCEGUItoluapp-0.7.9.so cegui07-0.7.9_1
 libCEGUIBase-0.so.2 cegui-0.8.7_1
 libCEGUIOpenGLRenderer-0.so.2 cegui-0.8.7_1
 libCEGUIOgreRenderer-0.so.2 cegui-0.8.7_1
diff --git a/srcpkgs/cegui07-data b/srcpkgs/cegui07-data
deleted file mode 120000
index f7f02f65ac4c..000000000000
--- a/srcpkgs/cegui07-data
+++ /dev/null
@@ -1 +0,0 @@
-cegui07
\ No newline at end of file
diff --git a/srcpkgs/cegui07-devel b/srcpkgs/cegui07-devel
deleted file mode 120000
index f7f02f65ac4c..000000000000
--- a/srcpkgs/cegui07-devel
+++ /dev/null
@@ -1 +0,0 @@
-cegui07
\ No newline at end of file
diff --git a/srcpkgs/cegui07-doc b/srcpkgs/cegui07-doc
deleted file mode 120000
index f7f02f65ac4c..000000000000
--- a/srcpkgs/cegui07-doc
+++ /dev/null
@@ -1 +0,0 @@
-cegui07
\ No newline at end of file
diff --git a/srcpkgs/cegui07/patches/fix-build.patch b/srcpkgs/cegui07/patches/fix-build.patch
deleted file mode 100644
index 2533061810ad..000000000000
--- a/srcpkgs/cegui07/patches/fix-build.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- a/cegui/include/CEGUISystem.h
-+++ b/cegui/include/CEGUISystem.h
-@@ -1123,12 +1123,6 @@
-            ScriptModule* scriptModule, const String& configFile,
-            const String& logFile);
- 
--    /*!
--    \brief
--        Destructor for System objects.
--    */
--    ~System(void);
--
- 	/*!
- 	\brief
- 		Given Point \a pt, return a pointer to the Window that should receive a mouse input if \a pt is the mouse location.
-@@ -1364,6 +1358,13 @@
-     RenderedStringParser* d_customRenderedStringParser;
-     //! true if mouse click events will be automatically generated.
-     bool d_generateMouseClickEvents;
-+
-+protected:
-+    /*!
-+    \brief
-+        Destructor for System objects.
-+    */
-+    ~System(void);
- };
- 
- } // End of  CEGUI namespace section
---- a/cegui/include/RendererModules/OpenGL/CEGUIOpenGLRenderer.h
-+++ b/cegui/include/RendererModules/OpenGL/CEGUIOpenGLRenderer.h
-@@ -291,12 +291,6 @@
-     */
-     OpenGLRenderer(const Size& display_size, const TextureTargetType tt_type);
- 
--    /*!
--    \brief
--        Destructor for OpenGLRenderer objects
--    */
--    virtual ~OpenGLRenderer();
--
-     //! init the extra GL states enabled via enableExtraStateSettings
-     void setupExtraStates();
- 
-@@ -336,6 +330,13 @@
-     OGLTextureTargetFactory* d_textureTargetFactory;
-     //! What blend mode we think is active.
-     BlendMode d_activeBlendMode;
-+
-+protected:
-+    /*!
-+    \brief
-+        Destructor for OpenGLRenderer objects
-+    */
-+    virtual ~OpenGLRenderer();
-   };
- 
- } // End of  CEGUI namespace section
---- a/cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
-+++ b/cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
-@@ -145,7 +145,7 @@
-                 processElement(childNode->ToElement());
-                 break;
-             case CEGUI_TINYXML_NAMESPACE::TiXmlNode::CEGUI_TINYXML_TEXT:
--                if (childNode->ToText()->Value() != '\0')
-+                if (childNode->ToText()->Value() != NULL)
-                     d_handler->text((utf8*)childNode->ToText()->Value());
-                 break;
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,7 +14,8 @@
- 
- AC_INIT([CEGUI], [CEGUI_RELEASE_VERSION], [http://mantis.cegui.org.uk/], [CEGUI])
- AC_CONFIG_SRCDIR([cegui/src/CEGUIBase.cpp])
--AM_INIT_AUTOMAKE([dist-zip tar-ustar])
-+AM_INIT_AUTOMAKE([dist-zip tar-ustar subdir-objects])
-+AM_SILENT_RULES([yes])
- AC_CONFIG_HEADER([cegui/include/config.h])
- AC_CANONICAL_HOST
- 
diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template
deleted file mode 100644
index 3fa7f80a2ea7..000000000000
--- a/srcpkgs/cegui07/template
+++ /dev/null
@@ -1,91 +0,0 @@
-# Template file for 'cegui07'
-pkgname=cegui07
-version=0.7.9
-revision=8
-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"
-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')"
-depends="cegui07-data"
-short_desc="Crazy Eddie's Graphical User Interface (0.7.x)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="http://cegui.org.uk/"
-distfiles="${SOURCEFORGE_SITE}/crayzedsgui/CEGUI%20Mk-2/${version}/CEGUI-${version}.tar.gz"
-checksum=7c3b264def08b46de749c2acaba363e907479d924612436f3bd09da2e474bb8c
-
-build_options="irrlicht python"
-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 \
-		-e 's;$(DOXYGEN) doxyfile;& >/dev/null 2>&1;'
-
-	# Modernize Makefile.am files
-	find . -name Makefile.am -exec sed -i "{}" \
-		-e "1i ACLOCAL_AMFLAGS = -I m4" \
-		-e "s;INCLUDES;AM_CXXFLAGS;g" \;
-
-	# Set AM_CPPFLAGS for the C source in tolua++
-	sed -i cegui/src/ScriptingModules/LuaScriptModule/support/tolua++/Makefile.am \
-		-e "s;AM_CXXFLAGS;AM_CFLAGS;"
-
-	# Modernize configure.ac (enable subdir-objects)
-	sed -i configure.ac \
-		-e "s;dist-zip tar-ustar;& subdir-objects;" \
-		-e "/^AM_INIT_AUTOMAKE.*/a AC_CONFIG_MACRO_DIRS([m4])"
-
-	mkdir -p m4
-	cp doc/COPYING doc/README .
-	touch NEWS AUTHORS ChangeLog
-	autoreconf -if
-}
-post_install() {
-	vlicense COPYING
-	vdoc doc/README
-	vdoc doc/GLEW-LICENSE
-	vdoc doc/PCRE-LICENSE
-	vdoc doc/TinyXML-License
-	vdoc doc/stringencoders-license
-}
-
-cegui07-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/CEGUI
-	}
-}
-cegui07-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmkdir usr/share/doc/${sourcepkg}
-		vcopy ${wrksrc}/doc/doxygen/html usr/share/doc/${sourcepkg}
-	}
-}
-cegui07-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		# Move only the symlink *.so files
-		find ${DESTDIR}/usr/lib/ -type l -exec mv "{}" ${PKGDESTDIR}/usr/lib \;
-	}
-}
diff --git a/srcpkgs/cegui07/update b/srcpkgs/cegui07/update
deleted file mode 100644
index 0341328766e9..000000000000
--- a/srcpkgs/cegui07/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='CEGUI Mk-2/\K0\.7\.[\d]+'
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 490cf40f8b96..272d240a429d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -37,6 +37,10 @@ replaces="
  california<=0.4.0_4
  capstone-python<=4.0.2_3
  captain-ballard<=1.0.0_2
+ cegui07<=0.7.9_8
+ cegui07-data<=0.7.9_8
+ cegui07-devel<=0.7.9_8
+ cegui07-doc<=0.7.9_8
  cgminer<=4.11.1_1
  clamz<=0.5_4
  couchdb<=1.7.1_2

From 4ea2a0091322d131afe7c60f851f960b315101cd Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 11 Aug 2022 12:16:35 -0400
Subject: [PATCH 3/3] 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 | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template
index 070fa66aff81..5a3beea1d514 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 <orphan@voidlinux.org>"
 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
@@ -42,7 +40,7 @@ pre_configure() {
 	cp -p ${FILESDIR}/FindOpenGLES.cmake cmake
 
 	# cmake sets standard to c++03 (which doesn’t know int16_t)
-	sed -i -e "s/-std=c++03//" CMakeLists.txt
+	vsed -i -e "s/-std=c++03//" CMakeLists.txt
 }
 post_install() {
 	local _ver2=${version%.*.*}

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Merged]: cegui: drop unused dependencies in makedepends; SMC/cegui07: remove
  2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
                   ` (14 preceding siblings ...)
  2022-08-15 12:42 ` [PR PATCH] [Updated] cegui: drop unused dependencies in makedepends; SMC/cegui07: remove TinfoilSubmarine
@ 2022-08-17 15:41 ` classabbyamp
  15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2022-08-17 15:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1419 bytes --]

There's a merged pull request on the void-packages repository

cegui: drop unused dependencies in makedepends; SMC/cegui07: remove
https://github.com/void-linux/void-packages/pull/38614

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES** (ran `TSC` with updated `gecui`)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Another one not actually using `python-devel`. Configure output shows that it wasn't even building the python extension modules due to some issue with Boost-python. The only package depending on this is `TSC` and it doesn't seem to require the python extensions.

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2022-08-17 15:41 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-11 16:29 [PR PATCH] cegui: drop unused python-devel in makedepends TinfoilSubmarine
2022-08-11 16:37 ` classabbyamp
2022-08-11 16:44 ` classabbyamp
2022-08-11 17:38 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-08-11 18:39 ` [PR REVIEW] cegui/cegui07: " paper42
2022-08-11 18:40 ` paper42
2022-08-11 18:59 ` classabbyamp
2022-08-11 19:09 ` [PR REVIEW] " TinfoilSubmarine
2022-08-11 21:13 ` paper42
2022-08-12 14:17 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-08-12 14:32 ` TinfoilSubmarine
2022-08-12 14:33 ` TinfoilSubmarine
2022-08-12 21:23 ` classabbyamp
2022-08-12 22:47 ` [PR REVIEW] " paper42
2022-08-15 12:39 ` [PR PATCH] [Updated] " TinfoilSubmarine
2022-08-15 12:42 ` [PR PATCH] [Updated] cegui: drop unused dependencies in makedepends; SMC/cegui07: remove TinfoilSubmarine
2022-08-17 15:41 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).