* [gentoo-commits] repo/gentoo:master commit in: x11-terms/aterm/, x11-terms/aterm/files/
@ 2017-11-19 1:29 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2017-11-19 1:29 UTC (permalink / raw
To: gentoo-commits
commit: 6c7e9c0e57b8b644f02a1b61dd5b628930015a06
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 01:28:38 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 01:28:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c7e9c0e
x11-terms/aterm: add patch from Fedora solving build failure
Closes: https://bugs.gentoo.org/615836
Package-Manager: Portage-2.3.8, Repoman-2.3.4
x11-terms/aterm/aterm-1.0.1-r3.ebuild | 1 +
x11-terms/aterm/files/aterm-1.0.1-dpy.patch | 28 ++++++++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/x11-terms/aterm/aterm-1.0.1-r3.ebuild b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
index e8db05b719d..13ec64d087d 100644
--- a/x11-terms/aterm/aterm-1.0.1-r3.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
# Security bug #219746
eapply "${FILESDIR}/${P}-display-security-issue.patch"
eapply "${FILESDIR}"/${P}-deadkeys.patch
+ eapply "${FILESDIR}/${P}-dpy.patch"
#fix pre-stripped files
sed -i -e "/INSTALL_PROGRAM/ s:-s::" autoconf/Make.common.in || die "sed Makefile failed"
diff --git a/x11-terms/aterm/files/aterm-1.0.1-dpy.patch b/x11-terms/aterm/files/aterm-1.0.1-dpy.patch
new file mode 100644
index 00000000000..fbe9800d218
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-1.0.1-dpy.patch
@@ -0,0 +1,28 @@
+Resolve build failure. Patch from Fedora.
+
+Bug: https://bugs.gentoo.org/615836
+
+diff -up aterm-1.0.1/src/main.c.orig aterm-1.0.1/src/main.c
+--- aterm-1.0.1/src/main.c.orig 2011-02-19 09:12:01.000000000 +0200
++++ aterm-1.0.1/src/main.c 2011-02-19 09:25:02.000000000 +0200
+@@ -2087,10 +2087,10 @@ main(int argc, char *argv[])
+ #endif
+
+ ConnectX ( &Scr, 0 );
+- Xdisplay = dpy ;
+- Xscreen = Scr.screen ;
++ Xscreen = Scr.screen ;
+ asv = Scr.asv ;
+
++ Xdisplay = asv->dpy;
+ Xcmap = asv->colormap;
+ Xdepth = asv->visual_info.depth;
+ Xvisual = asv->visual_info.visual;
+@@ -2125,7 +2125,6 @@ main(int argc, char *argv[])
+ XdisplayHeight = DisplayHeight (Xdisplay, Xscreen);
+
+ #ifdef HAVE_AFTERIMAGE
+- dpy = Xdisplay ;
+ asv = create_asvisual (Xdisplay, Xscreen, Xdepth, NULL);
+ Xcmap = asv->colormap;
+ Xdepth = asv->visual_info.depth;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/aterm/, x11-terms/aterm/files/
@ 2020-04-20 21:27 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2020-04-20 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 59f6d9714c8e46af940c43f9ae7a527386929c35
Author: Ilia Mirkin <imirkin <AT> alum <DOT> mit <DOT> edu>
AuthorDate: Tue Apr 14 17:35:21 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 21:26:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59f6d971
x11-terms/aterm: add patch to remove streams functionality
STREAMS were never supported in Linux, and have been removed from
glibc-2.30. This causes aterm to no longer build.
The included patch fixes the build by making the code follow the old
paths, on the assumption that the ioctls never did anything to begin
with.
Practical testing with this patch has not revealed any obvious issues.
Bug: https://bugs.gentoo.org/691756
Signed-off-by: Ilia Mirkin <imirkin <AT> alum.mit.edu>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-terms/aterm/aterm-1.0.1-r4.ebuild | 90 ++++++++++++++++++++++
.../aterm/files/aterm-1.0.1-remove-streams.patch | 36 +++++++++
2 files changed, 126 insertions(+)
diff --git a/x11-terms/aterm/aterm-1.0.1-r4.ebuild b/x11-terms/aterm/aterm-1.0.1-r4.ebuild
new file mode 100644
index 00000000000..503745ca6b9
--- /dev/null
+++ b/x11-terms/aterm/aterm-1.0.1-r4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="rxvt compatible terminal emulator with transparency support"
+HOMEPAGE="http://aterm.sourceforge.net"
+SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="background cjk xgetdefault"
+
+RDEPEND="
+ virtual/jpeg:0
+ media-libs/libpng:0=
+ background? ( x11-wm/afterstep )
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libICE
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ x11-libs/libXt
+"
+
+src_prepare() {
+ # Security bug #219746
+ eapply "${FILESDIR}/${P}-display-security-issue.patch"
+ eapply "${FILESDIR}"/${P}-deadkeys.patch
+ eapply "${FILESDIR}/${P}-dpy.patch"
+ eapply "${FILESDIR}/${P}-remove-streams.patch"
+
+ #fix pre-stripped files
+ sed -i -e "/INSTALL_PROGRAM/ s:-s::" autoconf/Make.common.in || die "sed Makefile failed"
+
+ default
+}
+
+src_configure() {
+ local myconf
+
+ use cjk && myconf="$myconf
+ --enable-kanji
+ --enable-thai
+ --enable-big5"
+
+ case "${CHOST}" in
+ *-darwin*) myconf="${myconf} --enable-wtmp" ;;
+ *-interix*) ;;
+ *) myconf="${myconf} --enable-utmp --enable-wtmp"
+ esac
+
+ econf \
+ $(use_enable xgetdefault) \
+ $(use_enable background background-image) \
+ --with-terminfo="${EPREFIX}"/usr/share/terminfo \
+ --enable-transparency \
+ --enable-fading \
+ --enable-background-image \
+ --enable-menubar \
+ --enable-graphics \
+ --with-x \
+ ${myconf}
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "make install failed"
+
+ fowners root:utmp /usr/bin/aterm
+ fperms g+s /usr/bin/aterm
+
+ doman doc/aterm.1
+ dodoc ChangeLog doc/FAQ doc/README.*
+ docinto menu
+ dodoc doc/menu/*
+ dohtml -r .
+}
+
+pkg_postinst() {
+ echo
+ elog "The transparent background will only work if you have the 'real'"
+ elog "root wallpaper set. Some tools that might help include: Esetroot"
+ elog "(x11-terms/eterm), wmsetbg (x11-wm/windowmaker), and/or"
+ elog "media-gfx/feh."
+ echo
+}
diff --git a/x11-terms/aterm/files/aterm-1.0.1-remove-streams.patch b/x11-terms/aterm/files/aterm-1.0.1-remove-streams.patch
new file mode 100644
index 00000000000..fc9f3f82ba1
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-1.0.1-remove-streams.patch
@@ -0,0 +1,36 @@
+diff -ur aterm-1.0.1-orig/src/command.c aterm-1.0.1/src/command.c
+--- aterm-1.0.1-orig/src/command.c 2020-04-01 12:50:59.222929696 -0400
++++ aterm-1.0.1/src/command.c 2020-04-01 12:49:47.319579199 -0400
+@@ -91,10 +91,13 @@
+
+ #if defined (__svr4__) || defined (__lnx21__)
+ # include <sys/resource.h> /* for struct rlimit */
+-# include <sys/stropts.h> /* for I_PUSH */
+ # define _NEW_TTY_CTRL /* to get proper defines in <termios.h> */
+ #endif
+
++#if defined (__svr4__)
++# include <sys/stropts.h> /* for I_PUSH */
++#endif
++
+ /*}}} */
+
+ static unsigned int ModMetaMask, ModNumLockMask;
+@@ -672,7 +675,7 @@
+ print_error("can't open slave tty %s", ttydev);
+ exit(EXIT_FAILURE);
+ }
+-#if defined (__svr4__) || defined (__lnx21__)
++#if defined (__svr4__)
+ /*
+ * Push STREAMS modules:
+ * ptem: pseudo-terminal hardware emulation module.
+@@ -682,6 +685,8 @@
+ ioctl(fd, I_PUSH, "ptem");
+ ioctl(fd, I_PUSH, "ldterm");
+ ioctl(fd, I_PUSH, "ttcompat");
++#elif defined (__lnx21__)
++ /* do nothing */
+ #else /* __svr4__ */
+ {
+ /* change ownership of tty to real uid and real group */
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/aterm/, x11-terms/aterm/files/
@ 2022-12-03 3:43 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-12-03 3:43 UTC (permalink / raw
To: gentoo-commits
commit: 031c0fbb084a87f1f5fc99db91f8c0d549c3eec9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 02:36:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 02:36:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031c0fbb
x11-terms/aterm: fix configure w/ clang 16
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-terms/aterm/aterm-1.0.1-r6.ebuild | 93 ++++++++++++++++++++++
.../files/aterm-1.0.1-configure-clang16.patch | 23 ++++++
2 files changed, 116 insertions(+)
diff --git a/x11-terms/aterm/aterm-1.0.1-r6.ebuild b/x11-terms/aterm/aterm-1.0.1-r6.ebuild
new file mode 100644
index 000000000000..382b049ea5f1
--- /dev/null
+++ b/x11-terms/aterm/aterm-1.0.1-r6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="rxvt compatible terminal emulator with transparency support"
+HOMEPAGE="http://aterm.sourceforge.net"
+SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="background cjk xgetdefault"
+
+RDEPEND="
+ media-libs/libjpeg-turbo:0=
+ media-libs/libpng:0=
+ background? ( media-libs/libafterimage )
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libICE
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ x11-libs/libXt
+"
+
+PATCHES=(
+ # Security bug #219746
+ "${FILESDIR}/${P}-display-security-issue.patch"
+ "${FILESDIR}/${P}-deadkeys.patch"
+ "${FILESDIR}/${P}-dpy.patch"
+ "${FILESDIR}/${P}-remove-streams.patch"
+ "${FILESDIR}/${P}-configure-clang16.patch"
+)
+
+src_prepare() {
+ default
+
+ # fix pre-stripped files
+ sed -i -e "/INSTALL_PROGRAM/ s:-s::" autoconf/Make.common.in || die "sed Makefile failed"
+
+ # Clang 16
+ sed -i -e 's:configure.in:configure.ac:' Makefile.in || die
+ cd autoconf || die
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ use cjk && myconf="$myconf
+ --enable-kanji
+ --enable-thai
+ --enable-big5"
+
+ case "${CHOST}" in
+ *-darwin*) myconf="${myconf} --enable-wtmp" ;;
+ *-interix*) ;;
+ *) myconf="${myconf} --enable-utmp --enable-wtmp"
+ esac
+
+ econf \
+ $(use_enable xgetdefault) \
+ $(use_with background afterimage-config "${EPREFIX}"/usr/bin) \
+ --with-terminfo="${EPREFIX}"/usr/share/terminfo \
+ --enable-transparency \
+ --with-x \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ fowners root:utmp /usr/bin/aterm
+ fperms g+s /usr/bin/aterm
+
+ doman doc/aterm.1
+ dodoc ChangeLog doc/FAQ doc/README.*
+ docinto menu
+ dodoc doc/menu/*
+}
+
+pkg_postinst() {
+ echo
+ elog "The transparent background will only work if you have the 'real'"
+ elog "root wallpaper set. Some tools that might help include:"
+ elog "wmsetbg (x11-wm/windowmaker), and/or media-gfx/feh."
+ echo
+}
diff --git a/x11-terms/aterm/files/aterm-1.0.1-configure-clang16.patch b/x11-terms/aterm/files/aterm-1.0.1-configure-clang16.patch
new file mode 100644
index 000000000000..9faf68837d4e
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-1.0.1-configure-clang16.patch
@@ -0,0 +1,23 @@
+Add missing int tpye, and avoid calling the undeclared exit function.
+Implicit ints and function declarations are language features removed
+in C99 and are likely to become unsupported (by default) in future
+compilers.
+
+--- a/autoconf/configure.in
++++ b/autoconf/configure.in
+@@ -615,12 +615,12 @@
+ [#define X_LOCALE 1
+ #include <X11/Xlocale.h>
+ #include <X11/Xlib.h>
+-main() {
++int main() {
+ char *p;
+ if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
+-exit (XSupportsLocale() ? 0 : 1);
++return XSupportsLocale() ? 0 : 1;
+ else
+-exit (1);}
++return 1;}
+ ],rxvt_cv_func_xlocale=yes, rxvt_cv_func_xlocale=no,
+ AC_MSG_WARN([Define NO_XLOCALE in config.h manually]))])
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-03 3:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-03 3:43 [gentoo-commits] repo/gentoo:master commit in: x11-terms/aterm/, x11-terms/aterm/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-04-20 21:27 Matt Turner
2017-11-19 1:29 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox