Hello community,
here is the log from the commit of package xdg-utils for openSUSE:Factory checked in at 2014-09-28 19:57:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdg-utils (Old)
and /work/SRC/openSUSE:Factory/.xdg-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-utils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdg-utils/xdg-utils.changes 2014-07-31 21:50:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xdg-utils.new/xdg-utils.changes 2014-09-28 19:58:00.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Sep 23 16:32:40 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 20140922:
+ * Initial support for Plasma5
+ * XFCE .desktop file created for browser selection is broken
+ (fdo#56092)
+ * Unnecessary filtering file:// for pcmanfm (fdo#63153)
+ * fails if user sets a custom IFS environment variable
+ (fdo#81386)
+ * xdg-utils-common is broken, xdg-open uses bashism (fdo#83979)
+ * xdg-email: do not encode - character
+
+-------------------------------------------------------------------
Old:
----
xdg-utils-20140630.tar.xz
New:
----
xdg-utils-20140922.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdg-utils.spec ++++++
--- /var/tmp/diff_new_pack.NdHuqB/_old 2014-09-28 19:58:01.000000000 +0200
+++ /var/tmp/diff_new_pack.NdHuqB/_new 2014-09-28 19:58:01.000000000 +0200
@@ -25,7 +25,7 @@
Summary: Utilities to uniformly interface desktop environments
License: MIT
Group: System/GUI/Other
-Version: 20140630
+Version: 20140922
Release: 0
BuildArch: noarch
Url: http://portland.freedesktop.org/
++++++ install-some-more-scripts.diff ++++++
--- /var/tmp/diff_new_pack.NdHuqB/_old 2014-09-28 19:58:02.000000000 +0200
+++ /var/tmp/diff_new_pack.NdHuqB/_new 2014-09-28 19:58:02.000000000 +0200
@@ -23,4 +23,4 @@
-# xdg-terminal
MANPAGES= $(SCRIPTS:%=man/%.1)
- WEBPAGES= $(SCRIPTS:%=%.html)
+ WEBPAGES= $(SCRIPTS:%=html/%.html)
++++++ xdg-utils-20140630.tar.xz -> xdg-utils-20140922.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/ChangeLog new/xdg-utils-20140922/ChangeLog
--- old/xdg-utils-20140630/ChangeLog 2014-07-01 13:45:18.000000000 +0200
+++ new/xdg-utils-20140922/ChangeLog 2014-09-23 18:34:19.000000000 +0200
@@ -1,5 +1,19 @@
=== xdg-utils 1.1.x ===
+2014-09-22 Rex Dieter
+ * Initial support for Plasma5 (largely thanks to Karol Herbst)
+
+2014-09-19 Rex Dieter
+ * XFCE .desktop file created for browser selection is broken (BR56092)
+ * Unnecessary filtering file:// for pcmanfm (BR63153)
+ * fails if user sets a custom IFS environment variable (BR81386)
+
+2014-09-17 Rex Dieter
+ * xdg-utils-common is broken, xdg-open uses bashism (BR83979)
+
+2014-08-25 Rex Dieter
+ * xdg-email: do not encode - character
+
2014-04-26 Rex Dieter
* xdg-open fails to open web browser urls with a query string (BR45857)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/Makefile.in new/xdg-utils-20140922/Makefile.in
--- old/xdg-utils-20140630/Makefile.in 2014-07-01 13:45:18.000000000 +0200
+++ new/xdg-utils-20140922/Makefile.in 2014-09-23 18:34:19.000000000 +0200
@@ -10,7 +10,7 @@
rm -f config.* Makefile
rm -rf autom4te.cache
-release: $(SUBDIRS:%=%/__release__) distclean
+release: $(SUBDIRS:%=%/__release__)
rm -f *~
help:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/RELEASE_NOTES new/xdg-utils-20140922/RELEASE_NOTES
--- old/xdg-utils-20140630/RELEASE_NOTES 2014-07-01 13:45:18.000000000 +0200
+++ new/xdg-utils-20140922/RELEASE_NOTES 2014-09-23 18:34:19.000000000 +0200
@@ -2,7 +2,7 @@
=================================
This release includes:
-* better support for GNOME3, KDE4, LXDE, MATE, XFCE
+* better support for GNOME3, KDE4, Plasma5, LXDE, MATE, XFCE
* initial support for generic methods (non toolkit-specific, experimental)
* xdg-settings utility, a script to get various settings from the desktop
environment
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/scripts/Makefile.in new/xdg-utils-20140922/scripts/Makefile.in
--- old/xdg-utils-20140630/scripts/Makefile.in 2014-07-01 13:45:18.000000000 +0200
+++ new/xdg-utils-20140922/scripts/Makefile.in 2014-09-23 18:34:19.000000000 +0200
@@ -27,30 +27,29 @@
# xdg-terminal
MANPAGES= $(SCRIPTS:%=man/%.1)
-WEBPAGES= $(SCRIPTS:%=%.html)
+WEBPAGES= $(SCRIPTS:%=html/%.html)
XMLFILES= $(SCRIPTS:%=desc/%.xml)
all: html man scripts
-html: index.html $(WEBPAGES)
+html: html/index.html $(WEBPAGES)
scripts: README $(SCRIPTS)
man: $(MANPAGES)
release: scripts html man
- rm -f xdg-*.in *~ HACKING generate-help-script.awk
- rm -rf desc/
- rm -rf xsl/
+ rm -f *~
+ #rm -rf desc/ xsl/
rm -f xdg-file-dialog xdg-su xdg-copy xdg-terminal
-distclean: clean
- rm -f Makefile
+distclean: clean
+ rm -f Makefile man/xdg-*.1 html/xdg-*.html
clean: scripts-clean
scripts-clean:
- rm -f $(SCRIPTS) README man/xdg-*.1 html/xdg-*.html
+ rm -f $(SCRIPTS) README
README: $(SCRIPTS)
echo > $@
@@ -103,12 +102,12 @@
man/%.1: desc/%.xml
(cd man;$(XMLTO) man ../$<)
-index.html: $(XMLFILES)
+html/index.html: $(XMLFILES)
(cat html/index.html.pre; \
xsltproc xsl/refentry2htmlindex.xsl $(XMLFILES); \
cat html/index.html.post ) > html/index.html
-%.html: desc/%.xml
+html/%.html: desc/%.xml
(cd html;$(XMLTO) html-nochunks ../$<)
%.txt: desc/%.xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/scripts/xdg-email.in new/xdg-utils-20140922/scripts/xdg-email.in
--- old/xdg-utils-20140630/scripts/xdg-email.in 2014-07-01 13:45:18.000000000 +0200
+++ new/xdg-utils-20140922/scripts/xdg-email.in 2014-09-23 18:34:19.000000000 +0200
@@ -85,8 +85,13 @@
open_kde()
{
local client kde_email_profile_name
- kde_email_profile_name=`kreadconfig --file emaildefaults --group Defaults --key Profile`
- client=`kreadconfig --file emaildefaults --group PROFILE_"$kde_email_profile_name" --key EmailClient | cut -d ' ' -f 1`
+ if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then
+ kde_email_profile_name=`kreadconfig5 --file emaildefaults --group Defaults --key Profile`
+ client=`kreadconfig5 --file emaildefaults --group PROFILE_"$kde_email_profile_name" --key EmailClient | cut -d ' ' -f 1`
+ else
+ kde_email_profile_name=`kreadconfig --file emaildefaults --group Defaults --key Profile`
+ client=`kreadconfig --file emaildefaults --group PROFILE_"$kde_email_profile_name" --key EmailClient | cut -d ' ' -f 1`
+ fi
echo $client | grep thunderbird > /dev/null 2>&1
if [ $? -eq 0 ] ; then
run_thunderbird "$client" "$1"
@@ -207,6 +212,9 @@
url_encode()
{
+# The shell needs the default internal field separator
+# otherwise it would search for $utf8 as a command in whole.
+IFS=" "
str=$(echo "$1" | $utf8)
local ORIG_LANG="$LANG"
local ORIG_LC_ALL="$LC_ALL"
@@ -226,7 +234,7 @@
c = substr ($0, i, 1)
if ( ord [c] > 127 ) {
e = e "%" sprintf("%02X", ord [c])
- } else if ( c ~ /[@a-zA-Z0-9.-\\\/]/ ) {
+ } else if ( c ~ /[@a-zA-Z0-9.\-\\\/]/ ) {
e = e c
} else {
e = e "%" sprintf("%02X", ord [c])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/scripts/xdg-mime.in new/xdg-utils-20140922/scripts/xdg-mime.in
--- old/xdg-utils-20140630/scripts/xdg-mime.in 2014-07-01 13:45:18.000000000 +0200
+++ new/xdg-utils-20140922/scripts/xdg-mime.in 2014-09-23 18:34:19.000000000 +0200
@@ -36,11 +36,7 @@
detectDE
if [ x"$DE" = x"kde" ] ; then
DEBUG 1 "Running kbuildsycoca"
- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
- eval 'kbuildsycoca4'$xdg_redirect_output
- else
- eval 'kbuildsycoca'$xdg_redirect_output
- fi
+ eval 'kbuildsycoca${KDE_SESSION_VERSION}'$xdg_redirect_output
fi
fi
for x in `echo "$PATH:/opt/gnome/bin" | sed 's/:/ /g'`; do
@@ -54,9 +50,17 @@
info_kde()
{
- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
- DEBUG 1 "Running kmimetypefinder \"$1\""
- kmimetypefinder "$1" 2>/dev/null | head -n 1
+ if [ -n "${KDE_SESSION_VERSION}" ]; then
+ case "${KDE_SESSION_VERSION}" in
+ 4)
+ DEBUG 1 "Running kmimetypefinder \"$1\""
+ kmimetypefinder "$1" 2>/dev/null | head -n 1
+ ;;
+ 5)
+ DEBUG 1 "Running kmimetypefinder${KDE_SESSION_VERSION} \"$1\""
+ kmimetypefinder${KDE_SESSION_VERSION} "$1" 2>/dev/null | head -n 1
+ ;;
+ esac
else
DEBUG 1 "Running kfile \"$1\""
kfile "$1" 2> /dev/null | head -n 1 | cut -d "(" -f 2 | cut -d ")" -f 1
@@ -394,10 +398,20 @@
defapp_kde()
{
MIME="$1"
- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
- KTRADER=`which ktraderclient 2> /dev/null`
- MIMETYPE="--mimetype"
- SERVICETYPE="--servicetype"
+
+ if [ -n "${KDE_SESSION_VERSION}" ]; then
+ 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
KTRADER=`which ktradertest 2> /dev/null`
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/scripts/xdg-open.in new/xdg-utils-20140922/scripts/xdg-open.in
--- old/xdg-utils-20140630/scripts/xdg-open.in 2014-07-01 13:45:18.000000000 +0200
+++ new/xdg-utils-20140922/scripts/xdg-open.in 2014-09-23 18:34:19.000000000 +0200
@@ -54,7 +54,7 @@
desktop_entry="y"
;;
# Reset match flag for other groups
- [*)
+ "["*)
desktop_entry=""
;;
*)
@@ -81,15 +81,18 @@
open_kde()
{
- if kde-open -v 2>/dev/null 1>&2; then
- kde-open "$1"
+ if [ -n "${KDE_SESSION_VERSION}" ]; then
+ case "${KDE_SESSION_VERSION}" in
+ 4)
+ kde-open "$1"
+ ;;
+ 5)
+ kde-open${KDE_SESSION_VERSION} "$1"
+ ;;
+ esac
else
- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
- kfmclient openURL "$1"
- else
- kfmclient exec "$1"
- kfmclient_fix_exit_code $?
- fi
+ kfmclient exec "$1"
+ kfmclient_fix_exit_code $?
fi
if [ $? -eq 0 ]; then
@@ -306,10 +309,10 @@
if (echo "$1" | grep -q '^file://' ||
! echo "$1" | egrep -q '^[[:alpha:]+\.\-]+:')
then
- local file="$(echo "$1" | sed 's%^file://%%')"
+ local file="$1"
# handle relative paths
- if ! echo "$file" | grep -q '^/'; then
+ if ! echo "$file" | egrep -q '^(file://)?/'; then
file="$(pwd)/$file"
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/scripts/xdg-settings.in new/xdg-utils-20140922/scripts/xdg-settings.in
--- old/xdg-utils-20140630/scripts/xdg-settings.in 2014-07-01 13:45:18.000000000 +0200
+++ new/xdg-utils-20140922/scripts/xdg-settings.in 2014-09-23 18:34:19.000000000 +0200
@@ -146,10 +146,15 @@
configfile="$1"
configsection="$2"
configkey="$3"
- application="`kreadconfig --file $configfile --group $configsection --key $configkey`"
+ if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then
+ application="`kreadconfig5 --file $configfile --group $configsection --key $configkey`"
+ else
+ application="`kreadconfig --file $configfile --group $configsection --key $configkey`"
+ fi
if [ x"$application" != x ]; then
echo "$application"
else
+ if [ x"${KDE_SESSION_VERSION}" = x"4" ]; then
# kreadconfig in KDE 4 may not notice Key[$*]=... localized settings, so
# check by hand if it didn't find anything (oddly kwriteconfig works
# fine though).
@@ -158,6 +163,7 @@
[ ! -f "$configfile_path" ] && return
# This will only take the first value if there is more than one.
grep "^$configkey"'\[$[^]=]*\]=' "$configfile_path" | head -n 1 | cut -d= -f 2-
+ fi
fi
}
@@ -239,7 +245,11 @@
set_browser_kde()
{
set_browser_mime "$1" || return
- kwriteconfig --file kdeglobals --group General --key BrowserApplication "$1"
+ if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then
+ kwriteconfig5 --file kdeglobals --group General --key BrowserApplication "$1"
+ else
+ kwriteconfig --file kdeglobals --group General --key BrowserApplication "$1"
+ fi
}
# }}} KDE
@@ -407,13 +417,15 @@
# Found a file to convert.
target="${XDG_DATA_HOME:-$HOME/.local/share}/xfce4/helpers"
mkdir -p "$target"
- grep -v "^Type=" "$file" > "$target/$1"
- echo "Type=X-XFCE-Helper" >> "$target/$1"
+ # Copy file up to first "Exec=" line.
+ sed -e 's/^Type=.*/Type=X-XFCE-Helper/' -e '/^Exec[=[]/,$d' "$file" > "$target/$1"
echo "X-XFCE-Category=WebBrowser" >> "$target/$1"
# Change %F, %f, %U, and %u to "%s".
- command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | sed -e 's/%[FfUu]/"%s"/g'`"
+ command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | sed -e 's/%[FfUu]/"%s"/g' | head -1`"
echo "X-XFCE-Commands=`echo "$command" | first_word`" >> "$target/$1"
echo "X-XFCE-CommandsWithParameter=$command" >> "$target/$1"
+ # Copy rest of file (from first "Exec=" line to end-of-file).
+ sed -n -e 's/^Type=.*/Type=X-XFCE-Helper/' -e '/^Exec[=[]/,$p' "$file" >> "$target/$1"
return
fi
done
@@ -514,7 +526,11 @@
set_browser_mime "$2" "x-scheme-handler/$1" || return
if [ "$1" = "mailto" ]; then
binary="`desktop_file_to_binary "$2"`"
- kwriteconfig --file emaildefaults --group PROFILE_Default --key EmailClient "$binary"
+ if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then
+ kwriteconfig5 --file emaildefaults --group PROFILE_Default --key EmailClient "$binary"
+ else
+ kwriteconfig --file emaildefaults --group PROFILE_Default --key EmailClient "$binary"
+ fi
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/scripts/xdg-utils-common.in new/xdg-utils-20140922/scripts/xdg-utils-common.in
--- old/xdg-utils-20140630/scripts/xdg-utils-common.in 2014-07-01 13:45:18.000000000 +0200
+++ new/xdg-utils-20140922/scripts/xdg-utils-common.in 2014-09-23 18:34:19.000000000 +0200
@@ -227,7 +227,7 @@
;;
--version)
- echo "@NAME@ 1.1.0 rc1"
+ echo "@NAME@ 1.1.0 rc3"
exit_success
;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140630/tests/Makefile.in new/xdg-utils-20140922/tests/Makefile.in
--- old/xdg-utils-20140630/tests/Makefile.in 2014-07-01 13:45:18.000000000 +0200
+++ new/xdg-utils-20140922/tests/Makefile.in 2014-09-23 18:34:19.000000000 +0200
@@ -15,7 +15,7 @@
all:
release:
- rm -rf xdg-su tmp
+ rm -rf tmp
rm -f xdg-test.log *~
test:
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org