[arch-commits] Commit in flex/trunk (PKGBUILD flex-2.6.0-comment-style.patch)

[Allan McRae]

    Date: Saturday, February 20, 2016 @ 03:12:24
  Author: allan
Revision: 260031

upgpkg: flex 2.6.0-2

fix quoting style bug

Added:
  flex/trunk/flex-2.6.0-comment-style.patch
Modified:
  flex/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   22 ++++++++++++++++------
 flex-2.6.0-comment-style.patch |   22 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2016-02-20 01:14:52 UTC (rev 260030)
+++ PKGBUILD    2016-02-20 02:12:24 UTC (rev 260031)
@@ -4,7 +4,7 @@
 
 pkgname=flex
 pkgver=2.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for generating text-scanning programs"
 arch=('i686' 'x86_64')
 url="http://flex.sourceforge.net";
@@ -11,23 +11,33 @@
 license=('custom')
 groups=('base-devel')
 depends=('glibc' 'm4' 'sh')
+makedepends=('help2man')  # needed for patch...
 install=flex.install
-source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.xz)
-md5sums=('3cbbfa1554d0b75fad9f8100732454de')
+source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.xz
+        flex-2.6.0-comment-style.patch)
+md5sums=('3cbbfa1554d0b75fad9f8100732454de'
+         '14c93c3930a8591bed2f736e28c47106')
 
+prepare() {
+  cd $pkgname-$pkgver
+  
+  # git commit 07d89829
+  patch -p1 -i $srcdir/flex-2.6.0-comment-style.patch
+}
+
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   make DESTDIR=$pkgdir install
   ln -s flex ${pkgdir}/usr/bin/lex

Added: flex-2.6.0-comment-style.patch
===================================================================
--- flex-2.6.0-comment-style.patch                              (rev 0)
+++ flex-2.6.0-comment-style.patch      2016-02-20 02:12:24 UTC (rev 260031)
@@ -0,0 +1,22 @@
+From 07d89829cce4527c7614a34642d4b2c2ef5d6005 Mon Sep 17 00:00:00 2001
+From: Will Estes <westes...@gmail.com>
+Date: Fri, 11 Dec 2015 09:45:14 -0500
+Subject: [PATCH] Commented in C style in skeleton; fixed sf#195
+
+---
+ src/flex.skl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/flex.skl b/src/flex.skl
+index b63c8c8..40287b6 100644
+--- a/src/flex.skl
++++ b/src/flex.skl
+@@ -2350,7 +2350,7 @@ void yyFlexLexer::yyensure_buffer_stack(void)
+                * scanner will even need a stack. We use 2 instead of 1 to 
avoid an
+                * immediate realloc on the next call.
+          */
+-              num_to_alloc = 1; // After all that talk, this was set to 1 
anyways...
++      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... 
*/
+               YY_G(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+                                                               (num_to_alloc * 
sizeof(struct yy_buffer_state*)
+                                                               
M4_YY_CALL_LAST_ARG);