Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Jan 2019 20:26:35 +0000 (UTC)
From:      Lars Engels <lme@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490009 - in head/devel/xdg-utils: . files
Message-ID:  <201901112026.x0BKQZwj094885@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lme
Date: Fri Jan 11 20:26:34 2019
New Revision: 490009
URL: https://svnweb.freebsd.org/changeset/ports/490009

Log:
  devel/xdg-utils: Update to 1.1.3
  
  PR:		234770
  Submitted by:	Marcel Kaiser <mk@nic-nac-project.org>
  Approved by:	maintainer (kwm)

Modified:
  head/devel/xdg-utils/Makefile
  head/devel/xdg-utils/distinfo
  head/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in
  head/devel/xdg-utils/files/patch-scripts_xdg-email.in
  head/devel/xdg-utils/files/patch-scripts_xdg-icon-resource.in
  head/devel/xdg-utils/files/patch-scripts_xdg-mime.in
  head/devel/xdg-utils/files/patch-scripts_xdg-open.in
  head/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in
  head/devel/xdg-utils/files/patch-scripts_xdg-utils-common.in

Modified: head/devel/xdg-utils/Makefile
==============================================================================
--- head/devel/xdg-utils/Makefile	Fri Jan 11 20:18:00 2019	(r490008)
+++ head/devel/xdg-utils/Makefile	Fri Jan 11 20:26:34 2019	(r490009)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xdg-utils
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.3
 CATEGORIES=	devel
 MASTER_SITES=	http://portland.freedesktop.org/download/
 
@@ -18,6 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.th
 		xset:x11/xset
 
 USES=		gmake
+
 CONFIGURE_ENV=	XMLTO=${LOCALBASE}/bin/minixmlto
 GNU_CONFIGURE=	yes
 NO_ARCH=	yes

Modified: head/devel/xdg-utils/distinfo
==============================================================================
--- head/devel/xdg-utils/distinfo	Fri Jan 11 20:18:00 2019	(r490008)
+++ head/devel/xdg-utils/distinfo	Fri Jan 11 20:26:34 2019	(r490009)
@@ -1,2 +1,3 @@
-SHA256 (xdg-utils-1.1.1.tar.gz) = b0dd63a2576e0bb16f1aa78d6ddf7d6784784a098d4df17161cd6a17c7bc4125
-SIZE (xdg-utils-1.1.1.tar.gz) = 295213
+TIMESTAMP = 1546903676
+SHA256 (xdg-utils-1.1.3.tar.gz) = d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
+SIZE (xdg-utils-1.1.3.tar.gz) = 297170

Modified: head/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in
==============================================================================
--- head/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in	Fri Jan 11 20:18:00 2019	(r490008)
+++ head/devel/xdg-utils/files/patch-scripts_xdg-desktop-menu.in	Fri Jan 11 20:26:34 2019	(r490009)
@@ -1,6 +1,6 @@
---- scripts/xdg-desktop-menu.in.orig	2016-01-27 22:06:06.661844000 +0100
-+++ scripts/xdg-desktop-menu.in	2016-01-27 22:08:30.057702000 +0100
-@@ -67,7 +67,7 @@
+--- scripts/xdg-desktop-menu.in.orig	2019-01-08 19:02:17 UTC
++++ scripts/xdg-desktop-menu.in
+@@ -67,7 +67,7 @@ make_lazy_default()
  
      for MIME in $mimetypes ; do
          xdg_default_dirs="$XDG_DATA_DIRS"
@@ -9,7 +9,7 @@
          if [ x"$mode" = x"user" ] ; then
              xdg_user_dir="$XDG_DATA_HOME"
              [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
-@@ -110,7 +110,7 @@
+@@ -110,7 +110,7 @@ update_submenu()
      xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
  
      xdg_system_dirs="$XDG_CONFIG_DIRS"
@@ -18,7 +18,7 @@
      xdg_global_dir=
      for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
          if [ -w $x/$xdg_dir_name ] ; then
-@@ -475,7 +475,7 @@
+@@ -475,7 +475,7 @@ xdg_user_dir="$XDG_DATA_HOME"
  xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
  
  xdg_system_dirs="$XDG_DATA_DIRS"
@@ -27,7 +27,7 @@
  xdg_global_dir=
  for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
      if [ -w $x/$xdg_dir_name ] ; then
-@@ -542,7 +542,7 @@
+@@ -542,7 +542,7 @@ xdg_user_dir="$XDG_DATA_HOME"
  xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
  
  xdg_system_dirs="$XDG_DATA_DIRS"
@@ -36,7 +36,7 @@
  xdg_global_dir=
  for x in `echo $xdg_system_dirs | sed 's/:/ /g'` ; do
      if [ -w $x/$xdg_dir_name ] ; then
-@@ -556,7 +556,7 @@
+@@ -556,7 +556,7 @@ kde_global_dir=`kde${KDE_SESSION_VERSION}-config --pat
  [ -w $kde_global_dir ] || kde_global_dir=
  
  gnome_user_dir="$HOME/.gnome/apps"

Modified: head/devel/xdg-utils/files/patch-scripts_xdg-email.in
==============================================================================
--- head/devel/xdg-utils/files/patch-scripts_xdg-email.in	Fri Jan 11 20:18:00 2019	(r490008)
+++ head/devel/xdg-utils/files/patch-scripts_xdg-email.in	Fri Jan 11 20:26:34 2019	(r490009)
@@ -1,6 +1,6 @@
---- scripts/xdg-email.in.orig	2016-01-27 22:09:31.736910000 +0100
-+++ scripts/xdg-email.in	2016-01-27 22:46:01.701427000 +0100
-@@ -34,7 +34,7 @@
+--- scripts/xdg-email.in.orig	2019-01-08 19:02:17 UTC
++++ scripts/xdg-email.in
+@@ -34,7 +34,7 @@ run_thunderbird()
  {
      local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY ATTACH
      THUNDERBIRD="$1"
@@ -9,7 +9,7 @@
      echo "$MAILTO" | grep -qs "^?"
      if [ "$?" = "0" ] ; then
          MAILTO=$(echo "$MAILTO" | sed 's/^?//')
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ run_thunderbird()
      BCC=$(/bin/echo -e $(echo "$MAILTO" | grep '^bcc=' | sed 's/^bcc=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }'))
      SUBJECT=$(echo "$MAILTO" | grep '^subject=' | tail -n 1)
      BODY=$(echo "$MAILTO" | grep '^body=' | tail -n 1)
@@ -18,7 +18,7 @@
  
      if [ -z "$TO" ] ; then
          NEWMAILTO=
-@@ -293,7 +293,7 @@
+@@ -314,7 +314,7 @@ LC_ALL="$ORIG_LC_ALL"
  
  options=
  mailto=
@@ -27,10 +27,10 @@
  while [ $# -gt 0 ] ; do
      parm="$1"
      shift
-@@ -434,7 +434,7 @@
+@@ -455,7 +455,7 @@ fi
  if [ x"$BROWSER" = x"" ]; then
      BROWSER=www-browser:links2:elinks:links:lynx:w3m
-     if [ -n "$DISPLAY" ]; then
+     if has_display; then
 -        BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
 +        BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chrome:chromium-browser:google-chrome:$BROWSER
      fi

Modified: head/devel/xdg-utils/files/patch-scripts_xdg-icon-resource.in
==============================================================================
--- head/devel/xdg-utils/files/patch-scripts_xdg-icon-resource.in	Fri Jan 11 20:18:00 2019	(r490008)
+++ head/devel/xdg-utils/files/patch-scripts_xdg-icon-resource.in	Fri Jan 11 20:26:34 2019	(r490009)
@@ -1,6 +1,6 @@
---- scripts/xdg-icon-resource.in.orig	2016-01-27 22:13:25.171381000 +0100
-+++ scripts/xdg-icon-resource.in	2016-01-27 22:13:51.264266000 +0100
-@@ -222,7 +222,7 @@
+--- scripts/xdg-icon-resource.in.orig	2019-01-08 19:02:17 UTC
++++ scripts/xdg-icon-resource.in
+@@ -222,7 +222,7 @@ xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
  xdg_global_dir=
  xdg_global_prefix=
  xdg_system_dirs="$XDG_DATA_DIRS"

Modified: head/devel/xdg-utils/files/patch-scripts_xdg-mime.in
==============================================================================
--- head/devel/xdg-utils/files/patch-scripts_xdg-mime.in	Fri Jan 11 20:18:00 2019	(r490008)
+++ head/devel/xdg-utils/files/patch-scripts_xdg-mime.in	Fri Jan 11 20:26:34 2019	(r490009)
@@ -1,6 +1,6 @@
---- scripts/xdg-mime.in.orig	2016-01-27 22:14:36.041781000 +0100
-+++ scripts/xdg-mime.in	2016-01-27 22:17:25.276625000 +0100
-@@ -315,7 +315,7 @@
+--- scripts/xdg-mime.in.orig	2019-01-08 19:02:17 UTC
++++ scripts/xdg-mime.in
+@@ -318,7 +318,7 @@ defapp_fallback()
      [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
  
      xdg_system_dirs="$XDG_DATA_DIRS"
@@ -9,7 +9,7 @@
  
      preference=-1
      desktop_file=""
-@@ -389,7 +389,7 @@
+@@ -401,7 +401,7 @@ defapp_generic()
      xdg_user_dir="$XDG_DATA_HOME"
      [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
      xdg_system_dirs="$XDG_DATA_DIRS"
@@ -18,16 +18,7 @@
  
      local oldifs="$IFS" dir
  
-@@ -492,7 +492,7 @@
-             ;;
-         esac
-         check_input_file "$filename"
--        filename=`readlink -f -- "$filename"`
-+        filename=`stat -f "$filename"`
-         ;;
- 
-       default)
-@@ -694,7 +694,7 @@
+@@ -702,7 +702,7 @@ xdg_user_dir="$XDG_DATA_HOME"
  xdg_user_dir="$xdg_user_dir/$xdg_dir_name"
  
  xdg_system_dirs="$XDG_DATA_DIRS"
@@ -36,7 +27,7 @@
  for x in `echo $xdg_system_dirs | sed 's/:/ /g'`; do
      if [ -w $x/$xdg_dir_name ] ; then
          [ x"$mode" = x"system" ] && xdg_base_dir="$x/mime"
-@@ -726,7 +726,7 @@
+@@ -734,7 +734,7 @@ DEBUG 3 "kde_global_dir: $kde_global_dir"
  # TODO: Gnome legacy support
  # See http://forums.fedoraforum.org/showthread.php?t=26875
  gnome_user_dir="$HOME/.gnome/apps"

Modified: head/devel/xdg-utils/files/patch-scripts_xdg-open.in
==============================================================================
--- head/devel/xdg-utils/files/patch-scripts_xdg-open.in	Fri Jan 11 20:18:00 2019	(r490008)
+++ head/devel/xdg-utils/files/patch-scripts_xdg-open.in	Fri Jan 11 20:26:34 2019	(r490009)
@@ -1,5 +1,5 @@
---- scripts/xdg-open.in.orig	2016-01-27 22:52:37.829535000 +0100
-+++ scripts/xdg-open.in	2016-01-28 11:10:29.639949000 +0100
+--- scripts/xdg-open.in.orig	2019-01-08 19:02:17 UTC
++++ scripts/xdg-open.in
 @@ -15,6 +15,12 @@
  #
  #---------------------------------------------
@@ -13,7 +13,7 @@
  manualpage()
  {
  cat << _MANUALPAGE
-@@ -92,7 +98,7 @@
+@@ -92,7 +98,7 @@ file_url_to_path()
          if [ -x /usr/bin/printf ]; then
              printf=/usr/bin/printf
          fi
@@ -22,7 +22,7 @@
      fi
      echo "$file"
  }
-@@ -211,6 +217,17 @@
+@@ -193,6 +199,17 @@ open_gnome()
      fi
  }
  
@@ -37,26 +37,36 @@
 +  fi
 +}
 +
- #-----------------------------------------
- # Recursively search .desktop file
+ open_mate()
+ {
+     if gio help open 2>/dev/null 1>&2; then
+@@ -342,8 +359,7 @@ open_generic_xdg_mime()
+         [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
  
-@@ -380,7 +397,7 @@
+         xdg_system_dirs="$XDG_DATA_DIRS"
+-        [ -n "$xdg_system_dirs" ] || xdg_system_dirs=/usr/local/share/:/usr/share/
+-
++        [ -n "$xdg_system_dirs" ] || xdg_system_dirs=%%LOCALBASE%%/share/:/usr/share/
+ DEBUG 3 "$xdg_user_dir:$xdg_system_dirs"
+         for x in `echo "$xdg_user_dir:$xdg_system_dirs" | sed 's/:/ /g'`; do
+             search_desktop_file "$default" "$x/applications/" "$1"
+@@ -438,7 +454,7 @@ open_generic()
      if [ x"$BROWSER" = x"" ]; then
          BROWSER=www-browser:links2:elinks:links:lynx:w3m
-         if [ -n "$DISPLAY" ]; then
--            BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
+         if has_display; then
+-            BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chromium:chromium-browser:google-chrome:$BROWSER
 +            BROWSER=x-www-browser:firefox:iceweasel:seamonkey:mozilla:epiphany:konqueror:chrome:chromium-browser:google-chrome:$BROWSER
          fi
      fi
  
-@@ -472,6 +489,10 @@
-     open_mate "$url"
-     ;;
+@@ -534,6 +550,10 @@ case "$DE" in
  
-+    lumina)
-+    open_lumina "$url"
+     gnome)
+     open_gnome "$url"
 +    ;;
 +
-     xfce)
-     open_xfce "$url"
++    lumina)
++    open_lumina "$url"
      ;;
+ 
+     mate)

Modified: head/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in
==============================================================================
--- head/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in	Fri Jan 11 20:18:00 2019	(r490008)
+++ head/devel/xdg-utils/files/patch-scripts_xdg-screensaver.in	Fri Jan 11 20:26:34 2019	(r490009)
@@ -1,6 +1,6 @@
---- scripts/xdg-screensaver.in.orig	2016-01-27 22:18:04.068869000 +0100
-+++ scripts/xdg-screensaver.in	2016-01-27 22:18:32.024901000 +0100
-@@ -27,7 +27,9 @@
+--- scripts/xdg-screensaver.in.orig	2019-01-08 19:02:17 UTC
++++ scripts/xdg-screensaver.in
+@@ -27,7 +27,9 @@ _USAGE
  #@xdg-utils-common@
  
  # Check if we can use "mv -T"

Modified: head/devel/xdg-utils/files/patch-scripts_xdg-utils-common.in
==============================================================================
--- head/devel/xdg-utils/files/patch-scripts_xdg-utils-common.in	Fri Jan 11 20:18:00 2019	(r490008)
+++ head/devel/xdg-utils/files/patch-scripts_xdg-utils-common.in	Fri Jan 11 20:26:34 2019	(r490009)
@@ -1,18 +1,18 @@
---- scripts/xdg-utils-common.in.orig	2016-01-27 22:52:37.833381000 +0100
-+++ scripts/xdg-utils-common.in	2016-01-28 09:44:29.953139000 +0100
-@@ -279,6 +279,44 @@
+--- scripts/xdg-utils-common.in.orig	2019-01-08 19:02:17 UTC
++++ scripts/xdg-utils-common.in
+@@ -304,12 +304,50 @@ detectDE()
           XFCE)
             DE=xfce
             ;;
 +         Lumina)
 +           DE=lumina
 +           ;;
-+         X-Generic)
-+           DE=generic
-+           ;;
-+      esac
-+    fi
-+
+          X-Generic)
+            DE=generic
+            ;;
+       esac
+     fi
+ 
 +# xxx PCDM_SESSION check here?
 +    if [ -n "${PCDM_SESSION}" ]; then
 +      case "${PCDM_SESSION}" in
@@ -42,15 +42,21 @@
 +         LUMINA)
 +           DE=lumina
 +           ;;
-          X-Generic)
-            DE=generic
-            ;;
-@@ -294,6 +332,8 @@
++         X-Generic)
++           DE=generic
++           ;;
++      esac
++    fi
++
+     if [ x"$DE" = x"" ]; then
+       # classic fallbacks
+       if [ x"$KDE_FULL_SESSION" != x"" ]; then DE=kde;
+@@ -319,6 +357,8 @@ detectDE()
        elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
        elif xprop -root 2> /dev/null | grep -i '^xfce_desktop_window' >/dev/null 2>&1; then DE=xfce
        elif echo $DESKTOP | grep -q '^Enlightenment'; then DE=enlightenment;
 +      #Simple fallback for non-XDG window managers if Lumina is installed in the normal place (no heavy runtime dependencies)
 +      elif [ -x "/usr/local/bin/lumina-open" ]; then DE=lumina;
+       elif [ x"$LXQT_SESSION_CONFIG" != x"" ]; then DE=lxqt;
        fi
      fi
- 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901112026.x0BKQZwj094885>