aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Lock <nox@FreeBSD.org>2012-03-07 06:47:28 +0800
committerJuergen Lock <nox@FreeBSD.org>2012-03-07 06:47:28 +0800
commit1fb6e6f60ce3b824e53688461e2bf2d46eae3602 (patch)
tree1db50104a4f8694504fe794504e167241d7ee998
parentca81209a9190378dad62c96d0d11d8bc8a728a35 (diff)
downloadfreebsd-ports-gnome-1fb6e6f60ce3b824e53688461e2bf2d46eae3602.tar.gz
freebsd-ports-gnome-1fb6e6f60ce3b824e53688461e2bf2d46eae3602.tar.zst
freebsd-ports-gnome-1fb6e6f60ce3b824e53688461e2bf2d46eae3602.zip
- Patch xdg-open to drop LD_PRELOAD if called from a Linux app to fix
skype invoking native browsers. [1] - Bump PORTREVISION. Reported by: guru@unixarea.de (Matthias Apitz) on -emulation [1] Approved by: gnome@ (kwm, via irc)
-rw-r--r--devel/xdg-utils/Makefile2
-rw-r--r--devel/xdg-utils/files/patch-scripts_xdg-open19
2 files changed, 17 insertions, 4 deletions
diff --git a/devel/xdg-utils/Makefile b/devel/xdg-utils/Makefile
index 84a4bb7c8e1a..0bd520b05ae9 100644
--- a/devel/xdg-utils/Makefile
+++ b/devel/xdg-utils/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xdg-utils
PORTVERSION= 1.0.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel
MASTER_SITES= http://portland.freedesktop.org/download/
EXTRACT_SUFX= .tgz
diff --git a/devel/xdg-utils/files/patch-scripts_xdg-open b/devel/xdg-utils/files/patch-scripts_xdg-open
index f747c8a20962..1b1c6a4611a2 100644
--- a/devel/xdg-utils/files/patch-scripts_xdg-open
+++ b/devel/xdg-utils/files/patch-scripts_xdg-open
@@ -1,6 +1,19 @@
---- scripts/xdg-open.orig 2009-08-15 13:22:26.000000000 -0400
-+++ scripts/xdg-open 2009-08-15 13:26:02.000000000 -0400
-@@ -364,7 +364,9 @@ open_generic()
+--- scripts/xdg-open.orig
++++ scripts/xdg-open
+@@ -31,6 +31,12 @@
+ #
+ #---------------------------------------------
+
++# If we are started from a Linux app with LD_PRELOAD set unset that
++# so native apps (like browers) won't fail to start.
++if [ "x$(uname)" = "xLinux" ]; then
++ unset LD_PRELOAD
++fi
++
+ manualpage()
+ {
+ cat << _MANUALPAGE
+@@ -364,7 +370,9 @@ open_generic()
for browser in $BROWSER; do
if [ x"$browser" != x"" ]; then