pull in upstream fixes
This commit is contained in:
Rex Dieter
parent
c4bcf98d86
commit
0b0a5c2419
18
.gitignore
vendored
18
.gitignore
vendored
@ -1 +1,19 @@
|
|||||||
/xdg-utils-1.1.1.tar.gz
|
/xdg-utils-1.1.1.tar.gz
|
||||||
|
/0001-Check-for-WAYLAND_DISPLAY-as-well-as-DISPLAY.patch
|
||||||
|
/0002-xdg-utils-common-bump-version-number.patch
|
||||||
|
/0003-ChangeLog-tag-current-version-as-unreleased.patch
|
||||||
|
/0004-xdg-open-improve-fallbacks-add-open_generic-almost-e.patch
|
||||||
|
/0005-xdg-open-standardize-output-redirection-style.patch
|
||||||
|
/0006-xdg-screensaver-Add-cinnamon-screensaver-D-Bus-API-s.patch
|
||||||
|
/0007-add-changelog-for-prior-commit.patch
|
||||||
|
/0008-xdg-mime-support-for-KDE-Frameworks-5.6.patch
|
||||||
|
/0009-changelog-for-prior-commit.patch
|
||||||
|
/0010-xdg-mime-does-not-write-the-file-it-reads-in-a-query.patch
|
||||||
|
/0011-xdg-mime-ensure-check_mimeapps_list-returns-only-pri.patch
|
||||||
|
/0012-xdg-open-prefer-open_generic_xdg_x_scheme_handler-ov.patch
|
||||||
|
/0013-xdg-open-add-flatpak-support.patch
|
||||||
|
/0014-xdg-email-add-flatpak-support.patch
|
||||||
|
/0015-changelog-for-prior-2-commits.patch
|
||||||
|
/0016-Add-gio-tool-support.patch
|
||||||
|
/0017-changelog-for-prior-commit.patch
|
||||||
|
/0018-xdg-open-fix-copy-paste-typo.patch
|
||||||
|
|||||||
@ -1,115 +0,0 @@
|
|||||||
From e6db37b89d90c10b31474ee8fbe4b24f77bb7c99 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Per Olofsson <pelle@debian.org>
|
|
||||||
Date: Tue, 3 Nov 2015 20:34:44 +0100
|
|
||||||
Subject: [PATCH 1/9] Check for $WAYLAND_DISPLAY as well as $DISPLAY.
|
|
||||||
|
|
||||||
---
|
|
||||||
ChangeLog | 6 ++++++
|
|
||||||
scripts/xdg-email.in | 2 +-
|
|
||||||
scripts/xdg-mime.in | 2 +-
|
|
||||||
scripts/xdg-open.in | 8 ++++----
|
|
||||||
scripts/xdg-utils-common.in | 12 ++++++++++++
|
|
||||||
5 files changed, 24 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/ChangeLog b/ChangeLog
|
|
||||||
index 2682c71..b0d8e2a 100644
|
|
||||||
--- a/ChangeLog
|
|
||||||
+++ b/ChangeLog
|
|
||||||
@@ -1,3 +1,9 @@
|
|
||||||
+=== xdg-utils 1.1.2 ===
|
|
||||||
+
|
|
||||||
+2015-11-03 Per Olofsson <pelle@debian.org>
|
|
||||||
+ * Check for $WAYLAND_DISPLAY as well as $DISPLAY. Move display checking
|
|
||||||
+ to a common has_display() function. Thanks to Pasi Sjöholm for reporting.
|
|
||||||
+
|
|
||||||
=== xdg-utils 1.1.1 ===
|
|
||||||
|
|
||||||
2015-10-05 Per Olofsson <pelle@debian.org>
|
|
||||||
diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in
|
|
||||||
index 2819e28..9d1701d 100644
|
|
||||||
--- a/scripts/xdg-email.in
|
|
||||||
+++ b/scripts/xdg-email.in
|
|
||||||
@@ -433,7 +433,7 @@ fi
|
|
||||||
# if BROWSER variable is not set, check some well known browsers instead
|
|
||||||
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
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
|
|
||||||
index 074256c..129850f 100644
|
|
||||||
--- a/scripts/xdg-mime.in
|
|
||||||
+++ b/scripts/xdg-mime.in
|
|
||||||
@@ -32,7 +32,7 @@ _USAGE
|
|
||||||
|
|
||||||
update_mime_database()
|
|
||||||
{
|
|
||||||
- if [ x"$mode" = x"user" -a -n "$DISPLAY" ] ; then
|
|
||||||
+ if [ "$mode" = user ] && has_display; then
|
|
||||||
detectDE
|
|
||||||
if [ x"$DE" = x"kde" ] ; then
|
|
||||||
DEBUG 1 "Running kbuildsycoca"
|
|
||||||
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
|
|
||||||
index 0fbd63d..92a5912 100644
|
|
||||||
--- a/scripts/xdg-open.in
|
|
||||||
+++ b/scripts/xdg-open.in
|
|
||||||
@@ -348,7 +348,7 @@ open_generic()
|
|
||||||
|
|
||||||
check_input_file "$file"
|
|
||||||
|
|
||||||
- if [ -n "$DISPLAY" ]; then
|
|
||||||
+ if has_display; then
|
|
||||||
filetype=`xdg-mime query filetype "$file" | sed "s/;.*//"`
|
|
||||||
open_generic_xdg_mime "$file" "$filetype"
|
|
||||||
fi
|
|
||||||
@@ -360,7 +360,7 @@ open_generic()
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
- if [ -n "$DISPLAY" ] && mimeopen -v 2>/dev/null 1>&2; then
|
|
||||||
+ if has_display && mimeopen -v 2>/dev/null 1>&2; then
|
|
||||||
mimeopen -L -n "$file"
|
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
exit_success
|
|
||||||
@@ -372,14 +372,14 @@ open_generic()
|
|
||||||
open_envvar "$1"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- if [ -n "$DISPLAY" ]; then
|
|
||||||
+ if has_display; then
|
|
||||||
open_generic_xdg_x_scheme_handler "$1"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# if BROWSER variable is not set, check some well known browsers instead
|
|
||||||
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
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
|
|
||||||
index f920799..cb70875 100644
|
|
||||||
--- a/scripts/xdg-utils-common.in
|
|
||||||
+++ b/scripts/xdg-utils-common.in
|
|
||||||
@@ -350,3 +350,15 @@ kfmclient_fix_exit_code()
|
|
||||||
test "$release" -gt 4 && return $1
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+#----------------------------------------------------------------------------
|
|
||||||
+# Returns true if there is a graphical display attached.
|
|
||||||
+
|
|
||||||
+has_display()
|
|
||||||
+{
|
|
||||||
+ if [ -n "$DISPLAY" ] || [ -n "$WAYLAND_DISPLAY" ]; then
|
|
||||||
+ return 0
|
|
||||||
+ else
|
|
||||||
+ return 1
|
|
||||||
+ fi
|
|
||||||
+}
|
|
||||||
--
|
|
||||||
2.7.3
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
From 68edecd130b29cd8678c4e6faa338afaa281a614 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Per Olofsson <pelle@debian.org>
|
|
||||||
Date: Thu, 12 Nov 2015 08:00:43 +0100
|
|
||||||
Subject: [PATCH 2/9] xdg-utils-common: bump version number
|
|
||||||
|
|
||||||
---
|
|
||||||
scripts/xdg-utils-common.in | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
|
|
||||||
index cb70875..cf08cd3 100644
|
|
||||||
--- a/scripts/xdg-utils-common.in
|
|
||||||
+++ b/scripts/xdg-utils-common.in
|
|
||||||
@@ -227,7 +227,7 @@ check_common_commands()
|
|
||||||
;;
|
|
||||||
|
|
||||||
--version)
|
|
||||||
- echo "@NAME@ 1.1.0 rc3"
|
|
||||||
+ echo "@NAME@ 1.1.1+"
|
|
||||||
exit_success
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
--
|
|
||||||
2.7.3
|
|
||||||
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
From b110b3555959c3aabd9484ad5c3b0c3abe8c5914 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Per Olofsson <pelle@debian.org>
|
|
||||||
Date: Thu, 12 Nov 2015 08:01:03 +0100
|
|
||||||
Subject: [PATCH 3/9] ChangeLog: tag current version as unreleased
|
|
||||||
|
|
||||||
---
|
|
||||||
ChangeLog | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/ChangeLog b/ChangeLog
|
|
||||||
index b0d8e2a..deaa86e 100644
|
|
||||||
--- a/ChangeLog
|
|
||||||
+++ b/ChangeLog
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-=== xdg-utils 1.1.2 ===
|
|
||||||
+=== xdg-utils 1.1.2 (unreleased) ===
|
|
||||||
|
|
||||||
2015-11-03 Per Olofsson <pelle@debian.org>
|
|
||||||
* Check for $WAYLAND_DISPLAY as well as $DISPLAY. Move display checking
|
|
||||||
--
|
|
||||||
2.7.3
|
|
||||||
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
From abd6cef36874f73c5c1c4a734d83eba9d340afe4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rex Dieter <rdieter@math.unl.edu>
|
|
||||||
Date: Sat, 19 Dec 2015 11:08:59 -0600
|
|
||||||
Subject: [PATCH 4/9] xdg-open: improve fallbacks, add open_generic (almost)
|
|
||||||
everywhere (BR93442)
|
|
||||||
|
|
||||||
---
|
|
||||||
ChangeLog | 3 +++
|
|
||||||
scripts/xdg-open.in | 18 +++++++++++++++---
|
|
||||||
2 files changed, 18 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/ChangeLog b/ChangeLog
|
|
||||||
index deaa86e..e8a6e40 100644
|
|
||||||
--- a/ChangeLog
|
|
||||||
+++ b/ChangeLog
|
|
||||||
@@ -1,5 +1,8 @@
|
|
||||||
=== xdg-utils 1.1.2 (unreleased) ===
|
|
||||||
|
|
||||||
+2015-12-19 Rex Dieter <rdieter@fedoraproject.org>
|
|
||||||
+ * xdg-open: improve fallbacks, add open_generic (almost) everywhere (BR93442)
|
|
||||||
+
|
|
||||||
2015-11-03 Per Olofsson <pelle@debian.org>
|
|
||||||
* Check for $WAYLAND_DISPLAY as well as $DISPLAY. Move display checking
|
|
||||||
to a common has_display() function. Thanks to Pasi Sjöholm for reporting.
|
|
||||||
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
|
|
||||||
index 92a5912..4578753 100644
|
|
||||||
--- a/scripts/xdg-open.in
|
|
||||||
+++ b/scripts/xdg-open.in
|
|
||||||
@@ -178,8 +178,10 @@ open_mate()
|
|
||||||
{
|
|
||||||
if gvfs-open --help 2>/dev/null 1>&2; then
|
|
||||||
gvfs-open "$1"
|
|
||||||
- else
|
|
||||||
+ elif mate-open --help >/dev/null 2>&1; then
|
|
||||||
mate-open "$1"
|
|
||||||
+ else
|
|
||||||
+ open_generic "$1"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
@@ -191,7 +193,13 @@ open_mate()
|
|
||||||
|
|
||||||
open_xfce()
|
|
||||||
{
|
|
||||||
- exo-open "$1"
|
|
||||||
+ if exo-open --help 2>/dev/null 1>&2; then
|
|
||||||
+ exo-open "$1"
|
|
||||||
+ elif gvfs-open --help 2>/dev/null 1>&2; then
|
|
||||||
+ gvfs-open "$1"
|
|
||||||
+ else
|
|
||||||
+ open_generic "$1"
|
|
||||||
+ fi
|
|
||||||
|
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
exit_success
|
|
||||||
@@ -202,7 +210,11 @@ open_xfce()
|
|
||||||
|
|
||||||
open_enlightenment()
|
|
||||||
{
|
|
||||||
- enlightenment_open "$1"
|
|
||||||
+ if enlightenment_open --help 2>/dev/null 1>&2; then
|
|
||||||
+ enlightenment_open "$1"
|
|
||||||
+ else
|
|
||||||
+ open_generic "$1"
|
|
||||||
+ fi
|
|
||||||
|
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
exit_success
|
|
||||||
--
|
|
||||||
2.7.3
|
|
||||||
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
From c913d96a56899ca2873a8fb51ab1b0f1d095199a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rex Dieter <rdieter@math.unl.edu>
|
|
||||||
Date: Sat, 19 Dec 2015 20:48:55 -0600
|
|
||||||
Subject: [PATCH 5/9] xdg-open: standardize output redirection style
|
|
||||||
|
|
||||||
using 2>/dev/null 1>&2 everywhere
|
|
||||||
---
|
|
||||||
scripts/xdg-open.in | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
|
|
||||||
index 4578753..fccb9bd 100644
|
|
||||||
--- a/scripts/xdg-open.in
|
|
||||||
+++ b/scripts/xdg-open.in
|
|
||||||
@@ -144,7 +144,7 @@ open_kde()
|
|
||||||
|
|
||||||
open_gnome3()
|
|
||||||
{
|
|
||||||
- if gvfs-open --help >/dev/null 2>&1; then
|
|
||||||
+ if gvfs-open --help 2>/dev/null 1>&2; then
|
|
||||||
gvfs-open "$1"
|
|
||||||
else
|
|
||||||
open_generic "$1"
|
|
||||||
@@ -159,9 +159,9 @@ open_gnome3()
|
|
||||||
|
|
||||||
open_gnome()
|
|
||||||
{
|
|
||||||
- if gvfs-open --help >/dev/null 2>&1; then
|
|
||||||
+ if gvfs-open --help 2>/dev/null 1>&2; then
|
|
||||||
gvfs-open "$1"
|
|
||||||
- elif gnome-open --help >/dev/null 2>&1; then
|
|
||||||
+ elif gnome-open --help 2>/dev/null 1>&2; then
|
|
||||||
gnome-open "$1"
|
|
||||||
else
|
|
||||||
open_generic "$1"
|
|
||||||
@@ -178,7 +178,7 @@ open_mate()
|
|
||||||
{
|
|
||||||
if gvfs-open --help 2>/dev/null 1>&2; then
|
|
||||||
gvfs-open "$1"
|
|
||||||
- elif mate-open --help >/dev/null 2>&1; then
|
|
||||||
+ elif mate-open --help 2>/dev/null 1>&2; then
|
|
||||||
mate-open "$1"
|
|
||||||
else
|
|
||||||
open_generic "$1"
|
|
||||||
--
|
|
||||||
2.7.3
|
|
||||||
|
|
||||||
@ -1,117 +0,0 @@
|
|||||||
From 066b46418f454c0b7e1b5e1478f5f94d91276c14 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eric Slenk <lucid.machine@gmail.com>
|
|
||||||
Date: Mon, 15 Feb 2016 15:50:16 -0500
|
|
||||||
Subject: [PATCH 6/9] xdg-screensaver: Add cinnamon-screensaver D-Bus API
|
|
||||||
support.
|
|
||||||
|
|
||||||
---
|
|
||||||
scripts/xdg-screensaver.in | 86 ++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
1 file changed, 86 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in
|
|
||||||
index 1dd7bf7..50ef916 100644
|
|
||||||
--- a/scripts/xdg-screensaver.in
|
|
||||||
+++ b/scripts/xdg-screensaver.in
|
|
||||||
@@ -102,6 +102,10 @@ perform_action()
|
|
||||||
screensaver_mate_screensaver "$1"
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ cinnamon)
|
|
||||||
+ screensaver_cinnamon_screensaver "$1"
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
xscreensaver)
|
|
||||||
screensaver_xscreensaver "$1"
|
|
||||||
;;
|
|
||||||
@@ -638,6 +642,88 @@ screensaver_mate_screensaver()
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
+screensaver_cinnamon_screensaver()
|
|
||||||
+{
|
|
||||||
+# DBUS interface for cinnamon-screensaver
|
|
||||||
+# https://raw.githubusercontent.com/linuxmint/cinnamon-screensaver/master/doc/dbus-interface.html
|
|
||||||
+ case "$1" in
|
|
||||||
+ suspend)
|
|
||||||
+ screensaver_suspend_loop \
|
|
||||||
+ dbus-send --session \
|
|
||||||
+ --dest=org.cinnamon.ScreenSaver \
|
|
||||||
+ --type=method_call \
|
|
||||||
+ /org/cinnamon/ScreenSaver \
|
|
||||||
+ org.cinnamon.ScreenSaver.SimulateUserActivity \
|
|
||||||
+ 2> /dev/null
|
|
||||||
+ result=$?
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
+ resume)
|
|
||||||
+ # Automatic resume when $screensaver_file disappears
|
|
||||||
+ result=0
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
+ activate)
|
|
||||||
+ dbus-send --session \
|
|
||||||
+ --dest=org.cinnamon.ScreenSaver \
|
|
||||||
+ --type=method_call \
|
|
||||||
+ /org/cinnamon/ScreenSaver \
|
|
||||||
+ org.cinnamon.ScreenSaver.SetActive \
|
|
||||||
+ boolean:true \
|
|
||||||
+ 2> /dev/null
|
|
||||||
+ result=$?
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
+ lock)
|
|
||||||
+ dbus-send --session \
|
|
||||||
+ --dest=org.cinnamon.ScreenSaver \
|
|
||||||
+ --type=method_call \
|
|
||||||
+ /org/cinnamon/ScreenSaver \
|
|
||||||
+ org.cinnamon.ScreenSaver.Lock \
|
|
||||||
+ string:"" \
|
|
||||||
+ 2> /dev/null
|
|
||||||
+
|
|
||||||
+ result=$?
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
+ reset)
|
|
||||||
+ # Turns the screensaver off right now
|
|
||||||
+ dbus-send --session \
|
|
||||||
+ --dest=org.cinnamon.ScreenSaver \
|
|
||||||
+ --type=method_call \
|
|
||||||
+ /org/cinnamon/ScreenSaver \
|
|
||||||
+ org.cinnamon.ScreenSaver.SimulateUserActivity \
|
|
||||||
+ 2> /dev/null
|
|
||||||
+ result=$?
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
+ status)
|
|
||||||
+ status=`dbus-send --session \
|
|
||||||
+ --dest=org.cinnamon.ScreenSaver \
|
|
||||||
+ --type=method_call \
|
|
||||||
+ --print-reply \
|
|
||||||
+ --reply-timeout=2000 \
|
|
||||||
+ /org/cinnamon/ScreenSaver \
|
|
||||||
+ org.cinnamon.ScreenSaver.GetActive \
|
|
||||||
+ | grep boolean | cut -d ' ' -f 5`
|
|
||||||
+ result=$?
|
|
||||||
+ if [ x"$status" = "xtrue" ]; then
|
|
||||||
+ echo "enabled"
|
|
||||||
+ elif [ x"$status" = "xfalse" ]; then
|
|
||||||
+ echo "disabled"
|
|
||||||
+ else
|
|
||||||
+ echo "ERROR: dbus org.cinnamon.ScreenSaver.GetActive returned '$status'" >&2
|
|
||||||
+ return 1
|
|
||||||
+ fi
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
+ *)
|
|
||||||
+ echo "ERROR: Unknown command '$1" >&2
|
|
||||||
+ return 1
|
|
||||||
+ ;;
|
|
||||||
+ esac
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
screensaver_xscreensaver()
|
|
||||||
{
|
|
||||||
case "$1" in
|
|
||||||
--
|
|
||||||
2.7.3
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
From c7ecf26e036c7a5f8a921d12c7efe1435f3e996b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rex Dieter <rdieter@math.unl.edu>
|
|
||||||
Date: Tue, 16 Feb 2016 11:32:18 -0600
|
|
||||||
Subject: [PATCH 7/9] add changelog for prior commit
|
|
||||||
|
|
||||||
---
|
|
||||||
ChangeLog | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/ChangeLog b/ChangeLog
|
|
||||||
index e8a6e40..a43ae3a 100644
|
|
||||||
--- a/ChangeLog
|
|
||||||
+++ b/ChangeLog
|
|
||||||
@@ -1,5 +1,8 @@
|
|
||||||
=== xdg-utils 1.1.2 (unreleased) ===
|
|
||||||
|
|
||||||
+2016-02-16 Rex Dieter <rdieter@fedoraproject.org>
|
|
||||||
+ * xdg-screensaver: support cinnamon-screensaver (BR92966)
|
|
||||||
+
|
|
||||||
2015-12-19 Rex Dieter <rdieter@fedoraproject.org>
|
|
||||||
* xdg-open: improve fallbacks, add open_generic (almost) everywhere (BR93442)
|
|
||||||
|
|
||||||
--
|
|
||||||
2.7.3
|
|
||||||
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
From 31db8136bdf61e7f9cb866f9d47c99c63343558d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
|
|
||||||
Date: Fri, 15 Apr 2016 11:17:37 +0200
|
|
||||||
Subject: [PATCH 8/9] xdg-mime: support for KDE Frameworks 5.6
|
|
||||||
|
|
||||||
---
|
|
||||||
scripts/xdg-mime.in | 9 ++-------
|
|
||||||
1 file changed, 2 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
|
|
||||||
index 129850f..63b8a82 100644
|
|
||||||
--- a/scripts/xdg-mime.in
|
|
||||||
+++ b/scripts/xdg-mime.in
|
|
||||||
@@ -428,13 +428,9 @@ defapp_kde()
|
|
||||||
case "${KDE_SESSION_VERSION}" in
|
|
||||||
4)
|
|
||||||
KTRADER=`which ktraderclient 2> /dev/null`
|
|
||||||
- MIMETYPE="--mimetype"
|
|
||||||
- SERVICETYPE="--servicetype"
|
|
||||||
;;
|
|
||||||
5)
|
|
||||||
KTRADER=`which ktraderclient${KDE_SESSION_VERSION} 2> /dev/null`
|
|
||||||
- MIMETYPE="--mimetype"
|
|
||||||
- SERVICETYPE="--servicetype"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
@@ -442,8 +438,8 @@ defapp_kde()
|
|
||||||
fi
|
|
||||||
if [ -n "$KTRADER" ] ; then
|
|
||||||
DEBUG 1 "Running KDE trader query \"$MIME\" mimetype and \"Application\" servicetype"
|
|
||||||
- trader_result=`$KTRADER $MIMETYPE "$MIME" $SERVICETYPE Application 2>/dev/null \
|
|
||||||
- | grep DesktopEntryPath | head -n 1 | cut -d ':' -f 2 | cut -d \' -f 2`
|
|
||||||
+ trader_result=`$KTRADER --mimetype "$MIME" --servicetype Application 2>/dev/null \
|
|
||||||
+ | grep -E "^DesktopEntryPath : |\.desktop$" | head -n1 | sed "s/^DesktopEntryPath : '\(.*\.desktop\)'\$/\1/"`
|
|
||||||
if [ -n "$trader_result" ] ; then
|
|
||||||
basename "$trader_result"
|
|
||||||
exit_success
|
|
||||||
@@ -954,4 +950,3 @@ esac
|
|
||||||
update_mime_database $xdg_base_dir
|
|
||||||
|
|
||||||
exit_success
|
|
||||||
-
|
|
||||||
--
|
|
||||||
2.7.3
|
|
||||||
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
From 6acfbbe3fc5fa545db9089da4448091ce598de4c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rex Dieter <rdieter@math.unl.edu>
|
|
||||||
Date: Fri, 15 Apr 2016 08:43:53 -0500
|
|
||||||
Subject: [PATCH 9/9] +changelog for prior commit
|
|
||||||
|
|
||||||
---
|
|
||||||
ChangeLog | 3 +++
|
|
||||||
1 file changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/ChangeLog b/ChangeLog
|
|
||||||
index a43ae3a..e50ad3c 100644
|
|
||||||
--- a/ChangeLog
|
|
||||||
+++ b/ChangeLog
|
|
||||||
@@ -1,5 +1,8 @@
|
|
||||||
=== xdg-utils 1.1.2 (unreleased) ===
|
|
||||||
|
|
||||||
+2016-04-15 Rex Dieter <rdieter@fedoraproject.org>
|
|
||||||
+ * xdg-mime: properly handle varied ktraderclient5 output (BR94946)
|
|
||||||
+
|
|
||||||
2016-02-16 Rex Dieter <rdieter@fedoraproject.org>
|
|
||||||
* xdg-screensaver: support cinnamon-screensaver (BR92966)
|
|
||||||
|
|
||||||
--
|
|
||||||
2.7.3
|
|
||||||
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
From 9dac27a442b0e44b3f235798b77715e26169500f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rex Dieter <rdieter@math.unl.edu>
|
|
||||||
Date: Thu, 5 May 2016 07:13:32 -0500
|
|
||||||
Subject: [PATCH 10/10] xdg-mime does not write the file it reads in a query
|
|
||||||
(BR95051)
|
|
||||||
|
|
||||||
use
|
|
||||||
$XDG_CONFIG_HOME/mimeapps.list
|
|
||||||
instead of (deprecated)
|
|
||||||
$XDG_DATA_HOME/applications/mimeapps.list
|
|
||||||
---
|
|
||||||
ChangeLog | 3 +++
|
|
||||||
scripts/xdg-mime.in | 8 ++++----
|
|
||||||
2 files changed, 7 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/ChangeLog b/ChangeLog
|
|
||||||
index e50ad3c..141f1f9 100644
|
|
||||||
--- a/ChangeLog
|
|
||||||
+++ b/ChangeLog
|
|
||||||
@@ -1,5 +1,8 @@
|
|
||||||
=== xdg-utils 1.1.2 (unreleased) ===
|
|
||||||
|
|
||||||
+2016-05-05 Rex Dieter <rdieter@fedoraproject.org>
|
|
||||||
+ * xdg-mime: xdg-mime does not write the file it reads in a query (BR95051)
|
|
||||||
+
|
|
||||||
2016-04-15 Rex Dieter <rdieter@fedoraproject.org>
|
|
||||||
* xdg-mime: properly handle varied ktraderclient5 output (BR94946)
|
|
||||||
|
|
||||||
diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
|
|
||||||
index 63b8a82..61b12f1 100644
|
|
||||||
--- a/scripts/xdg-mime.in
|
|
||||||
+++ b/scripts/xdg-mime.in
|
|
||||||
@@ -238,10 +238,10 @@ make_default_generic()
|
|
||||||
{
|
|
||||||
# $1 is vendor-name.desktop
|
|
||||||
# $2 is mime/type
|
|
||||||
- # Add $2=$1 to XDG_DATA_HOME/applications/mimeapps.list
|
|
||||||
- xdg_user_dir="$XDG_DATA_HOME"
|
|
||||||
- [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share"
|
|
||||||
- default_file="$xdg_user_dir/applications/mimeapps.list"
|
|
||||||
+ # Add $2=$1 to XDG_CONFIG_HOME/mimeapps.list
|
|
||||||
+ xdg_config_home="$XDG_CONFIG_HOME"
|
|
||||||
+ [ -n "$xdg_config_home" ] || xdg_config_home="$HOME/.config"
|
|
||||||
+ default_file="$xdg_config_home/mimeapps.list"
|
|
||||||
DEBUG 2 "make_default_generic $1 $2"
|
|
||||||
DEBUG 1 "Updating $default_file"
|
|
||||||
[ -f "$default_file" ] || touch "$default_file"
|
|
||||||
--
|
|
||||||
1.9.3
|
|
||||||
|
|
||||||
20
sources
20
sources
@ -1 +1,19 @@
|
|||||||
2d0aec6037769a5f138ff404b1bb4b15 xdg-utils-1.1.1.tar.gz
|
SHA512 (xdg-utils-1.1.1.tar.gz) = 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb
|
||||||
|
SHA512 (0001-Check-for-WAYLAND_DISPLAY-as-well-as-DISPLAY.patch) = 9ed4c42f4a22fcb5e044b04b74c3e4b6aca70d1bbadf5790b4e01b41401b0bc65ab34f8f352a2c0f247e74a0ef487ef4738c0896f842a2920bd0655b9d92162c
|
||||||
|
SHA512 (0002-xdg-utils-common-bump-version-number.patch) = cd78d618e8f19224dd976cd87b76c429a202fbbd25721a3c07acf05b9241cbea241d3504db4fc05b22116f7edad04ba7c468d442796d6875466d395a8eb26199
|
||||||
|
SHA512 (0003-ChangeLog-tag-current-version-as-unreleased.patch) = 672dbc494272b898608df1fd43b107dd18c0470a4229ef5b977fbb96daf7cc766e7e4ee1877897134b4f6fac5504e03bbbd1686861157000edae60723f435ee6
|
||||||
|
SHA512 (0004-xdg-open-improve-fallbacks-add-open_generic-almost-e.patch) = 3127047a1b47a6f5777281727a71452a12973b62681377c784630aa93c44e0dab9eaf1c38d93135840050aadca20b729dfb8282fe50076f3a4422735eda067ba
|
||||||
|
SHA512 (0005-xdg-open-standardize-output-redirection-style.patch) = e30637bb333616b3f446aaf2241928c49e5cb3bef623948f58bd0b613e9053a819965a5e3ae5124ff035d8250640fd28e804b905becfec2ef607285bc96175f4
|
||||||
|
SHA512 (0006-xdg-screensaver-Add-cinnamon-screensaver-D-Bus-API-s.patch) = 87deb19cd49e620e7e10a990ce6addd08f1296298c7d59c92a839b9e017a330b3a0c899a0192f7973d7a30eb7551e56fa4a5f550c7386e126174b2a23f2245b9
|
||||||
|
SHA512 (0007-add-changelog-for-prior-commit.patch) = ac9599ac4c749cbc294927b3649d096331d86b83c355baa6ec64b5a4418e1d004cbf0bbc0ba2aca2fe7923e76a0e3f3488cabfc7556eb1ed121bbfdd4d6bceb4
|
||||||
|
SHA512 (0008-xdg-mime-support-for-KDE-Frameworks-5.6.patch) = 01b88e8e122314df0a35c0cbe6b8d64808cf2927c5d2238343cc244cb21ad858d717c4f2b3c04f7c906935d386545807f1e9fae60f9606d544932e057a27a127
|
||||||
|
SHA512 (0009-changelog-for-prior-commit.patch) = 24e721f707534c99536ef63e6333e1036d7eba58a45bac8638e128f91fdf8b2117cb0804c2a455e28d515b44318848ebf22e95ab028443ba8e526f795f7204b1
|
||||||
|
SHA512 (0010-xdg-mime-does-not-write-the-file-it-reads-in-a-query.patch) = dad62cee11070e20a83fefd199aa26aca159b6d70d2d181e575d76d79d5ffbd276f666ae3630b4e1bda6479f03e4bd68018dc0f0bcef2c2536171648b1123b86
|
||||||
|
SHA512 (0011-xdg-mime-ensure-check_mimeapps_list-returns-only-pri.patch) = b587d6f2d445d0df1b8cd24aed1f4807c2576ef4a79d1875175a891b5eb4253fac07c343ea38cb41ff80c2d124f815153a9f6ddcf1e395160be40d7b34f86553
|
||||||
|
SHA512 (0012-xdg-open-prefer-open_generic_xdg_x_scheme_handler-ov.patch) = 70a4716ff847e203beb097748476335df9c7a9788a8dfa143b6707907e1369b227f56ad96681bdc3b66c244603ffdbc9f85aba1c48282acd1d048c9fb4c3350b
|
||||||
|
SHA512 (0013-xdg-open-add-flatpak-support.patch) = be112cebdcaf0b0e25c6b2ce4e1937f255459fafaeb57794bff253173633edcc08eb201afecbe1a8da72521fdcab146e0886c7123452d621bf3d7b024c932c1e
|
||||||
|
SHA512 (0014-xdg-email-add-flatpak-support.patch) = c6661d1f110bb28f65c2cbd97bbe7493e98188516a1676afef0c6262741ee36659a5acedb0e629a6d0756a85c489b5edc30389257cb7fada6e287645e2715dfa
|
||||||
|
SHA512 (0015-changelog-for-prior-2-commits.patch) = 642a52bb04c0d035484fe742a10387b157910a99acbde915d699767787af84d9fd0a000b352908b7e4691105cf52d28db319cbea0208e97d2e644a93198a68d3
|
||||||
|
SHA512 (0016-Add-gio-tool-support.patch) = e53c533679914428fee945d521a2e490da38ff2dc8ead21df2c33b2c652ae7e37526fa45d9723c3d76fe0adf8d09bd8bf82227be33c2ee60da41ecc43698c781
|
||||||
|
SHA512 (0017-changelog-for-prior-commit.patch) = 3508adf1e7b2483cd3bd6874a19fda4f4d29f6a1385d1b95f7e0915c8cc787122d6aee6f7fb7b46b1b6b051f3cabff10608df2527d89df7f0447475e26b5ebd1
|
||||||
|
SHA512 (0018-xdg-open-fix-copy-paste-typo.patch) = c6d28dad322f74c1f64bd79e035e8c80e27902110ff54518346a475ab5cff0d1372bf5afe49540662eccb0ef0a76262d99739c54315fc2abec4cdb6aee08420a
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
Summary: Basic desktop integration functions
|
Summary: Basic desktop integration functions
|
||||||
Name: xdg-utils
|
Name: xdg-utils
|
||||||
Version: 1.1.1
|
Version: 1.1.1
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
|
|
||||||
URL: http://portland.freedesktop.org/
|
URL: http://portland.freedesktop.org/
|
||||||
%if 0%{?snap:1}
|
%if 0%{?snap:1}
|
||||||
@ -16,7 +16,7 @@ Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?prerele
|
|||||||
Source1: xdg-utils-git_checkout.sh
|
Source1: xdg-utils-git_checkout.sh
|
||||||
License: MIT
|
License: MIT
|
||||||
|
|
||||||
## upstream patches
|
## upstream patches (treat as sources in lookaside cache)
|
||||||
Patch1: 0001-Check-for-WAYLAND_DISPLAY-as-well-as-DISPLAY.patch
|
Patch1: 0001-Check-for-WAYLAND_DISPLAY-as-well-as-DISPLAY.patch
|
||||||
Patch2: 0002-xdg-utils-common-bump-version-number.patch
|
Patch2: 0002-xdg-utils-common-bump-version-number.patch
|
||||||
Patch3: 0003-ChangeLog-tag-current-version-as-unreleased.patch
|
Patch3: 0003-ChangeLog-tag-current-version-as-unreleased.patch
|
||||||
@ -27,6 +27,14 @@ Patch7: 0007-add-changelog-for-prior-commit.patch
|
|||||||
Patch8: 0008-xdg-mime-support-for-KDE-Frameworks-5.6.patch
|
Patch8: 0008-xdg-mime-support-for-KDE-Frameworks-5.6.patch
|
||||||
Patch9: 0009-changelog-for-prior-commit.patch
|
Patch9: 0009-changelog-for-prior-commit.patch
|
||||||
Patch10: 0010-xdg-mime-does-not-write-the-file-it-reads-in-a-query.patch
|
Patch10: 0010-xdg-mime-does-not-write-the-file-it-reads-in-a-query.patch
|
||||||
|
Patch11: 0011-xdg-mime-ensure-check_mimeapps_list-returns-only-pri.patch
|
||||||
|
Patch12: 0012-xdg-open-prefer-open_generic_xdg_x_scheme_handler-ov.patch
|
||||||
|
Patch13: 0013-xdg-open-add-flatpak-support.patch
|
||||||
|
Patch14: 0014-xdg-email-add-flatpak-support.patch
|
||||||
|
Patch15: 0015-changelog-for-prior-2-commits.patch
|
||||||
|
Patch16: 0016-Add-gio-tool-support.patch
|
||||||
|
Patch17: 0017-changelog-for-prior-commit.patch
|
||||||
|
Patch18: 0018-xdg-open-fix-copy-paste-typo.patch
|
||||||
|
|
||||||
# make sure BuildArch comes *after* patches, to ensure %%autosetup works right
|
# make sure BuildArch comes *after* patches, to ensure %%autosetup works right
|
||||||
# http://bugzilla.redhat.com/1084309
|
# http://bugzilla.redhat.com/1084309
|
||||||
@ -101,6 +109,9 @@ make install DESTDIR=%{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 06 2017 Rex Dieter <rdieter@fedoraproject.org> - 1.1.1-5
|
||||||
|
- pull in upstream fixes
|
||||||
|
|
||||||
* Thu May 05 2016 Rex Dieter <rdieter@fedoraproject.org> 1.1.1-4
|
* Thu May 05 2016 Rex Dieter <rdieter@fedoraproject.org> 1.1.1-4
|
||||||
- save mimetype defaults to ~/.config/mimeapps.list
|
- save mimetype defaults to ~/.config/mimeapps.list
|
||||||
(instead of ~/.local/share/applications/mimeapps.list)
|
(instead of ~/.local/share/applications/mimeapps.list)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user