summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Alff2017-12-10 13:10:34 -0500
committerTed Alff2017-12-10 13:10:34 -0500
commitc3980d9a3ad0b1c82d5a59e6b646f558147bd8ab (patch)
treedb4461c688d181cc5d43d4be57db4d2f4fba1579
parent3e3f0ffa367ee2c44faff663d5af218ed80a4e7f (diff)
downloadaur-c3980d9a3ad0b1c82d5a59e6b646f558147bd8ab.tar.gz
Remove patch no longer needed
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD9
-rw-r--r--no_fail_on_warning.patch12
3 files changed, 5 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 93bd343cf836..c272ee7828ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Dec 2 01:41:34 UTC 2017
+# Sun Dec 10 18:10:04 UTC 2017
pkgbase = radiotray-ng-git
pkgdesc = An Internet radio player for Linux
- pkgver = 0.2.0.r42.aafdd77
+ pkgver = 0.2.0.r45.f80aa5f
pkgrel = 1
url = https://github.com/ebruck/radiotray-ng
arch = i686
@@ -27,9 +27,7 @@ pkgbase = radiotray-ng-git
conflicts = radiotray-ng
options = !libtool
source = radiotray-ng::git+https://github.com/ebruck/radiotray-ng#branch=v0.2.0-dev
- source = no_fail_on_warning.patch
sha256sums = SKIP
- sha256sums = cedd72d28535e202ca8658d6fbe96d7c1e18a079ecf8810bf79c8a7c09716baf
pkgname = radiotray-ng-git
diff --git a/PKGBUILD b/PKGBUILD
index 4083e3e59f51..09f367c2dd64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname=radiotray-ng
pkgname=${_pkgname}-git
_pkgver=0.2.0
_branch=v${_pkgver}-dev
-pkgver=0.2.0.r42.aafdd77
+pkgver=0.2.0.r45.f80aa5f
pkgrel=1
pkgdesc="An Internet radio player for Linux"
arch=('i686' 'x86_64')
@@ -17,10 +17,8 @@ optdepends=('python2-lxml: Convert radiotray bookmarks to radiotray-ng format')
options=('!libtool')
provides=("${_pkgname}=${pkgver%\.r*}")
conflicts=("${_pkgname}")
-source=("${_pkgname}::git+https://github.com/ebruck/radiotray-ng#branch=${_branch}"
- 'no_fail_on_warning.patch')
-sha256sums=('SKIP'
- 'cedd72d28535e202ca8658d6fbe96d7c1e18a079ecf8810bf79c8a7c09716baf')
+source=("${_pkgname}::git+https://github.com/ebruck/radiotray-ng#branch=${_branch}")
+sha256sums=('SKIP')
pkgver() {
cd "${srcdir}/${_pkgname}"
@@ -31,7 +29,6 @@ prepare() {
cd "${srcdir}/${_pkgname}"
# Build fails when GMock is found, so don't check for it, don't compile tests
sed -i 's:if (GMOCK_FOUND):if (GMOCK_FOUND AND ENABLE_GMOCK):' CMakeLists.txt
- patch -uNp2 -r- -i ../no_fail_on_warning.patch
}
build() {
diff --git a/no_fail_on_warning.patch b/no_fail_on_warning.patch
deleted file mode 100644
index 17c9234472d7..000000000000
--- a/no_fail_on_warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur ./radiotray-ng.orig/CMakeLists.txt ./radiotray-ng/CMakeLists.txt
---- ./radiotray-ng.orig/CMakeLists.txt 2017-12-01 20:37:18.786630180 -0500
-+++ ./radiotray-ng/CMakeLists.txt 2017-12-01 20:37:44.756629724 -0500
-@@ -51,7 +51,7 @@
- set(CMAKE_CXX_STANDARD 14)
- add_definitions("-DBOOST_LOG_DYN_LINK")
- add_compile_options("-fdiagnostics-color=auto")
--set(warnings "-Wall -Wextra -Werror")
-+set(warnings "-Wall -Wextra")
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
-