patch for GCC 6

4 files changed, 43 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cfe53e409872..f3627b154601 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Oct 10 15:05:12 UTC 2016
 pkgbase = molequeue-git
 	pkgdesc = Desktop integration of high performance computing resources
-	pkgver = 0.8.0.r779.8897623
-	pkgrel = 1
+	pkgver = 0.8.0.r784.fdcdbfb
+	pkgrel = 2
 	url = http://www.openchemistry.org/projects/molequeue
 	arch = i686
 	arch = x86_64
@@ -12,7 +14,9 @@ pkgbase = molequeue-git
 	provides = molequeue
 	conflicts = molequeue
 	source = git://github.com/OpenChemistry/molequeue.git
+	source = cmake_generateexportheader.patch
 	sha256sums = SKIP
+	sha256sums = 642d023be9456f71dd974693454a7817206548f4dcf086bd8e84eb1b1a1d0ea5
 
 pkgname = molequeue-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..68581b04417f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+# makepkg files
+pkg/
+src/
+*.xz
+
+# source files
+molequeue/
diff --git a/PKGBUILD b/PKGBUILD
index 0859cb5d3795..72cd2c9e92bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgname=molequeue
 pkgname="${_pkgname}-git"
-pkgver=0.8.0.r779.8897623
-pkgrel=1
+pkgver=0.8.0.r784.fdcdbfb
+pkgrel=2
 pkgdesc="Desktop integration of high performance computing resources"
 url="http://www.openchemistry.org/projects/molequeue"
 arch=("i686" "x86_64")
@@ -12,8 +12,10 @@ depends=("qt5-base")
 makedepends=("git" "cmake")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}")
-source=("git://github.com/OpenChemistry/${_pkgname}.git")
-sha256sums=("SKIP")
+source=("git://github.com/OpenChemistry/${_pkgname}.git"
+        "cmake_generateexportheader.patch")
+sha256sums=("SKIP"
+           "642d023be9456f71dd974693454a7817206548f4dcf086bd8e84eb1b1a1d0ea5")
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -24,6 +26,11 @@ pkgver() {
          "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+  patch -p1 < "${srcdir}"/cmake_generateexportheader.patch
+}
+
 build() {
   cd "${srcdir}/${_pkgname}"
   cmake \
diff --git a/cmake_generateexportheader.patch b/cmake_generateexportheader.patch
new file mode 100644
index 000000000000..4c0965bb6925
--- /dev/null
+++ b/cmake_generateexportheader.patch
@@ -0,0 +1,19 @@
+diff --git a/cmake/GenerateExportHeader.cmake b/cmake/GenerateExportHeader.cmake
+index a91da06..3dd14ed 100644
+--- a/cmake/GenerateExportHeader.cmake
++++ b/cmake/GenerateExportHeader.cmake
+@@ -164,12 +164,12 @@ macro(_test_compiler_hidden_visibility)
+   if(CMAKE_COMPILER_IS_GNUCXX)
+     exec_program(${CMAKE_C_COMPILER} ARGS --version
+       OUTPUT_VARIABLE _gcc_version_info)
+-    string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]"
++    string(REGEX MATCH "[3456]\\.[0-9]\\.[0-9]"
+       _gcc_version "${_gcc_version_info}")
+     # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+     # patch level, handle this here:
+     if(NOT _gcc_version)
+-      string(REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0"
++      string(REGEX REPLACE ".*\\(GCC\\).* ([3456]\\.[0-9]) .*" "\\1.0"
+         _gcc_version "${_gcc_version_info}")
+     endif()
+