Merge branch 'geany-master'

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+# Before applying suggested PRs, make sure that the new versions of any
+# updated actions are allowed in
+# https://github.com/organizations/geany/settings/actions
+# Versions are pinned and restricted for security reasons.
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/build.yml

@@ -15,7 +15,7 @@ on:
 
 # cancel already running builds of the same branch or pull request
 concurrency:
-  group: ci-${{ github.head_ref }} || concat(${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
 env:
@@ -45,7 +45,7 @@ jobs:
       CXX: ccache g++
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # create and use a timestamp for the cache key: GH Actions will never update a cache
       # only use an existing cache item or create a new one. To use an existing cache *and*
@@ -56,7 +56,7 @@ jobs:
         run: echo "timestamp=$(date +%Y-%m-%d-%H-%M)" >> $GITHUB_OUTPUT
 
       - name: Configure ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ runner.os }}-${{ github.job }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
@@ -117,7 +117,7 @@ jobs:
       CXX: ccache g++
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # create and use a timestamp for the cache key: GH Actions will never update a cache
       # only use an existing cache item or create a new one. To use an existing cache *and*
@@ -128,7 +128,7 @@ jobs:
         run: echo "timestamp=$(date +%Y-%m-%d-%H-%M)" >> $GITHUB_OUTPUT
 
       - name: Configure ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.CCACHE_DIR }}
           key: ${{ runner.os }}-${{ github.job }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
@@ -183,10 +183,10 @@ jobs:
 
     steps:
       - name: Checkout Geany
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Checkout Build Scripts
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: master
           repository: geany/infrastructure
@@ -212,7 +212,7 @@ jobs:
             env | sort
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.DOCKER_REGISTRY }}
           username: ${{ github.actor }}
@@ -243,7 +243,7 @@ jobs:
             bash start_build.sh --log-to-stdout --mingw64 --geany --geany-source "${{ github.workspace }}"
 
       - name: Archive Geany Installer
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: geany-installer-ci-${{ env.SHORT_SHA }}-pr${{ env.GITHUB_PULL_REQUEST_OR_REF }}
           retention-days: 30

.github/workflows/codeql.yml

@@ -0,0 +1,80 @@
+name: "CodeQL"
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "master" ]
+    paths:
+    - '**.c'
+    - '**.cpp'
+    - '**.h'
+    - '**.hpp'
+    - '**.py'
+    - '!**.yml'
+    - '**/codeql.yml'
+  pull_request:
+    branches: [ "master" ]
+    paths:
+    - '**.c'
+    - '**.cpp'
+    - '**.h'
+    - '**.hpp'
+    - '**.py'
+    - '!**.yml'
+    - '**/codeql.yml'
+  schedule:
+    - cron: '15 20 15 * *'
+
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'c-cpp', 'python' ]
+        # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get install --assume-yes --no-install-recommends \
+          ccache \
+          gettext autopoint \
+          libtool \
+          libgtk-3-dev \
+          doxygen \
+          python3-docutils \
+          python3-lxml \
+          rst2pdf
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

README.md

@@ -9,6 +9,11 @@ as possible from a special Desktop Environment like KDE or GNOME. So it
 is using only the GTK+ toolkit and therefore you need only the
 GTK+ runtime libraries to run Geany.
 
+.. image:: doc/images/main_window.png
+  :width: 750
+  :alt: Screenshot of Geany showing the main user interface
+  :target: doc/images/main_window.png
+
 
 ## Features
 

ctags/Makefile.am

@@ -85,6 +85,7 @@ parsers = \
 	parsers/pascal.c \
 	parsers/perl.c \
 	parsers/perl.h \
+	parsers/perl6.c \
 	parsers/php.c \
 	parsers/powershell.c \
 	parsers/python.c \