From patchwork Sun Dec 2 11:24:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Eisenmann X-Patchwork-Id: 367 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E258B16788; Sun, 2 Dec 2018 11:28:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 295FE1676F for ; Sun, 2 Dec 2018 11:28:10 +0000 (GMT) Received: from localhost ([::1]:44147 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTPuz-0008UY-6Z for patchwork@mira.cbaines.net; Sun, 02 Dec 2018 06:28:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49244) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTPuw-0008Mm-7r for guix-patches@gnu.org; Sun, 02 Dec 2018 06:28:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTPus-0003O8-94 for guix-patches@gnu.org; Sun, 02 Dec 2018 06:28:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:53350) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gTPus-0003O4-5G for guix-patches@gnu.org; Sun, 02 Dec 2018 06:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gTPus-0000co-0G for guix-patches@gnu.org; Sun, 02 Dec 2018 06:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33578] [PATCH] gnu: enlightenment: Use absolute path to 'edje_cc'. Resent-From: Timo Eisenmann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Dec 2018 11:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33578 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33578@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15437500412347 (code B ref -1); Sun, 02 Dec 2018 11:28:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Dec 2018 11:27:21 +0000 Received: from localhost ([127.0.0.1]:57608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gTPuC-0000bm-Mr for submit@debbugs.gnu.org; Sun, 02 Dec 2018 06:27:21 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gTPuA-0000bX-SJ for submit@debbugs.gnu.org; Sun, 02 Dec 2018 06:27:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTPu4-00030L-TW for submit@debbugs.gnu.org; Sun, 02 Dec 2018 06:27:13 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:46381) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gTPu4-00030F-Po for submit@debbugs.gnu.org; Sun, 02 Dec 2018 06:27:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTPu3-0007K0-Sp for guix-patches@gnu.org; Sun, 02 Dec 2018 06:27:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTPtz-0002wV-RP for guix-patches@gnu.org; Sun, 02 Dec 2018 06:27:11 -0500 Received: from mout2.freenet.de ([195.4.92.92]:51084) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gTPtz-0002tr-Eh for guix-patches@gnu.org; Sun, 02 Dec 2018 06:27:07 -0500 Received: from [195.4.92.163] (helo=mjail0.freenet.de) by mout2.freenet.de with esmtpa (ID eisenmann@fn.de) (port 25) (Exim 4.90_1 #2) id 1gTPtu-0003Nq-D6 for guix-patches@gnu.org; Sun, 02 Dec 2018 12:27:02 +0100 Received: from [::1] (port=41366 helo=mjail0.freenet.de) by mjail0.freenet.de with esmtpa (ID eisenmann@fn.de) (Exim 4.90_1 #2) id 1gTPtu-0005vA-C5 for guix-patches@gnu.org; Sun, 02 Dec 2018 12:27:02 +0100 Received: from sub6.freenet.de ([195.4.92.125]:47190) by mjail0.freenet.de with esmtpa (ID eisenmann@fn.de) (Exim 4.90_1 #2) id 1gTPrv-0005ZO-Uv for guix-patches@gnu.org; Sun, 02 Dec 2018 12:24:59 +0100 Received: from p200300d403d99200ed204c59a6e0cbe8.dip0.t-ipconnect.de ([2003:d4:3d9:9200:ed20:4c59:a6e0:cbe8]:59682) by sub6.freenet.de with esmtpsa (ID eisenmann@fn.de) (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256) (port 587) (Exim 4.90_1 #2) id 1gTPrv-0006JZ-Q4 for guix-patches@gnu.org; Sun, 02 Dec 2018 12:24:59 +0100 From: Timo Eisenmann Message-ID: Date: Sun, 2 Dec 2018 12:24:58 +0100 MIME-Version: 1.0 X-Originated-At: 2003:d4:3d9:9200:ed20:4c59:a6e0:cbe8!59682 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello, this patch should fix Enlightenment's background import dialog by replacing 'e_prefix_bin_get()' with the proper path to 'edje_cc'. Regards, Timo Eisenmann From 0db44da76a1586a4d8d827f2640df95666448d4c Mon Sep 17 00:00:00 2001 From: Timo Eisenmann Date: Sun, 2 Dec 2018 11:44:37 +0100 Subject: [PATCH] gnu: enlightenment: Use absolute path to 'edje_cc'. * gnu/packages/enlightenment.scm (enlightenment)[arguments]: In 'set-system-actions', set absolute file name to 'edje_cc'. --- gnu/packages/enlightenment.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 43ac388b2..9989e2f5a 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -275,7 +275,8 @@ Libraries with some extra bells and whistles.") (let ((xkeyboard (assoc-ref inputs "xkeyboard-config")) (setxkbmap (assoc-ref inputs "setxkbmap")) (utils (assoc-ref inputs "util-linux")) - (libc (assoc-ref inputs "libc"))) + (libc (assoc-ref inputs "libc")) + (efl (assoc-ref inputs "efl"))) ;; We need to patch the path to 'base.lst' to be able ;; to switch the keyboard layout in E. (substitute* (list "src/modules/xkbswitch/e_mod_parse.c" @@ -290,6 +291,9 @@ Libraries with some extra bells and whistles.") "src/modules/conf_intl/e_int_config_intl.c" "src/modules/wizard/page_010.c") (("locale -a") (string-append libc "/bin/locale -a"))) + (substitute* "src/bin/e_import_config_dialog.c" + (("%s/edje_cc -v %s %s %s\", e_prefix_bin_get\\(\\)") + (string-append efl "/bin/edje_cc -v %s %s %s\""))) (substitute* "src/modules/everything/evry_plug_apps.c" (("/usr/bin/") "")) (substitute* "configure"