From dfbaabfff2e80ed81c2f436f1f9b6a0dfc60047c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=A4=AA=E0=A5=8D=E0=A4=B0=E0=A4=B5=E0=A4=BF=E0=A4=A3=20?= =?UTF-8?q?=E0=A4=B8=E0=A4=BE=E0=A4=A4=E0=A4=AA=E0=A5=81=E0=A4=A4=E0=A5=87?= Date: Tue, 15 Jan 2013 12:36:45 +0530 Subject: [PATCH] reverting back to liberation 1.07.2 in f19 --- ...ation-fonts-bug-715309-714191-835182.patch | 1044 +++++++++++++++++ liberation-fonts-narrow.conf | 16 + liberation-fonts.spec | 58 +- sources | 2 +- 4 files changed, 1106 insertions(+), 14 deletions(-) create mode 100644 liberation-fonts-bug-715309-714191-835182.patch create mode 100644 liberation-fonts-narrow.conf diff --git a/liberation-fonts-bug-715309-714191-835182.patch b/liberation-fonts-bug-715309-714191-835182.patch new file mode 100644 index 0000000..065bc25 --- /dev/null +++ b/liberation-fonts-bug-715309-714191-835182.patch @@ -0,0 +1,1044 @@ +diff -rup liberation-fonts-1.07.2/src/LiberationMono-BoldItalic.sfd liberation-fonts-1.07.2_mod/src/LiberationMono-BoldItalic.sfd +--- liberation-fonts-1.07.2/src/LiberationMono-BoldItalic.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationMono-BoldItalic.sfd 2012-12-07 14:03:33.809419744 +0530 +@@ -13,13 +13,14 @@ Descent: 410 + LayerCount: 2 + Layer: 0 1 "Back" 1 + Layer: 1 1 "Fore" 0 ++NeedsXUIDChange: 1 + XUID: [1021 131 222397055 8302692] + FSType: 0 + OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1095817380 +-ModificationTime: 1328172358 ++ModificationTime: 1331115858 + PfmFamily: 17 + TTFWeight: 700 + TTFWidth: 5 +@@ -2841,7 +2842,7 @@ NameList: Adobe Glyph List + DisplaySize: -24 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 1113629 29 18 ++WinInfo: 783 29 18 + BeginPrivate: 0 + EndPrivate + BeginChars: 1114127 675 +@@ -75038,11 +75039,11 @@ EndChar + StartChar: uni040D + Encoding: 1037 1037 670 + Width: 1229 +-Flags: W ++Flags: HW + LayerCount: 2 + Fore ++Refer: 430 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 -15 241 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni0450 +@@ -75069,7 +75070,6 @@ StartChar: S_BE + Encoding: 1114109 -1 673 + Width: 1229 + VWidth: 0 +-Flags: H + LayerCount: 2 + Fore + SplineSet +@@ -75117,7 +75117,7 @@ EndChar + StartChar: S_TE + Encoding: 1114108 -1 674 + Width: 1229 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + Refer: 329 713 N 1 0 0 1 0 0 2 +diff -rup liberation-fonts-1.07.2/src/LiberationMono-Bold.sfd liberation-fonts-1.07.2_mod/src/LiberationMono-Bold.sfd +--- liberation-fonts-1.07.2/src/LiberationMono-Bold.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationMono-Bold.sfd 2012-12-07 14:03:33.815419698 +0530 +@@ -13,13 +13,14 @@ Descent: 410 + LayerCount: 2 + Layer: 0 1 "Back" 1 + Layer: 1 1 "Fore" 0 ++NeedsXUIDChange: 1 + XUID: [1021 131 222397055 13598569] + FSType: 0 + OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1095817380 +-ModificationTime: 1328170964 ++ModificationTime: 1331115791 + PfmFamily: 17 + TTFWeight: 700 + TTFWidth: 5 +@@ -3229,7 +3230,7 @@ NameList: Adobe Glyph List + DisplaySize: -24 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 1113629 29 18 ++WinInfo: 812 29 18 + BeginPrivate: 0 + EndPrivate + TeXData: 1 0 0 346030 173015 115343 553984 -1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 +@@ -64564,11 +64565,11 @@ EndChar + StartChar: uni040D + Encoding: 1037 1037 670 + Width: 1229 +-Flags: W ++Flags: HW + LayerCount: 2 + Fore ++Refer: 430 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 6 243 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni0450 +@@ -64595,7 +64596,6 @@ StartChar: S_BE + Encoding: 1114109 -1 673 + Width: 1229 + VWidth: 0 +-Flags: H + LayerCount: 2 + Fore + SplineSet +diff -rup liberation-fonts-1.07.2/src/LiberationMono-Italic.sfd liberation-fonts-1.07.2_mod/src/LiberationMono-Italic.sfd +--- liberation-fonts-1.07.2/src/LiberationMono-Italic.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationMono-Italic.sfd 2012-12-07 14:03:33.822419646 +0530 +@@ -13,13 +13,14 @@ Descent: 410 + LayerCount: 2 + Layer: 0 1 "Back" 1 + Layer: 1 1 "Fore" 0 ++NeedsXUIDChange: 1 + XUID: [1021 131 222397055 1812088] + FSType: 0 + OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1095817380 +-ModificationTime: 1328171470 ++ModificationTime: 1331115721 + PfmFamily: 17 + TTFWeight: 400 + TTFWidth: 5 +@@ -3415,7 +3416,7 @@ NameList: Adobe Glyph List + DisplaySize: -24 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 1113629 29 18 ++WinInfo: 783 29 18 + BeginPrivate: 0 + EndPrivate + BeginChars: 1114127 675 +@@ -80346,11 +80347,11 @@ EndChar + StartChar: uni040D + Encoding: 1037 1037 670 + Width: 1229 +-Flags: W ++Flags: HW + LayerCount: 2 + Fore ++Refer: 430 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 36.2126 241 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni0450 +@@ -80377,7 +80378,7 @@ StartChar: S_BE + Encoding: 1114109 -1 673 + Width: 1229 + VWidth: 0 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + SplineSet +@@ -80427,7 +80428,7 @@ EndChar + StartChar: S_TE + Encoding: 1114108 -1 674 + Width: 1229 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + Refer: 329 713 N 1 0 0 1 0 0 2 +diff -rup liberation-fonts-1.07.2/src/LiberationSans-BoldItalic.sfd liberation-fonts-1.07.2_mod/src/LiberationSans-BoldItalic.sfd +--- liberation-fonts-1.07.2/src/LiberationSans-BoldItalic.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationSans-BoldItalic.sfd 2012-12-07 14:03:33.829419596 +0530 +@@ -13,13 +13,14 @@ Descent: 410 + LayerCount: 2 + Layer: 0 1 "Back" 1 + Layer: 1 1 "Fore" 0 ++NeedsXUIDChange: 1 + XUID: [1021 131 222397055 951244] + FSType: 0 + OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1123372800 +-ModificationTime: 1327998476 ++ModificationTime: 1331115542 + PfmFamily: 17 + TTFWeight: 700 + TTFWidth: 5 +@@ -3000,7 +3001,7 @@ NameList: Adobe Glyph List + DisplaySize: -36 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 44 44 17 ++WinInfo: 616 44 17 + BeginPrivate: 0 + EndPrivate + BeginChars: 1114132 682 +@@ -7173,7 +7174,6 @@ SplineSet + 985 0 l 1,10,-1 + 33 0 l 1,0,-1 + EndSplineSet +-Kerns2: 20 -152 "'kern' Horizontal Kerning lookup 0 subtable" + EndChar + + StartChar: two +@@ -80985,12 +80985,12 @@ EndChar + + StartChar: uni040D + Encoding: 1037 1037 675 +-Width: 1479 +-Flags: W ++Width: 1473 ++Flags: HWO + LayerCount: 2 + Fore ++Refer: 429 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 336 306 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni045D +diff -rup liberation-fonts-1.07.2/src/LiberationSans-Bold.sfd liberation-fonts-1.07.2_mod/src/LiberationSans-Bold.sfd +--- liberation-fonts-1.07.2/src/LiberationSans-Bold.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationSans-Bold.sfd 2012-12-07 14:03:33.836419544 +0530 +@@ -13,13 +13,14 @@ Descent: 410 + LayerCount: 2 + Layer: 0 1 "Back" 1 + Layer: 1 1 "Fore" 0 ++NeedsXUIDChange: 1 + XUID: [1021 131 222397055 3251725] + FSType: 0 + OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1123372800 +-ModificationTime: 1327994263 ++ModificationTime: 1331115041 + PfmFamily: 17 + TTFWeight: 700 + TTFWidth: 5 +@@ -3103,7 +3104,7 @@ NameList: Adobe Glyph List + DisplaySize: -36 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 1113420 44 17 ++WinInfo: 616 44 17 + BeginPrivate: 0 + EndPrivate + BeginChars: 1114132 681 +@@ -6629,7 +6630,6 @@ SplineSet + 1082 0 l 1,10,-1 + 129 0 l 1,0,-1 + EndSplineSet +-Kerns2: 20 -113 "'kern' Horizontal Kerning lookup 0 subtable" + EndChar + + StartChar: two +@@ -18567,118 +18567,133 @@ StartChar: u + Encoding: 117 117 88 + Width: 1251 + Flags: W +-HStem: -20 210<479.297 667.902> 0 21G<847.5 1116> 1062 20G<127 408 827 1108> +-VStem: 127 281<269.177 1082> 827 281<3.2583 215 304.984 1082> 844.5 271.5<0 96.0013> + TtInstrs: +-SVTCA[y-axis] +-PUSHB_2 ++NPUSHB ++ 46 ++ 31 ++ 16 ++ 9 ++ 10 ++ 0 ++ 76 ++ 20 ++ 11 ++ 70 ++ 223 ++ 14 ++ 1 ++ 14 ++ 64 ++ 36 ++ 40 ++ 72 ++ 14 ++ 37 ++ 144 ++ 37 ++ 160 ++ 37 ++ 2 ++ 112 ++ 37 ++ 144 ++ 37 ++ 160 ++ 37 ++ 176 ++ 37 ++ 240 ++ 37 ++ 5 ++ 239 ++ 37 ++ 1 ++ 1 ++ 70 ++ 239 ++ 34 ++ 255 ++ 34 ++ 2 ++ 34 ++PUSHW_1 ++ -64 ++NPUSHB ++ 14 ++ 9 ++ 12 ++ 72 ++ 34 ++ 25 ++ 6 ++ 80 ++ 29 ++ 22 ++ 20 + 21 +- 8 ++ 12 ++ 0 ++ 15 ++SVTCA[y-axis] + MIAP[rnd] +-PUSHB_2 +- 2 +- 8 ++SHP[rp2] + MIAP[rnd] +-PUSHB_1 +- 11 +-MDRP[min,rnd,black] +-PUSHB_2 +- 7 +- 15 + MIAP[rnd] +-PUSHB_1 +- 16 ++MIRP[min,rnd,black] + SHP[rp1] + SVTCA[x-axis] +-PUSHB_1 +- 28 + MDAP[rnd] +-PUSHB_1 +- 6 +-MDRP[rp0,rnd,white] +-PUSHB_1 +- 9 +-MDRP[min,rnd,black] +-PUSHB_1 +- 9 ++CALL ++DELTAP1 ++MIRP[min,rnd,black] ++DELTAP1 ++DELTAP2 ++DELTAP3 + SRP0 +-PUSHB_1 +- 15 +-MDRP[rp0,min,rnd,grey] +-PUSHB_2 +- 24 +- 27 +-SHP[rp2] ++MDRP[rp0,min,rnd,white] ++CALL ++DELTAP1 ++MIRP[min,rnd,black] + SHP[rp2] +-PUSHB_1 +- 18 +-MDRP[min,rnd,black] +-PUSHB_1 +- 18 +-SRP0 +-PUSHB_1 +- 23 +-MDRP[min,rnd,black] +-PUSHB_1 +- 23 +-MDAP[rnd] +-PUSHB_1 +- 18 +-SRP0 +-PUSHB_1 +- 29 +-MDRP[rp0,rnd,white] +-PUSHB_2 +- 23 +- 15 +-SRP1 +-SRP2 +-PUSHB_1 +- 0 +-IP +-SVTCA[y-axis] +-PUSHB_2 +- 11 +- 21 +-SRP1 +-SRP2 +-PUSHB_1 +- 23 +-IP +-PUSHB_1 +- 7 +-SRP1 +-PUSHB_2 +- 0 +- 27 +-IP +-IP +-IUP[y] + IUP[x] ++IUP[y] ++SVTCA[y-axis] ++CALL + EndTTInstrs + LayerCount: 2 + Fore + SplineSet +-831 215 m 1,0,1 +- 724.008 -20 724.008 -20 483 -20 c 0,2,3 +- 299.009 -20 299.009 -20 207.5 99.5 c 0,4,5 +- 127 204.624 127 204.624 127 395 c 2,6,-1 +- 127 1082 l 1,7,-1 +- 408 1082 l 1,8,-1 +- 408 475 l 2,9,10 +- 408 190 408 190 600 190 c 0,11,12 +- 701.47 190 701.47 190 764 276.5 c 0,13,14 +- 827 363.65 827 363.65 827 502 c 2,15,-1 +- 827 1082 l 1,16,-1 +- 1108 1082 l 1,17,-1 +- 1108 242 l 2,18,19 +- 1108 104 1108 104 1116 0 c 1,20,-1 +- 848 0 l 1,21,22 +- 847 12 847 12 844.5 38.5 c 128,-1,23 +- 842 65 842 65 840.5 97 c 2,24,-1 +- 837.5 161 l 2,25,26 +- 836 193 836 193 836 215 c 1,27,-1 +- 831 215 l 1,0,1 ++408 1082 m 1,0,-1 ++ 408 475 l 2,1,2 ++ 408 412 408 412 418 359.5 c 128,-1,3 ++ 428 307 428 307 451 269.5 c 128,-1,4 ++ 474 232 474 232 510.5 211 c 128,-1,5 ++ 547 190 547 190 600 190 c 0,6,7 ++ 651 190 651 190 692.5 212.5 c 128,-1,8 ++ 734 235 734 235 764 276.5 c 128,-1,9 ++ 794 318 794 318 810.5 375.5 c 128,-1,10 ++ 827 433 827 433 827 502 c 2,11,-1 ++ 827 1082 l 1,12,-1 ++ 1108 1082 l 1,13,-1 ++ 1108 242 l 2,14,15 ++ 1108 208 1108 208 1108.5 170.5 c 128,-1,16 ++ 1109 133 1109 133 1110.5 99.5 c 128,-1,17 ++ 1112 66 1112 66 1113.5 39.5 c 128,-1,18 ++ 1115 13 1115 13 1116 0 c 1,19,-1 ++ 848 0 l 1,20,21 ++ 847 12 847 12 844.5 38.5 c 128,-1,22 ++ 842 65 842 65 840.5 97 c 128,-1,23 ++ 839 129 839 129 837.5 161 c 128,-1,24 ++ 836 193 836 193 836 215 c 1,25,-1 ++ 831 215 l 1,26,27 ++ 775 92 775 92 688.5 36 c 128,-1,28 ++ 602 -20 602 -20 483 -20 c 0,29,30 ++ 386 -20 386 -20 318 12 c 128,-1,31 ++ 250 44 250 44 207.5 99.5 c 128,-1,32 ++ 165 155 165 155 146 231 c 128,-1,33 ++ 127 307 127 307 127 395 c 2,34,-1 ++ 127 1082 l 1,35,-1 ++ 408 1082 l 1,0,-1 + EndSplineSet + EndChar + +@@ -83940,11 +83955,11 @@ EndChar + StartChar: uni040D + Encoding: 1037 1037 675 + Width: 1479 +-Flags: W ++Flags: HW + LayerCount: 2 + Fore ++Refer: 430 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 332 312 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni0450 +diff -rup liberation-fonts-1.07.2/src/LiberationSans-Italic.sfd liberation-fonts-1.07.2_mod/src/LiberationSans-Italic.sfd +--- liberation-fonts-1.07.2/src/LiberationSans-Italic.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationSans-Italic.sfd 2012-12-07 14:03:33.845419476 +0530 +@@ -13,13 +13,14 @@ Descent: 410 + LayerCount: 2 + Layer: 0 1 "Back" 1 + Layer: 1 1 "Fore" 0 ++NeedsXUIDChange: 1 + XUID: [1021 131 222397055 2032059] + FSType: 0 + OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1123372800 +-ModificationTime: 1327997434 ++ModificationTime: 1331115461 + PfmFamily: 17 + TTFWeight: 400 + TTFWidth: 5 +@@ -3144,7 +3145,7 @@ NameList: Adobe Glyph List + DisplaySize: -36 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 1113838 22 14 ++WinInfo: 836 22 14 + BeginPrivate: 0 + EndPrivate + BeginChars: 1114132 682 +@@ -5941,7 +5942,6 @@ SplineSet + 936 0 l 1,10,-1 + 53 0 l 1,0,-1 + EndSplineSet +-Kerns2: 20 -152 "'kern' Horizontal Kerning lookup 0 subtable" + EndChar + + StartChar: two +@@ -105530,12 +105530,12 @@ EndChar + + StartChar: uni040D + Encoding: 1037 1037 675 +-Width: 1479 +-Flags: W ++Width: 1465 ++Flags: HW + LayerCount: 2 + Fore ++Refer: 430 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 513 267 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni0450 +@@ -105601,7 +105601,7 @@ EndChar + StartChar: S_BE + Encoding: 1114109 -1 680 + Width: 1140 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + SplineSet +@@ -105646,13 +105646,13 @@ SplineSet + 1113.18 1431 l 1,47,48 + 898.967 1514.01 898.967 1514.01 590.877 1359 c 1,20,-1 + EndSplineSet +-Kerns2: 400 -59 "'kern' Horizontal Kerning lookup 0 subtable" 397 -45 "'kern' Horizontal Kerning lookup 0 subtable" 393 -45 "'kern' Horizontal Kerning lookup 0 subtable" 380 -37 "'kern' Horizontal Kerning lookup 0 subtable" ++Kerns2: 400 -59 "'kern' Horizontal Kerning lookup 0 subtable" 397 -45 "'kern' Horizontal Kerning lookup 0 subtable" 393 -45 "'kern' Horizontal Kerning lookup 0 subtable" 380 -37 "'kern' Horizontal Kerning lookup 0 subtable" + EndChar + + StartChar: S_TE + Encoding: 1114108 -1 681 + Width: 1700 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + Refer: 329 713 S 1 0 0 1 582 0 2 +diff -rup liberation-fonts-1.07.2/src/LiberationSansNarrow-BoldItalic.sfd liberation-fonts-1.07.2_mod/src/LiberationSansNarrow-BoldItalic.sfd +--- liberation-fonts-1.07.2/src/LiberationSansNarrow-BoldItalic.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationSansNarrow-BoldItalic.sfd 2012-12-07 14:03:33.852419425 +0530 +@@ -19,7 +19,7 @@ OS2Version: 1 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1123372800 +-ModificationTime: 1328009085 ++ModificationTime: 1331118589 + PfmFamily: 17 + TTFWeight: 700 + TTFWidth: 3 +@@ -805,7 +805,7 @@ NameList: Adobe Glyph List + DisplaySize: -36 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 65252 22 14 ++WinInfo: 660 44 17 + BeginPrivate: 0 + EndPrivate + BeginChars: 65558 682 +@@ -75122,12 +75122,12 @@ EndChar + + StartChar: uni040D + Encoding: 1037 1037 675 +-Width: 1212 +-Flags: W ++Width: 1208 ++Flags: HW + LayerCount: 2 + Fore ++Refer: 430 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 244 303 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni045D +@@ -75193,7 +75193,7 @@ EndChar + StartChar: S_BE + Encoding: 65556 -1 680 + Width: 1018 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + SplineSet +@@ -75249,7 +75249,7 @@ EndChar + StartChar: S_TE + Encoding: 65557 -1 681 + Width: 1487 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + Refer: 329 713 N 1 0 0 1 170 0 2 +diff -rup liberation-fonts-1.07.2/src/LiberationSansNarrow-Bold.sfd liberation-fonts-1.07.2_mod/src/LiberationSansNarrow-Bold.sfd +--- liberation-fonts-1.07.2/src/LiberationSansNarrow-Bold.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationSansNarrow-Bold.sfd 2012-12-07 14:03:33.858419379 +0530 +@@ -19,7 +19,7 @@ OS2Version: 1 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1123372800 +-ModificationTime: 1328007340 ++ModificationTime: 1331118512 + PfmFamily: 17 + TTFWeight: 700 + TTFWidth: 3 +@@ -800,7 +800,7 @@ NameList: Adobe Glyph List + DisplaySize: -36 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 924 22 14 ++WinInfo: 880 44 17 + BeginPrivate: 0 + EndPrivate + BeginChars: 65556 681 +@@ -59702,12 +59702,12 @@ EndChar + + StartChar: uni040D + Encoding: 1037 1037 675 +-Width: 1212 +-Flags: W ++Width: 1208 ++Flags: HW + LayerCount: 2 + Fore ++Refer: 430 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 317 316 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni0450 +@@ -59773,7 +59773,7 @@ EndChar + StartChar: S_BE + Encoding: 65522 -1 680 + Width: 1018 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + SplineSet +diff -rup liberation-fonts-1.07.2/src/LiberationSansNarrow-Italic.sfd liberation-fonts-1.07.2_mod/src/LiberationSansNarrow-Italic.sfd +--- liberation-fonts-1.07.2/src/LiberationSansNarrow-Italic.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationSansNarrow-Italic.sfd 2012-12-07 14:03:33.865419328 +0530 +@@ -19,7 +19,7 @@ OS2Version: 1 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1123372800 +-ModificationTime: 1328010105 ++ModificationTime: 1331118431 + PfmFamily: 17 + TTFWeight: 400 + TTFWidth: 3 +@@ -790,7 +790,7 @@ NameList: Adobe Glyph List + DisplaySize: -36 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 65280 20 14 ++WinInfo: 616 44 17 + BeginPrivate: 0 + EndPrivate + BeginChars: 65558 682 +@@ -78424,12 +78424,12 @@ EndChar + + StartChar: uni040D + Encoding: 1037 1037 675 +-Width: 1212 +-Flags: W ++Width: 1202 ++Flags: HW + LayerCount: 2 + Fore ++Refer: 430 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 474 270 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni0450 +@@ -78495,7 +78495,7 @@ EndChar + StartChar: S_BE + Encoding: 65556 -1 680 + Width: 936 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + SplineSet +@@ -78546,7 +78546,7 @@ EndChar + StartChar: S_TE + Encoding: 65557 -1 681 + Width: 1395 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + Refer: 329 713 S 1 0 0 1 220 0 2 +diff -rup liberation-fonts-1.07.2/src/LiberationSansNarrow-Regular.sfd liberation-fonts-1.07.2_mod/src/LiberationSansNarrow-Regular.sfd +--- liberation-fonts-1.07.2/src/LiberationSansNarrow-Regular.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationSansNarrow-Regular.sfd 2012-12-07 14:03:33.870419290 +0530 +@@ -19,7 +19,7 @@ OS2Version: 1 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1123372800 +-ModificationTime: 1328004541 ++ModificationTime: 1331118372 + PfmFamily: 17 + TTFWeight: 400 + TTFWidth: 3 +@@ -785,7 +785,7 @@ NameList: Adobe Glyph List + DisplaySize: -36 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 0 44 17 ++WinInfo: 528 44 17 + BeginPrivate: 0 + EndPrivate + BeginChars: 65556 681 +@@ -35767,7 +35767,7 @@ StartChar: afii10026 + Encoding: 1048 1048 430 + Width: 1207 + GlyphClass: 2 +-Flags: W ++Flags: WO + TtInstrs: + SVTCA[y-axis] + PUSHB_3 +@@ -61982,12 +61982,12 @@ EndChar + + StartChar: uni040D + Encoding: 1037 1037 675 +-Width: 1212 +-Flags: W ++Width: 1207 ++Flags: HWO + LayerCount: 2 + Fore ++Refer: 430 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 317 264 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni0450 +@@ -62053,7 +62053,7 @@ EndChar + StartChar: S_BE + Encoding: 65522 -1 680 + Width: 934 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + SplineSet +diff -rup liberation-fonts-1.07.2/src/LiberationSans-Regular.sfd liberation-fonts-1.07.2_mod/src/LiberationSans-Regular.sfd +--- liberation-fonts-1.07.2/src/LiberationSans-Regular.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationSans-Regular.sfd 2012-12-07 14:03:33.877419238 +0530 +@@ -13,13 +13,14 @@ Descent: 410 + LayerCount: 2 + Layer: 0 1 "Back" 1 + Layer: 1 1 "Fore" 0 ++NeedsXUIDChange: 1 + XUID: [1021 131 222397055 16587066] + FSType: 0 + OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1123372800 +-ModificationTime: 1327993790 ++ModificationTime: 1331114858 + PfmFamily: 17 + TTFWeight: 400 + TTFWidth: 5 +@@ -2842,7 +2843,7 @@ NameList: Adobe Glyph List + DisplaySize: -36 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 0 44 17 ++WinInfo: 748 44 17 + BeginPrivate: 0 + EndPrivate + BeginChars: 1114132 681 +@@ -5825,7 +5826,6 @@ SplineSet + 1039 0 l 1,10,-1 + 156 0 l 1,0,-1 + EndSplineSet +-Kerns2: 20 -152 "'kern' Horizontal Kerning lookup 0 subtable" + EndChar + + StartChar: two +@@ -86834,11 +86834,11 @@ EndChar + StartChar: uni040D + Encoding: 1037 1037 675 + Width: 1479 +-Flags: W ++Flags: HW + LayerCount: 2 + Fore +-Refer: 67 96 N 1 0 0 1 405 269 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 ++Refer: 430 1048 N 1 0 0 1 0 0 2 ++Refer: 67 96 N 1 0 0 1 385 269 2 + EndChar + + StartChar: uni0450 +diff -rup liberation-fonts-1.07.2/src/LiberationSerif-BoldItalic.sfd liberation-fonts-1.07.2_mod/src/LiberationSerif-BoldItalic.sfd +--- liberation-fonts-1.07.2/src/LiberationSerif-BoldItalic.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationSerif-BoldItalic.sfd 2012-12-07 14:03:33.884419185 +0530 +@@ -20,7 +20,7 @@ OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1123398000 +-ModificationTime: 1328001460 ++ModificationTime: 1331117345 + PfmFamily: 17 + TTFWeight: 700 + TTFWidth: 5 +@@ -3180,7 +3180,7 @@ NameList: Adobe Glyph List + DisplaySize: -24 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 682 31 18 ++WinInfo: 868 31 18 + BeginPrivate: 0 + EndPrivate + BeginChars: 1114124 672 +@@ -94874,12 +94874,12 @@ EndChar + + StartChar: uni040D + Encoding: 1037 1037 667 +-Width: 1479 +-Flags: W ++Width: 1593 ++Flags: HW + LayerCount: 2 + Fore ++Refer: 430 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 295 333 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni0450 +@@ -94965,7 +94965,7 @@ EndChar + StartChar: S_TE + Encoding: 1114108 -1 671 + Width: 1706 +-Flags: HWO ++Flags: W + LayerCount: 2 + Fore + Refer: 329 713 N 1 0 0 1 560 0 2 +diff -rup liberation-fonts-1.07.2/src/LiberationSerif-Bold.sfd liberation-fonts-1.07.2_mod/src/LiberationSerif-Bold.sfd +--- liberation-fonts-1.07.2/src/LiberationSerif-Bold.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationSerif-Bold.sfd 2012-12-07 14:03:33.892419125 +0530 +@@ -13,13 +13,14 @@ Descent: 410 + LayerCount: 2 + Layer: 0 1 "Back" 1 + Layer: 1 1 "Fore" 0 ++NeedsXUIDChange: 1 + XUID: [1021 131 222397055 11337752] + FSType: 0 + OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1123398000 +-ModificationTime: 1327999755 ++ModificationTime: 1331117181 + PfmFamily: 17 + TTFWeight: 700 + TTFWidth: 5 +@@ -2704,7 +2705,7 @@ NameList: Adobe Glyph List + DisplaySize: -24 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 66 33 18 ++WinInfo: 627 33 18 + BeginPrivate: 0 + EndPrivate + BeginChars: 1114124 671 +@@ -93433,12 +93434,12 @@ EndChar + + StartChar: uni040D + Encoding: 1037 1037 667 +-Width: 1479 +-Flags: W ++Width: 1593 ++Flags: HW + LayerCount: 2 + Fore ++Refer: 430 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 339 334 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni0450 +@@ -93464,7 +93465,7 @@ EndChar + StartChar: S_BE + Encoding: 1114109 -1 670 + Width: 1063 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + SplineSet +diff -rup liberation-fonts-1.07.2/src/LiberationSerif-Italic.sfd liberation-fonts-1.07.2_mod/src/LiberationSerif-Italic.sfd +--- liberation-fonts-1.07.2/src/LiberationSerif-Italic.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationSerif-Italic.sfd 2012-12-07 14:03:33.900419067 +0530 +@@ -13,13 +13,14 @@ Descent: 410 + LayerCount: 2 + Layer: 0 1 "Back" 1 + Layer: 1 1 "Fore" 0 ++NeedsXUIDChange: 1 + XUID: [1021 131 222397055 13298560] + FSType: 0 + OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1123398000 +-ModificationTime: 1328000087 ++ModificationTime: 1331117272 + PfmFamily: 17 + TTFWeight: 400 + TTFWidth: 5 +@@ -3100,7 +3101,7 @@ NameList: Adobe Glyph List + DisplaySize: -24 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 60 30 18 ++WinInfo: 690 30 18 + BeginPrivate: 0 + EndPrivate + BeginChars: 1114124 673 +@@ -88694,12 +88695,12 @@ EndChar + + StartChar: uni040D + Encoding: 1037 1037 668 +-Width: 1366 +-Flags: W ++Width: 1479 ++Flags: HW + LayerCount: 2 + Fore ++Refer: 430 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 254 332 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni0450 +@@ -88725,7 +88726,7 @@ EndChar + StartChar: S_BE + Encoding: 1114109 -1 671 + Width: 965 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + SplineSet +diff -rup liberation-fonts-1.07.2/src/LiberationSerif-Regular.sfd liberation-fonts-1.07.2_mod/src/LiberationSerif-Regular.sfd +--- liberation-fonts-1.07.2/src/LiberationSerif-Regular.sfd 2012-02-09 13:35:55.000000000 +0530 ++++ liberation-fonts-1.07.2_mod/src/LiberationSerif-Regular.sfd 2012-12-07 14:03:33.908419007 +0530 +@@ -13,13 +13,14 @@ Descent: 410 + LayerCount: 2 + Layer: 0 1 "Back" 1 + Layer: 1 1 "Fore" 0 ++NeedsXUIDChange: 1 + XUID: [1021 131 222397055 16509670] + FSType: 0 + OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1123398000 +-ModificationTime: 1327999557 ++ModificationTime: 1331117005 + PfmFamily: 17 + TTFWeight: 400 + TTFWidth: 5 +@@ -2742,7 +2743,7 @@ NameList: Adobe Glyph List + DisplaySize: -24 + AntiAlias: 1 + FitToEm: 1 +-WinInfo: 1113629 29 18 ++WinInfo: 696 29 18 + BeginPrivate: 0 + EndPrivate + BeginChars: 1114124 672 +@@ -97065,11 +97066,11 @@ EndChar + StartChar: uni040D + Encoding: 1037 1037 668 + Width: 1479 +-Flags: W ++Flags: HWO + LayerCount: 2 + Fore ++Refer: 430 1048 N 1 0 0 1 0 0 2 + Refer: 67 96 N 1 0 0 1 279 330 2 +-Refer: 49 78 N 1 0 0 1 0 0 2 + EndChar + + StartChar: uni0450 +@@ -97095,7 +97096,7 @@ EndChar + StartChar: S_BE + Encoding: 1114109 -1 671 + Width: 965 +-Flags: HW ++Flags: W + LayerCount: 2 + Fore + SplineSet diff --git a/liberation-fonts-narrow.conf b/liberation-fonts-narrow.conf new file mode 100644 index 0000000..fdbe20d --- /dev/null +++ b/liberation-fonts-narrow.conf @@ -0,0 +1,16 @@ + + + + + sans-serif + + Liberation Sans Narrow + + + + Liberation Sans Narrow + + sans-serif + + + diff --git a/liberation-fonts.spec b/liberation-fonts.spec index a1c1e96..eb7a836 100644 --- a/liberation-fonts.spec +++ b/liberation-fonts.spec @@ -1,4 +1,4 @@ -%global priority 30-0 +%global priority 59 %global fontname liberation %global fontconf %{priority}-%{fontname} %global archivename %{name}-%{version} @@ -11,20 +11,27 @@ New. Name: %{fontname}-fonts Summary: Fonts to replace commonly used Microsoft Windows fonts -Version: 2.00.1 -Release: 4%{?dist} -License: OFL +Version: 1.07.2 +Release: 12%{?dist} +Epoch: 1 +# The license of the Liberation Fonts is a EULA that contains GPLv2 and two +# exceptions: +# The first exception is the standard FSF font exception. +# The second exception is an anti-lockdown clause somewhat like the one in +# GPLv3. This license is Free, but GPLv2 and GPLv3 incompatible. +License: Liberation Group: User Interface/X URL: http://fedorahosted.org/liberation-fonts/ Source0: https://fedorahosted.org/releases/l/i/liberation-fonts/%{archivename}.tar.gz Source2: %{name}-mono.conf Source3: %{name}-sans.conf Source4: %{name}-serif.conf +Source5: %{name}-narrow.conf BuildArch: noarch BuildRequires: fontpackages-devel >= 1.13, xorg-x11-font-utils BuildRequires: fontforge -BuildRequires: python BuildRequires: fonttools +Patch1: %{name}-bug-715309-714191-835182.patch %description %common_desc @@ -33,11 +40,10 @@ Meta-package of Liberation fonts which installs Sans, Serif, and Monospace, Narrow families. %package -n %{fontname}-fonts-common +Epoch: 1 Summary: Shared common files of Liberation font families Group: User Interface/X Requires: fontpackages-filesystem >= 1.13 -Obsoletes: liberation-fonts < 1.04.93-7 -Obsoletes: liberation-fonts-compat <= 1.05.1.20090630 %description -n %{fontname}-fonts-common %common_desc @@ -45,7 +51,7 @@ Obsoletes: liberation-fonts-compat <= 1.05.1.20090630 Shared common files of Liberation font families. %files -n %{fontname}-fonts-common -%doc AUTHORS ChangeLog LICENSE README TODO +%doc AUTHORS ChangeLog COPYING License.txt README TODO %dir %{_fontdir} %verify(not md5 size mtime) %{_fontdir}/fonts.dir %verify(not md5 size mtime) %{_fontdir}/fonts.scale @@ -54,7 +60,7 @@ Shared common files of Liberation font families. %package -n %{fontname}-sans-fonts Summary: Sans-serif fonts to replace commonly used Microsoft Arial Group: User Interface/X -Requires: %{fontname}-fonts-common = %{version}-%{release} +Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release} %description -n %{fontname}-sans-fonts %common_desc @@ -66,7 +72,7 @@ This is Sans-serif TrueType fonts that replaced commonly used Microsoft Arial. %package -n %{fontname}-serif-fonts Summary: Serif fonts to replace commonly used Microsoft Times New Roman Group: User Interface/X -Requires: %{fontname}-fonts-common = %{version}-%{release} +Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release} %description -n %{fontname}-serif-fonts %common_desc @@ -79,7 +85,7 @@ Roman. %package -n %{fontname}-mono-fonts Summary: Monospace fonts to replace commonly used Microsoft Courier New Group: User Interface/X -Requires: %{fontname}-fonts-common = %{version}-%{release} +Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release} %description -n %{fontname}-mono-fonts %common_desc @@ -89,8 +95,22 @@ New. %_font_pkg -n mono -f *-%{fontname}-mono.conf LiberationMono*.ttf +%package -n %{fontname}-narrow-fonts +Summary: Sans-serif Narrow fonts to replace commonly used Microsoft Arial Narrow +Group: User Interface/X +Requires: %{fontname}-fonts-common = %{epoch}:%{version}-%{release} + +%description -n %{fontname}-narrow-fonts +%common_desc + +This is Sans-Serif Narrow TrueType fonts that replaced commonly used Microsoft \ +Arial Narrow. + +%_font_pkg -n narrow -f *-%{fontname}-narrow.conf LiberationSansNarrow*.ttf + %prep %setup -q -n %{archivename} +%patch1 -p1 -b .1-resolved-u-hinting-removed-kerning-for-11-pair-updated-patch-for-fix-u040D %build make %{?_smp_mflags} @@ -115,10 +135,13 @@ install -m 0644 -p %{SOURCE3} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sans.conf install -m 0644 -p %{SOURCE4} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-serif.conf +install -m 0644 -p %{SOURCE5} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-narrow.conf for fconf in %{fontconf}-mono.conf \ %{fontconf}-sans.conf \ - %{fontconf}-serif.conf; do + %{fontconf}-serif.conf \ + %{fontconf}-narrow.conf; do ln -s %{_fontconfig_templatedir}/$fconf \ %{buildroot}%{_fontconfig_confdir}/$fconf done @@ -128,7 +151,16 @@ mkfontscale %{buildroot}%{_fontdir} mkfontdir %{buildroot}%{_fontdir} %changelog -* Thu Nov 22 2012 Pravin Satpute - 2.00.1-4 +* Tue Jan 15 2013 Pravin Satpute - 1:1.07.2-12 +- Corrected font conf priority from 30-0 to 59 +- building from f18 to rawhide + +* Fri Dec 07 2012 Pravin Satpute - 1:1.07.2-11 +- Decided to defer Liberation 2.0 feature in Fedora 18. +- Reverting to Liberation 1.07.2. +- Using 11 release to match with Liberation Sans Narrow + +* Wed Nov 21 2012 Pravin Satpute - 2.00.1-4 - Improved spec file * Tue Nov 20 2012 Pravin Satpute - 2.00.1-3 diff --git a/sources b/sources index cdf6331..e1b5f2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a0dfdcffcd0398afe5f57269198846e9 liberation-fonts-2.00.1.tar.gz +293b364f3de019f0b19ddd54d36737e6 liberation-fonts-1.07.2.tar.gz