Date: Sunday, November 14, 2010 @ 12:28:59 Author: jgc Revision: 99437
upgpkg: xorg-xkbutils 1.0.3-1 Update to 1.0.3 Modified: xorg-xkbutils/trunk/PKGBUILD Deleted: xorg-xkbutils/trunk/git-fixes.patch -----------------+ PKGBUILD | 10 - git-fixes.patch | 358 ------------------------------------------------------ 2 files changed, 3 insertions(+), 365 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-11-14 17:26:24 UTC (rev 99436) +++ PKGBUILD 2010-11-14 17:28:59 UTC (rev 99437) @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <j...@archlinux.org> pkgname=xorg-xkbutils -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="XKB utility demos" arch=(i686 x86_64) @@ -10,15 +10,11 @@ license=('custom') depends=('libxaw' 'libxt' 'libx11') makedepends=('xorg-util-macros' 'xproto' 'inputproto') -source=(http://xorg.freedesktop.org/archive/individual/app/xkbutils-${pkgver}.tar.bz2 - git-fixes.patch) -sha1sums=('2c025038ca12ee2494b2401ea2c12c74fe88bf91' - 'b86efca955f260458bceec23531865f5ebb795c6') +source=(http://xorg.freedesktop.org/archive/individual/app/xkbutils-${pkgver}.tar.bz2) +sha1sums=('e5a2619b9449f95e02b520b492de0575bc4551d6') build() { cd "${srcdir}/xkbutils-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - autoreconf ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install Deleted: git-fixes.patch =================================================================== --- git-fixes.patch 2010-11-14 17:26:24 UTC (rev 99436) +++ git-fixes.patch 2010-11-14 17:28:59 UTC (rev 99437) @@ -1,358 +0,0 @@ -diff --git a/COPYING b/COPYING -index 7f33cbf..9bba684 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,68 @@ --This is a stub file. This package has not yet had its complete licensing --information compiled. Please see the individual source files for details on --your rights to use and modify this software. -+Copyright (c) 1993, 1995 by Silicon Graphics Computer Systems, Inc. - --Please submit updated COPYING files to the Xorg bugzilla: -+Permission to use, copy, modify, and distribute this -+software and its documentation for any purpose and without -+fee is hereby granted, 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 Silicon Graphics not be -+used in advertising or publicity pertaining to distribution -+of the software without specific prior written permission. -+Silicon Graphics makes no representation about the suitability -+of this software for any purpose. It is provided "as is" -+without any express or implied warranty. - --https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -+GRAPHICS 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. - --All licensing questions regarding this software should be directed at the --Xorg mailing list: - --http://lists.freedesktop.org/mailman/listinfo/xorg -+ COPYRIGHT 1990 -+ DIGITAL EQUIPMENT CORPORATION -+ MAYNARD, MASSACHUSETTS -+ ALL RIGHTS RESERVED. -+ -+THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND -+SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION. -+DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE -+FOR ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED -+WARRANTY. -+ -+IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT -+RIGHTS, APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN -+ADDITION TO THAT SET FORTH ABOVE. -+ -+Permission to use, copy, modify, and distribute this software and its -+documentation for any purpose and without fee is hereby granted, 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 Digital Equipment Corporation not be -+used in advertising or publicity pertaining to distribution of the -+software without specific, written prior permission. -+ -+ -+Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. -+ -+Permission is hereby granted, free of charge, to any person obtaining a -+copy of this software and associated documentation files (the "Software"), -+to deal in the Software without restriction, including without limitation -+the rights to use, copy, modify, merge, publish, distribute, sublicense, -+and/or sell copies of the Software, and to permit persons to whom the -+Software is furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice (including the next -+paragraph) shall be included in all copies or substantial portions of the -+Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+DEALINGS IN THE SOFTWARE. -diff --git a/INSTALL b/INSTALL -deleted file mode 100644 -index e69de29..0000000 -diff --git a/LED.c b/LED.c -index 2856329..b463074 100644 ---- a/LED.c -+++ b/LED.c -@@ -31,8 +31,6 @@ - #include <X11/Xos.h> - #include <X11/Xaw/XawInit.h> - #include "LEDP.h" --#include <X11/Xmu/Converters.h> --#include <X11/Xmu/Drawing.h> - #include <stdio.h> - #include <ctype.h> - /* needed for abs() */ -diff --git a/Makefile.am b/Makefile.am -index 3bfdf36..44eeb87 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -50,37 +50,22 @@ appmandir = $(APP_MAN_DIR) - - appman_DATA = $(appman_PRE:m...@app_man_suffix@) - --EXTRA_DIST = $(appman_PRE) ChangeLog -+EXTRA_DIST = $(appman_PRE) -+MAINTAINERCLEANFILES = ChangeLog INSTALL - CLEANFILES = $(appman_DATA) --MAINTAINERCLEANFILES = ChangeLog -- --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -- --SED = sed -- --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__apploaddir__|$(appdefaultdir)|' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - - SUFFIXES = .$(APP_MAN_SUFFIX) .man - -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - .man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - --.PHONY: ChangeLog -+.PHONY: ChangeLog INSTALL -+ -+INSTALL: -+ $(INSTALL_CMD) - - ChangeLog: - $(CHANGELOG_CMD) - --dist-hook: ChangeLog -+dist-hook: ChangeLog INSTALL -diff --git a/NEWS b/NEWS -deleted file mode 100644 -index e69de29..0000000 -diff --git a/configure.ac b/configure.ac -index a20ce3d..c64915f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,41 +21,28 @@ dnl PERFORMANCE OF THIS SOFTWARE. - dnl - dnl Process this file with autoconf to create configure. - --AC_PREREQ([2.57]) -+AC_PREREQ([2.60]) - AC_INIT(xkbutils, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbutils) --AM_INIT_AUTOMAKE([dist-bzip2]) -+AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE - --# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS - m4_ifndef([XORG_MACROS_VERSION], -- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.3) -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) -+XORG_DEFAULT_OPTIONS - - AM_CONFIG_HEADER(config.h) - --AC_PROG_CC - AM_PROG_CC_C_O --AC_PROG_INSTALL -- --XORG_DEFAULT_OPTIONS - - # xkbvleds checks --PKG_CHECK_MODULES(XKBVLEDS, xaw7) --AC_SUBST(XKBVLEDS_CFLAGS) --AC_SUBST(XKBVLEDS_LIBS) -+PKG_CHECK_MODULES(XKBVLEDS, xproto xaw7 xt x11) - - # xkbbell checks --PKG_CHECK_MODULES(XKBBELL, xkbfile x11 inputproto) --AC_SUBST(XKBBELL_CFLAGS) --AC_SUBST(XKBBELL_LIBS) -+PKG_CHECK_MODULES(XKBBELL, xproto inputproto x11) - - # xkbwatch checks --PKG_CHECK_MODULES(XKBWATCH, xaw7) --AC_SUBST(XKBWATCH_CFLAGS) --AC_SUBST(XKBWATCH_LIBS) -- --XORG_MANPAGE_SECTIONS --XORG_RELEASE_VERSION --XORG_CHANGELOG -+PKG_CHECK_MODULES(XKBWATCH, xproto xaw7 xt x11) - - AC_OUTPUT([Makefile]) -diff --git a/xkbbell.man b/xkbbell.man -index c179ed8..88c98bc 100644 ---- a/xkbbell.man -+++ b/xkbbell.man -@@ -1,30 +1,23 @@ --.\" Copyright 2008 Sun Microsystems, Inc. All rights reserved. --.\" Use subject to license terms. -+.\" Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. - .\" - .\" Permission is hereby granted, free of charge, to any person obtaining a --.\" copy of this software and associated documentation files (the --.\" "Software"), to deal in the Software without restriction, including --.\" without limitation the rights to use, copy, modify, merge, publish, --.\" distribute, and/or sell copies of the Software, and to permit persons --.\" to whom the Software is furnished to do so, provided that the above --.\" copyright notice(s) and this permission notice appear in all copies of --.\" the Software and that both the above copyright notice(s) and this --.\" permission notice appear in supporting documentation. -+.\" copy of this software and associated documentation files (the "Software"), -+.\" to deal in the Software without restriction, including without limitation -+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -+.\" and/or sell copies of the Software, and to permit persons to whom the -+.\" Software is furnished to do so, subject to the following conditions: - .\" --.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT --.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR --.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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. -+.\" The above copyright notice and this permission notice (including the next -+.\" paragraph) shall be included in all copies or substantial portions of the -+.\" Software. - .\" --.\" Except as contained in this notice, the name of a copyright holder --.\" shall not be used in advertising or otherwise to promote the sale, use --.\" or other dealings in this Software without prior written authorization --.\" of the copyright holder. -+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+.\" DEALINGS IN THE SOFTWARE. - .TH xkbbell __appmansuffix__ __xorgversion__ - .SH NAME - xkbbell - XKB extension user utility -diff --git a/xkbvleds.man b/xkbvleds.man -index 056d0d3..a8b4a37 100644 ---- a/xkbvleds.man -+++ b/xkbvleds.man -@@ -1,30 +1,23 @@ --.\" Copyright 2008 Sun Microsystems, Inc. All rights reserved. --.\" Use subject to license terms. -+.\" Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. - .\" - .\" Permission is hereby granted, free of charge, to any person obtaining a --.\" copy of this software and associated documentation files (the --.\" "Software"), to deal in the Software without restriction, including --.\" without limitation the rights to use, copy, modify, merge, publish, --.\" distribute, and/or sell copies of the Software, and to permit persons --.\" to whom the Software is furnished to do so, provided that the above --.\" copyright notice(s) and this permission notice appear in all copies of --.\" the Software and that both the above copyright notice(s) and this --.\" permission notice appear in supporting documentation. -+.\" copy of this software and associated documentation files (the "Software"), -+.\" to deal in the Software without restriction, including without limitation -+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -+.\" and/or sell copies of the Software, and to permit persons to whom the -+.\" Software is furnished to do so, subject to the following conditions: - .\" --.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT --.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR --.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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. -+.\" The above copyright notice and this permission notice (including the next -+.\" paragraph) shall be included in all copies or substantial portions of the -+.\" Software. - .\" --.\" Except as contained in this notice, the name of a copyright holder --.\" shall not be used in advertising or otherwise to promote the sale, use --.\" or other dealings in this Software without prior written authorization --.\" of the copyright holder. -+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+.\" DEALINGS IN THE SOFTWARE. - .TH xkbvleds __appmansuffix__ __xorgversion__ - .SH NAME - xkbvleds \- XKB extension user utility -diff --git a/xkbwatch.man b/xkbwatch.man -index 6d86af3..c01e4a8 100644 ---- a/xkbwatch.man -+++ b/xkbwatch.man -@@ -1,30 +1,23 @@ --.\" Copyright 2008 Sun Microsystems, Inc. All rights reserved. --.\" Use subject to license terms. -+.\" Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. - .\" - .\" Permission is hereby granted, free of charge, to any person obtaining a --.\" copy of this software and associated documentation files (the --.\" "Software"), to deal in the Software without restriction, including --.\" without limitation the rights to use, copy, modify, merge, publish, --.\" distribute, and/or sell copies of the Software, and to permit persons --.\" to whom the Software is furnished to do so, provided that the above --.\" copyright notice(s) and this permission notice appear in all copies of --.\" the Software and that both the above copyright notice(s) and this --.\" permission notice appear in supporting documentation. -+.\" copy of this software and associated documentation files (the "Software"), -+.\" to deal in the Software without restriction, including without limitation -+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -+.\" and/or sell copies of the Software, and to permit persons to whom the -+.\" Software is furnished to do so, subject to the following conditions: - .\" --.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT --.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR --.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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. -+.\" The above copyright notice and this permission notice (including the next -+.\" paragraph) shall be included in all copies or substantial portions of the -+.\" Software. - .\" --.\" Except as contained in this notice, the name of a copyright holder --.\" shall not be used in advertising or otherwise to promote the sale, use --.\" or other dealings in this Software without prior written authorization --.\" of the copyright holder. -+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+.\" DEALINGS IN THE SOFTWARE. - .TH xkbwatch __appmansuffix__ __xorgversion__ - .SH NAME - xkbwatch - XKB extension user utility