From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 11 07:30:11 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 044241065673 for ; Sat, 11 Jun 2011 07:30:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C89E28FC0A for ; Sat, 11 Jun 2011 07:30:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p5B7UA61009439 for ; Sat, 11 Jun 2011 07:30:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p5B7UAXW009438; Sat, 11 Jun 2011 07:30:10 GMT (envelope-from gnats) Resent-Date: Sat, 11 Jun 2011 07:30:10 GMT Resent-Message-Id: <201106110730.p5B7UAXW009438@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Zhihao Yuan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 395B1106566B for ; Sat, 11 Jun 2011 07:24:12 +0000 (UTC) (envelope-from lichray@gmail.com) Received: from mail-iy0-f182.google.com (mail-iy0-f182.google.com [209.85.210.182]) by mx1.freebsd.org (Postfix) with ESMTP id F3E448FC12 for ; Sat, 11 Jun 2011 07:24:11 +0000 (UTC) Received: by iyj12 with SMTP id 12so3946465iyj.13 for ; Sat, 11 Jun 2011 00:24:11 -0700 (PDT) Received: by 10.43.132.66 with SMTP id ht2mr3811094icc.339.1307777051099; Sat, 11 Jun 2011 00:24:11 -0700 (PDT) Received: from compaq.yuetime (adsl-99-135-144-33.dsl.emhril.sbcglobal.net [99.135.144.33]) by mx.google.com with ESMTPS id vn4sm2939725icb.19.2011.06.11.00.24.08 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 11 Jun 2011 00:24:09 -0700 (PDT) Received: by compaq.yuetime (sSMTP sendmail emulation); Sat, 11 Jun 2011 02:24:05 -0500 Message-Id: <4df31819.c4342b0a.379b.ffff8ac3@mx.google.com> Date: Sat, 11 Jun 2011 02:24:05 -0500 From: Zhihao Yuan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/157756: graphics/mupdf: makes use of xdg-open instead of $BROWSER X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Zhihao Yuan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jun 2011 07:30:11 -0000 >Number: 157756 >Category: ports >Synopsis: graphics/mupdf: makes use of xdg-open instead of $BROWSER >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jun 11 07:30:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Zhihao Yuan >Release: FreeBSD 8.2-STABLE amd64 >Organization: Northern Illinois University >Environment: System: FreeBSD compaq.yuetime 8.2-STABLE FreeBSD 8.2-STABLE #0 r222763: Mon Jun 6 13:13:53 CDT 2011 lichray@compaq.yuetime:/usr/obj/home/lichray/devel/freebsd-stable/sys/HOUKAGO amd64 >Description: When opening a URI in PDF, mupdf tries $BROWSER first, which is so decent; then tries the "open" command, which is wrong. >How-To-Repeat: >Fix: My patch only uses xdg-open. It will obeys the freedesktop standard, and tries $BROWSER as an fallback. --- mupdf_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/graphics/mupdf.orig/Makefile /usr/ports/graphics/mupdf/Makefile --- /usr/ports/graphics/mupdf.orig/Makefile 2011-05-17 19:25:45.000000000 -0500 +++ /usr/ports/graphics/mupdf/Makefile 2011-06-11 02:10:02.519730447 -0500 @@ -6,7 +6,7 @@ PORTNAME= mupdf PORTVERSION= 0.8.165 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE \ @@ -20,6 +20,7 @@ jpeg.11:${PORTSDIR}/graphics/jpeg \ jbig2dec.0:${PORTSDIR}/graphics/jbig2dec \ openjpeg.2:${PORTSDIR}/graphics/openjpeg +RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils USE_GMAKE= yes MAKE_ARGS+= build=native prefix=${PREFIX} verbose=1 mandir=${PREFIX}/man diff -ruN --exclude=CVS /usr/ports/graphics/mupdf.orig/files/patch-apps_x11_main.c /usr/ports/graphics/mupdf/files/patch-apps_x11_main.c --- /usr/ports/graphics/mupdf.orig/files/patch-apps_x11_main.c 2011-05-17 19:25:45.000000000 -0500 +++ /usr/ports/graphics/mupdf/files/patch-apps_x11_main.c 2011-06-11 02:15:18.340728757 -0500 @@ -1,6 +1,17 @@ ---- apps/x11_main.c.orig 2011-05-16 23:18:12.046785782 -0500 -+++ apps/x11_main.c 2011-05-16 23:24:55.669305772 -0500 -@@ -563,6 +563,24 @@ static void winresettmo(struct timeval * +--- apps/x11_main.c.orig 2011-04-29 14:06:09.000000000 -0500 ++++ apps/x11_main.c 2011-06-11 02:15:12.203411543 -0500 +@@ -482,9 +482,7 @@ void winreloadfile(pdfapp_t *app) + + void winopenuri(pdfapp_t *app, char *buf) + { +- char *browser = getenv("BROWSER"); +- if (!browser) +- browser = "open"; ++ char browser[] = "xdg-open"; + if (fork() == 0) + execlp(browser, browser, buf, (char*)0); + } +@@ -563,6 +561,24 @@ static void winresettmo(struct timeval * tmo_at->tv_usec = 0; } @@ -25,7 +36,7 @@ int main(int argc, char **argv) { int c; -@@ -571,7 +589,7 @@ int main(int argc, char **argv) +@@ -571,7 +587,7 @@ int main(int argc, char **argv) KeySym keysym; int oldx = 0; int oldy = 0; --- mupdf_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: