3353bf4722
```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,\(^--- \)\(./\)*,\1a/, s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1, s/[.-][Oo][Rr][Ii][Gg]$// s/[.]patched[.]\([^.]\)/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,\(^+++ \)\(./\)*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ```
79 lines
4.8 KiB
Diff
79 lines
4.8 KiB
Diff
--- a/src/u_fonts.c
|
|
+++ b/src/u_fonts.c
|
|
@@ -22,41 +22,41 @@
|
|
/* X11 font names */
|
|
|
|
struct _xfstruct x_fontinfo[NUM_FONTS] = {
|
|
- {"-*-times-medium-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-times-medium-i-normal--", (struct xfont*) NULL},
|
|
- {"-*-times-bold-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-times-bold-i-normal--", (struct xfont*) NULL},
|
|
- {"-*-avantgarde-book-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-avantgarde-book-o-normal--", (struct xfont*) NULL},
|
|
- {"-*-avantgarde-demi-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-avantgarde-demi-o-normal--", (struct xfont*) NULL},
|
|
- {"-*-bookman-light-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-bookman-light-i-normal--", (struct xfont*) NULL},
|
|
- {"-*-bookman-demi-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-bookman-demi-i-normal--", (struct xfont*) NULL},
|
|
- {"-*-courier-medium-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-courier-medium-o-normal--", (struct xfont*) NULL},
|
|
- {"-*-courier-bold-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-courier-bold-o-normal--", (struct xfont*) NULL},
|
|
- {"-*-helvetica-medium-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-helvetica-medium-o-normal--", (struct xfont*) NULL},
|
|
- {"-*-helvetica-bold-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-helvetica-bold-o-normal--", (struct xfont*) NULL},
|
|
- {"-*-helvetica-medium-r-narrow--", (struct xfont*) NULL},
|
|
- {"-*-helvetica-medium-o-narrow--", (struct xfont*) NULL},
|
|
- {"-*-helvetica-bold-r-narrow--", (struct xfont*) NULL},
|
|
- {"-*-helvetica-bold-o-narrow--", (struct xfont*) NULL},
|
|
- {"-*-new century schoolbook-medium-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-new century schoolbook-medium-i-normal--", (struct xfont*) NULL},
|
|
- {"-*-new century schoolbook-bold-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-new century schoolbook-bold-i-normal--", (struct xfont*) NULL},
|
|
- {"-*-palatino-medium-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-palatino-medium-i-normal--", (struct xfont*) NULL},
|
|
- {"-*-palatino-bold-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-palatino-bold-i-normal--", (struct xfont*) NULL},
|
|
- {"-*-symbol-medium-r-normal--", (struct xfont*) NULL},
|
|
- {"-*-itc zapf chancery-medium-i-normal--", (struct xfont*) NULL},
|
|
- {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus roman no9 l-medium-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus roman no9 l-medium-i-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus roman no9 l-bold-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus roman no9 l-bold-i-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-urw gothic l-medium-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-urw gothic l-medium-o-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-urw gothic l-semibold-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-urw gothic l-semibold-o-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-urw bookman l-medium-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-urw bookman l-medium-i-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-urw bookman l-bold-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-urw bookman l-bold-i-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus mono l-medium-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus mono l-medium-o-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus mono l-bold-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus mono l-bold-o-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus sans l-medium-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus sans l-medium-i-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus sans l-bold-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus sans l-bold-i-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus sans l condensed-medium-r-condensed--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus sans l condensed-medium-i-condensed--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus sans l condensed-bold-r-condensed--", (struct xfont*) NULL},
|
|
+ {"-urw-nimbus sans l condensed-bold-i-condensed--", (struct xfont*) NULL},
|
|
+ {"-urw-century schoolbook l-medium-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-century schoolbook l-medium-i-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-century schoolbook l-bold-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-century schoolbook l-bold-i-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-urw palladio l-medium-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-urw palladio l-medium-i-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-urw palladio l-bold-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-urw palladio l-bold-i-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-standard symbols l-medium-r-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-urw chancery l-medium-i-normal--", (struct xfont*) NULL},
|
|
+ {"-urw-dingbats-medium-r-normal--", (struct xfont*) NULL},
|
|
};
|
|
|
|
/* Use the following font names for any font that doesn't exist in the table above.
|