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 06B0A58973 for ; Thu, 28 Jan 2016 16:05:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B664DE079B; Thu, 28 Jan 2016 16:05:47 +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 46B11E079B for ; Thu, 28 Jan 2016 16:05:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 518A4340B79 for ; Thu, 28 Jan 2016 16:05:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87F76842 for ; Thu, 28 Jan 2016 16:05:43 +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: <1453997138.6d73c36e7dfa885c9bdaad4ab159eca8659c7429.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-9999-synctex.patch app-text/zathura/zathura-9999.ebuild X-VCS-Directories: app-text/zathura/files/ app-text/zathura/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 6d73c36e7dfa885c9bdaad4ab159eca8659c7429 X-VCS-Branch: master Date: Thu, 28 Jan 2016 16:05:43 +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: 23d48c75-f862-4bcb-a932-5f38f1155281 X-Archives-Hash: 63898f58269068c4c7a79858ecc887c0 commit: 6d73c36e7dfa885c9bdaad4ab159eca8659c7429 Author: Michael Weber gentoo org> AuthorDate: Thu Jan 28 15:59:15 2016 +0000 Commit: Michael Weber gentoo org> CommitDate: Thu Jan 28 16:05:38 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d73c36e app-text/zathura: drop synctex patch (bug 573162, thanks Luis Ressel). Package-Manager: portage-2.2.26 app-text/zathura/files/zathura-9999-synctex.patch | 51 ----------------------- app-text/zathura/zathura-9999.ebuild | 4 -- 2 files changed, 55 deletions(-) diff --git a/app-text/zathura/files/zathura-9999-synctex.patch b/app-text/zathura/files/zathura-9999-synctex.patch deleted file mode 100644 index 1a8a492..0000000 --- a/app-text/zathura/files/zathura-9999-synctex.patch +++ /dev/null @@ -1,51 +0,0 @@ -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-9999.ebuild b/app-text/zathura/zathura-9999.ebuild index ff9ff67..5abb1d2 100644 --- a/app-text/zathura/zathura-9999.ebuild +++ b/app-text/zathura/zathura-9999.ebuild @@ -52,10 +52,6 @@ pkg_setup() { ) } -src_prepare() { - epatch "${FILESDIR}"/${P}-synctex.patch -} - src_compile() { emake "${myzathuraconf[@]}" }