unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
blob a00e1f252155a970aecce967de57149fb64f5334 11285 bytes (raw)
name: gnu/packages/patches/cool-retro-term-remove-non-free-fonts.patch 	 # note: path name is non-authoritative(*)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
 
From be4e30368ea3b4b99af647b44a32dae464511c2b Mon Sep 17 00:00:00 2001
From: Petter <petter@mykolab.ch>
Date: Thu, 27 Apr 2017 18:55:10 +0200
Subject: [PATCH] Remove non-free fonts from settings menu

---
 app/qml/ApplicationSettings.qml | 20 ++++++++++----------
 app/qml/FontPixels.qml          | 16 ++++++++--------
 app/qml/FontScanlines.qml       | 16 ++++++++--------
 app/qml/Fonts.qml               | 20 ++++++++++----------
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/app/qml/ApplicationSettings.qml b/app/qml/ApplicationSettings.qml
index d0f8beb..240c522 100644
--- a/app/qml/ApplicationSettings.qml
+++ b/app/qml/ApplicationSettings.qml
@@ -409,36 +409,36 @@ QtObject{
             obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000","bloom":0.4,"brightness":0.5,"flickering":0.1,"contrast":0.85,"fontName":"TERMINUS_SCALED","fontColor":"#0ccc68","frameName":"SIMPLE_WHITE_FRAME","glowingLine":0.2,"horizontalSync":0.16,"jitter":0.18,"burnIn":0.45,"staticNoise":0.1,"rasterization":0,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":false,"customCommand":""}'
             builtin: true
         }
-        ListElement{
+        /*ListElement{
             text: "Default Scanlines"
             obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000","bloom":0.4,"brightness":0.5,"flickering":0.1,"contrast":0.85,"fontName":"COMMODORE_PET","fontColor":"#00ff5b","frameName":"SIMPLE_WHITE_FRAME","glowingLine":0.2,"horizontalSync":0.14,"jitter":0.11,"burnIn":0.4,"staticNoise":0.05,"rasterization":1,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":false,"customCommand":""}'
             builtin: true
-        }
-        ListElement{
+        }*/
+        /*ListElement{
             text: "Default Pixelated"
             obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000","bloom":0,"brightness":0.5,"flickering":0.2,"contrast":0.85,"fontName":"COMMODORE_PET","fontColor":"#ffffff","frameName":"ROUGH_BLACK_FRAME","glowingLine":0.2,"horizontalSync":0.2,"jitter":0,"burnIn":0.45,"staticNoise":0.19,"rasterization":2,"screenCurvature":0.05,"windowOpacity":1,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":false,"customCommand":""}'
             builtin: true
-        }
-        ListElement{
+        }*/
+        /*ListElement{
             text: "Apple ]["
             obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000","bloom":0.5,"brightness":0.5,"flickering":0.2,"contrast":0.85,"fontName":"APPLE_II","fontColor":"#2fff91","frameName":"SIMPLE_WHITE_FRAME","glowingLine":0.22,"horizontalSync":0.16,"jitter":0.1,"burnIn":0.65,"staticNoise":0.08,"rasterization":1,"screenCurvature":0.18,"windowOpacity":1,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":false,"customCommand":""}'
             builtin: true
-        }
-        ListElement{
+        }*/
+        /*ListElement{
             text: "Vintage"
             obj_string: '{"ambientLight":0.5,"backgroundColor":"#000000","bloom":0.4,"brightness":0.5,"flickering":0.9,"contrast":0.80,"fontName":"COMMODORE_PET","fontColor":"#00ff3e","frameName":"ROUGH_BLACK_FRAME","glowingLine":0.3,"horizontalSync":0.42,"jitter":0.4,"burnIn":0.75,"staticNoise":0.2,"rasterization":1,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":false,"customCommand":""}'
             builtin: true
-        }
+        }*/
         ListElement{
             text: "IBM Dos"
             obj_string: '{"ambientLight":0.16,"backgroundColor":"#000000","bloom":0.4,"brightness":0.5,"flickering":0.07,"contrast":0.85,"fontName":"IBM_DOS","fontColor":"#ffffff","frameName":"SIMPLE_WHITE_FRAME","glowingLine":0.13,"horizontalSync":0,"jitter":0.16,"burnIn":0.3,"staticNoise":0.03,"rasterization":0,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":1,"saturationColor":0,"rbgShift":0.35,"fontWidth":1.0,"useCustomCommand":false,"customCommand":""}'
             builtin: true
         }
-        ListElement{
+        /*ListElement{
             text: "IBM 3278"
             obj_string: '{"ambientLight":0.1,"backgroundColor":"#000000","bloom":0.15,"brightness":0.5,"flickering":0,"contrast":0.85,"fontName":"IBM_3278","fontColor":"#0ccc68","frameName":"SIMPLE_WHITE_FRAME","glowingLine":0,"horizontalSync":0,"jitter":0,"burnIn":0.6,"staticNoise":0,"rasterization":0,"screenCurvature":0.1,"windowOpacity":1,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":false,"customCommand":""}'
             builtin: true
-        }
+        }*/
         ListElement{
             text: "Transparent Green"
             obj_string: '{"ambientLight":0.2,"backgroundColor":"#000000","bloom":0.45,"brightness":0.5,"flickering":0.20,"contrast":0.85,"fontName":"TERMINUS_SCALED","fontColor":"#0ccc68","frameName":"NO_FRAME","glowingLine":0.16,"horizontalSync":0.1,"jitter":0.20,"burnIn":0.25,"staticNoise":0.20,"rasterization":0,"screenCurvature":0.05,"windowOpacity":0.60,"chromaColor":0,"saturationColor":0,"rbgShift":0,"fontWidth":1.0,"useCustomCommand":false,"customCommand":""}'
diff --git a/app/qml/FontPixels.qml b/app/qml/FontPixels.qml
index 6ff85da..88ff6c1 100644
--- a/app/qml/FontPixels.qml
+++ b/app/qml/FontPixels.qml
@@ -32,7 +32,7 @@ QtObject{
     property bool lowResolutionFont: true
 
     property ListModel fontlist: ListModel{
-        ListElement{
+        /*ListElement{
             name: "COMMODORE_PET"
             text: "Commodore PET (1977)"
             source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf"
@@ -40,7 +40,7 @@ QtObject{
             pixelSize: 8
             baseScaling: 4.0
             fontWidth: 0.8
-        }
+        }*/
         ListElement{
             name: "PROGGY_TINY"
             text: "Proggy Tiny (Modern)"
@@ -68,7 +68,7 @@ QtObject{
             baseScaling: 3.0
             fontWidth: 1.0
         }
-        ListElement{
+        /*ListElement{
             name: "APPLE_II"
             text: "Apple ][ (1977)"
             source: "fonts/1977-apple2/PrintChar21.ttf"
@@ -76,8 +76,8 @@ QtObject{
             pixelSize: 8
             baseScaling: 4.0
             fontWidth: 0.9
-        }
-        ListElement{
+        }*/
+        /*ListElement{
             name: "ATARI_400"
             text: "Atari 400-800 (1979)"
             source: "fonts/1979-atari-400-800/ATARI400800_original.TTF"
@@ -85,8 +85,8 @@ QtObject{
             pixelSize: 8
             baseScaling: 4.0
             fontWidth: 0.8
-        }
-        ListElement{
+        }*/
+        /*ListElement{
             name: "COMMODORE_64"
             text: "Commodore 64 (1982)"
             source: "fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf"
@@ -94,6 +94,6 @@ QtObject{
             pixelSize: 8
             baseScaling: 4.0
             fontWidth: 0.8
-        }
+        }*/
     }
 }
diff --git a/app/qml/FontScanlines.qml b/app/qml/FontScanlines.qml
index eebf00b..112f446 100644
--- a/app/qml/FontScanlines.qml
+++ b/app/qml/FontScanlines.qml
@@ -32,7 +32,7 @@ QtObject{
     property bool lowResolutionFont: true
 
     property ListModel fontlist: ListModel{
-        ListElement{
+        /*ListElement{
             name: "COMMODORE_PET"
             text: "Commodore PET (1977)"
             source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf"
@@ -40,7 +40,7 @@ QtObject{
             pixelSize: 8
             baseScaling: 4.0
             fontWidth: 0.7
-        }
+        }*/
         ListElement{
             name: "PROGGY_TINY"
             text: "Proggy Tiny (Modern)"
@@ -68,7 +68,7 @@ QtObject{
             baseScaling: 3.0
             fontWidth: 1.0
         }
-        ListElement{
+        /*ListElement{
             name: "APPLE_II"
             text: "Apple ][ (1977)"
             source: "fonts/1977-apple2/PrintChar21.ttf"
@@ -76,8 +76,8 @@ QtObject{
             pixelSize: 8
             baseScaling: 4.0
             fontWidth: 0.8
-        }
-        ListElement{
+        }*/
+        /*ListElement{
             name: "ATARI_400"
             text: "Atari 400-800 (1979)"
             source: "fonts/1979-atari-400-800/ATARI400800_original.TTF"
@@ -85,8 +85,8 @@ QtObject{
             pixelSize: 8
             baseScaling: 4.0
             fontWidth: 0.7
-        }
-        ListElement{
+        }*/
+        /*ListElement{
             name: "COMMODORE_64"
             text: "Commodore 64 (1982)"
             source: "fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf"
@@ -94,6 +94,6 @@ QtObject{
             pixelSize: 8
             baseScaling: 4.0
             fontWidth: 0.7
-        }
+        }*/
     }
 }
diff --git a/app/qml/Fonts.qml b/app/qml/Fonts.qml
index ad20844..857d00e 100644
--- a/app/qml/Fonts.qml
+++ b/app/qml/Fonts.qml
@@ -80,7 +80,7 @@ QtObject{
             fontWidth: 1.0
             lowResolutionFont: true
         }
-        ListElement{
+        /*ListElement{
             name: "COMMODORE_PET_SCALED"
             text: "Commodore PET (1977)"
             source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf"
@@ -89,7 +89,7 @@ QtObject{
             baseScaling: 3.5
             fontWidth: 0.7
             lowResolutionFont: true
-        }
+        }*/
         ListElement{
             name: "PROGGY_TINY_SCALED"
             text: "Proggy Tiny (Modern)"
@@ -100,7 +100,7 @@ QtObject{
             fontWidth: 0.9
             lowResolutionFont: true
         }
-        ListElement{
+        /*ListElement{
             name: "APPLE_II_SCALED"
             text: "Apple ][ (1977)"
             source: "fonts/1977-apple2/PrintChar21.ttf"
@@ -109,8 +109,8 @@ QtObject{
             baseScaling: 3.5
             fontWidth: 0.8
             lowResolutionFont: true
-        }
-        ListElement{
+        }*/
+        /*ListElement{
             name: "ATARI_400_SCALED"
             text: "Atari 400-800 (1979)"
             source: "fonts/1979-atari-400-800/ATARI400800_original.TTF"
@@ -119,8 +119,8 @@ QtObject{
             baseScaling: 3.5
             fontWidth: 0.7
             lowResolutionFont: true
-        }
-        ListElement{
+        }*/
+        /*ListElement{
             name: "COMMODORE_64_SCALED"
             text: "Commodore 64 (1982)"
             source: "fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf"
@@ -129,7 +129,7 @@ QtObject{
             baseScaling: 3.5
             fontWidth: 0.7
             lowResolutionFont: true
-        }
+        }*/
         ListElement{
             name: "ATARI_ST_SCALED"
             text: "Atari ST (1985)"
@@ -140,7 +140,7 @@ QtObject{
             fontWidth: 1.0
             lowResolutionFont: true
         }
-        ListElement{
+        /*ListElement{
             name: "IBM_DOS"
             text: "IBM DOS (1985)"
             source: "fonts/1985-ibm-pc-vga/Perfect DOS VGA 437 Win.ttf"
@@ -149,7 +149,7 @@ QtObject{
             baseScaling: 2.0
             fontWidth: 1.0
             lowResolutionFont: true
-        }
+        }*/
         ListElement{
             name: "HERMIT"
             text: "HD: Hermit (Modern)"
-- 
2.12.2


debug log:

solving a00e1f252 ...
found a00e1f252 in https://yhetil.org/guix-devel/20170428141037.6a4038f6@mykolab.ch/

applying [1/1] https://yhetil.org/guix-devel/20170428141037.6a4038f6@mykolab.ch/
diff --git a/gnu/packages/patches/cool-retro-term-remove-non-free-fonts.patch b/gnu/packages/patches/cool-retro-term-remove-non-free-fonts.patch
new file mode 100644
index 000000000..a00e1f252

1:76: trailing whitespace.
 
1:137: trailing whitespace.
 
1:272: trailing whitespace.
-- 
Checking patch gnu/packages/patches/cool-retro-term-remove-non-free-fonts.patch...
1:274: new blank line at EOF.
+
Applied patch gnu/packages/patches/cool-retro-term-remove-non-free-fonts.patch cleanly.
warning: 4 lines add whitespace errors.

index at:
100644 a00e1f252155a970aecce967de57149fb64f5334	gnu/packages/patches/cool-retro-term-remove-non-free-fonts.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).