From a1d30812afdc89da81e169e291bd88d9460faae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 14 Nov 2025 17:25:26 +0100 Subject: [PATCH 1/3] ci: Switch to forky MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther Part-of: --- .gitlab-ci.yml | 26 +++++++++++++------------- .gitlab-ci/debian.Dockerfile | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1883ffc..f6205e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,7 +39,7 @@ workflow: variables: # For ci-fairy FDO_UPSTREAM_REPO: World/Phosh/stevia - DEBIAN_IMAGE: $CI_REGISTRY/world/phosh/stevia/debian:v0.0.2025-09-18 + DEBIAN_IMAGE: $CI_REGISTRY/world/phosh/stevia/debian:v0.0.2025-11-14 XVFB_RUN: xvfb-run -a -s -noreset COMMON_BUILD_OPTS: --werror -Db_coverage=true -Dprefix=/usr ALPINE_EDGE_DEPS: alpine-sdk feedbackd-dev git glib-dev gnome-desktop-dev @@ -47,12 +47,12 @@ variables: elogind-dev wayland-dev wayland-protocols ttf-dejavu presage-dev gmobile-dev -.trixie_vars: &trixie_vars +.forky_vars: &forky_vars variables: - DIST: trixie + DIST: forky BUILD_OPTS: ${COMMON_BUILD_OPTS} -.trixie_prep: &trixie_prep +.forky_prep: &forky_prep before_script: - apt-get -y update - apt-get -y build-dep . @@ -105,11 +105,11 @@ sanity: rules: - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME' -build:native-debian-trixie: +build:native-debian-forky: stage: build image: ${DEBIAN_IMAGE} - <<: *trixie_prep - <<: *trixie_vars + <<: *forky_prep + <<: *forky_vars <<: *build_step artifacts: paths: @@ -118,13 +118,13 @@ build:native-debian-trixie: variables: - $PKG_ONLY == "1" -test:native-debian-trixie: +test:native-debian-forky: stage: test+docs image: ${DEBIAN_IMAGE} - <<: *trixie_prep + <<: *forky_prep needs: - - build:native-debian-trixie - <<: *trixie_vars + - build:native-debian-forky + <<: *forky_vars <<: *test_step coverage: '/^lines:\s+([\d.]+\%)\s+/' artifacts: @@ -138,7 +138,7 @@ test:native-debian-trixie: doc: stage: test+docs image: ${DEBIAN_IMAGE} - <<: *trixie_prep + <<: *forky_prep needs: [] variables: BUILD_OPTS: >- @@ -163,7 +163,7 @@ test-layouts: phosh-wallpapers dbus-x11 fonts-noto-core needs: - - build:native-debian-trixie + - build:native-debian-forky script: - !reference [.phosh-prepare-apt] - XDG_RUNTIME_DIR=$PWD diff --git a/.gitlab-ci/debian.Dockerfile b/.gitlab-ci/debian.Dockerfile index 12b2695..91df74a 100644 --- a/.gitlab-ci/debian.Dockerfile +++ b/.gitlab-ci/debian.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:trixie-slim +FROM debian:forky-slim RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -y update \ -- GitLab From 5ec69699e60287aa202a14973e66feccced40e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 14 Nov 2025 17:29:00 +0100 Subject: [PATCH 2/3] ci: Use stevia namespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther Part-of: --- .gitlab-ci/run-docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index a220a69..e675958 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -99,7 +99,7 @@ else fi REGISTRY="registry.gitlab.gnome.org" -REPO="world/phosh" +REPO="world/phosh/stevia" TAG="${REGISTRY}/${REPO}/${base}:${base_version}" if [ $build == 1 ]; then -- GitLab From 288744f1f0b33f1071075ee7a385831b981f31ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 14 Nov 2025 17:13:40 +0100 Subject: [PATCH 3/3] treewide: Document changes and release 0.51.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guido Günther Part-of: --- NEWS | 4 ++-- data/mobi.phosh.Stevia.metainfo.xml.in | 8 ++++++++ debian/changelog | 8 ++++++++ meson.build | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index ba6608d..e6caed7 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ -phosh-osk-stevia 0.51~rc1 -------------------------- +phosh-osk-stevia 0.51.0 +----------------------- Released November 2025 * Give up when we fail to claim the DBus name on startup * Don't spawn two instances with gnome-session-bin < 49 diff --git a/data/mobi.phosh.Stevia.metainfo.xml.in b/data/mobi.phosh.Stevia.metainfo.xml.in index 6f6255e..0030188 100644 --- a/data/mobi.phosh.Stevia.metainfo.xml.in +++ b/data/mobi.phosh.Stevia.metainfo.xml.in @@ -64,6 +64,14 @@ + + +
    +
  • Give up when we fail to claim the DBus name on startup
    • +
  • Don't spawn two instances with gnome-session-bin < 49
    • +
+ +
    diff --git a/debian/changelog b/debian/changelog index d9c3de3..34414a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +phosh-osk-stevia (0.51.0) experimental; urgency=medium + + * doc: Fix default keyboard mention. + Most distros ship stevia as default so it can be confusing if + we say something else in the docs. + + -- Guido Günther Fri, 14 Nov 2025 17:13:29 +0100 + phosh-osk-stevia (0.51~rc1) experimental; urgency=medium * input-surface: Don't trigger key repeat when deleting in emoji layout. diff --git a/meson.build b/meson.build index 8a5e11a..c0c6d9f 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'phosh-osk-stevia', 'c', - version: '0.51.rc1', + version: '0.51.0', license: 'GPLv3+', meson_version: '>= 1.1', default_options: ['warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11'], -- GitLab