public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdock/, x11-misc/xdock/files/
@ 2022-10-14  3:20 Ionen Wolkens
  0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2022-10-14  3:20 UTC (permalink / raw
  To: gentoo-commits

commit:     0d73805d6a949a1e222ad8955f35d4931d9a2818
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 03:13:48 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 03:19:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d73805d

x11-misc/xdock: fix build w/ upcoming clang16

Closes: https://bugs.gentoo.org/871549
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-misc/xdock/files/xdock-0.3.0-clang16.patch        | 19 +++++++++++++++++++
 .../{xdock-0.3.0.ebuild => xdock-0.3.0-r1.ebuild}     |  1 +
 2 files changed, 20 insertions(+)

diff --git a/x11-misc/xdock/files/xdock-0.3.0-clang16.patch b/x11-misc/xdock/files/xdock-0.3.0-clang16.patch
new file mode 100644
index 000000000000..17db7dbb0433
--- /dev/null
+++ b/x11-misc/xdock/files/xdock-0.3.0-clang16.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/871549
+--- a/src/docks/xdcalendar.c
++++ b/src/docks/xdcalendar.c
+@@ -1,2 +1,3 @@
+ #include <xdock.h>
++#include <ctype.h>
+ #include <getopt.h>
+--- a/src/docks/xdmemory.c
++++ b/src/docks/xdmemory.c
+@@ -1,2 +1,3 @@
+ #include <xdock.h>
++#include <ctype.h>
+ #include <getopt.h>
+--- a/src/lib/network.c
++++ b/src/lib/network.c
+@@ -10,2 +10,3 @@
+ #	include <fcntl.h>
++#	include <unistd.h>
+ #	define INVALID_SOCKET -1

diff --git a/x11-misc/xdock/xdock-0.3.0.ebuild b/x11-misc/xdock/xdock-0.3.0-r1.ebuild
similarity index 95%
rename from x11-misc/xdock/xdock-0.3.0.ebuild
rename to x11-misc/xdock/xdock-0.3.0-r1.ebuild
index dd2c66023042..4c830a3fe0f3 100644
--- a/x11-misc/xdock/xdock-0.3.0.ebuild
+++ b/x11-misc/xdock/xdock-0.3.0-r1.ebuild
@@ -22,6 +22,7 @@ DOCS=( API AUTHORS ChangeLog README TODO )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2.0-ldconfig.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_prepare() {


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

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdock/, x11-misc/xdock/files/
@ 2023-05-29 11:54 Joonas Niilola
  0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2023-05-29 11:54 UTC (permalink / raw
  To: gentoo-commits

commit:     595eb68d7d7d5098a4437bf23278052de3aa2f71
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sun May 28 14:02:44 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 29 11:54:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=595eb68d

x11-misc/xdock: Fix memset and memcpy undeclared

Closes: https://bugs.gentoo.org/898894
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31202
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../xdock/files/xdock-0.3.0-clang16-memcpy.patch   | 11 ++++++
 x11-misc/xdock/xdock-0.3.0-r2.ebuild               | 40 ++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/x11-misc/xdock/files/xdock-0.3.0-clang16-memcpy.patch b/x11-misc/xdock/files/xdock-0.3.0-clang16-memcpy.patch
new file mode 100644
index 000000000000..a4cd766c06e7
--- /dev/null
+++ b/x11-misc/xdock/files/xdock-0.3.0-clang16-memcpy.patch
@@ -0,0 +1,11 @@
+#Bug https://bugs.gentoo.org/898894
+--- a/src/lib/network.c
++++ b/src/lib/network.c
+@@ -16,6 +16,7 @@
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <errno.h>
++#include <string.h>
+ 
+ int net_connect(char* host, int port)
+ {

diff --git a/x11-misc/xdock/xdock-0.3.0-r2.ebuild b/x11-misc/xdock/xdock-0.3.0-r2.ebuild
new file mode 100644
index 000000000000..ce4411d6f6e6
--- /dev/null
+++ b/x11-misc/xdock/xdock-0.3.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Emulates Window Maker docks (runs in any window manager)"
+HOMEPAGE="https://xdock.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+
+DOCS=( API AUTHORS ChangeLog README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.0-ldconfig.patch
+	"${FILESDIR}"/${P}-clang16.patch
+	"${FILESDIR}"/${P}-clang16-memcpy.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}


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

end of thread, other threads:[~2023-05-29 11:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-29 11:54 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdock/, x11-misc/xdock/files/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2022-10-14  3:20 Ionen Wolkens

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox