[arch-commits] Commit in pcre/repos (4 files)

[Eric Belanger]

    Date: Tuesday, May 13, 2008 @ 23:03:05
  Author: eric
Revision: 1628

Merged revisions 2-1627 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/pcre/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r1480 | eric | 2008-05-10 20:57:17 -0400 (Sat, 10 May 2008) | 2 lines
  
  upgpkg: pcre 7.7-1
      Upstream update, Added ChangeLog
........

Added:
  pcre/repos/core-i686/ChangeLog
    (from rev 1480, pcre/trunk/ChangeLog)
Modified:
  pcre/repos/core-i686/	(properties)
  pcre/repos/core-i686/PKGBUILD
Deleted:
  pcre/repos/core-i686/no_arg.patch

--------------+
 ChangeLog    |    5 +++++
 PKGBUILD     |   14 ++++++--------
 no_arg.patch |   18 ------------------
 3 files changed, 11 insertions(+), 26 deletions(-)


Property changes on: pcre/repos/core-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /pcre/trunk:1
   + /pcre/trunk:1-1627

Copied: pcre/repos/core-i686/ChangeLog (from rev 1480, pcre/trunk/ChangeLog)
===================================================================
--- core-i686/ChangeLog	                        (rev 0)
+++ core-i686/ChangeLog	2008-05-14 03:03:05 UTC (rev 1628)
@@ -0,0 +1,5 @@
+2008-05-10  Eric Belanger  <eric at archlinux.org>
+
+	* pcre 7.7-1
+	* Upstream update
+	* Added ChangeLog

Modified: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2008-05-14 03:02:30 UTC (rev 1627)
+++ core-i686/PKGBUILD	2008-05-14 03:03:05 UTC (rev 1628)
@@ -3,24 +3,22 @@
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=pcre
-pkgver=7.6
-pkgrel=3
+pkgver=7.7
+pkgrel=1
 pkgdesc="A library that implements Perl 5-style regular expressions"
 arch=('i686' 'x86_64') 
 url="http://pcre.sourceforge.net"
 license=('custom')
 groups=('base')
 depends=('gcc-libs')
-options=('!libtool')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2
-	no_arg.patch)
-md5sums=('2af38e083fb90ef60fa9eda7cc290e86'
-         '9adcec8fce27628753a89f67b52c6ff2')
+options=('!libtool' '!makeflags')
+source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('4b2e9cde1f7227448dddba59843efa0b')
+sha1sums=('f1f54d3e13e6cb427de962e62eaaee32c74cba38')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
-  patch -Np0 -i ${startdir}/src/no_arg.patch || return 1
   ./configure --prefix=/usr --enable-utf8 --enable-unicode-properties
   make || return 1
   make DESTDIR=${startdir}/pkg install

Deleted: core-i686/no_arg.patch
===================================================================
--- core-i686/no_arg.patch	2008-05-14 03:02:30 UTC (rev 1627)
+++ core-i686/no_arg.patch	2008-05-14 03:03:05 UTC (rev 1628)
@@ -1,18 +0,0 @@
-Index: pcrecpp.cc
-===================================================================
---- pcrecpp.cc  (revision 319)
-+++ pcrecpp.cc  (working copy)
-@@ -57,6 +57,14 @@
- // Special object that stands-in for no argument
- Arg RE::no_arg((void*)NULL);
-
-+// This is for ABI compatibility with old versions of pcre (pre-7.6),
-+// which defined a global no_arg variable instead of putting it in the
-+// RE class.  This works on GCC >= 3, at least.  We could probably have
-+// a more inclusive test if we ever needed it.
-+#if defined(__GNUC__) && __GNUC__ >= 3
-+extern Arg no_arg __attribute__((alias("_ZN7pcrecpp2RE6no_argE")));
-+#endif
-+
- // If a regular expression has no error, its error_ field points here
- static const string empty_string;