diff options
Diffstat (limited to 'app-misc/twin')
| -rw-r--r-- | app-misc/twin/ChangeLog | 7 | ||||
| -rw-r--r-- | app-misc/twin/files/twin-0.4.6-build.patch | 31 | ||||
| -rw-r--r-- | app-misc/twin/files/twin-0.4.6-gcc.patch | 21 | ||||
| -rw-r--r-- | app-misc/twin/twin-0.4.6.ebuild | 15 |
4 files changed, 66 insertions, 8 deletions
diff --git a/app-misc/twin/ChangeLog b/app-misc/twin/ChangeLog index 69e7e3f34e7d..12b75380c5e3 100644 --- a/app-misc/twin/ChangeLog +++ b/app-misc/twin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/twin # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/ChangeLog,v 1.19 2006/07/09 01:36:38 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/ChangeLog,v 1.20 2006/10/22 05:55:19 vapier Exp $ + + 22 Oct 2006; Mike Frysinger <vapier@gentoo.org> + +files/twin-0.4.6-build.patch, files/twin-0.4.6-gcc.patch, + twin-0.4.6.ebuild: + Cleanup build and fix compile failure with gcc4 #152133. 09 Jul 2006; Joshua Kinard <kumba@gentoo.org> twin-0.4.6.ebuild: Marked stable on mips to satisfy eterm dep. diff --git a/app-misc/twin/files/twin-0.4.6-build.patch b/app-misc/twin/files/twin-0.4.6-build.patch new file mode 100644 index 000000000000..fb7a8d033330 --- /dev/null +++ b/app-misc/twin/files/twin-0.4.6-build.patch @@ -0,0 +1,31 @@ +just respect the settings from portage, local strip stuff be damned + +--- makerules ++++ makerules +@@ -27,25 +27,7 @@ + # + # compile/link flags. Used if no CFLAGS/LDFLAGS given in `make' command line + # +-ifdef DEBUG +- CFLAGS+=-g -DINLINE=static +- LDFLAGS+=-g +-else +- ifdef PROFILE +- CFLAGS+=-p -pg +- LDFLAGS+=-p -pg +- else +- ifeq ($(CC),gcc) +- CFLAGS+=-O2 -fomit-frame-pointer +- LDFLAGS+=-s +- else +- # detected by `./configure' : +- CFLAGS+=$(CC_AC_FLAGS) +- endif +- # strip installed binaries +- INSTALLFLAGS+=-s +- endif +-endif ++CFLAGS+=$(CC_AC_FLAGS) + + # + # how picky should your compiler be? uncomment for paranoid gcc settings. diff --git a/app-misc/twin/files/twin-0.4.6-gcc.patch b/app-misc/twin/files/twin-0.4.6-gcc.patch index 88fa69d70a73..62fd7f62e983 100644 --- a/app-misc/twin/files/twin-0.4.6-gcc.patch +++ b/app-misc/twin/files/twin-0.4.6-gcc.patch @@ -17,3 +17,24 @@ s_tw_errno *E; byte *q; int i; +--- server/HW/hw_tty.c ++++ server/HW/hw_tty.c +@@ -389,8 +389,9 @@ + + static byte xterm_MouseData[10] = "\033[M#!!!!"; + ++static void xterm_MouseEvent(int fd, display_hw hw); ++ + static void stdin_KeyboardEvent(int fd, display_hw hw) { +- static void xterm_MouseEvent(int, display_hw); + static byte *match; + byte got, chunk, buf[SMALLBUFF], *s, *sret; + udat Code, ShiftFlags; +@@ -574,7 +575,6 @@ + */ + + static void xterm_QuitMouse(void); +-static void xterm_MouseEvent(int fd, display_hw hw); + + + /* return FALSE if failed */ diff --git a/app-misc/twin/twin-0.4.6.ebuild b/app-misc/twin/twin-0.4.6.ebuild index cc5c4f0a30b8..275da26d1e90 100644 --- a/app-misc/twin/twin-0.4.6.ebuild +++ b/app-misc/twin/twin-0.4.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/twin-0.4.6.ebuild,v 1.11 2006/09/04 08:43:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/twin/twin-0.4.6.ebuild,v 1.12 2006/10/22 05:55:19 vapier Exp $ inherit eutils fixheadtails @@ -13,18 +13,19 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86" IUSE="X gtk ggi gpm" -RDEPEND="X? ( || ( ( x11-libs/libXpm x11-libs/libX11 ) virtual/x11 ) ) +RDEPEND="X? ( x11-libs/libXpm x11-libs/libX11 ) ggi? ( >=media-libs/libggi-1.9 ) gtk? ( =x11-libs/gtk+-1.2* ) gpm? ( >=sys-libs/gpm-1.19.3 ) >=sys-libs/ncurses-5.2" DEPEND="${RDEPEND} - X? ( || ( ( x11-proto/xproto ) virtual/x11 ) )" + X? ( x11-proto/xproto )" src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-autotools.patch + epatch "${FILESDIR}"/${P}-build.patch epatch "${FILESDIR}"/${P}-gcc.patch ht_fix_file configure } @@ -59,17 +60,17 @@ src_compile() { } src_install() { - make install DESTDIR="${D}" || die + emake install DESTDIR="${D}" || die if use X ; then insinto /usr/lib/X11/fonts/misc doins fonts/vga.pcf.gz fi - rm -rf ${D}/usr/share/twin/{BUGS,docs,COP*,READ*,Change*,INSTALL*} + rm -rf "${D}"/usr/share/twin/{BUGS,docs,COP*,READ*,Change*,INSTALL*} dodoc BUGS Change* README* TODO/TODO TODO/twin-thoughts - doman docs/twin.1; rm -rf docs/twin.1 + doman docs/twin.1 dodoc docs/* - + rm -f "${D}"/usr/share/doc/${PF}/twin.1* } |