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