Merge branch 'release-squeekboard-1.24.0' into 'main'

Release Squeekboard 1.24.0

See merge request World/Phosh/squeekboard!622

.gitlab-ci.yml

@@ -1,4 +1,21 @@
-image: pureos/byzantium
+image: debian:bookworm
+
+variables:
+  DEBIAN_FRONTEND: noninteractive
+
+default:
+  # Protect CI infra from rogue jobs
+  timeout: 15 minutes
+  # Allow jobs to be caneled on new commits
+  interruptible: true
+  # Retry on infra hickups automatically
+  retry:
+    max: 1
+    when:
+      - api_failure
+      - runner_system_failure
+      - scheduler_failure
+      - stuck_or_timeout_failure
 
 stages:
   - build
@@ -10,27 +27,25 @@ before_script:
   - apt-get -y install ca-certificates
 
 build_docs:
+  image: debian:trixie
   stage: build
   artifacts:
     paths:
       - _build
   script:
-    - apt-get -y install python3-pip python3-sphinx
+    - apt-get -y install --on-install-recommends python3-pip python3-sphinx python3-recommonmark
-    - pip3 install recommonmark
     - ./doc/build.sh _build
   except:
     variables:
       - $PKG_ONLY == "1"
 
 build_meson:
-  image: debian:bookworm
   stage: build
   artifacts:
     paths:
       - _build
     expire_in: 3h
   script:
-    - mv debian/control-newer debian/control
     - apt-get -y build-dep .
     - meson . _build/ -Ddepdatadir=/usr/share -Dfind_orphans=true --werror
     - ninja -C _build install
@@ -39,45 +54,7 @@ build_meson:
       - $PKG_ONLY == "1"
 
 build_deb:
-  stage: build
-  artifacts:
-    paths:
-      - '*.deb'
-  script:
-    - rm -f ../*.deb
-    - apt-get -y build-dep .
-    - apt-get -y install devscripts
-    - REV=$(git log -1 --format=%h)
-    - VER=$(dpkg-parsechangelog -SVersion)
-    - DEBFULLNAME="Librem5 CI"
-    - EMAIL="librem5-builds@lists.community.puri.sm"
-    - dch -v"$VER+librem5ci$CI_PIPELINE_ID.$REV" "$MSG"
-    - debuild -i -us -uc -b
-    - cp ../*.deb .
-
-build_deb:arm64:
-  image: pureos/byzantium
-  tags:
-    - aarch64
-  stage: build
-  artifacts:
-    paths:
-      - '*.deb'
-  script:
-    - rm -f ../*.deb
-    - apt-get -y build-dep .
-    - apt-get -y install devscripts
-    - REV=$(git log -1 --format=%h)
-    - VER=$(dpkg-parsechangelog -SVersion)
-    - DEBFULLNAME="Librem5 CI"
-    - EMAIL="librem5-builds@lists.community.puri.sm"
-    - dch -v"$VER+librem5ci$CI_PIPELINE_ID.$REV" "$MSG"
-    - debuild -i -us -uc -b
-    - cp ../*.deb .
-
-build_deb:future:
   image: debian:bookworm
-  allow_failure: true
   tags:
     - aarch64
   stage: build
@@ -86,7 +63,6 @@ build_deb:future:
       - '*.deb'
   script:
     - rm -f ../*.deb
-    - mv debian/control-newer debian/control
     - apt-get -y build-dep .
     - apt-get -y install devscripts
     - REV=$(git log -1 --format=%h)
@@ -98,7 +74,6 @@ build_deb:future:
     - cp ../*.deb .
 
 build_reference:
-  image: debian:bookworm
   stage: build
   needs:
     - job: build_meson
@@ -114,26 +89,12 @@ build_reference:
     variables:
       - $PKG_ONLY == "1"
 
-test_lintian:
-  stage: test
-  needs:
-    - job: build_deb
-      artifacts: true
-  script:
-    - apt-get -y install lintian
-    - lintian *.deb
-  except:
-    variables:
-      - $PKG_ONLY == "1"
-
 test:
-  image: debian:bookworm
   stage: test
   needs:
     - job: build_meson
       artifacts: true
   script:
-    - mv debian/control-newer debian/control
     - apt-get -y build-dep .
     - apt-get -y install clang-tidy
     - ninja -C _build test
@@ -157,7 +118,7 @@ check_release:
   needs: []
   only:
     refs:
-      - master
+      - main
   script:
     - apt-get -y install git python3
     - (head -n 1 ./debian/changelog && git tag) | ./debian/check_release.py
@@ -177,4 +138,4 @@ pages:
       - public
   only:
     refs:
-      - master
+      - main

NEWS.md

@@ -1,3 +1,9 @@
+1.24.0
+------------------
+
+Changes:
+- The emoji-layout has been replaced with a new one, which offers many more emojis to choose from.
+
 1.23.0
 ------------------
 

debian/changelog

@@ -1,3 +1,22 @@
+squeekboard (1.24.0) experimental; urgency=medium
+
+  [ MoonlightWave-12 ]
+  * src/popover.c: Change 'ControlCenter' to 'Settings'
+  * Add new emoji-layout
+  * squeekboard.doap: update descriptions and links
+  * Change branch-name from 'master' to 'main'
+  * hacking.md: add more instructions
+
+  [ Guido Günther ]
+  * ci: Stop building byzantium debs
+  * Use newer dependencies everywhere
+  * ci: Drop lintian check
+  * ci: Use Debian trixie for the doc build
+  * ci: Cancel running jobs
+  * ci: Always use noninteractive debconf backend
+
+ -- MoonlightWave-12 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org>  Sun, 10 Mar 2024 14:44:36 +0100
+
 squeekboard (1.23.0) experimental; urgency=medium
 
   [ Vasil Pupkin ]

debian/control

@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
 Build-Depends:
- cargo-mozilla,
+ cargo,
  debhelper-compat (= 13),
  meson (>=0.51.0),
  ninja-build,
@@ -13,10 +13,10 @@ Build-Depends:
  libgnome-desktop-3-dev,
  libgtk-3-dev,
  libfeedback-dev,
- librust-bitflags-1-dev (>= 1.0),
+ librust-bitflags-dev (>= 1.0),
- librust-clap-2+default-dev (>= 2.32),
+ librust-clap-dev (>= 2.32),
- librust-gio+v2-44-dev,
+ librust-gio+v2-58-dev,
- librust-glib+v2-44-dev,
+ librust-glib+v2-58-dev,
  librust-glib-sys-dev,
  librust-gtk+v3-22-dev (>= 0.5),
  librust-gtk-sys-dev,
@@ -24,12 +24,12 @@ Build-Depends:
  librust-serde-derive-1-dev (>= 1.0),
  librust-serde-yaml-0.8-dev (>= 0.8),
  librust-xkbcommon-0.4+wayland-dev (>= 0.4),
- librust-zbus-dev (>=1.0),
+ librust-zbus-dev (>= 1.9),
  libwayland-dev (>= 1.16),
  lsb-release,
  python3,
  python3-ruamel.yaml,
- rustc-mozilla,
+ rustc,
  wayland-protocols (>= 1.14),
 Standards-Version: 4.1.3
 Homepage: https://gitlab.gnome.org/World/Phosh/squeekboard

debian/control-newer

@@ -1,62 +0,0 @@
-Source: squeekboard
-Section: x11
-Priority: optional
-Maintainer: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
-Build-Depends:
- cargo,
- debhelper-compat (= 13),
- meson (>=0.51.0),
- ninja-build,
- pkg-config,
- libbsd-dev,
- libglib2.0-dev,
- libgnome-desktop-3-dev,
- libgtk-3-dev,
- libfeedback-dev,
- librust-bitflags-dev (>= 1.0),
- librust-clap-dev (>= 2.32),
- librust-gio+v2-58-dev,
- librust-glib+v2-58-dev,
- librust-glib-sys-dev,
- librust-gtk+v3-22-dev (>= 0.5),
- librust-gtk-sys-dev,
- librust-maplit-1-dev (>= 1.0),
- librust-serde-derive-1-dev (>= 1.0),
- librust-serde-yaml-0.8-dev (>= 0.8),
- librust-xkbcommon-0.4+wayland-dev (>= 0.4),
- librust-zbus-dev (>= 1.9),
- libwayland-dev (>= 1.16),
- lsb-release,
- python3,
- python3-ruamel.yaml,
- rustc,
- wayland-protocols (>= 1.14),
-Standards-Version: 4.1.3
-Homepage: https://gitlab.gnome.org/World/Phosh/squeekboard
-
-Package: squeekboard
-Architecture: linux-any
-Depends:
-# for Greek polytonic readability
- fonts-gfs-didot-classic,
-# for the Adwaita-dark theme
- gnome-themes-extra-data,
- ${shlibs:Depends},
- ${misc:Depends},
-Breaks:
- librem5-base (<< 24),
-Description: On-screen keyboard for Wayland
- Virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.
-
-Package: squeekboard-devel
-Architecture: linux-any
-Depends:
- python3,
- python3-gi,
- ${shlibs:Depends},
- ${misc:Depends},
-Description: Resources for making Squeekboard layouts
- Tools for creating and testing Squeekboard layouts:
- .
-  * squeekboard-entry
-  * squeekboard-test-layout

doc/hacking.md

@@ -245,13 +245,13 @@ Packaging is in the `debian/` directory, and creates builds that can be quickly
 
 ```
 cd squeekboard-source
-gbp dch --multimaint-merge  --ignore-branch
+EMAIL=my_address@example.com gbp dch --multimaint-merge  --ignore-branch --git-author --distribution=experimental --new-version=x.y.z
 ```
 
 Inspect `debian/changelog`, and make sure the first line contains the correct version number and suite. For example:
 
 ```
-squeekboard (1.13.0pureos0~amber0) amber-phone; urgency=medium
+squeekboard (1.22.0) experimental; urgency=medium
 ```
 
 Add the updated `debian/changelog` to the commit. The commit message should contain the release version and a description of changes.
@@ -261,17 +261,17 @@ Add the updated `debian/changelog` to the commit. The commit message should cont
 Summarize the changes since the last release in the NEWS file. Use the Markdown syntax, e.g.
 
 ```
-1.13.0 "Externality"
+1.22.0 "Superposition"
 -----------------------------
 
 Changes:
-- A system for latching and locking views
+- Fixed panel sizing when scaling
 ...
 ```
 
 ### 6. Commit changes
 
-Generate a commit message from the news file:
+Generate a commit message from the NEWS file:
 
 ```
 tools/make_message | git commit --file=- ...
@@ -284,10 +284,10 @@ If the commit message looks wrong, fix the NEWS file, and do `git commit --amend
 The tag should be the version number with "v" in front of it. The tag message should be "squeekboard" and the tag name. Push it to the upstream repository:
 
 ```
-git tag -s -u my_address@example.com v1.13.0 -m "squeekboard v1.13.0"
+git tag -s -u my_address@example.com v1.22.0 -m "squeekboard v1.22.0"
-git push v1.13.0
+git push origin v1.22.0
 ```
 
 ### 8. Rejoice
 
-You released a new version of Squeekboard, and made it available on PureOS. Congratulations.
+You released a new version of Squeekboard. Congratulations!

doc/tutorial.md

@@ -79,12 +79,12 @@ If you want your change to become part of official Squeekboard, or if you want t
 
 ### Compile squeekboard
 
-* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [README.md#building](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/master/README.md#building)
+* Follow the instructions found in “Building” section of the squeekboard’s README: Running squeekboard: [README.md#building](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/main/README.md#building)
 
 ### Run squeekboard
 
-* Follow these instructions to run squeekboard: [README.md#running](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/master/README.md#running)
+* Follow these instructions to run squeekboard: [README.md#running](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/main/README.md#running)
-* Additionally take a look at the contribution document for [testing info](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/master/doc/hacking.md#testing)
+* Additionally take a look at the contribution document for [testing info](https://gitlab.gnome.org/World/Phosh/squeekboard/-/blob/main/doc/hacking.md#testing)
 * You can either test it locally on your Linux system or use the [QEMU Librem 5 image](https://developer.puri.sm/Librem5/Development_Environment/Boards/emulators.html)
 * To test squeekboard locally, you need phoc. Either compile that from the sources as well or use the CI repository ci.puri.sm for Debian based systems:
   `deb [arch=amd64] http://ci.puri.sm/ scratch librem5`

meson.build

@@ -1,7 +1,7 @@
 project(
     'squeekboard',
     'c', 'rust',
-    version: '1.23.0',
+    version: '1.24.0',
     license: 'GPLv3',
     meson_version: '>=0.51.0',
     default_options: [

squeekboard.doap

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns="http://usefulinc.com/ns/doap#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:admin="http://webns.net/mvcb/">
  <name>squeekboard</name>
- <shortdesc>A Wayland virtual keyboard</shortdesc>
+ <shortdesc>A virtual keyboard for Wayland</shortdesc>
- <description>A virtual keyboard supporting Wayland, built primarily for the Librem 5 phone.</description>
+ <description>An on-screen-keyboard input method for Wayland</description>
- <homepage rdf:resource="https://source.puri.sm/Librem5/squeekboard" />
+ <homepage rdf:resource="https://gitlab.gnome.org/World/Phosh/squeekboard" />
- <bug-database rdf:resource="https://source.puri.sm/Librem5/squeekboard/issues" />
+ <bug-database rdf:resource="https://gitlab.gnome.org/World/Phosh/squeekboard/issues" />
  <os>Linux</os>
  <license rdf:resource="http://usefulinc.com/doap/licenses/gpl" />
  <maintainer>

src/popover.c

@@ -59,8 +59,8 @@ popover_open_settings_panel (char *panel)
   g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
                 G_DBUS_PROXY_FLAGS_NONE,
                 NULL,
-                "org.gnome.ControlCenter",
+                "org.gnome.Settings",
-                "/org/gnome/ControlCenter",
+                "/org/gnome/Settings",
                 "org.gtk.Actions",
                 NULL,
                 (GAsyncReadyCallback) create_dbus_proxy_cb,