diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-28 03:31:41 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-28 03:31:41 +0000 |
| commit | fc3a052d9f439abcf0ce424b7d45b682a5377087 (patch) | |
| tree | e30cf804e2126c73de97abfb7a4819dd8aa092f8 /extra/imake | |
| parent | 266ddb4aa9aed9a6a66b5eb9e17da710e66c4987 (diff) | |
Wed May 28 03:24:53 UTC 2014
Diffstat (limited to 'extra/imake')
| -rw-r--r-- | extra/imake/PKGBUILD | 22 | ||||
| -rw-r--r-- | extra/imake/gccmakedep-cpp-4.8-compat.patch | 8 | ||||
| -rw-r--r-- | extra/imake/imake-cpp-4.8-compat.patch | 19 |
3 files changed, 6 insertions, 43 deletions
diff --git a/extra/imake/PKGBUILD b/extra/imake/PKGBUILD index a0b5d0bd0..d3b226377 100644 --- a/extra/imake/PKGBUILD +++ b/extra/imake/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 201359 2013-12-09 12:44:37Z jgc $ +# $Id: PKGBUILD 213641 2014-05-27 08:56:36Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=imake -pkgver=1.0.6 -pkgrel=2 +pkgver=1.0.7 +pkgrel=1 pkgdesc="X.Org imake program and related utilities" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,21 +12,17 @@ depends=('glibc') makedepends=('pkgconfig' 'xproto' 'perl' 'xorg-util-macros' 'xorg-font-util') optdepends=('perl: for mkhtmlindex') source=(http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2 - http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2 + http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.3.tar.bz2 http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2 http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.5.tar.bz2 http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.5.tar.bz2 - gccmakedep-cpp-4.8-compat.patch - imake-cpp-4.8-compat.patch linuxconfig.patch LICENSE) -sha1sums=('a54c025d7ac9894b6bc919d13454c6adb12ae140' - 'a3d971a507a460233afd8ed46e9f06135fed634d' +sha1sums=('52e236776133f217d438622034b8603d201a6ec5' + '03018e2fb9d7df4fec1623cedb1c090bc224f971' 'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe' '2599afa039d2070bae9df6ce43da288b3a4adf97' 'ae22eb81d56d018f0b3b149f70965ebfef2385fd' - 'ef7bb90e30ce35131d049f45b650cd0cf6dc0a20' - '24f87a945307d4336ab2afd5cade683f0e94533c' '72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0' 'c5ecffb25ad079ba3858e3aec047d046df603a89') @@ -34,12 +30,6 @@ sha1sums=('a54c025d7ac9894b6bc919d13454c6adb12ae140' prepare() { cd xorg-cf-files-1.0.5 patch -p1 -i ../linuxconfig.patch - - cd ../imake-1.0.6 - patch -Np1 -i ../imake-cpp-4.8-compat.patch - - cd ../gccmakedep-1.0.2 - patch -Np1 -i ../gccmakedep-cpp-4.8-compat.patch } build() { diff --git a/extra/imake/gccmakedep-cpp-4.8-compat.patch b/extra/imake/gccmakedep-cpp-4.8-compat.patch deleted file mode 100644 index 0e5302a83..000000000 --- a/extra/imake/gccmakedep-cpp-4.8-compat.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- gccmakedep-1.0.2/cpprules.in.orig 2013-12-09 12:24:06.246894574 +0000 -+++ gccmakedep-1.0.2/cpprules.in 2013-12-09 12:24:44.806641603 +0000 -@@ -23,4 +23,4 @@ - -e '/\@\@$$/s/\@\@$$/\\/' - - .cpp: -- $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ -+ $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@ diff --git a/extra/imake/imake-cpp-4.8-compat.patch b/extra/imake/imake-cpp-4.8-compat.patch deleted file mode 100644 index 45e9ca305..000000000 --- a/extra/imake/imake-cpp-4.8-compat.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- imake-1.0.6/Makefile.am.orig 2013-12-09 12:21:18.374675219 +0000 -+++ imake-1.0.6/Makefile.am 2013-12-09 12:21:53.367776337 +0000 -@@ -76,13 +76,13 @@ - $(MKHTMLINDEX) - - xmkmf: xmkmf.cpp -- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' < $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ -+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ - - ccmakedep: mdepend.cpp -- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' < $(srcdir)/mdepend.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ -+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' $(srcdir)/mdepend.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ - - mergelib: mergelib.cpp -- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" < $(srcdir)/mergelib.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ -+ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" $(srcdir)/mergelib.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ - - if HAS_PERL - MKHTMLINDEX_SCRIPT = $(srcdir)/mkhtmlindex.pl |