mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

x11-wm/wlmaker: convert patch-libbase to PATCHFILES

Browse source 
Different hashes due to cherry-picks over the flattened submodule
as PATCHFILES doesn't support passing PATCH_WRKSRC subdirectory.
This commit is contained in:
Jan Beich 2024-01-17 06:00:54 +01:00
parent 5aa9ae29e8
commit e386e01dee
3 changed files with 6 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
x11-wm/wlmaker/Makefile
View file

@ -5,6 +5,8 @@ DISTVERSIONSUFFIX= -ged7a302
CATEGORIES= x11-wm wayland
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= 0179c3c5a837.patch:-p1 # https://github.com/phkaeser/libbase/pull/2
PATCHFILES+= 811db3b1582a.patch:-p1 # https://github.com/phkaeser/libbase/pull/2
PATCHFILES+= 486758619471.patch:-p1 # https://github.com/phkaeser/wlmaker/pull/11
PATCHFILES+= 3a64446b128a.patch:-p1 # https://github.com/phkaeser/wlmaker/pull/11
PATCHFILES+= 2a7108e964e0.patch:-p1 # https://github.com/phkaeser/wlmaker/pull/11

4
x11-wm/wlmaker/distinfo
View file

@ -3,6 +3,10 @@ SHA256 (phkaeser-wlmaker-v0.1-430-ged7a302_GH0.tar.gz) = 468eb262a62fdf66423a318
SIZE (phkaeser-wlmaker-v0.1-430-ged7a302_GH0.tar.gz) = 249717
SHA256 (phkaeser-libbase-c215f7d_GH0.tar.gz) = 11030b84111982bc175e23d3eced8449585a46ccaa0b2ea1c23d661592f53974
SIZE (phkaeser-libbase-c215f7d_GH0.tar.gz) = 94029
SHA256 (0179c3c5a837.patch) = 09b1426585e20d4bf5965d0593f71fba55d2b3d034aca59339fbd707a9ce194c
SIZE (0179c3c5a837.patch) = 1664
SHA256 (811db3b1582a.patch) = 672f946d56596238837544e5d950791c307a98a66f191ae6a6d4ca7b882df261
SIZE (811db3b1582a.patch) = 1300
SHA256 (486758619471.patch) = 0226ca4162f451b5ba0ed0d98e29b9b7458500f21b4dc6033902d4beeade9189
SIZE (486758619471.patch) = 1113
SHA256 (3a64446b128a.patch) = 6ac2464a4f6675bdb19d144857037785c2153213786af6f330401a447a05e70d

33
x11-wm/wlmaker/files/patch-libbase
View file

@ -1,33 +0,0 @@
https://github.com/phkaeser/libbase/pull/2
--- submodules/libbase/subprocess.c.orig 2023-11-05 16:20:38 UTC
+++ submodules/libbase/subprocess.c
@@ -27,6 +27,7 @@
#include <limits.h>
#include <errno.h>
#include <poll.h>
+#include <signal.h>
#include <stdlib.h>
#include <unistd.h>
#include <regex.h>
--- submodules/libbase/time.c.orig 2023-11-05 16:20:38 UTC
+++ submodules/libbase/time.c
@@ -19,7 +19,8 @@
*/
/// clock_gettime(2) is a POSIX extension, needs this macro.
-#define _POSIX_C_SOURCE 199309L
+/// gettimeofday(2) is a XSI extension, needs this macro.
+#define _XOPEN_SOURCE 500
#include "log.h"
#include "time.h"
@@ -30,7 +31,7 @@
#include <time.h>
#include <sys/time.h>
-#undef _POSIX_C_SOURCE
+#undef _XOPEN_SOURCE
/* == Methods ============================================================== */