summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Wasylków2022-05-22 15:43:50 +0200
committerJakub Wasylków2022-05-22 15:43:50 +0200
commitbdb034afb48c1ebbabf0b5a87747aeea9ecc949e (patch)
tree13e1e37b111a4667e436b88321e4d44302b0c4a9
parentbe6bb0537db9856215211cdc1803952ca9553d89 (diff)
downloadaur-bdb034afb48c1ebbabf0b5a87747aeea9ecc949e.tar.gz
Patch has been applied to mainstream
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD9
-rw-r--r--ddb_discord_presence-makefile.patch13
3 files changed, 2 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1c577e87f4a7..c0ea2b6f02d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,9 +10,7 @@ pkgbase = deadbeef-plugin-discord-git
makedepends = wget
depends = deadbeef
source = ddb_discord_presence::git+https://github.com/kuba160/ddb_discord_presence
- source = ddb_discord_presence-makefile.patch
sha256sums = SKIP
- sha256sums = 5f9f2a604c20f0ea877542c2dcc7cc3d5372b026f310bdfd65214664452683a9
pkgname = deadbeef-plugin-discord-git
diff --git a/PKGBUILD b/PKGBUILD
index fcdae3adc4d0..2366c5d2b0b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,10 +12,8 @@ url="https://github.com/kuba160/ddb_discord_presence"
license=('BSD')
depends=('deadbeef')
makedepends=('git' 'wget')
-source=("${_pkgname}::git+https://github.com/kuba160/${_pkgname}"
- "${_pkgname}-makefile.patch")
-sha256sums=('SKIP'
- '5f9f2a604c20f0ea877542c2dcc7cc3d5372b026f310bdfd65214664452683a9')
+source=("${_pkgname}::git+https://github.com/kuba160/${_pkgname}")
+sha256sums=('SKIP')
pkgver() {
cd "${_pkgname}"
@@ -27,9 +25,6 @@ pkgver() {
prepare() {
cd "${_pkgname}"
- # Arch compile FLAGS
- patch -p1 -i ../${_pkgname}-makefile.patch
-
make submodules_load
make discord-rpc-patch
}
diff --git a/ddb_discord_presence-makefile.patch b/ddb_discord_presence-makefile.patch
deleted file mode 100644
index 5631dc5c16b8..000000000000
--- a/ddb_discord_presence-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ddb_discord_presence/Makefile 2021-04-14 15:29:00.819911000 +0200
-+++ ddb_discord_presence/Makefile_f 2021-04-14 15:29:06.353262000 +0200
-@@ -14,8 +14,8 @@
- CC?=gcc
- CXX?=g++
- STD?=gnu99
--CFLAGS+=-fPIC -I /usr/local/include -I discord-rpc/include -I . -Wall
--CXXFLAGS+=-fPIC -I /usr/local/include -I . -Wall
-+CFLAGS+=$(COPT) -fPIC -I /usr/local/include -I discord-rpc/include -I . -Wall
-+CXXFLAGS+=$(CXXOPT) -fPIC -I /usr/local/include -I . -Wall
- ifeq ($(UNAME_S),Darwin)
- CFLAGS+=-I $(DEADBEEF_OSX)/Contents/Headers
- CXXFLAGS+=-I $(DEADBEEF_OSX)/Contents/Headers