Skip to content
Snippets Groups Projects
Commit 3044d6ca authored by Sören Tempel's avatar Sören Tempel Committed by Natanael Copa
Browse files

community/tofi: remove fix-basename.patch

See previous musl change for details.
parent 5b03d0f6
No related branches found
No related tags found
1 merge request!55694main/musl: backport patch to remove basename prototype from string.h
Pipeline #202152 skipped
......@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tofi
pkgver=0.9.1
pkgrel=1
pkgrel=2
pkgdesc="Tiny dynamic menu for Wayland"
url="https://github.com/philj56/tofi"
arch="all"
......@@ -18,13 +18,13 @@ makedepends="
scdoc
wayland-dev
wayland-protocols
musl-dev>=1.2.4_git20230717-r5
"
subpackages="
$pkgname-doc
$pkgname-bash-completion
"
source="https://github.com/philj56/tofi/archive/v$pkgver/tofi-$pkgver.tar.gz
fix-basename.patch
strtol-fix.patch
"
......@@ -46,6 +46,5 @@ package() {
sha512sums="
a14ab5ecf2c6e1ecb0ec3366c436140aa422995d464de513e81e454df0f303fc9661b534a3f40df4f14897629cd0cc299bb449482b676fbf254002731ac02231 tofi-0.9.1.tar.gz
4d5181773b26d6663d64361c1360fcbf91201546c7f389079a3985d1c2a90de6fdb77390c85098b492f3b4cff591c5c0860c88d99b10463771164f283246564c fix-basename.patch
4dc707b90d5f27f97a84601fe6c618c7ba5803d94a565b14c6f7a9c1ac44e7065d5df1cb8537a704d41ce6479e126fc668d6ddabb8d97401d54eb1d17ad7d31d strtol-fix.patch
"
config.c and history.c include both string.h and libgen.h. For this
reason, they have to conflict prototypes for basename(3). The workaround
here is to remove the include of libgen.h. The downside of this
workaround is that it causes dirname(3) to be implicitly declared.
--- a/src/config.c
+++ b/src/config.c
@@ -1,6 +1,5 @@
#include <ctype.h>
#include <errno.h>
-#include <libgen.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
--- a/src/history.c
+++ b/src/history.c
@@ -1,6 +1,5 @@
#include <errno.h>
#include <fcntl.h>
-#include <libgen.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment