[arch-commits] Commit in sigil/trunk (PKGBUILD sigil.install)

[Eli Schwartz]

    Date: Sunday, June 7, 2020 @ 04:47:06
  Author: eschwartz
Revision: 639579

upgpkg: sigil 1.2.1-2: backport commit to fix qt 5.15 breakage

add security warning for non-default javascript option
drop build type in accordance with new cmake guidelines

Modified:
  sigil/trunk/PKGBUILD
  sigil/trunk/sigil.install

---------------+
 PKGBUILD      |   18 +++++++++++++-----
 sigil.install |   10 +++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-07 00:56:48 UTC (rev 639578)
+++ PKGBUILD	2020-06-07 04:47:06 UTC (rev 639579)
@@ -5,7 +5,7 @@
 
 pkgname=sigil
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="multi-platform EPUB2/EPUB3 ebook editor"
 arch=('x86_64')
 url="https://sigil-ebook.com/"
@@ -25,13 +25,22 @@
             'tk: recommended for plugins')
 install=${pkgname}.install
 source=("Sigil-${pkgver}.tar.gz::https://github.com/Sigil-Ebook/Sigil/archive/${pkgver}.tar.gz"
-        "https://github.com/Sigil-Ebook/Sigil/releases/download/${pkgver}/Sigil-${pkgver}.tar.gz.sig")
+        "https://github.com/Sigil-Ebook/Sigil/releases/download/${pkgver}/Sigil-${pkgver}.tar.gz.sig"
+        "https://github.com/Sigil-Ebook/Sigil/commit/50280fae48717e76d56685bf0fda19783c8904e1.patch")
 sha256sums=('5187084486513f9bd3239eb4f4961cd98192c34fe6e161f277b52511fd760861'
-            'SKIP')
+            'SKIP'
+            '5c57da8d1bc29fdaddcf6b52747bf453bc40af166fb4c77e49b7869a2776458f')
 b2sums=('b615304d80ae1bc8b202398e4e00e25e6f13130ba5f27239d78cb847813fac6d13ddd868ed8daa496b5a5f2f37914603b3014b2c0ecb9f8ae2f0e5f6f2bdf84b'
-        'SKIP')
+        'SKIP'
+        '61c4b8de1d7e6a65668f45b6aadebb7c93bad6c82ed415caad3900f009f88f253aa10ca678c76580ef5d3b344cead91390b001aa824e49ad963a45ff259971d3')
 validpgpkeys=('B5A56206AB0FBC1A24EFAB8AA166D29A8FCDAC63') # Doug Massay <douglaslmassay at gmail.com>
 
+prepare() {
+    cd "${srcdir}"/Sigil-${pkgver}
+
+    patch -p1 -i ../50280fae48717e76d56685bf0fda19783c8904e1.patch
+}
+
 build() {
     mkdir -p "${srcdir}"/Sigil-${pkgver}/build
     cd "${srcdir}"/Sigil-${pkgver}/build
@@ -45,7 +54,6 @@
         -DCMAKE_INSTALL_LIBDIR=lib \
         -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
         -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
-        -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_SKIP_RPATH=ON ..
 
     make

Modified: sigil.install
===================================================================
--- sigil.install	2020-06-07 00:56:48 UTC (rev 639578)
+++ sigil.install	2020-06-07 04:47:06 UTC (rev 639579)
@@ -1,10 +1,10 @@
 post_upgrade() {
-    if (( $(vercmp 0.9.13 "$2") > 0 )); then
+    if (( $(vercmp 1.2.1-2 "$2") > 0 )); then
         cat << __EOF__
-Sigil will very possibly not work at first due to bugs in the 0.9.11 - 0.9.12 preferences code.
-Please see the following resources for migration instructions:
-  https://www.mobileread.com/forums/showthread.php?t=315748
-  https://github.com/Sigil-Ebook/Sigil/wiki#if-youre-here-because
+Warning: Qt5 5.15 has broken the security sandbox for ebooks with javascript.
+If you've enabled javascript support, be aware that untrusted EPUBs can now
+exfiltrate user data.  See
+https://www.mobileread.com/forums/showthread.php?t=330486
 __EOF__
     fi
 }