Skip to content

Commit df18175

Browse files
authored
Merge branch 'master' into jeremypw/clone/show-progress-in-sidebar
2 parents 2ab619e + f9ca61b commit df18175

File tree

615 files changed

+25292
-18959
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

615 files changed

+25292
-18959
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
image: ghcr.io/elementary/docker:${{ matrix.version }}
1919

2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
- name: Install Dependencies
2323
run: |
2424
apt update
@@ -50,7 +50,7 @@ jobs:
5050

5151
steps:
5252
- name: Checkout
53-
uses: actions/checkout@v4
53+
uses: actions/checkout@v5
5454

5555
- name: Build
5656
uses: flatpak/flatpak-github-actions/[email protected]
@@ -71,7 +71,7 @@ jobs:
7171

7272
steps:
7373
- name: Checkout
74-
uses: actions/checkout@v4
74+
uses: actions/checkout@v5
7575

7676
- name: Lint
7777
run: io.elementary.vala-lint -d .

.github/workflows/merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99

1010
steps:
1111
- name: Clone repository
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v5
1313
with:
1414
token: ${{ secrets.GIT_USER_TOKEN }}
1515

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
- uses: elementary/actions/release@main
1414
env:
1515
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"

data/code.metainfo.xml.in

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929

3030
<screenshots>
3131
<screenshot type="default">
32-
<image>https://raw.githubusercontent.com/elementary/code/8.1.0/data/screenshot.png</image>
32+
<image>https://raw.githubusercontent.com/elementary/code/8.1.1/data/screenshot.png</image>
3333
</screenshot>
3434
<screenshot>
35-
<image>https://raw.githubusercontent.com/elementary/code/8.1.0/data/screenshot-dark.png</image>
35+
<image>https://raw.githubusercontent.com/elementary/code/8.1.1/data/screenshot-dark.png</image>
3636
</screenshot>
3737
</screenshots>
3838

@@ -68,6 +68,21 @@
6868
<update_contact>contact_AT_elementary.io</update_contact>
6969

7070
<releases>
71+
<release version="8.1.1" date="2025-09-06" urgency="medium">
72+
<description>
73+
<p>Minor updates:</p>
74+
<ul>
75+
<li>The terminal pane is now synchronized with the Terminal app foreground, background and palette settings</li>
76+
<li>The terminal pane is now synchronized with GNOME font and cursor blink settings</li>
77+
<li>Updated translations</li>
78+
</ul>
79+
</description>
80+
<issues>
81+
<issue url="https://github.com/elementary/code/issues/1586">Relies on external Terminal settings keys</issue>
82+
<issue url="https://github.com/elementary/code/issues/457">Exiting process running in terminal leaves terminal useless</issue>
83+
<issue url="https://github.com/elementary/code/issues/276">Listen for changes to Terminal color scheme</issue>
84+
</issues>
85+
</release>
7186
<release version="8.1.0" date="2025-08-01" urgency="medium">
7287
<description>
7388
<p>Improvements:</p>

meson.build

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project(
22
'io.elementary.code',
33
'vala', 'c',
44
meson_version: '>= 0.58.0',
5-
version: '8.1.0'
5+
version: '8.1.1'
66
)
77

88
add_project_arguments([
@@ -73,6 +73,40 @@ if get_option('development') and git.found ()
7373
branch = output.stdout().strip()
7474
endif
7575

76+
# Profiler linking code taken from https://github.com/RidgeRun/gst-inference/blob/master/meson.build
77+
# with some amendments
78+
# 'libprofiler' and 'libtcmalloc' are provided by installing (e.g.) 'google-perftools' and 'libgoogle-pertools-dev'
79+
# Profiling is not active unless either the correct environment variables are set at runtime
80+
# or the profiling is switched on/off in the code using the CPU_PROFILING and HEAP_PROFILING conditional compilation flags
81+
# with the commands Profiler.start (<path-to-profile-output>) and Profiler.stop () and the corresponding HeapProfiler functions
82+
# It is advisable not to run cpu profiling at the same time as heap profiling
83+
# If meson options are changed then rebuild with 'cd .. && sudo rm -R ./build && build'
84+
# See https://github.com/gperftools/gperftools/blob/master/docs/cpuprofile.adoc
85+
# and https://github.com/gperftools/gperftools/blob/master/docs/heapprofile.adoc
86+
if get_option('cpu-profiling-enabled')
87+
profiler_dep = dependency ('libprofiler')
88+
if(profiler_dep.found())
89+
message('CPU profiling enabled: Building with profiling support.')
90+
add_global_link_arguments ('-lprofiler', language: 'c')
91+
add_project_arguments ('--define=PROFILING', language: 'vala')
92+
dependencies += profiler_dep
93+
else
94+
message('MESON_FAIL: CPU profiling requested but libprofiler (gperftools) not found.')
95+
endif
96+
endif
97+
if get_option('heap-profiling-enabled')
98+
heap_profiler_dep = dependency ('libtcmalloc')
99+
if(heap_profiler_dep.found())
100+
message('Heap profiling enabled: Building with heap profiling support.')
101+
add_global_link_arguments ('-ltcmalloc', language: 'c')
102+
add_project_arguments ('--define=HEAP_PROFILING', language: 'vala')
103+
dependencies += heap_profiler_dep
104+
else
105+
message('MESON_FAIL: Heap profiling requested but libtcmalloc (gperftools) not found.')
106+
endif
107+
endif
108+
109+
76110
subdir('data')
77111
subdir('src')
78112
if get_option('plugins')

meson_options.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
option('plugins', type : 'boolean', value : true)
22
option('have_pkexec', type : 'boolean', value : true, description : 'Allow launching with pkexec. Should not be used in FlatPak')
33
option('development', type : 'boolean', value : false, description : 'Build is a development branch')
4+
option('cpu-profiling-enabled', type : 'boolean', value : false, description: 'Enable cpu profiling')
5+
option('heap-profiling-enabled', type : 'boolean', value : false, description: 'Enable heap profiling')

po/LINGUAS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,3 +198,5 @@ aa
198198
ab
199199
gn
200200
an
201+
zh_HANT
202+
zh_HANS

po/aa.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2025-07-23 15:37+0000\n"
5+
"POT-Creation-Date: 2025-09-07 16:45+0000\n"
66
"PO-Revision-Date: 2015-12-18 20:01+0000\n"
77
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
88
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -1021,11 +1021,11 @@ msgstr ""
10211021
msgid "Toggle Comment"
10221022
msgstr ""
10231023

1024-
#: src/Widgets/Terminal.vala:62
1024+
#: src/Widgets/Terminal.vala:140
10251025
msgid "Copy"
10261026
msgstr ""
10271027

1028-
#: src/Widgets/Terminal.vala:63
1028+
#: src/Widgets/Terminal.vala:141
10291029
msgid "Paste"
10301030
msgstr ""
10311031

po/ab.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2025-07-23 15:37+0000\n"
5+
"POT-Creation-Date: 2025-09-07 16:45+0000\n"
66
"PO-Revision-Date: 2015-12-18 20:01+0000\n"
77
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
88
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -1021,11 +1021,11 @@ msgstr ""
10211021
msgid "Toggle Comment"
10221022
msgstr ""
10231023

1024-
#: src/Widgets/Terminal.vala:62
1024+
#: src/Widgets/Terminal.vala:140
10251025
msgid "Copy"
10261026
msgstr ""
10271027

1028-
#: src/Widgets/Terminal.vala:63
1028+
#: src/Widgets/Terminal.vala:141
10291029
msgid "Paste"
10301030
msgstr ""
10311031

po/ae.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
msgid ""
22
msgstr ""
33
"Report-Msgid-Bugs-To: \n"
4-
"POT-Creation-Date: 2025-07-23 15:37+0000\n"
4+
"POT-Creation-Date: 2025-09-07 16:45+0000\n"
55
"MIME-Version: 1.0\n"
66
"Content-Type: text/plain; charset=UTF-8\n"
77

@@ -1013,11 +1013,11 @@ msgstr ""
10131013
msgid "Toggle Comment"
10141014
msgstr ""
10151015

1016-
#: src/Widgets/Terminal.vala:62
1016+
#: src/Widgets/Terminal.vala:140
10171017
msgid "Copy"
10181018
msgstr ""
10191019

1020-
#: src/Widgets/Terminal.vala:63
1020+
#: src/Widgets/Terminal.vala:141
10211021
msgid "Paste"
10221022
msgstr ""
10231023

0 commit comments

Comments
 (0)