From ca10363baac7de9581ec90ab47957f973e1dbdc4 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 15 Aug 2006 11:58:37 +0000 Subject: Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/xmodmap/xmodmap/autofoo.patch | 109 ---------------------------- meta/packages/xmodmap/xmodmap_cvs.bb | 14 ---- 2 files changed, 123 deletions(-) delete mode 100644 meta/packages/xmodmap/xmodmap/autofoo.patch delete mode 100644 meta/packages/xmodmap/xmodmap_cvs.bb (limited to 'meta/packages/xmodmap') diff --git a/meta/packages/xmodmap/xmodmap/autofoo.patch b/meta/packages/xmodmap/xmodmap/autofoo.patch deleted file mode 100644 index f309add08..000000000 --- a/meta/packages/xmodmap/xmodmap/autofoo.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff -urN xmodmap.orig/Makefile.am xmodmap/Makefile.am ---- xmodmap.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ xmodmap/Makefile.am 2004-08-31 19:49:33.000000000 +0200 -@@ -0,0 +1,53 @@ -+# -+# $Id: Makefile.am,v 1.2 2004/06/25 19:38:50 markh Exp $ -+# -+# Copyright © 2003 Keith Packard -+# -+# Permission to use, copy, modify, distribute, and sell this software and its -+# documentation for any purpose is hereby granted without fee, provided that -+# the above copyright notice appear in all copies and that both that -+# copyright notice and this permission notice appear in supporting -+# documentation, and that the name of Keith Packard not be used in -+# advertising or publicity pertaining to distribution of the software without -+# specific, written prior permission. Keith Packard makes no -+# representations about the suitability of this software for any purpose. It -+# is provided "as is" without express or implied warranty. -+# -+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+# PERFORMANCE OF THIS SOFTWARE. -+# -+ -+AUTOMAKE_OPTIONS = 1.7 foreign -+ -+AM_CFLAGS = @XMODMAP_CFLAGS@ -+ -+bin_PROGRAMS = xmodmap -+ -+xmodmap_SOURCES = exec.c handle.c pf.c wq.h xmodmap.c xmodmap.h -+ -+xmodmap_LDADD = @XMODMAP_LIBS@ -+ -+man5_MANS=xmodmap.man -+ -+EXTRA_DIST= $(man5_MANS) -+ -+MAINTAINERCLEANFILES = configure \ -+config.guess \ -+config.sub \ -+install-sh \ -+ltmain.sh \ -+missing \ -+mkinstalldirs \ -+aclocal.m4 \ -+Makefile.in \ -+depcomp \ -+autoscan.log \ -+configure.scan \ -+config.h \ -+config.h.in \ -+$(man5_MANS) -diff -urN xmodmap.orig/autogen.sh xmodmap/autogen.sh ---- xmodmap.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 -+++ xmodmap/autogen.sh 2004-08-31 19:46:14.000000000 +0200 -@@ -0,0 +1,3 @@ -+#! /bin/sh -+autoreconf -v --install || exit 1 -+./configure --enable-maintainer-mode "$@" -diff -urN xmodmap.orig/configure.ac xmodmap/configure.ac ---- xmodmap.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ xmodmap/configure.ac 2004-08-31 20:27:03.000000000 +0200 -@@ -0,0 +1,41 @@ -+dnl -+dnl $Id: configure.ac,v 1.1 2003/10/09 06:16:59 keithp Exp $ -+dnl -+dnl Copyright © 2003 Keith Packard -+dnl -+dnl Permission to use, copy, modify, distribute, and sell this software and its -+dnl documentation for any purpose is hereby granted without fee, provided that -+dnl the above copyright notice appear in all copies and that both that -+dnl copyright notice and this permission notice appear in supporting -+dnl documentation, and that the name of Keith Packard not be used in -+dnl advertising or publicity pertaining to distribution of the software without -+dnl specific, written prior permission. Keith Packard makes no -+dnl representations about the suitability of this software for any purpose. It -+dnl is provided "as is" without express or implied warranty. -+dnl -+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+dnl PERFORMANCE OF THIS SOFTWARE. -+dnl -+ -+AC_PREREQ(2.57) -+AC_INIT([xmodmap],4.4.0,[],xmodmap) -+AC_CONFIG_SRCDIR([Makefile.am]) -+AM_INIT_AUTOMAKE([dist-bzip2]) -+AM_MAINTAINER_MODE -+AM_CONFIG_HEADER(config.h) -+ -+AC_PROG_CC -+AC_PROG_INSTALL -+AC_PROG_LN_S -+AC_LIBTOOL_WIN32_DLL -+AM_PROG_LIBTOOL -+AC_PROG_MAKE_SET -+ -+PKG_CHECK_MODULES(XMODMAP, x11) -+ -+AC_OUTPUT([Makefile]) diff --git a/meta/packages/xmodmap/xmodmap_cvs.bb b/meta/packages/xmodmap/xmodmap_cvs.bb deleted file mode 100644 index 773466e6b..000000000 --- a/meta/packages/xmodmap/xmodmap_cvs.bb +++ /dev/null @@ -1,14 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT" -DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" -MAINTAINER = "Rene Wagner " -SECTION = "x11/base" -PR = "r1" - -DEPENDS = "libx11" - -SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xmodmap \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/xmodmap" - -inherit autotools pkgconfig -- cgit v1.2.3