diff options
author | Jeroen Roovers <jer@gentoo.org> | 2020-09-15 22:30:26 +0200 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2020-09-15 22:31:55 +0200 |
commit | 0ba5bd57189250c6bc82f7af56f2a974e3b62ea5 (patch) | |
tree | d7f1987efb09d0280fba490257fa1f60598af94e /x11-misc | |
parent | x11-misc/evolvotron: Depend on dev-qt/qtwidgets:5, drop old HOMEPAGE (diff) | |
download | gentoo-0ba5bd57189250c6bc82f7af56f2a974e3b62ea5.tar.gz gentoo-0ba5bd57189250c6bc82f7af56f2a974e3b62ea5.tar.bz2 gentoo-0ba5bd57189250c6bc82f7af56f2a974e3b62ea5.zip |
x11-misc/3ddesktop: Fix building with sys-devel/clang
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Closes: https://bugs.gentoo.org/742671
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild | 5 | ||||
-rw-r--r-- | x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild | 58 | ||||
-rw-r--r-- | x11-misc/3ddesktop/files/3ddesktop-0.2.9-Options_Options.patch | 11 |
3 files changed, 72 insertions, 2 deletions
diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild index 9751760d13b8..1a17ff0dc9bd 100644 --- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild +++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -35,7 +35,8 @@ src_prepare() { "${FILESDIR}"/${P}-gcc4.patch \ "${FILESDIR}"/${P}-asneeded.patch \ "${FILESDIR}"/${P}-missing-include.patch \ - "${FILESDIR}"/${P}-gl_init.patch + "${FILESDIR}"/${P}-gl_init.patch \ + "${FILESDIR}"/${P}-Options_Options.patch eautoreconf } diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild new file mode 100644 index 000000000000..199878c516f1 --- /dev/null +++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +DESCRIPTION="OpenGL virtual desktop switching" +HOMEPAGE="https://sourceforge.net/projects/desk3d/" +SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND=" + >=media-libs/freetype-2 + media-libs/freeglut + media-libs/imlib2[X] + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXmu + x11-libs/libXt + x11-libs/libXxf86vm +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +DOCS=( AUTHORS TODO ChangeLog README README.windowmanagers ) +PATCHES=( + "${FILESDIR}"/${P}-gcc4.patch + "${FILESDIR}"/${P}-asneeded.patch + "${FILESDIR}"/${P}-missing-include.patch + "${FILESDIR}"/${P}-gl_init.patch + "${FILESDIR}"/${P}-Options_Options.patch +) + +src_prepare() { + default + + eautoreconf +} + +pkg_postinst() { + echo + elog "This ebuild installed a configuration file called /etc/3ddesktop.conf" + elog "The default configuration makes a screenshot of the virtual desktops" + elog "every X seconds. This is non-optimal behavior." + elog + elog "To enable a more intelligent way of updating the virtual desktops," + elog "execute the following:" + elog + elog " echo \"AutoAcquire 0\" >> /etc/3ddesktop.conf" + elog + elog "This will cause 3ddesktop to update the virtual desktop snapshots" + elog "only when a 3d desktop switch is required." +} diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-Options_Options.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-Options_Options.patch new file mode 100644 index 000000000000..00e8b8c1ee53 --- /dev/null +++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-Options_Options.patch @@ -0,0 +1,11 @@ +--- a/config.cpp ++++ b/config.cpp +@@ -64,7 +64,7 @@ + } + + +-Options::Options(char *n = NULL) ++Options::Options(char *n) + { + + if (n) |