1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-17 19:39:43 +00:00

x11/polybar: Update to 3.7.0

Changelog: https://github.com/polybar/polybar/releases/tag/3.7.0

Approved by:		tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D42529
This commit is contained in:
Joel Bodenmann 2023-11-12 20:29:41 +01:00
parent 1939f15624
commit 468f1ec759
9 changed files with 51 additions and 37 deletions

View File

@ -1,6 +1,5 @@
PORTNAME= polybar
DISTVERSION= 3.6.3
PORTREVISION= 3
DISTVERSION= 3.7.0
CATEGORIES= x11
MASTER_SITES= https://github.com/polybar/polybar/releases/download/${DISTVERSION}/

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1651678522
SHA256 (polybar-3.6.3.tar.gz) = f25758573567208fc7b6f4d4115a6117a87389cbcc094cf605d079775be95fa5
SIZE (polybar-3.6.3.tar.gz) = 439838
TIMESTAMP = 1699810833
SHA256 (polybar-3.7.0.tar.gz) = b8e07aca94a013341b7d47ee548afe84f519113f202300565d4852885a11e91d
SIZE (polybar-3.7.0.tar.gz) = 494588

View File

@ -1,11 +0,0 @@
--- CMakeLists.txt.orig 2022-03-27 18:35:56 UTC
+++ CMakeLists.txt
@@ -63,7 +63,7 @@ endif()
if(BUILD_CONFIG)
install(FILES ${CMAKE_SOURCE_DIR}/doc/config.ini
- DESTINATION /etc/${PROJECT_NAME}
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/${PROJECT_NAME}
COMPONENT config)
endif()

View File

@ -0,0 +1,10 @@
--- include/cairo/context.hpp.orig 2023-11-12 19:12:43 UTC
+++ include/cairo/context.hpp
@@ -3,6 +3,7 @@
#include <cairo/cairo-xcb.h>
#include <algorithm>
+#include <array>
#include <cmath>
#include <deque>
#include <iomanip>

View File

@ -1,12 +1,12 @@
--- include/common.hpp.orig 2020-12-02 17:15:49 UTC
--- include/common.hpp.orig 2023-11-05 22:37:13 UTC
+++ include/common.hpp
@@ -5,6 +5,9 @@
@@ -6,6 +6,9 @@
#include <type_traits>
#include <vector>
#include <functional>
+#include <sys/types.h>
+#include <unistd.h>
+
#include "settings.hpp"
#define POLYBAR_NS \
#define POLYBAR_NS namespace polybar {

View File

@ -0,0 +1,10 @@
--- lib/i3ipcpp/src/ipc.cpp.orig 2023-11-12 19:08:48 UTC
+++ lib/i3ipcpp/src/ipc.cpp
@@ -1,6 +1,7 @@
#include "i3ipc++/ipc.hpp"
#include <json/json.h>
+#include <sys/wait.h>
#include <auss.hpp>
#include <cstdio>

View File

@ -1,9 +1,7 @@
diff --git src/modules/cpu.cpp src/modules/cpu.cpp
index 527f27fb..179d9221 100644
--- src/modules/cpu.cpp
--- src/modules/cpu.cpp.orig 2023-11-05 22:37:13 UTC
+++ src/modules/cpu.cpp
@@ -2,6 +2,11 @@
#include <fstream>
#include <istream>
+#ifdef __FreeBSD__
@ -11,12 +9,12 @@ index 527f27fb..179d9221 100644
+ #include <sys/resource.h>
+ #include <sys/sysctl.h>
+#endif
#include "drawtypes/label.hpp"
#include "drawtypes/progressbar.hpp"
@@ -128,6 +133,41 @@ namespace modules {
@@ -129,6 +134,41 @@ namespace modules {
m_cputimes.clear();
try {
+#ifdef __FreeBSD__
+ // Get number of CPUs
@ -55,8 +53,8 @@ index 527f27fb..179d9221 100644
+#else
std::ifstream in(PATH_CPU_INFO);
string str;
@@ -148,6 +188,7 @@ namespace modules {
@@ -149,6 +189,7 @@ namespace modules {
m_cputimes.back()->total = m_cputimes.back()->user + m_cputimes.back()->nice + m_cputimes.back()->system +
m_cputimes.back()->idle + m_cputimes.back()->steal;
}

View File

@ -1,6 +1,4 @@
diff --git src/modules/memory.cpp src/modules/memory.cpp
index eb36e5dc..042d85cb 100644
--- src/modules/memory.cpp
--- src/modules/memory.cpp.orig 2023-11-05 22:37:13 UTC
+++ src/modules/memory.cpp
@@ -1,6 +1,10 @@
#include <fstream>
@ -10,12 +8,12 @@ index eb36e5dc..042d85cb 100644
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+#endif
#include "drawtypes/label.hpp"
#include "drawtypes/progressbar.hpp"
@@ -63,6 +67,25 @@ namespace modules {
@@ -64,6 +68,25 @@ namespace modules {
unsigned long long kb_swap_free{0ULL};
try {
+#ifdef __FreeBSD__
+ std::size_t sz;
@ -38,8 +36,8 @@ index eb36e5dc..042d85cb 100644
+#else
std::ifstream meminfo(PATH_MEMORY_INFO);
std::map<std::string, unsigned long long int> parsed;
@@ -91,6 +114,7 @@ namespace modules {
@@ -92,6 +115,7 @@ namespace modules {
// old kernel; give a best-effort approximation of available memory
kb_avail = parsed["MemFree"] + parsed["Buffers"] + parsed["Cached"] + parsed["SReclaimable"] - parsed["Shmem"];
}

View File

@ -0,0 +1,10 @@
--- src/utils/string.cpp.orig 2023-11-12 19:11:07 UTC
+++ src/utils/string.cpp
@@ -1,6 +1,7 @@
#include "utils/string.hpp"
#include <algorithm>
+#include <array>
#include <cassert>
#include <iomanip>
#include <sstream>