From 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Fri, 27 Dec 2013 23:55:53 +0000
Subject: Fri Dec 27 23:54:04 UTC 2013

---
 extra/imake/PKGBUILD                        | 33 +++++++++++++++++++----------
 extra/imake/gccmakedep-cpp-4.8-compat.patch |  8 +++++++
 extra/imake/imake-cpp-4.8-compat.patch      | 19 +++++++++++++++++
 3 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 extra/imake/gccmakedep-cpp-4.8-compat.patch
 create mode 100644 extra/imake/imake-cpp-4.8-compat.patch

(limited to 'extra/imake')

diff --git a/extra/imake/PKGBUILD b/extra/imake/PKGBUILD
index 8f943c5ce..a0b5d0bd0 100644
--- a/extra/imake/PKGBUILD
+++ b/extra/imake/PKGBUILD
@@ -1,41 +1,52 @@
-# $Id: PKGBUILD 191324 2013-07-23 16:42:27Z jgc $
+# $Id: PKGBUILD 201359 2013-12-09 12:44:37Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=imake
 pkgver=1.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org imake program and related utilities"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xproto' 'perl')
+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/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'
-        'linuxconfig.patch'
-        'LICENSE')
+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/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'
           'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe'
           '2599afa039d2070bae9df6ce43da288b3a4adf97'
           'ae22eb81d56d018f0b3b149f70965ebfef2385fd'
+          'ef7bb90e30ce35131d049f45b650cd0cf6dc0a20'
+          '24f87a945307d4336ab2afd5cade683f0e94533c'
           '72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0'
           'c5ecffb25ad079ba3858e3aec047d046df603a89')
 
 
 prepare() {
   cd xorg-cf-files-1.0.5
-  patch -p1 -i "${srcdir}/linuxconfig.patch"
+  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() {
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
+      autoreconf -fi
       ./configure --prefix=/usr --mandir=/usr/share/man
       make
       popd
diff --git a/extra/imake/gccmakedep-cpp-4.8-compat.patch b/extra/imake/gccmakedep-cpp-4.8-compat.patch
new file mode 100644
index 000000000..0e5302a83
--- /dev/null
+++ b/extra/imake/gccmakedep-cpp-4.8-compat.patch
@@ -0,0 +1,8 @@
+--- 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
new file mode 100644
index 000000000..45e9ca305
--- /dev/null
+++ b/extra/imake/imake-cpp-4.8-compat.patch
@@ -0,0 +1,19 @@
+--- 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
-- 
cgit v1.2.3-54-g00ecf