public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Bernard Cafarelli" <voyageur@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver-app/files/, x11-misc/xscreensaver-app/
Date: Fri, 16 Feb 2024 08:21:26 +0000 (UTC)	[thread overview]
Message-ID: <1708071591.b79ffd3a3cfdaf089817f5216ec7ea84ae4cd608.voyageur@gentoo> (raw)

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
+}


             reply	other threads:[~2024-02-16  8:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-16  8:21 Bernard Cafarelli [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-08-22  4:37 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver-app/files/, x11-misc/xscreensaver-app/ Jeroen Roovers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1708071591.b79ffd3a3cfdaf089817f5216ec7ea84ae4cd608.voyageur@gentoo \
    --to=voyageur@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox