From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 40EDA1388BF for ; Tue, 12 Jan 2016 17:38:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2D47221C014; Tue, 12 Jan 2016 17:38:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB8FF21C014 for ; Tue, 12 Jan 2016 17:38:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7FC153409EC for ; Tue, 12 Jan 2016 17:38:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75ED3A16 for ; Tue, 12 Jan 2016 17:38:00 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1452619867.568fab566516a0c9a68ea9e8a290ffcbb9ef13de.xmw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/zathura/files/, app-text/zathura/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/zathura/files/zathura-0.3.4-synctex.patch app-text/zathura/zathura-0.3.4.ebuild X-VCS-Directories: app-text/zathura/files/ app-text/zathura/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 568fab566516a0c9a68ea9e8a290ffcbb9ef13de X-VCS-Branch: master Date: Tue, 12 Jan 2016 17:38:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b0a37f3e-19b0-408f-821b-85172874f9b3 X-Archives-Hash: ff64bc623f048c842ef9d6c090f591ec commit: 568fab566516a0c9a68ea9e8a290ffcbb9ef13de Author: Michael Weber gentoo org> AuthorDate: Tue Jan 12 17:28:11 2016 +0000 Commit: Michael Weber gentoo org> CommitDate: Tue Jan 12 17:31:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568fab56 app-text/zathura: Fix for missing synctex (thanks Petr Pisar, bug 571346). Package-Manager: portage-2.2.26 app-text/zathura/files/zathura-0.3.4-synctex.patch | 51 ++++++++++++++++++++++ app-text/zathura/zathura-0.3.4.ebuild | 4 ++ 2 files changed, 55 insertions(+) diff --git a/app-text/zathura/files/zathura-0.3.4-synctex.patch b/app-text/zathura/files/zathura-0.3.4-synctex.patch new file mode 100644 index 0000000..1a8a492 --- /dev/null +++ b/app-text/zathura/files/zathura-0.3.4-synctex.patch @@ -0,0 +1,51 @@ +From f0a86c6ef7c43eec07b0ddc7c002dba506ca1e26 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Sat, 9 Jan 2016 09:48:53 +0100 +Subject: [PATCH] Use synctex_editor only if WITH_SYNCTEX +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without installed synctex, the build fails like: + +zathura/main.c: In function ‘main’: +zathura/main.c:254:26: error: ‘synctex_editor’ undeclared (first use in this function) + plugin_path, argv, synctex_editor, embed); + ^ +zathura/main.c:254:26: note: each undeclared identifier is reported only once for each function it appears in +Makefile:103: recipe for target 'build/release/zathura/main.o' failed + +This patch fixes it. + + +--- + zathura/main.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/zathura/main.c b/zathura/main.c +index 060382a..9c0d0d3 100644 +--- a/zathura/main.c ++++ b/zathura/main.c +@@ -250,11 +250,16 @@ main(int argc, char* argv[]) + + /* Create zathura session */ + zathura_t* zathura = init_zathura(config_dir, data_dir, cache_dir, +-#ifdef GDK_WINDOWING_X11 +- plugin_path, argv, synctex_editor, embed); ++ plugin_path, argv, ++#ifdef WITH_SYNCTEX ++ synctex_editor + #else +- plugin_path, argv, synctex_editor); ++ NULL ++#endif ++#ifdef GDK_WINDOWING_X11 ++ , embed + #endif ++ ); + if (zathura == NULL) { + girara_error("Could not initialize zathura."); + return -1; +-- +2.4.10 + diff --git a/app-text/zathura/zathura-0.3.4.ebuild b/app-text/zathura/zathura-0.3.4.ebuild index ef9d28e..8909dc1 100644 --- a/app-text/zathura/zathura-0.3.4.ebuild +++ b/app-text/zathura/zathura-0.3.4.ebuild @@ -50,6 +50,10 @@ pkg_setup() { ) } +src_prepare() { + epatch "${FILESDIR}"/${P}-synctex.patch +} + src_compile() { emake "${myzathuraconf[@]}" }