x11-misc/i3status: remove unused patch
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>
Thu, 10 Aug 2017 17:48:05 +0000 (19:48 +0200)
committerDavid Seifert <soap@gentoo.org>
Sun, 13 Aug 2017 11:29:19 +0000 (13:29 +0200)
Closes: https://github.com/gentoo/gentoo/pull/5383

x11-misc/i3status/files/i3status-2.10-pulseaudio.patch [deleted file]

diff --git a/x11-misc/i3status/files/i3status-2.10-pulseaudio.patch b/x11-misc/i3status/files/i3status-2.10-pulseaudio.patch
deleted file mode 100644 (file)
index 991ce03..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-Make dependency on pulseaudio optional.
-
-It's unfortunately not upstreamable. See:
-
-https://github.com/i3/i3status/pull/43
-https://bugs.gentoo.org/show_bug.cgi?id=570786
-
---- a/Makefile
-+++ b/Makefile
-@@ -49,6 +49,10 @@ ifeq ($(OS),NetBSD)
- LIBS+=-lprop
- endif
-+ifeq ($(OS),OpenBSD)
-+LIBS+=-lpthread
-+endif
-+
- # This probably applies for any pkgsrc based system
- ifneq (, $(filter $(OS), NetBSD DragonFly))
- CFLAGS+=-I/usr/pkg/include/
-@@ -70,9 +74,12 @@ CFLAGS += -idirafter yajl-fallback
- OBJS:=$(wildcard src/*.c *.c)
- OBJS:=$(OBJS:.c=.o)
--ifeq ($(OS),OpenBSD)
-+PULSE ?= 1
-+ifeq ($(PULSE),0)
- OBJS:=$(filter-out src/pulse.o, $(OBJS))
--LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread
-+LIBS:=$(filter-out -lpulse, $(LIBS))
-+else
-+CPPFLAGS+=-DPULSE
- endif
- src/%.o: src/%.c include/i3status.h
---- a/src/print_volume.c
-+++ b/src/print_volume.c
-@@ -60,7 +60,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
-         free(instance);
-     }
--#ifndef __OpenBSD__
-+#if !defined(__OpenBSD__) && defined(PULSE)
-     /* Try PulseAudio first */
-     /* If the device name has the format "pulse[:N]" where N is the