unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 8243dc548e98fcea3be668a61a9ac0ba5f0d8ac3 1281 bytes (raw)
name: gnu/packages/patches/i3lock-color-fix-makefile.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
 
From eaca36ed78bafb82bd51a9e83c6445ef8f1698c8 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@no-reply.pragmatique.xyz>
Date: Mon, 22 May 2017 18:22:19 +0000
Subject: [PATCH] This fix to the Makefile is required to make i3lock-color
 build on Guix.

---
 Makefile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index c0fe888..b4b6cd9 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,6 @@ SYSCONFDIR=/etc
 PKG_CONFIG=pkg-config
 MANDIR=/usr/share/man
 
-# Check if pkg-config is installed, we need it for building CFLAGS/LIBS
-ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null 1>/dev/null || echo 1),1)
-$(error "$(PKG_CONFIG) was not found")
-endif
-
 CFLAGS += -std=c99
 CFLAGS += -pipe
 CFLAGS += -Wall
@@ -18,7 +13,7 @@ CFLAGS += -O2
 SIMD_CFLAGS += -funroll-loops
 SIMD_CFLAGS += -msse2
 CPPFLAGS += -D_GNU_SOURCE
-CPPFLAGS += -DXKBCOMPOSE=$(shell if test -e /usr/include/xkbcommon/xkbcommon-compose.h ; then echo 1 ; else echo 0 ; fi )
+CPPFLAGS += -DXKBCOMPOSE=1
 CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
 LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
 LIBS += -lpam
-- 
2.13.0


debug log:

solving 8243dc548 ...
found 8243dc548 in https://yhetil.org/guix-patches/871skx9ql3.fsf@gmail.com/ ||
	https://yhetil.org/guix-patches/E1dEDUZ-0006gP-3L@rmmprod05.runbox/

applying [1/1] https://yhetil.org/guix-patches/871skx9ql3.fsf@gmail.com/
diff --git a/gnu/packages/patches/i3lock-color-fix-makefile.patch b/gnu/packages/patches/i3lock-color-fix-makefile.patch
new file mode 100644
index 000000000..8243dc548

1:24: trailing whitespace.
 
1:42: trailing whitespace.
-- 
Checking patch gnu/packages/patches/i3lock-color-fix-makefile.patch...
1:44: new blank line at EOF.
+
Applied patch gnu/packages/patches/i3lock-color-fix-makefile.patch cleanly.
warning: 3 lines add whitespace errors.

skipping https://yhetil.org/guix-patches/E1dEDUZ-0006gP-3L@rmmprod05.runbox/ for 8243dc548
index at:
100644 8243dc548e98fcea3be668a61a9ac0ba5f0d8ac3	gnu/packages/patches/i3lock-color-fix-makefile.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).