[arch-commits] Commit in xorg-xmag/trunk (PKGBUILD git-fixes.patch)
Jan de Groot
jgc at archlinux.org
Sun Nov 14 17:24:39 UTC 2010
Date: Sunday, November 14, 2010 @ 12:24:38
Author: jgc
Revision: 99427
upgpkg: xorg-xmag 1.0.4-1
Update to 1.0.4
Modified:
xorg-xmag/trunk/PKGBUILD
Deleted:
xorg-xmag/trunk/git-fixes.patch
-----------------+
PKGBUILD | 10 --
git-fixes.patch | 211 ------------------------------------------------------
2 files changed, 3 insertions(+), 218 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-11-14 17:23:50 UTC (rev 99426)
+++ PKGBUILD 2010-11-14 17:24:38 UTC (rev 99427)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=xorg-xmag
-pkgver=1.0.3
+pkgver=1.0.4
pkgrel=1
pkgdesc="Magnify parts of the screen"
arch=(i686 x86_64)
@@ -10,15 +10,11 @@
license=('custom')
depends=('libxaw' 'libxmu' 'libxt' 'libx11')
makedepends=('xorg-util-macros')
-source=(http://xorg.freedesktop.org/archive/individual/app/xmag-${pkgver}.tar.bz2
- git-fixes.patch)
-sha1sums=('1acbc1ccdcd0399b62ad6e96a47021c00dcfde7d'
- '4f7cceae4bf4c297b6de38c6ea54e23d1a39764b')
+source=(http://xorg.freedesktop.org/archive/individual/app/xmag-${pkgver}.tar.bz2)
+sha1sums=('95695d4d4a731e5deb4196a0cc6d04ecaba023fe')
build() {
cd "${srcdir}/xmag-${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:23:50 UTC (rev 99426)
+++ git-fixes.patch 2010-11-14 17:24:38 UTC (rev 99427)
@@ -1,211 +0,0 @@
-diff --git a/AUTHORS b/AUTHORS
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/COPYING b/COPYING
-index 7f33cbf..d9172c5 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,48 @@
--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 1989, 1990, 1991, 1993, 1994, 1998 The Open Group
-
--Please submit updated COPYING files to the Xorg bugzilla:
-+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.
-
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+The above copyright notice and this permission notice shall be included
-+in all copies or substantial portions of the Software.
-
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+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 OPEN GROUP 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.
-
--http://lists.freedesktop.org/mailman/listinfo/xorg
-+Except as contained in this notice, the name of The Open Group shall
-+not be used in advertising or otherwise to promote the sale, use or
-+other dealings in this Software without prior written authorization
-+from The Open Group.
-+
-+
-+Copyright (C) 1999 The XFree86 Project, Inc. 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 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
-+XFREE86 PROJECT 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.
-+
-+Except as contained in this notice, the name of the XFree86 Project shall
-+not be used in advertising or otherwise to promote the sale, use or other
-+dealings in this Software without prior written authorization from the
-+XFree86 Project.
-diff --git a/INSTALL b/INSTALL
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/Makefile.am b/Makefile.am
-index 39de39e..b52bebc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -21,7 +21,7 @@
-
- bin_PROGRAMS = xmag
-
--AM_CFLAGS = $(XMAG_CFLAGS)
-+AM_CFLAGS = $(XMAG_CFLAGS) $(CWARNFLAGS)
- xmag_LDADD = $(XMAG_LIBS) -lm
-
- xmag_SOURCES = \
-@@ -57,38 +57,22 @@ appmandir = $(APP_MAN_DIR)
- appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
- EXTRA_DIST += $(appman_PRE)
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
- CLEANFILES = $(appman_DATA)
-
--SED = sed
--
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
-- XORGMANNAME = X Version 11
--
--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):
-- sed $(MAN_SUBSTS) < $< > $@
-+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-+
-
--EXTRA_DIST += ChangeLog
--MAINTAINERCLEANFILES = ChangeLog
-+.PHONY: ChangeLog INSTALL
-
--.PHONY: ChangeLog
-+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/README b/README
-index e69de29..7475d13 100644
---- a/README
-+++ b/README
-@@ -0,0 +1,25 @@
-+xmag displays a magnified snapshot of a portion of an X11 screen.
-+
-+All questions regarding this software should be directed at the
-+Xorg mailing list:
-+
-+ http://lists.freedesktop.org/mailman/listinfo/xorg
-+
-+Please submit bug reports to the Xorg bugzilla:
-+
-+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+
-+The master development code repository can be found at:
-+
-+ git://anongit.freedesktop.org/git/xorg/app/xmag
-+
-+ http://cgit.freedesktop.org/xorg/app/xmag
-+
-+For patch submission instructions, see:
-+
-+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-+
-+For more information on the git code manager, see:
-+
-+ http://wiki.x.org/wiki/GitPage
-+
-diff --git a/configure.ac b/configure.ac
-index 41730b9..98df095 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,38 +23,33 @@ dnl Process this file with autoconf to create configure.
-
- AC_PREREQ([2.57])
- AC_INIT(xmag, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmag)
--AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
-
--# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
--m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.2)
-+# 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.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
-
- AM_CONFIG_HEADER(config.h)
-
- AC_PROG_CC
- AC_PROG_INSTALL
-
--XORG_CWARNFLAGS
-
- AC_CHECK_FUNCS([nanosleep poll select])
-
- # Checks for pkg-config packages
--PKG_CHECK_MODULES(XMAG, xaw7)
--XMAG_CFLAGS="$CWARNFLAGS $XMAG_CFLAGS"
--AC_SUBST(XMAG_CFLAGS)
--AC_SUBST(XMAG_LIBS)
-+PKG_CHECK_MODULES(XMAG, xaw7 xmu xt x11)
-
- PKG_CHECK_MODULES(APPDEFS, xt)
--xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
-+xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
- AC_ARG_WITH(appdefaultdir,
- AC_HELP_STRING([--with-appdefaultdir=<pathname>],
- [specify directory for app-defaults files (default is autodetected)]),
- [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
- AC_SUBST(appdefaultdir)
-
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--XORG_CHANGELOG
-
- AC_OUTPUT([Makefile])
More information about the arch-commits
mailing list