diff --git a/.gitignore b/.gitignore index 471e588..0d0f97c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,9 @@ /xdg-utils-1.1.2.tar.gz +/0001-bump-version-1.1.2.patch +/0002-init-1.1.3-ChangeLog-section.patch +/0003-Fix-tests-for-1f8e58d51e6fb3f50f59ed2d8265f2f346ac68.patch +/0004-xdg-mime.1-Add-missing-period.patch +/0005-Spelling-fixes-BR103255.patch +/0006-xdg-mime-awk-script-syntax-error-BR104298.patch +/0007-xdg-open-Fixes-LXQt-behavior.patch +/0008-Changelog-for-prior-commit.patch diff --git a/0001-bump-version-1.1.2.patch b/0001-bump-version-1.1.2.patch deleted file mode 100644 index bc261af..0000000 --- a/0001-bump-version-1.1.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 233512d857379115736216392b048c753b5d04b5 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Mon, 8 May 2017 07:33:56 -0500 -Subject: [PATCH 1/8] bump version: 1.1.2+ - ---- - 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 160e3ca..8b85883 100644 ---- a/scripts/xdg-utils-common.in -+++ b/scripts/xdg-utils-common.in -@@ -245,7 +245,7 @@ check_common_commands() - ;; - - --version) -- echo "@NAME@ 1.1.2" -+ echo "@NAME@ 1.1.2+" - exit_success - ;; - esac --- -2.14.3 - diff --git a/0002-init-1.1.3-ChangeLog-section.patch b/0002-init-1.1.3-ChangeLog-section.patch deleted file mode 100644 index 70e3fda..0000000 --- a/0002-init-1.1.3-ChangeLog-section.patch +++ /dev/null @@ -1,24 +0,0 @@ -From fb9ee8c69932feb716ad4db793a7941dd06b345c Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Mon, 8 May 2017 07:34:29 -0500 -Subject: [PATCH 2/8] init 1.1.3 ChangeLog section - ---- - ChangeLog | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index 77e6cef..c819efb 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,4 +1,6 @@ --=== xdg-utils 1.1.2 (unreleased) === -+=== xdg-utils 1.1.3 === -+ -+=== xdg-utils 1.1.2 === - - 2017-02-28 Rex Dieter - * xdg-open: Add "chromium" to fallback browsers (BR99366) --- -2.14.3 - diff --git a/0003-Fix-tests-for-1f8e58d51e6fb3f50f59ed2d8265f2f346ac68.patch b/0003-Fix-tests-for-1f8e58d51e6fb3f50f59ed2d8265f2f346ac68.patch deleted file mode 100644 index c78fd12..0000000 --- a/0003-Fix-tests-for-1f8e58d51e6fb3f50f59ed2d8265f2f346ac68.patch +++ /dev/null @@ -1,47 +0,0 @@ -From afeedb5c932371482b4ffe7b5e98bc1d619f9594 Mon Sep 17 00:00:00 2001 -From: Nicholas Guriev -Date: Sat, 30 Sep 2017 21:34:18 +0300 -Subject: [PATCH 3/8] Fix tests for 1f8e58d51e6fb3f50f59ed2d8265f2f346ac68e6 - ---- - autotests/t-xdg-mime-query-default.sh | 2 ++ - autotests/t-xdg-settings.sh | 4 ++++ - 2 files changed, 6 insertions(+) - -diff --git a/autotests/t-xdg-mime-query-default.sh b/autotests/t-xdg-mime-query-default.sh -index 66bb8d7..a746b1d 100755 ---- a/autotests/t-xdg-mime-query-default.sh -+++ b/autotests/t-xdg-mime-query-default.sh -@@ -3,6 +3,8 @@ COMMAND_TESTED="xdg-mime query default" - . ./test-lib.sh - - test_that_it reads \$XDG_CONFIG_HOME/mimeapps.list -+mock mosaic # Default app should exist -+mock_desktop_file mosaic - mock_default_app x-scheme-handler/http mosaic - handler=$(run generic xdg-mime query default x-scheme-handler/http) - assert_equal mosaic.desktop "$handler" -diff --git a/autotests/t-xdg-settings.sh b/autotests/t-xdg-settings.sh -index 7b697e4..b8255ab 100755 ---- a/autotests/t-xdg-settings.sh -+++ b/autotests/t-xdg-settings.sh -@@ -12,12 +12,16 @@ assert_run gconftool-2 --get /desktop/gnome/applications/browser/exec - for de in gnome3 cinnamon lxde mate generic; do - test_that_it determines default browser from \ - \$XDG_CONFIG_HOME/mimeapps.list in $de -+ mock mosaic # Default app should exist -+ mock_desktop_file mosaic - mock_default_app x-scheme-handler/http mosaic - assert_equal mosaic.desktop \ - "$(run $de xdg-settings get default-web-browser)" - - test_that_it determines default URL handler from \ - \$XDG_CONFIG_HOME/mimeapps.list in $de -+ mock footorrent # Default app should exist -+ mock_desktop_file footorrent - mock_default_app x-scheme-handler/magnet footorrent - assert_equal \ - footorrent.desktop \ --- -2.14.3 - diff --git a/0004-xdg-mime.1-Add-missing-period.patch b/0004-xdg-mime.1-Add-missing-period.patch deleted file mode 100644 index 0b607b3..0000000 --- a/0004-xdg-mime.1-Add-missing-period.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 186b6d7839ae8528d845c977fb680a46bd1c6123 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -Date: Fri, 13 Oct 2017 11:40:05 +0300 -Subject: [PATCH 4/8] xdg-mime.1: Add missing period - ---- - scripts/desc/xdg-mime.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/desc/xdg-mime.xml b/scripts/desc/xdg-mime.xml -index 04d1e17..64bfc85 100644 ---- a/scripts/desc/xdg-mime.xml -+++ b/scripts/desc/xdg-mime.xml -@@ -119,7 +119,7 @@ and adding descriptions for new file types - - - application is the desktop file -- id of the application and has the form vendor-name.desktop -+ id of the application and has the form vendor-name.desktop. - application must already be installed - in the desktop menu before it can be made the default handler. - The application's desktop file must list support for all the --- -2.14.3 - diff --git a/0005-Spelling-fixes-BR103255.patch b/0005-Spelling-fixes-BR103255.patch deleted file mode 100644 index e81987e..0000000 --- a/0005-Spelling-fixes-BR103255.patch +++ /dev/null @@ -1,209 +0,0 @@ -From fa5805559ad27382ef62110cb23e67d6eb649030 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Wed, 29 Nov 2017 14:07:24 -0600 -Subject: [PATCH 5/8] Spelling fixes (BR103255) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Credit to Ville Skyttä ---- - ChangeLog | 4 ++-- - scripts/desc/xdg-settings.xml | 2 +- - scripts/xdg-desktop-menu.in | 2 +- - scripts/xdg-screensaver.in | 2 +- - tests/README | 4 ++-- - tests/debug/t.extraout | 2 +- - tests/debug/t.interactive | 2 +- - tests/doc_gen.pl | 2 +- - tests/include/testassertions.sh | 10 +++++----- - tests/testrun | 2 +- - 10 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index c819efb..292915f 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -541,7 +541,7 @@ - - 2006-04-24 Kevin Krammer - * Applied patch provided by Benedikt Meurer -- to improve the compatability of the Makefile -+ to improve the compatibility of the Makefile - * Added --title option to xdg-file-dialog - * Applied another path by Benedikt to let xdg-file-dialog use - zenity on GNOME and XFCE -@@ -564,7 +564,7 @@ - Currently only used in xdg-mime to gather feedback - - 2006-04-08 Kevin Krammer -- * In case of $BROWSER being not avialable or empty, try a fixed list of well -+ * In case of $BROWSER being not available or empty, try a fixed list of well - known browsers instead - - 2006-04-06 Kevin Krammer -diff --git a/scripts/desc/xdg-settings.xml b/scripts/desc/xdg-settings.xml -index 56055b7..255d712 100644 ---- a/scripts/desc/xdg-settings.xml -+++ b/scripts/desc/xdg-settings.xml -@@ -114,7 +114,7 @@ - - Properties - -- When using xdg-settings to get, check or set a destkop setting, properties -+ When using xdg-settings to get, check or set a desktop setting, properties - and possibly sub-properties are used to specify the setting to be changed. - - -diff --git a/scripts/xdg-desktop-menu.in b/scripts/xdg-desktop-menu.in -index 13159cb..9d837e1 100644 ---- a/scripts/xdg-desktop-menu.in -+++ b/scripts/xdg-desktop-menu.in -@@ -394,7 +394,7 @@ while [ $# -gt 0 ] ; do - case "$parm" in - *.directory) - if [ -n "$desktop_files" ] ; then -- exit_failure_syntax "'$parm' must preceed any *.desktop file" -+ exit_failure_syntax "'$parm' must precede any *.desktop file" - fi - directory_files="$directory_files $parm" - ;; -diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in -index aecd8e3..9e68196 100644 ---- a/scripts/xdg-screensaver.in -+++ b/scripts/xdg-screensaver.in -@@ -583,7 +583,7 @@ screensaver_mate_screensaver() - { - # DBUS interface for mate-screensaver - # This is same as gnome's for now but may change in the future as MATE --# does not follow gnome's developement necessarily. -+# does not follow gnome's development necessarily. - case "$1" in - suspend) - screensaver_suspend_loop \ -diff --git a/tests/README b/tests/README -index 26469f2..8ebcfef 100644 ---- a/tests/README -+++ b/tests/README -@@ -18,7 +18,7 @@ NORESULT: test_system_mime_install - See xdg-test.log for details. - NOT OK! - --FAIL indicates (not suprisingly) a test failure. -+FAIL indicates (not surprisingly) a test failure. - NORESULT indicates that the test prerequisites failed for some reason. - (e.g. the install phase of an uninstall test failed) - UNTESTED means that something needed was not found. This is fine and should -@@ -26,7 +26,7 @@ UNTESTED means that something needed was not found. This is fine and should - (e.g. test requires root, but we are not running as root) - - NOTE: The test runner makes guesses about appropriate values of XDG_TEST_DIR -- and PATH. These values can be overriden explicitly. -+ and PATH. These values can be overridden explicitly. - - To run tests individually, or as smaller groups do something like - -diff --git a/tests/debug/t.extraout b/tests/debug/t.extraout -index ea84b33..4946673 100755 ---- a/tests/debug/t.extraout -+++ b/tests/debug/t.extraout -@@ -4,7 +4,7 @@ - . "$XDG_TEST_DIR/include/testcontrol.sh" - - test_extraout() { --test_start "$FUNCNAME: verify functionallity of assert_nostdout" -+test_start "$FUNCNAME: verify functionality of assert_nostdout" - - test_procedure - -diff --git a/tests/debug/t.interactive b/tests/debug/t.interactive -index fa203c2..6f6f858 100755 ---- a/tests/debug/t.interactive -+++ b/tests/debug/t.interactive -@@ -4,7 +4,7 @@ - . "$XDG_TEST_DIR/include/testcontrol.sh" - - test_interactive() { --test_start "$FUNCNAME: verify functionallity of assert_interactive" -+test_start "$FUNCNAME: verify functionality of assert_interactive" - - test_procedure - -diff --git a/tests/doc_gen.pl b/tests/doc_gen.pl -index ed29d94..50d134d 100755 ---- a/tests/doc_gen.pl -+++ b/tests/doc_gen.pl -@@ -102,7 +102,7 @@ for $f ( @test_files ) { - } - #find initilization - elsif ( m/test_init/ ) { -- print HTM "

Depencencies

\n"; -+ print HTM "

Dependencies

\n"; - $state = 'INIT'; - next; - } -diff --git a/tests/include/testassertions.sh b/tests/include/testassertions.sh -index 1ba026d..142c0de 100644 ---- a/tests/include/testassertions.sh -+++ b/tests/include/testassertions.sh -@@ -5,7 +5,7 @@ - . "$XDG_TEST_DIR/include/testfuncs.sh" - - ## NOTE: Documentation is generated AUTOMATICALLY from this file --## Function usage must immediately follow function delcaration -+## Function usage must immediately follow function declaration - - assert_exit() { - # execute command (saving output) and check exit code -@@ -41,7 +41,7 @@ assert_interactive_notroot() { - } - - assert_interactive() { --# Useage: -+# Usage: - # assert_interactive {msg} [y|n|C|s varname] - # - # msg is the text to print. -@@ -122,7 +122,7 @@ assert_file_not_in_path() { - - - assert_file() { --# Assert the existance of an exact filename -+# Assert the existence of an exact filename - # Usage: assert_file FILE - if [ ! -e "$1" ] ; then - test_fail "'$1' does not exist" -@@ -140,7 +140,7 @@ assert_file() { - } - - assert_nofile() { --# Assert the non existance of an exact filename. -+# Assert the non existence of an exact filename. - # Opposite of 'assert_file' - if [ -e "$1" ] ; then - test_fail "'$1' exists." -@@ -339,7 +339,7 @@ get_unique_name() { - varname="$1" - file="$2" - if [ -z "$varname" ] ; then -- echo "TEST SYNAX ERROR: get_unique_name requries a variable name" -+ echo "TEST SYNAX ERROR: get_unique_name requires a variable name" - exit 255 - fi - -diff --git a/tests/testrun b/tests/testrun -index 822fc69..4a9f748 100755 ---- a/tests/testrun -+++ b/tests/testrun -@@ -123,7 +123,7 @@ if [ -z "$XDG_TEST_SELF_LAUNCH" ] ; then # not self launched - else - SUCMD=`which sudo 2>/dev/null` - echo "Running ${SUCMD-su} for system tests." -- echo "Please enter an apropriate password if requested." -+ echo "Please enter an appropriate password if requested." - fi - # Note if sudo is not found, $SUCMD will be blank, so run su directly. - # We cannot assume su works since systems like Ubuntu require sudo --- -2.14.3 - diff --git a/0006-xdg-mime-awk-script-syntax-error-BR104298.patch b/0006-xdg-mime-awk-script-syntax-error-BR104298.patch deleted file mode 100644 index 8fa8dc7..0000000 --- a/0006-xdg-mime-awk-script-syntax-error-BR104298.patch +++ /dev/null @@ -1,48 +0,0 @@ -From eda08ef065adac7cfa46f296d378cc06a3131d3e Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Mon, 18 Dec 2017 15:50:45 -0600 -Subject: [PATCH 6/8] xdg-mime awk script syntax error (BR104298) - ---- - ChangeLog | 3 +++ - scripts/xdg-mime.in | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 292915f..964006c 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,8 @@ - === xdg-utils 1.1.3 === - -+2017-1218 -+ * xdg-mime awk script syntax error (BR104298) -+ - === xdg-utils 1.1.2 === - - 2017-02-28 Rex Dieter -diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in -index b67581c..0e567c7 100644 ---- a/scripts/xdg-mime.in -+++ b/scripts/xdg-mime.in -@@ -171,7 +171,7 @@ make_default_kde() - blanks++ - suppress=1 - } else if (associations && index($0, prefix) == 1) { -- value=substr($0, length(prefix) + 1, length) -+ value=substr($0, length(prefix) + 1, length()) - split(value, apps, ";") - value=application ";" - count=0 -@@ -369,7 +369,7 @@ check_mimeapps_list() - } else if (index($0, "[") == 1) { - indefault=0 - } else if (!found && indefault && index($0, prefix) == 1) { -- print substr($0, length(prefix) +1, length) -+ print substr($0, length(prefix) +1, length()) - found=1 - } - } --- -2.14.3 - diff --git a/0007-xdg-open-Fixes-LXQt-behavior.patch b/0007-xdg-open-Fixes-LXQt-behavior.patch deleted file mode 100644 index b745b78..0000000 --- a/0007-xdg-open-Fixes-LXQt-behavior.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7d4360c64d94de53d907f13ca99837285e972ec6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= -Date: Wed, 17 May 2017 14:33:30 +0100 -Subject: [PATCH 7/8] xdg-open: Fixes LXQt behavior - -Commit 6387086e4938d568c2bab185632f60e1619b3f68 introduced LXQt support. -In xdg-open it assumed that LXQt and LXDE are the same. They aren't. LXQt -does not have pcmanfm, it has pcmanfm-qt. -LXQt doesn't want to rely on pcmamfm-qt to handle it: LXQt is very modular -and can be deployed without pcmanfm-qt. - -open_generic() works for LXQt but it depends on mimeopen and mimetype. In -the future we will want, for sure, to drop those dependencies. That's the -reason for the existence of open_lxqt(). ---- - scripts/xdg-open.in | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 9817c5f..2972257 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -447,6 +447,11 @@ open_lxde() - fi - } - -+open_lxqt() -+{ -+ open_generic "$1" -+} -+ - [ x"$1" != x"" ] || exit_failure_syntax - - url= -@@ -511,10 +516,14 @@ case "$DE" in - open_xfce "$url" - ;; - -- lxde|lxqt) -+ lxde) - open_lxde "$url" - ;; - -+ lxqt) -+ open_lxqt "$url" -+ ;; -+ - enlightenment) - open_enlightenment "$url" - ;; --- -2.14.3 - diff --git a/0008-Changelog-for-prior-commit.patch b/0008-Changelog-for-prior-commit.patch deleted file mode 100644 index 0d83dfc..0000000 --- a/0008-Changelog-for-prior-commit.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 13963edddcad55438f03aefd4db1538cc8f68f14 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Tue, 27 Feb 2018 15:58:42 -0600 -Subject: [PATCH 8/8] Changelog for prior commit - ---- - ChangeLog | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index 964006c..8060d47 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,6 +1,9 @@ - === xdg-utils 1.1.3 === - --2017-1218 -+2018-02-27 -+ * xdg-open: Fixes LXQt behavior (BR81674,BR103146) -+ -+2017-12-18 - * xdg-mime awk script syntax error (BR104298) - - === xdg-utils 1.1.2 === --- -2.14.3 - diff --git a/sources b/sources index 7e68d49..764965d 100644 --- a/sources +++ b/sources @@ -1 +1,9 @@ SHA512 (xdg-utils-1.1.2.tar.gz) = 1927506065788b5f8bba8b0617a8ee585265342fa40c4b73000d320acd5909036daef94d49495b00982dbb67b7706b2f1ed949cb4cc519dfa534be2c1c8f74db +SHA512 (0001-bump-version-1.1.2.patch) = 9e5d94ee6a6b28ebbf385d20fe3bd05f0e3505060f177bc842ca4b2367c998dc0385b1902cfab767044dbcf8be7561e224d55eb79d7b016f1ffa1c08a113fd01 +SHA512 (0002-init-1.1.3-ChangeLog-section.patch) = 49a21f5d8e2fc0143841c7aa6de6144ae889463c7907c2064e24d4fbbb91d7ca3f86884a63388b2dddc98ddc19b3055751113a8129d63fba9cf4769798246838 +SHA512 (0003-Fix-tests-for-1f8e58d51e6fb3f50f59ed2d8265f2f346ac68.patch) = 44fcf20fe1ac3f0e5a9fc9131d75cbed628d5fad40ca2a2291e602aad95ae1c0930a33cdee6c38f9d32c8dd94cf7c2eee06f8659e62d6575b47ad522b179b60c +SHA512 (0004-xdg-mime.1-Add-missing-period.patch) = e3a2fbc490dd627a4971cfd9667d9afaccd60898632276e48c07979c417b7aaa7a692a6a1160041f0d3e533e97aa9254de435b05708435045a3e90d90945a9d1 +SHA512 (0005-Spelling-fixes-BR103255.patch) = 332ecb4cd6980b7848516a9f93afc22fd672bba4d804a74980ef8c2816bdca3a74a18488d853dcca1d25e375f10472d831ed8d518a1847f0c57241a7a0f9e0a3 +SHA512 (0006-xdg-mime-awk-script-syntax-error-BR104298.patch) = 76bc6153b5487d20bd8a0b399e937ce69c5120fbe8d0d98ea25c1ad5afa48bbd59af2f199928babeecdf66c71cb761b884a2ac14e1090d8372e8a14c4fb52232 +SHA512 (0007-xdg-open-Fixes-LXQt-behavior.patch) = 790c28c8c45d3574f54f8f21a0b76620de7ea0d47666efa0b26f9be131b31c3e0b0a7f45dbb8c6c482bb7f42a5a89c10867037810c61189097f43be3904cdaf0 +SHA512 (0008-Changelog-for-prior-commit.patch) = c13befcb948b0d7c6e8b953eb5667e005e0ea408f8822ef74eac71571e0dc7ac1e1fc102dc43ce04c36c30be2dd4169ff907330428baef045ca87a3a07087928 diff --git a/xdg-utils-git_checkout.sh b/xdg-utils-git_checkout.sh old mode 100755 new mode 100644