[arch-commits] Commit in wine-staging/trunk (PKGBUILD flex-2.6.3.patch)

2017-01-16 Thread Felix Yan 
Date: Monday, January 16, 2017 @ 09:18:19
  Author: felixonmars
Revision: 207587

upgpkg: wine-staging 2.0rc5-1

Modified:
  wine-staging/trunk/PKGBUILD
Deleted:
  wine-staging/trunk/flex-2.6.3.patch

--+
 PKGBUILD |   13 -
 flex-2.6.3.patch |   19 ---
 2 files changed, 4 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-16 09:17:45 UTC (rev 207586)
+++ PKGBUILD2017-01-16 09:18:19 UTC (rev 207587)
@@ -6,17 +6,15 @@
 # Contributor: Giovanni Scafora 
 
 pkgname=wine-staging
-pkgver=2.0rc4
+pkgver=2.0rc5
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 
source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz";
-30-win32-aliases.conf
-flex-2.6.3.patch)
-sha1sums=('b2639f4b62ac83eafbb66beff46be2cba28c08a5'
-  '023a5c901c6a091c56e76b6a62d141d87cce9fdb'
-  '8da80ebf00a37f85abc58770aa68fa4a00eaaf7d')
+30-win32-aliases.conf)
+sha1sums=('e9eca2bbb587968577562af5c236deabd7b5da63'
+  '023a5c901c6a091c56e76b6a62d141d87cce9fdb')
 
 pkgdesc="A compatibility layer for running Windows programs - Staging branch"
 url="http://www.wine-staging.com";
@@ -112,9 +110,6 @@
   # Allow ccache to work
   mv wine-patched-staging-$_pkgbasever $pkgname
 
-  # https://bugs.winehq.org/show_bug.cgi?id=42132
-  (cd $pkgname; patch -p1 -i ../flex-2.6.3.patch)
-
   sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
 
   # Get rid of old build dirs

Deleted: flex-2.6.3.patch
===
--- flex-2.6.3.patch2017-01-16 09:17:45 UTC (rev 207586)
+++ flex-2.6.3.patch2017-01-16 09:18:19 UTC (rev 207587)
@@ -1,19 +0,0 @@
 a/programs/winhlp32/macro.lex.l
-+++ a/programs/winhlp32/macro.lex.l
-@@ -20,7 +20,7 @@ 
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- %}
--%option noinput nounput never-interactive 8bit
-+%option noinput nounput noyywrap never-interactive 8bit
- %x quote
- %{
- #include "config.h"
-@@ -367,7 +367,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void)
- {
- return lex_data ? lex_data->window : Globals.active_win;
- }
--
--#ifndef yywrap
--int yywrap(void) { return 1; }
--#endif

[arch-commits] Commit in wine-staging/trunk (PKGBUILD flex-2.6.3.patch)

2017-01-10 Thread Felix Yan 
Date: Tuesday, January 10, 2017 @ 16:53:03
  Author: felixonmars
Revision: 206597

upgpkg: wine-staging 2.0rc4-1

Added:
  wine-staging/trunk/flex-2.6.3.patch
Modified:
  wine-staging/trunk/PKGBUILD

--+
 PKGBUILD |   13 +
 flex-2.6.3.patch |   19 +++
 2 files changed, 28 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-10 16:22:59 UTC (rev 206596)
+++ PKGBUILD2017-01-10 16:53:03 UTC (rev 206597)
@@ -6,15 +6,17 @@
 # Contributor: Giovanni Scafora 
 
 pkgname=wine-staging
-pkgver=2.0rc3
+pkgver=2.0rc4
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 
source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz";
-30-win32-aliases.conf)
-sha1sums=('3b8bf862775a7efdce886115d8c9e550066f563f'
-  '023a5c901c6a091c56e76b6a62d141d87cce9fdb')
+30-win32-aliases.conf
+flex-2.6.3.patch)
+sha1sums=('b2639f4b62ac83eafbb66beff46be2cba28c08a5'
+  '023a5c901c6a091c56e76b6a62d141d87cce9fdb'
+  '8da80ebf00a37f85abc58770aa68fa4a00eaaf7d')
 
 pkgdesc="A compatibility layer for running Windows programs - Staging branch"
 url="http://www.wine-staging.com";
@@ -110,6 +112,9 @@
   # Allow ccache to work
   mv wine-patched-staging-$_pkgbasever $pkgname
 
+  # https://bugs.winehq.org/show_bug.cgi?id=42132
+  (cd $pkgname; patch -p1 -i ../flex-2.6.3.patch)
+
   sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*
 
   # Get rid of old build dirs

Added: flex-2.6.3.patch
===
--- flex-2.6.3.patch(rev 0)
+++ flex-2.6.3.patch2017-01-10 16:53:03 UTC (rev 206597)
@@ -0,0 +1,19 @@
+--- a/programs/winhlp32/macro.lex.l
 a/programs/winhlp32/macro.lex.l
+@@ -20,7 +20,7 @@ 
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ %}
+-%option noinput nounput never-interactive 8bit
++%option noinput nounput noyywrap never-interactive 8bit
+ %x quote
+ %{
+ #include "config.h"
+@@ -367,7 +367,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void)
+ {
+ return lex_data ? lex_data->window : Globals.active_win;
+ }
+-
+-#ifndef yywrap
+-int yywrap(void) { return 1; }
+-#endif