[arch-commits] Commit in libe-book/trunk (2 files)

[Evangelos Foutras]

    Date: Saturday, November 26, 2016 @ 14:19:57
  Author: foutrelis
Revision: 282042

Add upstream patch that disables werror by default

Added:
  libe-book/trunk/0001-Disable-werror-by-default-since-gperf-code-will-not-.patch
Modified:
  libe-book/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Disable-werror-by-default-since-gperf-code-will-not-.patch |   29 ++++++++++
 PKGBUILD                                                        |    4 +
 2 files changed, 33 insertions(+)

Added: 0001-Disable-werror-by-default-since-gperf-code-will-not-.patch
===================================================================
--- 0001-Disable-werror-by-default-since-gperf-code-will-not-.patch	                        (rev 0)
+++ 0001-Disable-werror-by-default-since-gperf-code-will-not-.patch	2016-11-26 14:19:57 UTC (rev 282042)
@@ -0,0 +1,29 @@
+From 784c5168d1a62618e53619fd0a979363d596775a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba at bluewin.ch>
+Date: Sun, 3 Jul 2016 21:43:25 +0200
+Subject: [PATCH] Disable werror by default since gperf code will not build
+ with gcc 6
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 06e9afb..6e00ed5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -223,9 +223,9 @@ AS_IF([test "x$platform_win32" = "xyes"],
+ # Check for cflags
+ # ================
+ AC_ARG_ENABLE([werror],
+-    [AS_HELP_STRING([--disable-werror], [Treat all warnings as errors, usefull for development])],
++    [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, usefull for development])],
+     [enable_werror="$enableval"],
+-    [enable_werror=yes]
++    [enable_werror=no]
+ )
+ AS_IF([test x"$enable_werror" != "xno"], [
+     CFLAGS="$CFLAGS -Werror"
+-- 
+2.10.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-26 14:10:44 UTC (rev 282041)
+++ PKGBUILD	2016-11-26 14:19:57 UTC (rev 282042)
@@ -12,12 +12,16 @@
 depends=('librevenge' 'libxml2')
 makedepends=('gperf' 'boost' 'cppunit' 'doxygen')
 source=(https://sourceforge.net/projects/${pkgname//-/}/files//${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.xz
+        0001-Disable-werror-by-default-since-gperf-code-will-not-.patch
         boost159.patch)
 sha1sums=('950ee08e7a41585636aebb7774fdc6f05817a18c'
+          '7d38227479fd993e0a736115b53f00745a8a987c'
           '8b5b88a05db43773aae486c8410c9bb79e0f6d16')
 
 prepare() {
   cd ${pkgname}-${pkgver}
+  # https://sourceforge.net/p/libebook/code/ci/784c5168d1a62618e53619fd0a979363d596775a/
+  patch -Np1 -i ../0001-Disable-werror-by-default-since-gperf-code-will-not-.patch
   patch -Np1 -i ../boost159.patch
   autoreconf -vi
 }