Date: Sunday, November 14, 2010 @ 12:26:04 Author: jgc Revision: 99432
upgpkg: xorg-xlogo 1.0.3-1 Update to 1.0.3 Modified: xorg-xlogo/trunk/PKGBUILD Deleted: xorg-xlogo/trunk/git-fixes.patch -----------------+ PKGBUILD | 10 +-- git-fixes.patch | 144 ------------------------------------------------------ 2 files changed, 3 insertions(+), 151 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-11-14 17:24:57 UTC (rev 99431) +++ PKGBUILD 2010-11-14 17:26:04 UTC (rev 99432) @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <j...@archlinux.org> pkgname=xorg-xlogo -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="Draw [old] X logo" arch=(i686 x86_64) @@ -10,15 +10,11 @@ license=('custom') depends=('libsm' 'libxaw' 'libxmu' 'libxt' 'libxext' 'libx11' 'libxrender' 'libxft') makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xlogo-${pkgver}.tar.bz2 - git-fixes.patch) -sha1sums=('79f0370e1944194cb6dcce9c4efd144be69e8657' - 'ecb608bf0afbac901a3f5c661a4913f3bccae89e') +source=(http://xorg.freedesktop.org/archive/individual/app/xlogo-${pkgver}.tar.bz2) +sha1sums=('5016e74ba16ac80f3eac1c97738a6afbfc8b3bdd') build() { cd "${srcdir}/xlogo-${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:24:57 UTC (rev 99431) +++ git-fixes.patch 2010-11-14 17:26:04 UTC (rev 99432) @@ -1,144 +0,0 @@ -diff --git a/COPYING b/COPYING -index 7f33cbf..1a758af 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,24 @@ --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 1988, 1990, 1993 1994, 1998 The Open Group -+Copyright 2004 Roland Mainz <roland.ma...@nrubsig.org> - --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. -diff --git a/Makefile.am b/Makefile.am -index 78f68b0..fa8729e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -20,7 +20,7 @@ - - bin_PROGRAMS = xlogo - --AM_CFLAGS = $(XLOGO_CFLAGS) -+AM_CFLAGS = $(XLOGO_CFLAGS) $(CWARNFLAGS) - xlogo_LDADD = $(XLOGO_LIBS) - - xlogo_SOURCES = \ -@@ -53,27 +53,9 @@ 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): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - -diff --git a/configure.ac b/configure.ac -index b213a50..1ca8766 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,25 +20,22 @@ 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(xlogo, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xlogo) - AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE - --# Require xorg-macros: 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 --AC_PROG_INSTALL -- --# Checks for pkg-config packages --PKG_CHECK_MODULES(XLOGO, xaw7 xt) -+# Base set of required pkg-config packages -+XLOGO_DEPS="sm xaw7 xmu xt xext x11" - - # Use render & xft2 to draw logo? - -@@ -51,25 +48,15 @@ if test "x$USE_RENDER" = "xtry" ; then - fi - - if test "x$USE_RENDER" = "xyes" ; then -- PKG_CHECK_MODULES(XRENDER, xrender) -- PKG_CHECK_MODULES(XFT, xft) -+ XLOGO_DEPS="xft xrender $XLOGO_DEPS" - - AC_DEFINE(XRENDER, 1, [Define to 1 to use Xrender & Xft2 to draw logo]) -- -- XLOGO_CFLAGS="$XLOGO_CFLAGS $XRENDER_CFLAGS $XFT_CFLAGS" -- XLOGO_LIBS="$XLOGO_LIBS $XRENDER_LIBS $XFT_LIBS" - fi - --PKG_CHECK_MODULES(XEXT, xext) --XLOGO_CFLAGS="$XLOGO_CFLAGS $XEXT_CFLAGS" --XLOGO_LIBS="$XLOGO_LIBS $XEXT_LIBS" -- --XLOGO_CFLAGS="$CWARNFLAGS $XLOGO_CFLAGS" --AC_SUBST(XLOGO_CFLAGS) --AC_SUBST(XLOGO_LIBS) -+PKG_CHECK_MODULES(XLOGO, $XLOGO_DEPS) - - 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)]),