[arch-commits] Commit in imake/trunk (3 files)

[Jan de Groot]

    Date: Tuesday, May 27, 2014 @ 10:56:26
  Author: jgc
Revision: 213640

upgpkg: imake 1.0.7-1

Modified:
  imake/trunk/PKGBUILD
Deleted:
  imake/trunk/gccmakedep-cpp-4.8-compat.patch
  imake/trunk/imake-cpp-4.8-compat.patch

---------------------------------+
 PKGBUILD                        |   20 +++++---------------
 gccmakedep-cpp-4.8-compat.patch |    8 --------
 imake-cpp-4.8-compat.patch      |   19 -------------------
 3 files changed, 5 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-27 08:41:55 UTC (rev 213639)
+++ PKGBUILD	2014-05-27 08:56:26 UTC (rev 213640)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at 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 @@
 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 @@
 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() {

Deleted: gccmakedep-cpp-4.8-compat.patch
===================================================================
--- gccmakedep-cpp-4.8-compat.patch	2014-05-27 08:41:55 UTC (rev 213639)
+++ gccmakedep-cpp-4.8-compat.patch	2014-05-27 08:56:26 UTC (rev 213640)
@@ -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) > $@

Deleted: imake-cpp-4.8-compat.patch
===================================================================
--- imake-cpp-4.8-compat.patch	2014-05-27 08:41:55 UTC (rev 213639)
+++ imake-cpp-4.8-compat.patch	2014-05-27 08:56:26 UTC (rev 213640)
@@ -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