diff --git a/srcpkgs/polybar/patches/Add-support-for-eventstruct.patch b/srcpkgs/polybar/patches/Add-support-for-eventstruct.patch
deleted file mode 100644
index bd52e5e88f3..00000000000
--- a/srcpkgs/polybar/patches/Add-support-for-eventstruct.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 00165e1a6d5dd61bc153e1352b21ec07fc81245d Mon Sep 17 00:00:00 2001
-From: patrick96
-Date: Sun, 11 Feb 2018 21:27:52 +0100
-Subject: [PATCH] fix(generators): Add support for eventstruct
-
-Newer xcb-proto commits after the 1.12 release require the 'eventstruct'
-key in the output dictionary, otherwise the generator crashes.
-
-I don't see a need for xpp to actually support the eventstruct key and
-thus it uses a NOP lambda function
----
- generators/cpp_client.py | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/generators/cpp_client.py b/generators/cpp_client.py
-index 20d116f..709e8d8 100644
---- lib/xpp/generators/cpp_client.py
-+++ lib/xpp/generators/cpp_client.py
-@@ -3130,15 +3130,16 @@ def cpp_type_classes():
- # }
-
- # Must create an "output" dictionary before any xcbgen imports.
--output = {'open' : c_open,
-- 'close' : c_close,
-- 'simple' : c_simple, # lambda x, y: None,
-- 'enum' : lambda x, y: None,
-- 'struct' : lambda x, y: None,
-- 'union' : lambda x, y: None,
-- 'request' : c_request,
-- 'event' : cpp_event,
-- 'error' : cpp_error,
-+output = {'open' : c_open,
-+ 'close' : c_close,
-+ 'simple' : c_simple, # lambda x, y: None,
-+ 'enum' : lambda x, y: None,
-+ 'struct' : lambda x, y: None,
-+ 'union' : lambda x, y: None,
-+ 'request' : c_request,
-+ 'event' : cpp_event,
-+ 'error' : cpp_error,
-+ 'eventstruct' : lambda x, y: None,
- }
-
- # Boilerplate below this point
diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template
index 36febb424b6..531827ae2a1 100644
--- a/srcpkgs/polybar/template
+++ b/srcpkgs/polybar/template
@@ -1,9 +1,8 @@
# Template file for 'polybar'
pkgname=polybar
-version=3.2.1
-revision=3
-_i3ipcpp_version=0.7.1
-_xpp_version=1.4.0
+version=3.3.0
+revision=1
+wrksrc="$pkgname"
build_style=cmake
configure_args="
-DENABLE_ALSA=$(vopt_if alsa ON OFF)
@@ -12,7 +11,7 @@ configure_args="
-DENABLE_MPD=$(vopt_if mpd ON OFF)
-DENABLE_NETWORK=$(vopt_if network ON OFF)
-DENABLE_PULSEAUDIO=$(vopt_if pulseaudio ON OFF)
- -DWITH_XRENDER=ON -DWITH_XDAMAGE=ON -DWITH_XSYNC=ON
+ -DWITH_XRENDER=OFF -DWITH_XDAMAGE=ON -DWITH_XSYNC=ON
-DWITH_XCOMPOSITE=ON"
hostmakedepends="pkg-config xcb-proto"
makedepends="cairo-devel xcb-util-image-devel xcb-util-wm-devel xcb-util-xrm-devel
@@ -23,17 +22,12 @@ makedepends="cairo-devel xcb-util-image-devel xcb-util-wm-devel xcb-util-xrm-dev
$(vopt_if mpd "libmpdclient-devel")
$(vopt_if network "wireless_tools-devel")
$(vopt_if pulseaudio "pulseaudio-devel")"
-short_desc="A fast and easy-to-use status bar"
+short_desc="Fast and easy-to-use status bar"
maintainer="Michael Carlberg "
license="MIT"
homepage="https://github.com/jaagr/polybar"
-distfiles="
- https://github.com/jaagr/polybar/archive/${version}.tar.gz
- https://github.com/jaagr/xpp/archive/${_xpp_version}.tar.gz
- $(vopt_if i3 https://github.com/jaagr/i3ipcpp/archive/v${_i3ipcpp_version}.tar.gz)"
-checksum="604e3e8b4fd8c211df94cdd193f8c760c7c027e6822e5b2f598132decdf3edaf
- b689d1d66a39a79b9db89e620061e910f9e2a49b9b1c06c58323b926ac61a658
- $(vopt_if i3 644d82d0e73b7c653e344ac8852e4d7435d9fb7ea54a160ab81662ab4b3652cf)"
+distfiles="https://github.com/jaagr/polybar/releases/download/${version}/polybar-${version}.tar"
+checksum=647dde8fbf6690138b354bf538d1d97ba8c1743ff22314af4ee085e06a1f506a
build_options="alsa curl i3 mpd network pulseaudio"
build_options_default="$build_options"
@@ -54,13 +48,6 @@ if [ "$build_option_network" ]; then
fi
post_extract() {
- if [ -d ../i3ipcpp-${_i3ipcpp_version} ]; then
- mv -f -T ../i3ipcpp-${_i3ipcpp_version} lib/i3ipcpp
- fi
- if [ -d ../xpp-${_xpp_version} ]; then
- mv -f -T ../xpp-${_xpp_version} lib/xpp
- fi
-
# Fixes compilation with musl
sed -i 's|strncpy(header->magic, g_i3_ipc_magic.c_str(),|memcpy(header->magic, g_i3_ipc_magic.c_str(),|g' lib/i3ipcpp/src/ipc-util.cpp
}