summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLenovsky2017-11-12 12:57:56 +0100
committerLenovsky2017-11-12 12:57:56 +0100
commit308f73b32c47630e397d5df34d0561015c23d2b8 (patch)
tree60eb3a9affeb5f879774b2c8405a7fada5078b4d
parent2e45e17fd1c5531bb8c962d13a9ec634963631b9 (diff)
downloadaur-308f73b32c47630e397d5df34d0561015c23d2b8.tar.gz
Delete patch for "StringUtils.h"
"fmt/printf.h" for libfmt >= 4 is already included [1] [1] https://github.com/xbmc/xbmc/commit/f2abb94fc333d685cd4938ef0693e3271762898e#diff-a6e1f89ada899808d059c74c6b79de31
-rw-r--r--.SRCINFO4
-rw-r--r--0001-include-fmt-printf.h-to-allow-the-use-of-fmt-sprintf.patch25
-rw-r--r--PKGBUILD10
-rw-r--r--README.md4
4 files changed, 4 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index afcce5dfe179..90f215a59de1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = kodi-git
- pkgver = 18.0.r46814.32cc2b329d
+ pkgver = 18.0.r46817.203b86f32f
pkgrel = 1
url = http://kodi.tv
arch = i686
@@ -50,9 +50,7 @@ pkgbase = kodi-git
makedepends = tinyxml
makedepends = upower
source = xbmc::git+https://github.com/xbmc/xbmc.git#branch=master
- source = 0001-include-fmt-printf.h-to-allow-the-use-of-fmt-sprintf.patch
sha256sums = SKIP
- sha256sums = 867e0b91c9c4d3f69074b567d065f50bdfe9010b3601fef876069e41842bbaac
pkgname = kodi-git
pkgdesc = A software media player and entertainment hub for digital media (master branch)
diff --git a/0001-include-fmt-printf.h-to-allow-the-use-of-fmt-sprintf.patch b/0001-include-fmt-printf.h-to-allow-the-use-of-fmt-sprintf.patch
deleted file mode 100644
index bc7558eb9276..000000000000
--- a/0001-include-fmt-printf.h-to-allow-the-use-of-fmt-sprintf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 07240910e3a5a0c2f5e452d42606be75aafb7e38 Mon Sep 17 00:00:00 2001
-From: BlackEagle <ike.devolder@gmail.com>
-Date: Sun, 9 Apr 2017 15:23:04 +0200
-Subject: [PATCH] include fmt/printf.h to allow the use of fmt::sprintf
-
-Signed-off-by: BlackEagle <ike.devolder@gmail.com>
----
- xbmc/utils/StringUtils.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/xbmc/utils/StringUtils.h b/xbmc/utils/StringUtils.h
-index 0c1d98c2be..b04057184c 100644
---- a/xbmc/utils/StringUtils.h
-+++ b/xbmc/utils/StringUtils.h
-@@ -37,6 +37,7 @@
- #include <locale>
-
- #include <fmt/format.h>
-+#include <fmt/printf.h>
-
- #include "LangInfo.h"
- #include "XBDateTime.h"
---
-2.12.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 56fb8cb2ef1b..c0866038f41f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@
pkgbase=kodi-git
pkgname=('kodi-git' 'kodi-eventclients-git' 'kodi-tools-texturepacker-git' 'kodi-dev-git')
_gitname='xbmc'
-pkgver=18.0.r46814.32cc2b329d
+pkgver=18.0.r46817.203b86f32f
pkgrel=1
arch=('i686' 'x86_64')
url="http://kodi.tv"
@@ -29,10 +29,8 @@ makedepends=('afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'g
'libmpeg2' 'libnfs' 'libplist' 'libxrandr' 'libxslt' 'lzo' 'mesa' 'nasm' 'nss-mdns'
'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'rapidjson-git' 'rtmpdump'
'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'upower')
-source=("$_gitname::git+https://github.com/xbmc/xbmc.git#branch=master"
- '0001-include-fmt-printf.h-to-allow-the-use-of-fmt-sprintf.patch')
-sha256sums=('SKIP'
- '867e0b91c9c4d3f69074b567d065f50bdfe9010b3601fef876069e41842bbaac')
+source=("$_gitname::git+https://github.com/xbmc/xbmc.git#branch=master")
+sha256sums=('SKIP')
pkgver() {
cd "$srcdir/$_gitname"
_major=$(grep 'VERSION_MAJOR' version.txt | sed 's/VERSION_MAJOR //')
@@ -44,8 +42,6 @@ pkgver() {
prepare() {
[[ -d kodi-build ]] && rm -rf kodi-build
mkdir kodi-build
- cd $_gitname
- patch -p1 -i "$srcdir/0001-include-fmt-printf.h-to-allow-the-use-of-fmt-sprintf.patch"
}
build() {
diff --git a/README.md b/README.md
deleted file mode 100644
index 83b473e25212..000000000000
--- a/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-kodi-git
-========================================
-
-url = http://kodi.tv