Skip to content

Commit 28cd056

Browse files
committed
vte deprecated get_text_range() -> get_text_range_format()
1 parent fb84093 commit 28cd056

23 files changed

Lines changed: 296 additions & 398 deletions

BRANDING.mak

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33

44
VERSION_MAJOR = 1
55
VERSION_MINOR = 4
6-
VERSION_MICRO = 10
6+
VERSION_MICRO = 11
77
BRANDING_SHORTNAME = mainline
88
BRANDING_LONGNAME = Mainline Kernels
9+
BRANDING_COPYRIGHT = 2019-2025
910
BRANDING_AUTHORNAME = Brian K. White
1011
BRANDING_AUTHOREMAIL = b.kenyon.w@gmail.com
1112
BRANDING_WEBSITE = https://github.com/bkw777/mainline

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ json-glib := json-glib-1.0
3535
gee := gee-0.8
3636

3737
#VALACFLAGS += $(shell pkg-config $(json-glib) --atleast-version=1.6 && echo " -D HAVE_GLIB_JSON_1_6")
38-
#VALACFLAGS += $(shell pkg-config $(vte) --atleast-version=0.66 && echo " -D HAVE_VTE_0_66")
38+
#VALACFLAGS += $(shell pkg-config $(vte) --atleast-version=0.72 && echo " -D VTE_0_72")
3939
VALACFLAGS += $(shell pkg-config $(glib) --atleast-version=2.56 || echo " --target-glib 2.32")
4040

4141
include BRANDING.mak
@@ -44,6 +44,7 @@ build_symbols := -X -D'INSTALL_PREFIX="$(prefix)"' \
4444
-X -D'BRANDING_SHORTNAME="$(BRANDING_SHORTNAME)"' \
4545
-X -D'BRANDING_LONGNAME="$(BRANDING_LONGNAME)"' \
4646
-X -D'BRANDING_VERSION="$(BRANDING_VERSION)"' \
47+
-X -D'BRANDING_COPYRIGHT="$(BRANDING_COPYRIGHT)"' \
4748
-X -D'BRANDING_AUTHORNAME="$(BRANDING_AUTHORNAME)"' \
4849
-X -D'BRANDING_AUTHOREMAIL="$(BRANDING_AUTHOREMAIL)"' \
4950
-X -D'BRANDING_WEBSITE="$(BRANDING_WEBSITE)"' \
@@ -98,10 +99,11 @@ $(BRANDING_SHORTNAME)-gtk: $(misc_files) $(common_vala_files) $(gui_vala_files)
9899
$(misc_files): %: %.src BRANDING.mak
99100
sed -e 's|BRANDING_SHORTNAME|$(BRANDING_SHORTNAME)|g' \
100101
-e 's|BRANDING_LONGNAME|$(BRANDING_LONGNAME)|g' \
102+
-e 's|BRANDING_VERSION|$(BRANDING_VERSION)|g' \
103+
-e 's|BRANDING_COPYRIGHT|$(BRANDING_COPYRIGHT)|g' \
101104
-e 's|BRANDING_AUTHORNAME|$(BRANDING_AUTHORNAME)|g' \
102105
-e 's|BRANDING_AUTHOREMAIL|$(BRANDING_AUTHOREMAIL)|g' \
103106
-e 's|BRANDING_WEBSITE|$(BRANDING_WEBSITE)|g' \
104-
-e 's|BRANDING_VERSION|$(BRANDING_VERSION)|g' \
105107
-e 's|BRANDING_GITREPO|$(BRANDING_GITREPO)|g' \
106108
$(@).src >$(@)
107109

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,11 @@ Sorting on the "Notes" column is a way to see all kernels that have any notes to
171171

172172
## Secure Boot
173173
If you want to have secure boot, then you need to have a signed kernel, and the mainline kernels are not signed.
174-
174+
175175
This might be an answer.
176176
I did not write this, have not tried to use it, nor even looked at it's code to see if it should be trusted.
177177
It appears to be a script that you install in /etc that will be automatically triggered by dpkg as a post-install step.
178-
(I think you also have to read the rest of the readme to set up a shim and owner-key etc, this script would just be the last step to integrate with dpkg after you got everything else actually working.)
179-
178+
(I think you also have to read the rest of the readme to set up a shim and owner-key etc, this script would just be the last step to integrate with dpkg after you got everything else actually working.)
180179
https://github.com/berglh/ubuntu-sb-kernel-signing?tab=readme-ov-file#automated-signing-of-mainline-kernels-installed-with-mainline-or-via-dpkg
181180
<!-- https://github.com/M-P-P-C/Signing-a-Linux-Kernel-for-Secure-Boot -->
182181

README.md.src

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,14 @@ Sorting on the "Notes" column is a way to see all kernels that have any notes to
170170
Then **Uninstall Old** should successfully remove everything.
171171

172172
## Secure Boot
173-
Possibly useful, I have not tried:
174-
https://github.com/M-P-P-C/Signing-a-Linux-Kernel-for-Secure-Boot
173+
If you want to have secure boot, then you need to have a signed kernel, and the mainline kernels are not signed.
174+
175+
This might be an answer.
176+
I did not write this, have not tried to use it, nor even looked at it's code to see if it should be trusted.
177+
It appears to be a script that you install in /etc that will be automatically triggered by dpkg as a post-install step.
178+
(I think you also have to read the rest of the readme to set up a shim and owner-key etc, this script would just be the last step to integrate with dpkg after you got everything else actually working.)
179+
https://github.com/berglh/ubuntu-sb-kernel-signing?tab=readme-ov-file#automated-signing-of-mainline-kernels-installed-with-mainline-or-via-dpkg
180+
<!-- https://github.com/M-P-P-C/Signing-a-Linux-Kernel-for-Secure-Boot -->
175181

176182
## Kernels with broken dependencies
177183
The build environment that builds the kernels is newer than most installed systems, and so the built kernels occasionally but regularly break compatibility with all current release and older systems.

TRANSLATORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ el: Vasilis Kosmidis <skyhirules@gmail.com>
33
es: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
44
fr: Yolateng0 <yo@yo.nohost.me>
55
hr: gogo <trebelnik2@gmail.com>
6+
hu: Kálmán „KAMI” Szalai <kami911@gmail.com>
67
it: Demetrio Mendozzi
78
ko: Kevin Kim <root@hamonikr.org>
89
nl: Heimen Stoffels <vistausss@outlook.com>

po/de.po

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: mainline\n"
44
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2023-10-16 01:53-0400\n"
5+
"POT-Creation-Date: 2025-02-02 12:11-0500\n"
66
"PO-Revision-Date: 2023-02-20 18:40+0100\n"
77
"Last-Translator: Tobyw121 <Tobiasw763@gmail.com>\n"
88
"Language-Team: German\n"
@@ -226,63 +226,63 @@ msgstr "Keine updates"
226226

227227
#. Translators: uppercase, or otherwise emphasized, display version of a single character for "yes",
228228
#. * string may be longer than one character. Examples: "Y" or "[y]"
229-
#: src/Common/Main.vala:123
229+
#: src/Common/Main.vala:124
230230
msgid "Y"
231231
msgstr "J"
232232

233233
#. Translators: lowercase, or otherwise not-emphasized, single keypress user response for "yes",
234234
#. * Example: "y"
235-
#: src/Common/Main.vala:126
235+
#: src/Common/Main.vala:127
236236
msgid "y"
237237
msgstr "j"
238238

239239
#. Translators: uppercase, or otherwise emphasized, display version of a single character for "no",
240240
#. * string may be longer than one character. Examples: "N" or "[n]"
241-
#: src/Common/Main.vala:129
241+
#: src/Common/Main.vala:130
242242
msgid "N"
243243
msgstr "N"
244244

245245
#. Translators: lowercase, or otherwise not-emphasized, single keypress user response for "no",
246246
#. * Example: "n"
247-
#: src/Common/Main.vala:132
247+
#: src/Common/Main.vala:133
248248
msgid "n"
249249
msgstr "n"
250250

251-
#: src/Common/Main.vala:224
251+
#: src/Common/Main.vala:225
252252
msgid "Missing threads support in GLib."
253253
msgstr "Fehlende thread unterstützung in GLib"
254254

255-
#: src/Common/Main.vala:320
255+
#: src/Common/Main.vala:321
256256
msgid "Wrote config file"
257257
msgstr "Konfigurationsdatei geschrieben"
258258

259-
#: src/Common/Main.vala:339
259+
#: src/Common/Main.vala:340
260260
msgid "No config file"
261261
msgstr "Keine konfigurationsdatei"
262262

263-
#: src/Common/Main.vala:422
263+
#: src/Common/Main.vala:423
264264
msgid "Loaded config file"
265265
msgstr "Geladene konfigurationsdatei"
266266

267-
#: src/Common/Main.vala:444
267+
#: src/Common/Main.vala:445
268268
msgid "Called from"
269269
msgstr "Aufgerufen von"
270270

271-
#: src/Common/Main.vala:444
271+
#: src/Common/Main.vala:445
272272
msgid "at logon"
273273
msgstr "bei der anmeldung"
274274

275-
#: src/Common/Main.vala:445
275+
#: src/Common/Main.vala:446
276276
msgid ""
277277
"This file is over-written and executed again whenever settings are saved in"
278278
msgstr ""
279279
"Diese datei wird überschrieben und erneut ausgeführt, wenn einstellungen in"
280280

281-
#: src/Common/Main.vala:485
281+
#: src/Common/Main.vala:486
282282
msgid "Notifications are disabled"
283283
msgstr "Benachrichtigungen sind deaktiviert"
284284

285-
#: src/Common/Main.vala:538
285+
#: src/Common/Main.vala:539
286286
msgid "Can not reach site"
287287
msgstr "Die webseite kann nicht erreicht werden"
288288

@@ -619,14 +619,6 @@ msgstr ""
619619
"Ein werkzeug zum installieren von kernel paketen\n"
620620
"aus dem Ubuntu Mainline Kernels PPA"
621621

622-
#: src/Gtk/MainWindow.vala:433
623-
msgid "Original"
624-
msgstr "Original"
625-
626-
#: src/Gtk/MainWindow.vala:434
627-
msgid "Forked"
628-
msgstr "Abspaltung"
629-
630622
#: src/Gtk/MainWindow.vala:444
631623
msgid "Updating Kernels..."
632624
msgstr "Kernel Werden Aktualisiert... "
@@ -901,17 +893,17 @@ msgstr "Zum beispiel erfordert %s \"%s\"."
901893
msgid "Copy"
902894
msgstr "Kopieren"
903895

904-
#: src/Gtk/TerminalWindow.vala:138
896+
#: src/Gtk/TerminalWindow.vala:142
905897
msgid ""
906898
"Copies the entire output buffer, including scrollback, to the clipboard."
907899
msgstr ""
908900
"Kopiert den gesamten ausgabepuffer, einschließlich scrollback, in die "
909901
"zwischenablage"
910902

911-
#: src/Gtk/TerminalWindow.vala:145
903+
#: src/Gtk/TerminalWindow.vala:149
912904
msgid "Cancel"
913905
msgstr "Abbrechen"
914906

915-
#: src/Gtk/TerminalWindow.vala:153
907+
#: src/Gtk/TerminalWindow.vala:157
916908
msgid "Close"
917909
msgstr "Schließen"

po/el.po

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: mainline\n"
44
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2023-10-16 01:53-0400\n"
5+
"POT-Creation-Date: 2025-02-02 12:11-0500\n"
66
"PO-Revision-Date: 2023-01-10 02:03-0600\n"
77
"Last-Translator: Vasilis Kosmidis <skyhirules@gmail.com>\n"
88
"Language-Team: Greek\n"
@@ -227,64 +227,64 @@ msgstr ""
227227

228228
#. Translators: uppercase, or otherwise emphasized, display version of a single character for "yes",
229229
#. * string may be longer than one character. Examples: "Y" or "[y]"
230-
#: src/Common/Main.vala:123
230+
#: src/Common/Main.vala:124
231231
msgid "Y"
232232
msgstr "Ν"
233233

234234
#. Translators: lowercase, or otherwise not-emphasized, single keypress user response for "yes",
235235
#. * Example: "y"
236-
#: src/Common/Main.vala:126
236+
#: src/Common/Main.vala:127
237237
msgid "y"
238238
msgstr "ν"
239239

240240
#. Translators: uppercase, or otherwise emphasized, display version of a single character for "no",
241241
#. * string may be longer than one character. Examples: "N" or "[n]"
242-
#: src/Common/Main.vala:129
242+
#: src/Common/Main.vala:130
243243
msgid "N"
244244
msgstr "Ο"
245245

246246
#. Translators: lowercase, or otherwise not-emphasized, single keypress user response for "no",
247247
#. * Example: "n"
248-
#: src/Common/Main.vala:132
248+
#: src/Common/Main.vala:133
249249
msgid "n"
250250
msgstr "ό"
251251

252-
#: src/Common/Main.vala:224
252+
#: src/Common/Main.vala:225
253253
msgid "Missing threads support in GLib."
254254
msgstr ""
255255

256-
#: src/Common/Main.vala:320
256+
#: src/Common/Main.vala:321
257257
msgid "Wrote config file"
258258
msgstr "Έγραψε αρχείο ρυθμίσεων"
259259

260-
#: src/Common/Main.vala:339
260+
#: src/Common/Main.vala:340
261261
msgid "No config file"
262262
msgstr "Κανένα αρχείο διαμόρφωσης"
263263

264-
#: src/Common/Main.vala:422
264+
#: src/Common/Main.vala:423
265265
msgid "Loaded config file"
266266
msgstr "Φορτωμένο αρχείο διαμόρφωσης"
267267

268-
#: src/Common/Main.vala:444
268+
#: src/Common/Main.vala:445
269269
msgid "Called from"
270270
msgstr "Κλήθηκε από"
271271

272-
#: src/Common/Main.vala:444
272+
#: src/Common/Main.vala:445
273273
msgid "at logon"
274274
msgstr "κατά την εκκίνηση"
275275

276-
#: src/Common/Main.vala:445
276+
#: src/Common/Main.vala:446
277277
msgid ""
278278
"This file is over-written and executed again whenever settings are saved in"
279279
msgstr ""
280280
"Αυτό το αρχείο αντικαθίσταται και εκτελείται ξανά κάθε φορά που "
281281
"αποθηκεύονται οι ρυθμίσεις στο"
282282

283-
#: src/Common/Main.vala:485
283+
#: src/Common/Main.vala:486
284284
msgid "Notifications are disabled"
285285
msgstr "Οι ειδοποιήσεις είναι απενεργοποιημένες"
286286

287-
#: src/Common/Main.vala:538
287+
#: src/Common/Main.vala:539
288288
msgid "Can not reach site"
289289
msgstr "Αποτυχία ανάγνωσης του αρχείου"
290290

@@ -620,14 +620,6 @@ msgstr ""
620620
"Ένα εργαλείο για την εγκατάσταση πακέτων πυρήνα\n"
621621
"από το Ubuntu Mainline Kernels PPA"
622622

623-
#: src/Gtk/MainWindow.vala:433
624-
msgid "Original"
625-
msgstr "Πρωτότυπο"
626-
627-
#: src/Gtk/MainWindow.vala:434
628-
msgid "Forked"
629-
msgstr "Διχαλωτός"
630-
631623
#: src/Gtk/MainWindow.vala:444
632624
msgid "Updating Kernels..."
633625
msgstr ""
@@ -883,17 +875,17 @@ msgstr ""
883875
msgid "Copy"
884876
msgstr "Αντιγράψτε"
885877

886-
#: src/Gtk/TerminalWindow.vala:138
878+
#: src/Gtk/TerminalWindow.vala:142
887879
msgid ""
888880
"Copies the entire output buffer, including scrollback, to the clipboard."
889881
msgstr ""
890882
"Αντιγράφει ολόκληρη την προσωρινή μνήμη εξόδου, συμπεριλαμβανομένου του "
891883
"scrollback, στο πρόχειρο."
892884

893-
#: src/Gtk/TerminalWindow.vala:145
885+
#: src/Gtk/TerminalWindow.vala:149
894886
msgid "Cancel"
895887
msgstr "Άκυρο"
896888

897-
#: src/Gtk/TerminalWindow.vala:153
889+
#: src/Gtk/TerminalWindow.vala:157
898890
msgid "Close"
899891
msgstr "Κλείσιμο"

0 commit comments

Comments
 (0)