[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver-app/files/, x11-misc/xscreensaver-app/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver-app/files/, x11-misc/xscreensaver-app/

[Jeroen Roovers]

commit:     82e736b5af629afa68f0c490d8d930a31dcf2e94
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 04:36:01 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 04:36:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e736b5

Fix building against =x11-libs/libdockapp-0.7.0 (bug #558364 by Toralf Förster).

Package-Manager: portage-2.2.20.1

 .../files/xscreensaver-app-2.3-configure.ac        | 21 ++++++++++
 .../xscreensaver-app-2.3-r3.ebuild                 | 46 ++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-configure.ac b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-configure.ac
new file mode 100644
index 0000000..af8b327
--- /dev/null
+++ b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-configure.ac
@@ -0,0 +1,21 @@
+AC_INIT(xscreensaver.app.c)
+
+AM_INIT_AUTOMAKE(XScreenSaver.App,2.3)
+
+AC_PROG_CC
+
+AC_PROG_INSTALL
+
+AC_PATH_X
+
+AC_CHECK_LIB(dockapp, DAProcessActionRects, , exit 1)
+
+PKG_CHECK_MODULES(LIBX11, x11,[LIBS="$LIBS $LIBX11_LIBS";CFLAGS="$CFLAGS $LIBX11_CFLAGS"],[exit 1])
+
+AC_CHECK_HEADER(dockapp.h, have_dockapp_h=yes, [], [])
+
+if test "$have_dockapp_h"x != "yes"x; then
+AC_CHECK_HEADER(libdockapp/dockapp.h, [CFLAGS="$CFLAGS -I/usr/include/libdockapp"], exit 1, [])
+fi
+
+AC_OUTPUT(Makefile)

diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild
new file mode 100644
index 0000000..c8ebbb9
--- /dev/null
+++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools toolchain-funcs
+
+MY_PN=${PN/-a/.A}
+MY_PN=${MY_PN/xs/XS}
+MY_PN=${MY_PN/s/S}
+
+DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager"
+HOMEPAGE="http://xscreensaverapp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	x11-libs/libdockapp
+	x11-libs/libX11
+"
+DEPEND="
+	${CDEPEND}
+	x11-proto/xproto
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	x11-misc/xscreensaver
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	rm configure.in || die
+	cp "${FILESDIR}"/${PN}-2.3-configure.ac configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	dobin ${MY_PN}
+	dodoc README NEWS ChangeLog TODO AUTHORS
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver-app/files/, x11-misc/xscreensaver-app/

[Bernard Cafarelli]

commit:     b79ffd3a3cfdaf089817f5216ec7ea84ae4cd608
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Thu Feb 15 19:42:04 2024 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 08:19:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b79ffd3a

x11-misc/xscreensaver-app: Fix passing argument from incompatible pointer

And update EAPI 7 -> 8

Closes: https://bugs.gentoo.org/924177
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35353
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 .../xscreensaver-app-2.3-gcc14-build-fix.patch     | 12 +++++
 .../xscreensaver-app-2.3-r5.ebuild                 | 51 ++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-gcc14-build-fix.patch b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-gcc14-build-fix.patch
new file mode 100644
index 000000000000..533a72386d8c
--- /dev/null
+++ b/x11-misc/xscreensaver-app/files/xscreensaver-app-2.3-gcc14-build-fix.patch
@@ -0,0 +1,12 @@
+Bug: https://bugs.gentoo.org/924177
+--- a/xscreensaver.app.c
++++ b/xscreensaver.app.c
+@@ -116,7 +116,7 @@ void popConfig()
+ 
+ int main(int argc, char **argv)
+ {
+-  unsigned height, width;
++  unsigned short height, width;
+   char *st_command;
+   int status;
+ 

diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r5.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r5.ebuild
new file mode 100644
index 000000000000..fd5b64aef202
--- /dev/null
+++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools
+
+MY_PN=${PN/-a/.A}
+MY_PN=${MY_PN/xs/XS}
+MY_PN=${MY_PN/s/S}
+
+DESCRIPTION="XScreenSaver dockapp for the Window Maker window manager"
+HOMEPAGE="https://xscreensaverapp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/xscreensaverapp/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	x11-libs/libdockapp
+	x11-libs/libX11
+"
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+RDEPEND="
+	${CDEPEND}
+	x11-misc/xscreensaver
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3-gcc14-build-fix.patch"
+)
+
+src_prepare() {
+	rm configure.in || die
+	cp "${FILESDIR}"/${PN}-2.3-configure.ac configure.ac || die
+
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	dobin ${MY_PN}
+	dodoc README NEWS ChangeLog TODO AUTHORS
+}