summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Berquist2016-11-30 20:01:32 -0500
committerEric Berquist2016-11-30 20:01:32 -0500
commit45369c6300dc1e740f8871ba7513efb9128d6c5e (patch)
treea593fe5b4cc2408e26cae8ab72061f5c2fbf0404
parentf255b968f6d44551832b9ff6a8d30287bf3eb432 (diff)
downloadaur-45369c6300dc1e740f8871ba7513efb9128d6c5e.tar.gz
patch no longer needed
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--cmake_generateexportheader.patch19
3 files changed, 7 insertions, 35 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f3627b154601..e0b14688d772 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Oct 10 15:05:12 UTC 2016
+# Thu Dec 1 01:00:58 UTC 2016
pkgbase = molequeue-git
pkgdesc = Desktop integration of high performance computing resources
- pkgver = 0.8.0.r784.fdcdbfb
- pkgrel = 2
+ pkgver = 0.8.0.r792.0d6fbba
+ pkgrel = 3
url = http://www.openchemistry.org/projects/molequeue
arch = i686
arch = x86_64
@@ -14,9 +14,7 @@ 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/PKGBUILD b/PKGBUILD
index 72cd2c9e92bf..cbfecc7bbec9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
_pkgname=molequeue
pkgname="${_pkgname}-git"
-pkgver=0.8.0.r784.fdcdbfb
-pkgrel=2
+pkgver=0.8.0.r792.0d6fbba
+pkgrel=3
pkgdesc="Desktop integration of high performance computing resources"
url="http://www.openchemistry.org/projects/molequeue"
arch=("i686" "x86_64")
@@ -12,10 +12,8 @@ depends=("qt5-base")
makedepends=("git" "cmake")
conflicts=("${_pkgname}")
provides=("${_pkgname}")
-source=("git://github.com/OpenChemistry/${_pkgname}.git"
- "cmake_generateexportheader.patch")
-sha256sums=("SKIP"
- "642d023be9456f71dd974693454a7817206548f4dcf086bd8e84eb1b1a1d0ea5")
+source=("git://github.com/OpenChemistry/${_pkgname}.git")
+sha256sums=("SKIP")
pkgver() {
cd "${srcdir}/${_pkgname}"
@@ -26,11 +24,6 @@ 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
deleted file mode 100644
index 4c0965bb6925..000000000000
--- a/cmake_generateexportheader.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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()
-