summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Lange2020-10-16 11:42:38 +0200
committerThomas Lange2020-10-16 11:42:38 +0200
commit00c641379cae970ba577c7fd06eddad84e22ba96 (patch)
tree685bd3d91bdb4fabe1a1e789b235eecf4dd042f0
parentdf76fdb087b10b03bddd70b4e68fe9d376b02be7 (diff)
downloadaur-00c641379cae970ba577c7fd06eddad84e22ba96.tar.gz
Remove now obsolete patch
See also: https://github.com/mumble-voip/mumble/pull/4510
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
-rw-r--r--build-type-release.patch13
3 files changed, 6 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index edf2498a887f..3632e4cb64d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mumble-git
- pkgdesc = Open source, low-latency, high quality voice chat (git version)
- pkgver = 1.3.0.rc2.r910.g42e3752be
+ pkgdesc = An Open Source, low-latency, high quality voice chat software (git version)
+ pkgver = 1.3.0.rc2.r963.g4de96f8bc
pkgrel = 1
epoch = 1
url = https://www.mumble.info
@@ -42,13 +42,11 @@ pkgbase = mumble-git
source = git://github.com/mumble-voip/celt-0.7.0.git
source = git://github.com/mumble-voip/opus.git
source = git://github.com/mumble-voip/speex.git
- source = build-type-release.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = 328e160a99970773a9b3c165d8c4f24e73306b07a42ce91f974e936551a38a25
pkgname = mumble-git
depends = gcc-libs
diff --git a/PKGBUILD b/PKGBUILD
index 68cc60600718..249bb9095fbc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,10 +7,10 @@
_pkgname=mumble
pkgname="$_pkgname-git"
-pkgver=1.3.0.rc2.r910.g42e3752be
+pkgver=1.3.0.rc2.r963.g4de96f8bc
pkgrel=1
epoch=1
-pkgdesc='Open source, low-latency, high quality voice chat (git version)'
+pkgdesc='An Open Source, low-latency, high quality voice chat software (git version)'
arch=('i686' 'x86_64')
url='https://www.mumble.info'
license=('BSD')
@@ -26,10 +26,8 @@ source=('git://github.com/mumble-voip/mumble.git'
'git://github.com/mumble-voip/mumble-theme.git'
'git://github.com/mumble-voip/celt-0.7.0.git'
'git://github.com/mumble-voip/opus.git'
- 'git://github.com/mumble-voip/speex.git'
- 'build-type-release.patch')
-sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
- '328e160a99970773a9b3c165d8c4f24e73306b07a42ce91f974e936551a38a25')
+ 'git://github.com/mumble-voip/speex.git')
+sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
pkgver() {
cd "$_pkgname"
@@ -45,9 +43,6 @@ prepare() {
git config submodule.3rdparty/speex.url "$srcdir/speex"
git config submodule.themes/Mumble.url "$srcdir/mumble-theme"
git submodule update
-
- # https://github.com/mumble-voip/mumble/issues/4470
- patch -Np1 -i "$srcdir/build-type-release.patch"
}
build() {
diff --git a/build-type-release.patch b/build-type-release.patch
deleted file mode 100644
index 0b572c8bdea5..000000000000
--- a/build-type-release.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e3fe096c..61bed085 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -79,8 +79,6 @@ else()
- set(BUILD_STR "Debug")
- elseif(${CMAKE_BUILD_TYPE} STREQUAL "Release")
- set(BUILD_STR "Release")
-- else()
-- message(FATAL_ERROR "Unsupported build type! Please choose either \"Debug\" or \"Release\".")
- endif()
- endif()
-