author | Jay Cotton <Jay.Cotton@Oracle.COM> |
Sat, 01 Oct 2016 21:55:12 -0700 | |
changeset 7037 | 680031ff5b57 |
permissions | -rw-r--r-- |
7037
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
1 |
Existing set of desktop patches |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
2 |
Not suitable for upstream |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
3 |
|
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
4 |
diff -up xdg-utils-1.0.2/scripts/xdg-desktop-menu.orig xdg-utils-1.0.2/scripts/xdg-desktop-menu |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
5 |
--- xdg-utils-1.0.2/scripts/xdg-desktop-menu.orig 2008-02-13 12:19:40.000000000 +0000 |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
6 |
+++ xdg-utils-1.0.2/scripts/xdg-desktop-menu 2008-02-13 12:32:47.396025000 +0000 |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
7 |
@@ -641,7 +641,7 @@ update_desktop_database() |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
8 |
fixup_mandriva_categories() |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
9 |
{ |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
10 |
DEBUG 1 "fixup_mandriva_categories $1" |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
11 |
- awk ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
12 |
+ nawk ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
13 |
BEGIN { |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
14 |
xlat["AudioVideo"]="X-Mandrakelinux-Multimedia;X-MandrivaLinux-Multimedia" |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
15 |
xlat["Development"]="X-Mandrakelinux-MoreApplications-Development;X-MandrivaLinux-MoreApplications-Development" |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
16 |
@@ -685,7 +685,7 @@ make_lazy_default() |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
17 |
local xdg_default_dirs |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
18 |
|
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
19 |
DEBUG 1 "make_lazy_default $1/$2" |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
20 |
- mimetypes=`awk ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
21 |
+ mimetypes=`nawk ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
22 |
{ |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
23 |
if (match($0,/MimeType=/)) { |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
24 |
split(substr($0,RSTART+9),mimetypes,";") |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
25 |
@@ -832,7 +832,7 @@ update_submenu() |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
26 |
tmpfile=`mktemp $TMPDIR/tmp.XXXXXXXXXX` |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
27 |
orig_desktop_files= |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
28 |
if [ -r "$orig_menu_file" ] ; then |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
29 |
- awk ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
30 |
+ nawk ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
31 |
# List all files within <Filename> tags |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
32 |
BEGIN { |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
33 |
RS="<" |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
34 |
@@ -926,7 +926,7 @@ BEGIN { |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
35 |
tmpfile=`mktemp $TMPDIR/tmp.XXXXXXXXXX` |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
36 |
for menu_file in $xdg_dir/*; do |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
37 |
if grep 'generated and managed by xdg-desktop-menu' $menu_file > /dev/null 2> /dev/null; then |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
38 |
- awk ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
39 |
+ nawk ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
40 |
# List all files within <Directory> tags |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
41 |
BEGIN { |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
42 |
RS="<" |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
43 |
|
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
44 |
diff -up xdg-utils-1.0.2/scripts/xdg-email.orig xdg-utils-1.0.2/scripts/xdg-email |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
45 |
--- xdg-utils-1.0.2/scripts/xdg-email.orig 2008-02-13 12:19:40.000000000 +0000 |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
46 |
+++ xdg-utils-1.0.2/scripts/xdg-email 2008-02-13 12:32:52.343450000 +0000 |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
47 |
@@ -454,7 +454,7 @@ open_generic() |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
48 |
|
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
49 |
url_encode() |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
50 |
{ |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
51 |
-result=$(echo "$1" | $utf8 | awk ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
52 |
+result=$(echo "$1" | $utf8 | nawk ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
53 |
BEGIN { |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
54 |
for ( i=1; i<=255; ++i ) ord [ sprintf ("%c", i) "" ] = i + 0 |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
55 |
e = "" |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
56 |
|
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
57 |
diff -up xdg-utils-1.0.2/scripts/xdg-mime.orig xdg-utils-1.0.2/scripts/xdg-mime |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
58 |
--- xdg-utils-1.0.2/scripts/xdg-mime.orig 2008-02-13 12:19:40.000000000 +0000 |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
59 |
+++ xdg-utils-1.0.2/scripts/xdg-mime 2008-02-13 12:32:56.308218000 +0000 |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
60 |
@@ -508,7 +508,7 @@ make_default_kde() |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
61 |
DEBUG 1 "Updating $default_file" |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
62 |
mkdir -p "$HOME/.kde/share/config" |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
63 |
[ -f $default_file ] || touch $default_file |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
64 |
- awk -v application="$1" -v mimetype="$2" ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
65 |
+ nawk -v application="$1" -v mimetype="$2" ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
66 |
BEGIN { |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
67 |
header_start="[" mimetype " - " |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
68 |
supress=0 |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
69 |
@@ -894,7 +894,7 @@ mimetypes= |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
70 |
if [ -n "$kde_dir" ] ; then |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
71 |
DEBUG 2 "KDE3 mimelnk directory found, extracting mimetypes from XML file" |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
72 |
|
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
73 |
- mimetypes=`awk < "$filename" ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
74 |
+ mimetypes=`nawk < "$filename" ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
75 |
# Strip XML comments |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
76 |
BEGIN { |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
77 |
supress=0 |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
78 |
@@ -923,7 +923,7 @@ BEGIN { |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
79 |
} |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
80 |
while(1) |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
81 |
} |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
82 |
-' | awk ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
83 |
+' | nawk ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
84 |
# List MIME types listed in <mime-type> tags |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
85 |
BEGIN { |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
86 |
RS="<" |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
87 |
@@ -954,7 +954,7 @@ case $action in |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
88 |
for x in $mimetypes ; do |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
89 |
DEBUG 1 "Installing $kde_dir/$x.desktop (KDE 3.x support)" |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
90 |
mkdir -p `dirname $kde_dir/$x.desktop` |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
91 |
- awk < "$filename" ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
92 |
+ nawk < "$filename" ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
93 |
# Strip XML comments |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
94 |
BEGIN { |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
95 |
supress=0 |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
96 |
@@ -983,7 +983,7 @@ BEGIN { |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
97 |
} |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
98 |
while(1) |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
99 |
} |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
100 |
-' | awk > $kde_dir/$x.desktop ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
101 |
+' | nawk > $kde_dir/$x.desktop ' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
102 |
# Extract mimetype $x from the XML file $filename |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
103 |
# Note that bash requires us to escape a single quote as '"'"' |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
104 |
BEGIN { |
680031ff5b57
23245496 Move xdg-utils 1.0.2 to Userland
Jay Cotton <Jay.Cotton@Oracle.COM>
parents:
diff
changeset
|
105 |