[arch-commits] Commit in scribus/trunk (PKGBUILD scribus-boost-1.71.patch)

[Antonio Rojas]

    Date: Tuesday, November 12, 2019 @ 09:03:59
  Author: arojas
Revision: 526960

Fix build with boost 1.71 and poppler 0.82

Added:
  scribus/trunk/scribus-boost-1.71.patch
Modified:
  scribus/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   12 ++++++++++--
 scribus-boost-1.71.patch |   12 ++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-12 08:34:17 UTC (rev 526959)
+++ PKGBUILD	2019-11-12 09:03:59 UTC (rev 526960)
@@ -17,8 +17,13 @@
 makedepends=(cmake boost mesa qt5-tools)
 optdepends=('tk: scripts based on tkinter'
             'hyphen-lang: hyphenation patterns for desired languages')
-source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc})
-sha256sums=(7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71 SKIP)
+source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc}
+         scribus-boost-1.71.patch
+         scribus-poppler-0.82.patch::"https://github.com/scribusproject/scribus/commit/6db15ec1.patch")
+sha256sums=('7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71'
+            'SKIP'
+            '19e20b11c0bce2dce07a845e31adb9ff1b680746698fa150d4572776513b243e'
+            'a948a5ee53842ffc8acc3f6720291819d55d2ff370c2b46ddffc1122cba07e7f')
 validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA  # Peter Linnell <plinnell at scribus.net>
               757F5E9B13DD648887AD50092D47C099E782504E  # The Scribus Team (www.scribus.net) <the_scribus_team at scribus.net>
               6558BE84D27273A438A151198BEA48118AEBEE64) # Craig Bradney <cbradney at zipworld.com.au>
@@ -33,6 +38,9 @@
         -i scribus/plugins/scriptplugin/{samples,scripts}/*
 
     mkdir -p build
+
+    patch -p1 -i ../scribus-boost-1.71.patch # Fix build with boost 1.71
+    patch -p1 -i ../scribus-poppler-0.82.patch # Fix build with poppler 0.82
 }
 
 build() {

Added: scribus-boost-1.71.patch
===================================================================
--- scribus-boost-1.71.patch	                        (rev 0)
+++ scribus-boost-1.71.patch	2019-11-12 09:03:59 UTC (rev 526960)
@@ -0,0 +1,12 @@
+diff --git a/scribus/plugins/tools/2geomtools/CMakeLists.txt b/scribus/plugins/tools/2geomtools/CMakeLists.txt
+index 9b6683cbb..d2e1ee5ea 100644
+--- a/scribus/plugins/tools/2geomtools/CMakeLists.txt
++++ b/scribus/plugins/tools/2geomtools/CMakeLists.txt
+@@ -3,6 +3,6 @@ include_directories(
+   ${CMAKE_SOURCE_DIR}/scribus
+ )
+ 
+-include_directories( ${Boost_INCLUDE_DIR} )
++include_directories( ${Boost_INCLUDE_DIRS} )
+ add_subdirectory (meshdistortion)
+ add_subdirectory (pathalongpath)