* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libXaw3d/, x11-libs/libXaw3d/files/
@ 2023-12-09 18:45 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-12-09 18:45 UTC (permalink / raw
To: gentoo-commits
commit: e70b6ce82d8416747da4441a282df3ddc0c1acbe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 18:44:28 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 18:44:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e70b6ce8
x11-libs/libXaw3d: fix modern C issue
Closes: https://bugs.gentoo.org/919373
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-libs/libXaw3d/files/libXaw3d-1.6.5-c99.patch | 39 ++++++++++++++++++++++++
x11-libs/libXaw3d/libXaw3d-1.6.5-r1.ebuild | 37 ++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/x11-libs/libXaw3d/files/libXaw3d-1.6.5-c99.patch b/x11-libs/libXaw3d/files/libXaw3d-1.6.5-c99.patch
new file mode 100644
index 000000000000..95b96f627ed3
--- /dev/null
+++ b/x11-libs/libXaw3d/files/libXaw3d-1.6.5-c99.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/919373
+https://gitlab.freedesktop.org/xorg/lib/libxaw3d/-/merge_requests/10
+
+From 7b4af57e8a1471747e17fff184032d8250e598b6 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu, 7 Dec 2023 18:01:47 -0800
+Subject: [PATCH] Multisink.c: Clear -Werror=incompatible-pointer-types error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+MultiSink.c: In function ‘SetValues’:
+MultiSink.c:582:18: error: passing argument 1 of ‘SetTabs’ from
+ incompatible pointer type [-Werror=incompatible-pointer-types]
+ 582 | SetTabs( w, w->text_sink.tab_count, w->text_sink.char_tabs );
+ | ^
+ | |
+ | MultiSinkObject {aka struct _MultiSinkRec *}
+MultiSink.c:99:21: note: expected ‘Widget’ {aka ‘struct _WidgetRec *’}
+ but argument is of type ‘MultiSinkObject’ {aka ‘struct _MultiSinkRec *’}
+ 99 | static void SetTabs(Widget, int, short *);
+ | ^~~~~~
+
+Adopts change originally made to libXaw in XFree86 4
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+--- a/src/MultiSink.c
++++ b/src/MultiSink.c
+@@ -579,7 +579,7 @@ SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *nu
+ if ( w->multi_sink.fontset != old_w->multi_sink.fontset ) {
+ ((TextWidget)XtParent(new))->text.redisplay_needed = True;
+ #ifndef NO_TAB_FIX
+- SetTabs( w, w->text_sink.tab_count, w->text_sink.char_tabs );
++ SetTabs((Widget)w, w->text_sink.tab_count, w->text_sink.char_tabs);
+ #endif
+ }
+
+--
+GitLab
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.5-r1.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.5-r1.ebuild
new file mode 100644
index 000000000000..180315f6ad32
--- /dev/null
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.5-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org Xaw3d library"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="xpm"
+
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXt
+ xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="
+ sys-devel/flex
+ app-alternatives/yacc"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.5-c99.patch
+)
+
+src_configure() {
+ local XORG_CONFIGURE_OPTIONS=(
+ --enable-internationalization
+ $(use_enable xpm multiplane-bitmaps)
+ --enable-gray-stipples
+ --enable-arrow-scrollbars
+ )
+ xorg-3_src_configure
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libXaw3d/, x11-libs/libXaw3d/files/
@ 2024-04-04 3:21 Matt Turner
0 siblings, 0 replies; 2+ messages in thread
From: Matt Turner @ 2024-04-04 3:21 UTC (permalink / raw
To: gentoo-commits
commit: 56daac816decddf89fff74ddaffbcd94f7ec0957
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 4 03:12:40 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 4 03:15:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56daac81
x11-libs/libXaw3d: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-libs/libXaw3d/Manifest | 1 -
x11-libs/libXaw3d/files/libXaw3d-1.6.5-c99.patch | 39 ------------------------
x11-libs/libXaw3d/libXaw3d-1.6.5-r1.ebuild | 37 ----------------------
3 files changed, 77 deletions(-)
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index 31b47896cc15..c679c10e529f 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -1,2 +1 @@
-DIST libXaw3d-1.6.5.tar.xz 483496 BLAKE2B 54dc1bb06b40685e3e2f00bc1aa8447a23ff61226c0b8d20cb0fe070bb7d914290cc4a5f2c70925da528bd9f02a283748178cb2b17111a56fbcc938a1eae25c9 SHA512 b2fbceffcbaff7c332f37769fd6b496ac820de8a80fbf9777416f1895b74a07e4efc3f2bd64db3f584983b24d2b10e9b60cf4aae3ec4a30c06510ae7c213a663
DIST libXaw3d-1.6.6.tar.xz 482040 BLAKE2B d0c7be64283837a7b32f67a2671eebd6d608818819afc4055c360d46152a3348d895159e9a7b7321913b2fea5ec8c587043e921127043d4d37f929a4b71bd27d SHA512 f324ddb1117ae6f8d50137390b2e82b638b53a6b170cce8f7bd8108fd98ce956badc7dede6b49065419f1565f9f4304571880842e799f7f48fb36bebe3dc3603
diff --git a/x11-libs/libXaw3d/files/libXaw3d-1.6.5-c99.patch b/x11-libs/libXaw3d/files/libXaw3d-1.6.5-c99.patch
deleted file mode 100644
index 95b96f627ed3..000000000000
--- a/x11-libs/libXaw3d/files/libXaw3d-1.6.5-c99.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/919373
-https://gitlab.freedesktop.org/xorg/lib/libxaw3d/-/merge_requests/10
-
-From 7b4af57e8a1471747e17fff184032d8250e598b6 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Thu, 7 Dec 2023 18:01:47 -0800
-Subject: [PATCH] Multisink.c: Clear -Werror=incompatible-pointer-types error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-MultiSink.c: In function ‘SetValues’:
-MultiSink.c:582:18: error: passing argument 1 of ‘SetTabs’ from
- incompatible pointer type [-Werror=incompatible-pointer-types]
- 582 | SetTabs( w, w->text_sink.tab_count, w->text_sink.char_tabs );
- | ^
- | |
- | MultiSinkObject {aka struct _MultiSinkRec *}
-MultiSink.c:99:21: note: expected ‘Widget’ {aka ‘struct _WidgetRec *’}
- but argument is of type ‘MultiSinkObject’ {aka ‘struct _MultiSinkRec *’}
- 99 | static void SetTabs(Widget, int, short *);
- | ^~~~~~
-
-Adopts change originally made to libXaw in XFree86 4
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---- a/src/MultiSink.c
-+++ b/src/MultiSink.c
-@@ -579,7 +579,7 @@ SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *nu
- if ( w->multi_sink.fontset != old_w->multi_sink.fontset ) {
- ((TextWidget)XtParent(new))->text.redisplay_needed = True;
- #ifndef NO_TAB_FIX
-- SetTabs( w, w->text_sink.tab_count, w->text_sink.char_tabs );
-+ SetTabs((Widget)w, w->text_sink.tab_count, w->text_sink.char_tabs);
- #endif
- }
-
---
-GitLab
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.5-r1.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.5-r1.ebuild
deleted file mode 100644
index c2cf86b8b27b..000000000000
--- a/x11-libs/libXaw3d/libXaw3d-1.6.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-inherit xorg-3
-
-DESCRIPTION="X.Org Xaw3d library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="xpm"
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-BDEPEND="
- app-alternatives/lex
- app-alternatives/yacc"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.5-c99.patch
-)
-
-src_configure() {
- local XORG_CONFIGURE_OPTIONS=(
- --enable-internationalization
- $(use_enable xpm multiplane-bitmaps)
- --enable-gray-stipples
- --enable-arrow-scrollbars
- )
- xorg-3_src_configure
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-04 3:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-09 18:45 [gentoo-commits] repo/gentoo:master commit in: x11-libs/libXaw3d/, x11-libs/libXaw3d/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-04-04 3:21 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox