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

Andreas Radke andyrtr at archlinux.org
Mon Jan 1 13:07:36 UTC 2018


    Date: Monday, January 1, 2018 @ 13:07:35
  Author: andyrtr
Revision: 313838

upgpkg: libe-book 0.1.3-1

upstream update 0.1.3

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

-----------------------------------------------------------------+
 0001-Disable-werror-by-default-since-gperf-code-will-not-.patch |   29 ----------
 PKGBUILD                                                        |   24 ++------
 boost159.patch                                                  |   24 --------
 3 files changed, 6 insertions(+), 71 deletions(-)

Deleted: 0001-Disable-werror-by-default-since-gperf-code-will-not-.patch
===================================================================
--- 0001-Disable-werror-by-default-since-gperf-code-will-not-.patch	2018-01-01 10:43:43 UTC (rev 313837)
+++ 0001-Disable-werror-by-default-since-gperf-code-will-not-.patch	2018-01-01 13:07:35 UTC (rev 313838)
@@ -1,29 +0,0 @@
-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	2018-01-01 10:43:43 UTC (rev 313837)
+++ PKGBUILD	2018-01-01 13:07:35 UTC (rev 313838)
@@ -3,32 +3,20 @@
 # Contributor: Thomas Arnhold <thomas at arnhold dot org>
 
 pkgname=libe-book
-pkgver=0.1.2
-pkgrel=8
+pkgver=0.1.3
+pkgrel=1
 pkgdesc="Library for import of reflowable e-book formats."
 arch=('x86_64')
 url="http://sourceforge.net/projects/libebook/"
 license=('LGPL2.1' 'MPL')
-depends=('librevenge' 'libxml2')
+depends=('librevenge' 'libxml2' 'liblangtag')
 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')
+source=(https://sourceforge.net/projects/${pkgname//-/}/files//${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('18fde9588c236d51eea9437ed882d8b751daf01f')
 
-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
-}
-
 build() {
   cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr #--disable-werror
+  ./configure --prefix=/usr
   make
 }
 

Deleted: boost159.patch
===================================================================
--- boost159.patch	2018-01-01 10:43:43 UTC (rev 313837)
+++ boost159.patch	2018-01-01 13:07:35 UTC (rev 313838)
@@ -1,24 +0,0 @@
-From b903d0dc91f482b348e5840e5a1df599ebd5e6f9 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Sun, 30 Aug 2015 13:57:14 +0200
-Subject: [PATCH] fix build with boost 1.59
-
----
- src/lib/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index 9931a22..35d35be 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -64,6 +64,7 @@ libe_book_ at EBOOK_MAJOR_VERSION@_ at EBOOK_MINOR_VERSION@_la_LDFLAGS = $(version_inf
- libe_book_ at EBOOK_MAJOR_VERSION@_ at EBOOK_MINOR_VERSION@_la_SOURCES = \
- 	EBOOKDocument.cpp
- 
-+libe_book_internal_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY
- libe_book_internal_la_SOURCES = \
- 	EBOOKBitStream.cpp \
- 	EBOOKBitStream.h \
--- 
-2.6.2
-



More information about the arch-commits mailing list