unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
blob fafdb992bf7237159c4c4ae79a27f112d45c09bc 671 bytes (raw)
name: gnu/packages/patches/handbrake-pkg-config-path.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
 
Do not clobber PKG_CONFIG_PATH during configure.

--- HandBrake-0.10.5/gtk/module.rules.orig	2016-02-11 14:14:05.000000000 -0600
+++ HandBrake-0.10.5/gtk/module.rules	2016-10-29 22:27:50.550960848 -0500
@@ -15,7 +15,7 @@
 	set -e; cd $(GTK.src/); NOCONFIGURE=1 ./autogen.sh
 	set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \
 		$(GTK.CONFIGURE.extra) \
-		PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig \
+		PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig$(if $(PKG_CONFIG_PATH),:)$(PKG_CONFIG_PATH) \
 	    CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \
 	    LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \
 	    --prefix=$(PREFIX) \

debug log:

solving fafdb99 ...
found fafdb99 in https://yhetil.org/guix-devel/20161031030822.10785-1-bavier@member.fsf.org/

applying [1/1] https://yhetil.org/guix-devel/20161031030822.10785-1-bavier@member.fsf.org/
diff --git a/gnu/packages/patches/handbrake-pkg-config-path.patch b/gnu/packages/patches/handbrake-pkg-config-path.patch
new file mode 100644
index 0000000..fafdb99

1:12: space before tab in indent.
 	set -e; cd $(GTK.src/); NOCONFIGURE=1 ./autogen.sh
1:13: space before tab in indent.
 	set -e; cd $(GTK.build/); $(call fn.ABSOLUTE,$(GTK.src/))configure \
1:14: space before tab in indent.
 		$(GTK.CONFIGURE.extra) \
1:17: space before tab in indent.
 	    CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \
1:18: space before tab in indent.
 	    LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \
Checking patch gnu/packages/patches/handbrake-pkg-config-path.patch...
Applied patch gnu/packages/patches/handbrake-pkg-config-path.patch cleanly.
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

index at:
100644 fafdb992bf7237159c4c4ae79a27f112d45c09bc	gnu/packages/patches/handbrake-pkg-config-path.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).