diff options
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/synaptics/ChangeLog | 96 | ||||
| -rw-r--r-- | x11-misc/synaptics/files/rc.conf | 4 | ||||
| -rw-r--r-- | x11-misc/synaptics/files/rc.init | 4 | ||||
| -rw-r--r-- | x11-misc/synaptics/files/synaptics-0.13.3-amd64.patch | 13 | ||||
| -rw-r--r-- | x11-misc/synaptics/synaptics-0.13.3.ebuild | 14 |
5 files changed, 119 insertions, 12 deletions
diff --git a/x11-misc/synaptics/ChangeLog b/x11-misc/synaptics/ChangeLog index 4ed99b2503e5..ba766dfa9d73 100644 --- a/x11-misc/synaptics/ChangeLog +++ b/x11-misc/synaptics/ChangeLog @@ -1,20 +1,104 @@ # ChangeLog for x11-misc/synaptics # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/ChangeLog,v 1.22 2004/06/28 20:14:38 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/ChangeLog,v 1.23 2004/07/07 20:01:15 battousai Exp $ -*synaptics-0.12.5 (28 Jun 2004) + 07 Jul 2004; Bryan Stine <battousai@gentoo.org>; + +files/synaptics-0.13.3-amd64.patch, synaptics-0.13.3.ebuild: + Added a new patch to fix runtime problems with amd64 in 64-bit mode. Added + ~amd64 keyword. Thanks to David Barton <davebarton@cityinthesky.co.uk>, bug + 50384. 28 Jun 2004; Aron Griffis <agriffis@gentoo.org> synaptics-0.12.4.ebuild, synaptics-0.12.5.ebuild, synaptics-0.13.2.ebuild, synaptics-0.13.3.ebuild: add sed-4 dep - + *synaptics-0.13.3 (14 Jun 2004) 14 Jun 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.13.3.ebuild: Bumped version to 0.13.3. -*synaptics-0.13.2-r1 14 Jun 2004 + 13 Jun 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.12.4.ebuild, + synaptics-0.12.5.ebuild, synaptics-0.13.2.ebuild: + Reverting DEPEND change back to xfree -r6 as xfree -r7 is still masked. + + 11 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; + synaptics-0.12.4.ebuild, synaptics-0.12.5.ebuild, synaptics-0.13.2.ebuild: + xfree -r6 became -r7. + + 31 May 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.13.2.ebuild: + Add back the xorg-x11 RDEPEND. Fixes 52627, thanks to Ta^3 on FreeNode. + + 31 May 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.13.2.ebuild: + Added a little sed magic to change the MANDIR to /usr/man/man1 instead of + /usr/local... Thanks to Simon Cooper <thecoop@runbox.com> for reporting the + bug. + +*synaptics-0.13.2 (10 May 2004) + + 10 May 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.13.2.ebuild: + Version bump. Upstream made quite a few cleanups, some bug fixes and a few new + features. + + 07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; + synaptics-0.12.5.ebuild: + Missing space in DEPEND. + + 07 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; + synaptics-0.12.5.ebuild: + Add xorg-x11 to possible. + +*synaptics-0.12.5 (31 Mar 2004) + + 31 Mar 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.12.5.ebuild: + Version bumpity. + + 23 Feb 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.12.4.ebuild: + Oops. Fixed my stupid RDEPEND mistake. + +*synaptics-0.12.4 (19 Feb 2004) + + 19 Feb 2004; Bryan Stine <battousai@gentoo.org>; synaptics-0.12.4.ebuild: + Version bump. This version has some good upstream Makefile fixes, including + DESTDIR compliance and ability to detect and build against XFree86 SDK + headers. + + 15 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml: + Removing myself as primary maintainer, this is now a herd thing. + + 15 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; files/rc.init: + Fix typo. + + 15 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; files/rc.conf, + files/rc.init: + Somehow I forgot to add the init.d and conf.d scripts for syndaemon, and + nobody even noticed. + + 23 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; synaptics-0.12.0.ebuild: + Re-marking as testing, it's not allowed to depend on something unstable. + + 23 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; synaptics-0.12.0.ebuild: + Stable on x86. + +*synaptics-0.12.1 (23 Nov 2003) + + 23 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; synaptics-0.12.1.ebuild: + Bump. New daemon, seems a little broken though. + + 09 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; synaptics-0.11.8.ebuild, + synaptics-0.12.0.ebuild: + Pulling 0.11.8. Force >=xfree-4.3.0-r4, so it doesn't overwrite files xfree + provides. + +*synaptics-0.12.0 (27 Oct 2003) + + 27 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; + synaptics-0.12.0.ebuild: + Version bump. + +*synaptics-0.11.8 (13 Oct 2003) - 14 Jun 2004; <> - Version bump to 0.13.3. + 13 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml, + synaptics-0.11.8.ebuild, files/synaptics-0.11.8-makefile-fixup.patch: + Initial commit of standalone Synaptics touchpad driver, to be used in future + XFree revisions. diff --git a/x11-misc/synaptics/files/rc.conf b/x11-misc/synaptics/files/rc.conf index 23106604cb94..01f179b583a6 100644 --- a/x11-misc/synaptics/files/rc.conf +++ b/x11-misc/synaptics/files/rc.conf @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2003 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/files/rc.conf,v 1.1 2003/12/15 11:46:37 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/files/rc.conf,v 1.2 2004/07/07 20:01:15 battousai Exp $ # Config file for /etc/init.d/syndaemon diff --git a/x11-misc/synaptics/files/rc.init b/x11-misc/synaptics/files/rc.init index e1819142e372..fb629528bad9 100644 --- a/x11-misc/synaptics/files/rc.init +++ b/x11-misc/synaptics/files/rc.init @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2002 Gentoo Technologies, Inc. +# Copyright 1999-2002 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/files/rc.init,v 1.2 2003/12/15 11:50:30 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/files/rc.init,v 1.3 2004/07/07 20:01:15 battousai Exp $ depend() { use localmount diff --git a/x11-misc/synaptics/files/synaptics-0.13.3-amd64.patch b/x11-misc/synaptics/files/synaptics-0.13.3-amd64.patch new file mode 100644 index 000000000000..a03e8a43b297 --- /dev/null +++ b/x11-misc/synaptics/files/synaptics-0.13.3-amd64.patch @@ -0,0 +1,13 @@ +--- Makefile.old 2004-07-07 18:36:06.325962960 +0200 ++++ Makefile 2004-07-07 18:35:51.878159360 +0200 +@@ -38,7 +38,9 @@ + MODULE_DEFINES = -DIN_MODULE -DXFree86Module + PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO + +-STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY -DTOGCUP -DDPMSExtension -DPIXPRIV -DPANORAMIX -DRENDER -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH -DXFreeXDGA -DXvExtension -DXFree86LOADER -DXFree86Server -DXF86VIDMODE -DSMART_SCHEDULE -DBUILDDEBUG -DX_BYTE_ORDER=X_LITTLE_ENDIAN -DNDEBUG ++#ARCH_DEFINES = -D__i386__ ++ARCH_DEFINES = -D__x86_64__ -D_XSERVER64 ++STD_DEFINES = -Dlinux -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY -DTOGCUP -DDPMSExtension -DPIXPRIV -DPANORAMIX -DRENDER -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH -DXFreeXDGA -DXvExtension -DXFree86LOADER -DXFree86Server -DXF86VIDMODE -DSMART_SCHEDULE -DBUILDDEBUG -DX_BYTE_ORDER=X_LITTLE_ENDIAN -DNDEBUG $(ARCH_DEFINES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(MODULE_DEFINES) + + check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) diff --git a/x11-misc/synaptics/synaptics-0.13.3.ebuild b/x11-misc/synaptics/synaptics-0.13.3.ebuild index dcb88f763ce1..a6472d89e349 100644 --- a/x11-misc/synaptics/synaptics-0.13.3.ebuild +++ b/x11-misc/synaptics/synaptics-0.13.3.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.13.3.ebuild,v 1.3 2004/06/28 20:14:38 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/synaptics/synaptics-0.13.3.ebuild,v 1.4 2004/07/07 20:01:15 battousai Exp $ + +inherit eutils # This ebuild overwrites synaptics files installed by <= xfree-4.3.0-r6 # and xfree-4.3.99.14 >= X >= xfree-4.3.99.8. @@ -10,7 +12,7 @@ HOMEPAGE="http://w1.894.telia.com/~u89404340/touchpad/" SRC_URI="http://w1.894.telia.com/~u89404340/touchpad/files/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~x86 ~amd64" IUSE="" RDEPEND="|| ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 )" DEPEND=">=sys-apps/sed-4" @@ -18,6 +20,14 @@ DEPEND=">=sys-apps/sed-4" src_unpack() { unpack ${A} + cd ${S} + # Fixes runtime brokenness with amd64 (bug 50384) + if [ "${ARCH}" == "amd64" ] + then + einfo "Patching for amd64 arch..." + epatch ${FILESDIR}/${P}-amd64.patch + fi + # Put stuff into /usr/X11R6, also switch up the CC and CFLAGS stuff. sed -i -e "s:BINDIR = \\\$(DESTDIR)/usr/local/bin:BINDIR = ${D}/usr/X11R6/bin:g" ${S}/Makefile sed -i -e "s:CC = gcc:CC = ${CC}:g" ${S}/Makefile |