summaryrefslogtreecommitdiff
path: root/packages/xset
diff options
context:
space:
mode:
authorRaymond Danks <raymond@edanks.com>2006-07-24 19:46:41 +0000
committerRaymond Danks <raymond@edanks.com>2006-07-24 19:46:41 +0000
commitdd0c887b669ed5f2fdfa21118f4b32d096e92816 (patch)
tree52a9bb766480ea9983a6e3e5d4ae600e0a482f2c /packages/xset
parentb88c8ee5fdd3c5bda8a7fea778c3d7b09b180622 (diff)
xorg-*: Massive rename to conform to X11R7.x_a.b.c versioning and xorg-* directory structure.
This is the first step for the update to X11R7.1. This will not build and will be followed by more patches and updates.
Diffstat (limited to 'packages/xset')
-rw-r--r--packages/xset/xset/.mtn2git_empty0
-rw-r--r--packages/xset/xset/autofoo.patch109
-rw-r--r--packages/xset/xset/disable-xkb.patch18
-rw-r--r--packages/xset/xset_1.0.1.bb17
-rw-r--r--packages/xset/xset_20040817.bb18
5 files changed, 0 insertions, 162 deletions
diff --git a/packages/xset/xset/.mtn2git_empty b/packages/xset/xset/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xset/xset/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xset/xset/autofoo.patch b/packages/xset/xset/autofoo.patch
deleted file mode 100644
index 039d1319e3..0000000000
--- a/packages/xset/xset/autofoo.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -urN xset.orig/Makefile.am xset/Makefile.am
---- xset.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xset/Makefile.am 2004-08-14 16:32:10.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 = @XSET_CFLAGS@
-+
-+bin_PROGRAMS = xset
-+
-+xset_SOURCES = xset.c
-+
-+xset_LDADD = @XSET_LIBS@
-+
-+man5_MANS=xset.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 xset.orig/autogen.sh xset/autogen.sh
---- xset.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ xset/autogen.sh 2004-08-14 16:27:56.000000000 +0200
-@@ -0,0 +1,3 @@
-+#! /bin/sh
-+autoreconf -v --install || exit 1
-+./configure --enable-maintainer-mode "$@"
-diff -urN xset.orig/configure.ac xset/configure.ac
---- xset.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
-+++ xset/configure.ac 2004-08-17 14:21:25.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([xset],4.4.0,[],xset)
-+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(XSET, xext xextensions xmuu x11)
-+
-+AC_OUTPUT([Makefile])
diff --git a/packages/xset/xset/disable-xkb.patch b/packages/xset/xset/disable-xkb.patch
deleted file mode 100644
index 6060fbb995..0000000000
--- a/packages/xset/xset/disable-xkb.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- xset-1.0.1/configure.ac.orig 2006-03-08 19:46:59.000000000 +0100
-+++ xset-1.0.1/configure.ac 2006-03-08 19:47:40.000000000 +0100
-@@ -42,11 +42,15 @@
- AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
- CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-
-+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
-+ XKB="$enableval", XKB="yes")
-+if test "x$XKB" = "xyes" ; then
- PKG_CHECK_MODULES(SET_XKB, x11,
- [SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
- AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
- CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-+fi
-
- PKG_CHECK_MODULES(SET_XF86MISC, xxf86misc,
- [SAVE_CPPFLAGS="$CPPFLAGS"
diff --git a/packages/xset/xset_1.0.1.bb b/packages/xset/xset_1.0.1.bb
deleted file mode 100644
index 55f3a0de21..0000000000
--- a/packages/xset/xset_1.0.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-DEPENDS = "libx11 libxext xextproto libxmu"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-SECTION = "x11/base"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/${PN}-X11R7.0-${PV}.tar.bz2 \
- file://disable-xkb.patch;patch=1"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
-
-EXTRA_OECONF = "--disable-xkb"
-
-inherit autotools pkgconfig
diff --git a/packages/xset/xset_20040817.bb b/packages/xset/xset_20040817.bb
deleted file mode 100644
index daf57d15c8..0000000000
--- a/packages/xset/xset_20040817.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "user preference utility for X"
-LICENSE = "MIT"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-PV = "0.0+cvs${FIXEDSRCDATE}"
-PR = "r1"
-
-DEPENDS = "libx11 libxext xextensions libxmu"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-SECTION = "x11/base"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc/programs/xset;date=${FIXEDSRCDATE} \
- file://autofoo.patch;patch=1"
-S = "${WORKDIR}/xset"
-
-inherit autotools pkgconfig