Add better description to patches.

5 files changed, 25 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5fab3d16efc..0b50fee794bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sigil-git
 	pkgdesc = multi-platform EPUB2/EPUB3 ebook editor
-	pkgver = 1.9.20.r27.gf8c39038c
+	pkgver = 1.9.20.r46.ga2898308c
 	pkgrel = 1
 	url = https://github.com/Sigil-Ebook/Sigil
 	arch = x86_64
@@ -24,12 +24,12 @@ pkgbase = sigil-git
 	conflicts = sigil
 	source = sigil::git+https://github.com/Sigil-Ebook/Sigil
 	source = default_nav_css.patch
-	source = skip_ver_mod_tags.patch
-	source = skip_version_check.patch
+	source = skip_epub_version_check.patch
+	source = skip_version_mod_tags.patch
 	sha256sums = SKIP
-	sha256sums = 298928226e4e5cf9d2cf5298d2fe8c87357b92c8962c09c0683bc9af4ed9516c
-	sha256sums = 9414dfd43a18d83f82c099838faca1bba8e70fe9e66e5691e652345c5d2286ab
-	sha256sums = ad10e067885809f0fab8aebcbc907f317ad7a43251d1cf9ffd0802dfb77cc540
+	sha256sums = 3478ff361a34fd7cd7811d5103cbace91ecc790463684aaab9e21687b5553a28
+	sha256sums = fc2bdc23d13b2e917f08608b516495b744f991642f73c1f6d943cf322a25fc11
+	sha256sums = c74be3af315c9ffe181df6b465d0037f152f6078b953e6eeaab7b2932ae4c729
 
 pkgname = sigil-git
 	depends = hunspell
diff --git a/PKGBUILD b/PKGBUILD
index 296d5be3b41b..49e2f312140c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _localepurge=
 
 _pkgname=sigil
 pkgname="$_pkgname-git"
-pkgver=1.9.20.r27.gf8c39038c
+pkgver=1.9.20.r46.ga2898308c
 pkgrel=1
 pkgdesc='multi-platform EPUB2/EPUB3 ebook editor'
 arch=('x86_64')
@@ -39,23 +39,24 @@ provides=("$_pkgname")
 conflicts=(${provides[@]})
 source=(
   "$_pkgname"::"git+$url"
-  default_nav_css.patch
-  skip_ver_mod_tags.patch
-  skip_version_check.patch
+  'default_nav_css.patch'
+  'skip_epub_version_check.patch'
+  'skip_version_mod_tags.patch'
 )
+
 sha256sums=(
   'SKIP'
-  '298928226e4e5cf9d2cf5298d2fe8c87357b92c8962c09c0683bc9af4ed9516c'
-  '9414dfd43a18d83f82c099838faca1bba8e70fe9e66e5691e652345c5d2286ab'
-  'ad10e067885809f0fab8aebcbc907f317ad7a43251d1cf9ffd0802dfb77cc540'
+  '3478ff361a34fd7cd7811d5103cbace91ecc790463684aaab9e21687b5553a28'
+  'fc2bdc23d13b2e917f08608b516495b744f991642f73c1f6d943cf322a25fc11'
+  'c74be3af315c9ffe181df6b465d0037f152f6078b953e6eeaab7b2932ae4c729'
 )
 
 prepare() {
   cd "$srcdir/$_pkgname"
 
-  patch -Np1 -i "$srcdir/default_nav_css.patch"
-  patch -Np1 -i "$srcdir/skip_ver_mod_tags.patch"
-  patch -Np1 -i "$srcdir/skip_version_check.patch"
+  for p in "$srcdir"/*.patch ; do
+    patch -Np1 -i "$p"
+  done
 
   if [[ "${_localepurge}" != "" ]]; then
     for trans in src/Resource_Files/ts/*; do
@@ -90,8 +91,7 @@ build() {
 }
 
 package() {
-  depends=(
-    ${depends[@]}
+  depends+=(
     'python-cchardet'
     'python-certifi'
     'python-css-parser'
diff --git a/default_nav_css.patch b/default_nav_css.patch
index 76b5bb8a6a81..fe49838156cb 100644
--- a/default_nav_css.patch
+++ b/default_nav_css.patch
@@ -1,4 +1,4 @@
-description: modify default navigation css
+Subject: [PATCH] modify default navigation css
 
 --- old/src/BookManipulation/Book.cpp
 +++ new/src/BookManipulation/Book.cpp
diff --git a/skip_version_check.patch b/skip_epub_version_check.patch
index 79e33279decb..b00f876b0952 100644
--- a/skip_version_check.patch
+++ b/skip_epub_version_check.patch
@@ -1,4 +1,6 @@
-description: skip epub version check
+Subject: [PATCH] skip epub version check
+Description: allows changing from epub2 to epub3 by directly editing the opf
+  some data is lost and needs to be recreated (eg, table of contents)
 
 --- sigil.old/src/ResourceObjects/OPFResource.cpp
 +++ sigil.new/src/ResourceObjects/OPFResource.cpp
diff --git a/skip_ver_mod_tags.patch b/skip_version_mod_tags.patch
index 5a1d528b3272..fdffc085a3a8 100644
--- a/skip_ver_mod_tags.patch
+++ b/skip_version_mod_tags.patch
@@ -1,4 +1,6 @@
-description: don't write version and modified tags
+Subject: [PATCH] don't write version and modified tags
+Description: Don't write version and modification tags to the opf.
+  Results in a somewhat cleaner opf.
 
 --- sigil.old/src/ResourceObjects/OPFResource.cpp
 +++ sigil.new/src/ResourceObjects/OPFResource.cpp