Fix pod2man argument issue

3 files changed, 26 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc517b62c115..be1a899b148c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Jun  1 18:06:28 UTC 2016
+# Sat Jun 11 02:34:03 UTC 2016
 pkgbase = swift-language
 	pkgdesc = The Swift programming language and debugger
 	pkgver = 2.2.1
-	pkgrel = 3
+	pkgrel = 4
 	url = http://swift.org/
 	arch = i686
 	arch = x86_64
@@ -30,12 +30,14 @@ pkgbase = swift-language
 	source = swift-lldb-2.2.1-RELEASE.tar.gz::https://github.com/apple/swift-lldb/archive/swift-2.2.1-RELEASE.tar.gz
 	source = swift-cmark-2.2.1-RELEASE.tar.gz::https://github.com/apple/swift-cmark/archive/swift-2.2.1-RELEASE.tar.gz
 	source = swift-sphinx2.patch
+	source = pod2man_release.patch
 	sha256sums = e971e2287055da72564356f369bad97e95821afb1ef36157e954a04a7e90753a
 	sha256sums = f7977e5bb275494b5dac4490afc5d634f894ba5f209f3b2dbd5b7e520fa5fce2
 	sha256sums = 40bdfa7eec0497ec69005d6a5d018b12c85aa2c0959d3408ecaaa9e34ff0415f
 	sha256sums = 2098043dbda98374e784d3357f71f8e931aea3ac958c042adf0df0fae7bc22a3
 	sha256sums = 254d3c02bf2b03ad456fa3ad27b4da854e36318fcaf6b6f199fdb3e978a90803
 	sha256sums = 93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f
+	sha256sums = 68fe01cac3bf796fd06a0d42ab97fcf3db9eba27e582dad06bde76a9992d7028
 
 pkgname = swift
 	pkgdesc = The Swift programming language compiler and tools
diff --git a/PKGBUILD b/PKGBUILD
index d256f2b36f82..0320882266c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=(swift swift-lldb)
 _swiftver=2.2.1-RELEASE
 _swiftold=2.2-SNAPSHOT-2016-01-11-a
 pkgver=${_swiftver//-RELEASE/}
-pkgrel=3
+pkgrel=4
 pkgdesc="The Swift programming language and debugger"
 arch=('i686' 'x86_64')
 url="http://swift.org/"
@@ -19,14 +19,15 @@ source=(
     "swift-clang-${_swiftver}.tar.gz::https://github.com/apple/swift-clang/archive/swift-${_swiftver}.tar.gz"
     "swift-lldb-${_swiftver}.tar.gz::https://github.com/apple/swift-lldb/archive/swift-${_swiftver}.tar.gz"
     "swift-cmark-${_swiftver}.tar.gz::https://github.com/apple/swift-cmark/archive/swift-${_swiftver}.tar.gz"
-    "swift-sphinx2.patch"
+    "swift-sphinx2.patch" "pod2man_release.patch"
 )
 sha256sums=('e971e2287055da72564356f369bad97e95821afb1ef36157e954a04a7e90753a'
             'f7977e5bb275494b5dac4490afc5d634f894ba5f209f3b2dbd5b7e520fa5fce2'
             '40bdfa7eec0497ec69005d6a5d018b12c85aa2c0959d3408ecaaa9e34ff0415f'
             '2098043dbda98374e784d3357f71f8e931aea3ac958c042adf0df0fae7bc22a3'
             '254d3c02bf2b03ad456fa3ad27b4da854e36318fcaf6b6f199fdb3e978a90803'
-            '93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f')
+            '93bbe769666aab15b15d12e2423f213b39d6c47237eafc781569698c8367535f'
+            '68fe01cac3bf796fd06a0d42ab97fcf3db9eba27e582dad06bde76a9992d7028')
 
 # Set this to 1 to enable the experimental parts (swiftpm, corelibs)
 # Otherwise, the standard libraries, llbuild, and swiftpm will NOT be available
@@ -79,6 +80,12 @@ prepare() {
     # Sphinx 1.3.5 raises a warning (promoted to error) when using an unknown
     # syntax highlighting language (like "swift").
     ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/swift-sphinx2.patch" )
+
+    # Recent versions of pod2man require an argument to --release.  If no
+    # argument is provided, it will treat the next option as its argument,
+    # thereby breaking all subsequent arguments.  So let's put something
+    # useful there instead :)
+    ( cd "${srcdir}/swift" && patch -p1 -i "${srcdir}/pod2man_release.patch" )
 }
 
 build() {
diff --git a/pod2man_release.patch b/pod2man_release.patch
new file mode 100644
index 000000000000..37ec4a7bf8e5
--- /dev/null
+++ b/pod2man_release.patch
@@ -0,0 +1,12 @@
+diff -rpuN a/cmake/modules/SwiftManpage.cmake b/cmake/modules/SwiftManpage.cmake
+--- a/cmake/modules/SwiftManpage.cmake	2016-06-10 16:36:37.737343117 -0700
++++ b/cmake/modules/SwiftManpage.cmake	2016-06-10 16:36:13.480423171 -0700
+@@ -30,7 +30,7 @@ function(manpage)
+       unused_var
+       COMMAND
+         "${POD2MAN}" "--section" "${MP_MAN_SECTION}"
+-        "--center" "${MP_PAGE_HEADER}" "--release"
++        "--center" "${MP_PAGE_HEADER}" "--release" "2.2.1-RELEASE"
+         "--name" "${MP_MAN_FILE_BASENAME}"
+         "--stderr"
+         "${MP_SOURCE}" > "${output_file_name}"