commit: 829815780ea2a31ac095ada21bcca9bcdd92e118 Author: Vivian Heisz (demize) <demize <AT> unstable <DOT> systems> AuthorDate: Thu May 15 20:36:19 2025 +0000 Commit: demize <demize <AT> unstable <DOT> systems> CommitDate: Thu May 15 20:42:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=82981578
app-misc/electricsheep: add 3.0.4_p20240213, drop 3.0.2_p20191005-r2 This also bumps WX_GTK_VER to 3.2-gtk3, as 3.0 was dropped in ::gentoo. Closes: https://bugs.gentoo.org/901021 (obsolete) Closes: https://bugs.gentoo.org/932190 Closes: https://bugs.gentoo.org/937249 Signed-off-by: Vivian Heisz (demize) <demize <AT> unstable.systems> app-misc/electricsheep/Manifest | 5 ++--- ...05-r2.ebuild => electricsheep-3.0.4_p20240213.ebuild} | 14 ++++++-------- .../files/electricsheep-glext-prototypes.patch | 16 ---------------- 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/app-misc/electricsheep/Manifest b/app-misc/electricsheep/Manifest index 42915f22c..d27626851 100644 --- a/app-misc/electricsheep/Manifest +++ b/app-misc/electricsheep/Manifest @@ -1,3 +1,2 @@ -DIST electricsheep-3.0.2_p20191005.tar.gz 11115290 BLAKE2B d952663864287a0081dd2b65dbe77e09ce8beb3c0693e8605a469244eaa21c441f159c6a74b5d5b1cf20151b9b8fe57ee20f4ef44d0f564c56aa9b84f33062bf SHA512 ef8138466d3f938eaf78e530e804f42947dd05c5d9511a091b67600b6719a9e70917594879668953d252a4cdfafd0f547ecbb2e23fe7dc610b959e2c04ac85e5 -DIST electricsheep-fix-build-boost-185.patch 4062 BLAKE2B 9eeda51d02d93db3c4179d43441436634bd8e5ce6a2912ac9484460a18eb35d25ee04ba82ff9eda0524f551b1e1584b94aef1c932213cb8e3be8997915dffd1d SHA512 d85c6a9161ef90f3ea73908ef2a27683f5caba97f72e5ef8943770fcfe7f069de1b4d2594ff03ffbbce50ed9deb9e773e998127d1e8d90dcaa73c687cb3093bc -DIST electricsheep-fix-ffmpeg5.patch 48619 BLAKE2B bed22bf7cdd07fd637ad621fc7f653d31e701757ffe2c6a72110076572a2cb1dce1d429ce8181f9af08a4e6d0792945c63937bb2e3a2defe5aacf5aa4cea74c8 SHA512 42ba5d5789e72632cb9ab5600166a45aea6c32b0a56d0da97b62b4298617fc8a7dbe36b6f3b73eb4ba3cb12369e19657f49a94d9f501861a0b6c30a888bec1cf +DIST electricsheep-3.0.4_p20240213.tar.gz 24606079 BLAKE2B 60b13b5ad0efdfe980905a1df049c81c74c55ff6823a754bf4d0245f008ed932154e298bdde305098a95508852049e9c7a93f63b0839aeaa6c382ed75bd599f0 SHA512 5a32761d2b4a103105930c8ed0beb3bbf63d84bcf844b176570828984885cde072e1627b9b9e2282767e4b8de1901d77ae2fbeb2be91911f32c04177a7df8945 +DIST electricsheep-remove-convenience.patch 3210 BLAKE2B 0b66b29fce9d32de66bded2485cd9ac6e66275029e3c564ee2829ddb83a967946085e507eb9d5ca9127b0c9ff27515ed831218b6d8f8462504b607c7441e18b1 SHA512 e8e4883b3fe711dd446dc0d60c787e34aa0aa6cbd53c242d1fe7dd0efeb25ad9c26628a88897a358042d2f3b6520d9fbdca4d6c32dd983efb2b18af9eb8211a4 diff --git a/app-misc/electricsheep/electricsheep-3.0.2_p20191005-r2.ebuild b/app-misc/electricsheep/electricsheep-3.0.4_p20240213.ebuild similarity index 75% rename from app-misc/electricsheep/electricsheep-3.0.2_p20191005-r2.ebuild rename to app-misc/electricsheep/electricsheep-3.0.4_p20240213.ebuild index 3987f2886..9c2b6e840 100644 --- a/app-misc/electricsheep/electricsheep-3.0.2_p20191005-r2.ebuild +++ b/app-misc/electricsheep/electricsheep-3.0.4_p20240213.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -WX_GTK_VER="3.0-gtk3" +WX_GTK_VER="3.2-gtk3" inherit autotools wxwidgets desktop flag-o-matic DESCRIPTION="Realize the collective dream of sleeping computers from all over the internet" HOMEPAGE="https://electricsheep.org/"; -MY_COMMIT="37ba0fd692d6581f8fe009ed11c9650cd8174123" +MY_COMMIT="5fbbb684752be06ccbea41639968aa7f1cc678dd" SRC_URI=" https://github.com/scottdraves/electricsheep/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz - https://github.com/scottdraves/electricsheep/pull/109.patch -> electricsheep-fix-ffmpeg5.patch - https://github.com/scottdraves/electricsheep/pull/123.patch -> electricsheep-fix-build-boost-185.patch + https://github.com/scottdraves/electricsheep/pull/126.patch -> electricsheep-remove-convenience.patch " S="${WORKDIR}/${PN}-${MY_COMMIT}/client_generic" @@ -42,7 +41,6 @@ DEPEND="dev-lang/lua:5.1 RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/electricsheep-glext-prototypes.patch" # is included in the boost181 patch "${FILESDIR}/electricsheep-disable-vsync.patch" ) @@ -52,8 +50,7 @@ src_prepare() { eautoreconf rm -f DisplayOutput/OpenGL/{GLee.c,GLee.h} cd ../ - eapply "${DISTDIR}/electricsheep-fix-ffmpeg5.patch" - eapply "${DISTDIR}/electricsheep-fix-build-boost-185.patch" + eapply "${DISTDIR}/electricsheep-remove-convenience.patch" } src_configure() { @@ -70,4 +67,5 @@ src_install() { mv "${ED}/usr/share/doc/electricsheep-2.7b33-svn" "${ED}/usr/share/${PF}" || die sed -i "$ a OnlyShowIn=" "${ED}/usr/share/applications/screensavers/electricsheep.desktop" domenu "${FILESDIR}/ElectricSheep.desktop" + } diff --git a/app-misc/electricsheep/files/electricsheep-glext-prototypes.patch b/app-misc/electricsheep/files/electricsheep-glext-prototypes.patch deleted file mode 100644 index 386e70e98..000000000 --- a/app-misc/electricsheep/files/electricsheep-glext-prototypes.patch +++ /dev/null @@ -1,16 +0,0 @@ -See: https://github.com/stefantalpalaru/gentoo-overlay/issues/26#issuecomment-455773380 -"Seems that GL/glext.h now exports functions for GL_ARB_shader_objects extension, so they -define GL_ARB_shader_objects, which results in relevant section being skipped in /usr/include/GLee.h. -By default GL/glext.h skips defining prototypes for functions, but it can be enabled - -I used -DGL_GLEXT_PROTOTYPES option to gcc, and compilation finished without errors." - ---- client_generic/Client/Makefile.am -+++ client_generic/Client/Makefile.am -@@ -12,6 +12,7 @@ - AM_CPPFLAGS = \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \ -+ -DGL_GLEXT_PROTOTYPES \ - -I $(top_srcdir) \ - -iquote ../DisplayOutput/OpenGL \ - -I ../Common \
