Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package swappy for openSUSE:Factory checked in at 2021-02-22 14:41:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swappy (Old) and /work/SRC/openSUSE:Factory/.swappy.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "swappy" Mon Feb 22 14:41:10 2021 rev:4 rq:874288 version:1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/swappy/swappy.changes 2021-02-18 20:53:06.491478667 +0100 +++ /work/SRC/openSUSE:Factory/.swappy.new.2378/swappy.changes 2021-02-22 14:41:16.444678453 +0100 @@ -1,0 +2,8 @@ +Mon Feb 22 10:51:23 UTC 2021 - Michael Vetter <mvet...@suse.com> + +- Update to 1.3.1: + * chore(script): add sign-post-release helper script + * chore(readme): prettify readme file + * docs(readme): add instructions to build i18n + +------------------------------------------------------------------- Old: ---- swappy-1.3.0.tar.gz.sig v1.3.0.tar.gz New: ---- swappy-1.3.1.tar.gz.sig v1.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swappy.spec ++++++ --- /var/tmp/diff_new_pack.Awd5GL/_old 2021-02-22 14:41:17.160679247 +0100 +++ /var/tmp/diff_new_pack.Awd5GL/_new 2021-02-22 14:41:17.164679252 +0100 @@ -17,7 +17,7 @@ Name: swappy -Version: 1.3.0 +Version: 1.3.1 Release: 0 Summary: Wayland compositor screenshot editor License: MIT ++++++ v1.3.0.tar.gz -> v1.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.3.0/.gitignore new/swappy-1.3.1/.gitignore --- old/swappy-1.3.0/.gitignore 2021-02-18 01:45:00.000000000 +0100 +++ new/swappy-1.3.1/.gitignore 2021-02-20 18:54:26.000000000 +0100 @@ -56,3 +56,4 @@ # Build folders build/ +release/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.3.0/CHANGELOG.md new/swappy-1.3.1/CHANGELOG.md --- old/swappy-1.3.0/CHANGELOG.md 2021-02-18 01:45:00.000000000 +0100 +++ new/swappy-1.3.1/CHANGELOG.md 2021-02-20 18:54:26.000000000 +0100 @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [1.3.1](https://github.com/jtheoof/swappy/compare/v1.3.0...v1.3.1) (2021-02-20) + ## [1.3.0](https://github.com/jtheoof/swappy/compare/v1.2.1...v1.3.0) (2021-02-18) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.3.0/README.md new/swappy-1.3.1/README.md --- old/swappy-1.3.0/README.md 2021-02-18 01:45:00.000000000 +0100 +++ new/swappy-1.3.1/README.md 2021-02-20 18:54:26.000000000 +0100 @@ -50,74 +50,74 @@ text_font=sans-serif ``` -- `save_dir` is where swappshots will be saved, can contain env variables and must exist in your filesystem -- `save_filename_format`: is the filename template, if it contains a date format, this will be parsed into a timestamp. Format is detailed in [strftime(3)](https://linux.die.net/man/3/strftime). If this date format is missing, filename will have no timestamp -- `show_panel` is used to toggle the paint panel on or off upon startup -- `line_size` is the default line size (must be between 1 and 50) -- `text_size` is the default text size (must be between 10 and 50) -- `text_font` is the font used to render text, its format is pango friendly +- `save_dir` is where swappshots will be saved, can contain env variables and must exist in your filesystem +- `save_filename_format`: is the filename template, if it contains a date format, this will be parsed into a timestamp. Format is detailed in [strftime(3)](https://linux.die.net/man/3/strftime). If this date format is missing, filename will have no timestamp +- `show_panel` is used to toggle the paint panel on or off upon startup +- `line_size` is the default line size (must be between 1 and 50) +- `text_size` is the default text size (must be between 10 and 50) +- `text_font` is the font used to render text, its format is pango friendly ## Keyboard Shortcuts -- `Ctrl+b`: Toggle Paint Panel +- `Ctrl+b`: Toggle Paint Panel <hr> -- `b`: Switch to Brush -- `t`: Switch to Text -- `r`: Switch to Rectangle -- `o`: Switch to Ellipse -- `a`: Switch to Arrow -- `d`: Switch to Blur (`d` stands for droplet) +- `b`: Switch to Brush +- `t`: Switch to Text +- `r`: Switch to Rectangle +- `o`: Switch to Ellipse +- `a`: Switch to Arrow +- `d`: Switch to Blur (`d` stands for droplet) <hr> -- `R`: Use Red Color -- `G`: Use Green Color -- `B`: Use Blue Color -- `C`: Use Custom Color -- `Minus`: Reduce Stroke Size -- `Plus`: Increase Stroke Size -- `Equal`: Reset Stroke Size -- `k`: Clear Paints (cannot be undone) +- `R`: Use Red Color +- `G`: Use Green Color +- `B`: Use Blue Color +- `C`: Use Custom Color +- `Minus`: Reduce Stroke Size +- `Plus`: Increase Stroke Size +- `Equal`: Reset Stroke Size +- `k`: Clear Paints (cannot be undone) <hr> -- `Ctrl+z`: Undo -- `Ctrl+Shift+z` or `Ctrl+y`: Redo -- `Ctrl+s`: Save to file (see man page) -- `Ctrl+c`: Copy to clipboard -- `Escape` or `q` or `Ctrl+w`: Quit swappy +- `Ctrl+z`: Undo +- `Ctrl+Shift+z` or `Ctrl+y`: Redo +- `Ctrl+s`: Save to file (see man page) +- `Ctrl+c`: Copy to clipboard +- `Escape` or `q` or `Ctrl+w`: Quit swappy ## Limitations -- **Copy**: If you don't have [wl-clipboard] installed, copy to clipboard won't work if you close swappy (the content of the clipboard is lost). This because GTK 3.24 [has not implemented persistent storage on wayland backend yet](https://gitlab.gnome.org/GNOME/gtk/blob/3.24.13/gdk/wayland/gdkdisplay-wayland.c#L857). We need to do it on the [Wayland level](https://github.com/swaywm/wlr-protocols/blob/master/unstable/wlr-data-control-unstable-v1.xml), or wait for GTK 4. For now, we use `wl-copy` if installed and revert to `gtk` clipboard if not found. -- **Fonts**: Swappy relies on Font Awesome 5 being present to properly render the icons. On Arch you can simply install those with: `sudo pacman -S otf-font-awesome` +- **Copy**: If you don't have [wl-clipboard] installed, copy to clipboard won't work if you close swappy (the content of the clipboard is lost). This because GTK 3.24 [has not implemented persistent storage on wayland backend yet](https://gitlab.gnome.org/GNOME/gtk/blob/3.24.13/gdk/wayland/gdkdisplay-wayland.c#L857). We need to do it on the [Wayland level](https://github.com/swaywm/wlr-protocols/blob/master/unstable/wlr-data-control-unstable-v1.xml), or wait for GTK 4. For now, we use `wl-copy` if installed and revert to `gtk` clipboard if not found. +- **Fonts**: Swappy relies on Font Awesome 5 being present to properly render the icons. On Arch you can simply install those with: `sudo pacman -S otf-font-awesome` ## Installation -- [Arch Linux](https://aur.archlinux.org/packages/swappy) -- [Arch Linux (git)](https://aur.archlinux.org/packages/swappy-git) -- [Fedora 31/32](https://copr.fedorainfracloud.org/coprs/wef/swappy) -- [openSUSE](https://build.opensuse.org/package/show/X11:Wayland/swappy) -- [Void Linux](https://github.com/void-linux/void-packages/tree/master/srcpkgs/swappy) +- [Arch Linux](https://aur.archlinux.org/packages/swappy) +- [Arch Linux (git)](https://aur.archlinux.org/packages/swappy-git) +- [Fedora 31/32](https://copr.fedorainfracloud.org/coprs/wef/swappy) +- [openSUSE](https://build.opensuse.org/package/show/X11:Wayland/swappy) +- [Void Linux](https://github.com/void-linux/void-packages/tree/master/srcpkgs/swappy) ## Building from source Install dependencies (on Arch, name can vary for other distros): -- meson -- ninja -- cairo -- pango -- gtk -- glib2 -- scdoc +- meson +- ninja +- cairo +- pango +- gtk +- glib2 +- scdoc Optional dependencies: -- `wl-clipboard` (to make sure the copy is saved if you close swappy) -- `otf-font-awesome` (to draw the paint icons properly) +- `wl-clipboard` (to make sure the copy is saved if you close swappy) +- `otf-font-awesome` (to draw the paint icons properly) Then run: @@ -126,6 +126,14 @@ ninja -C build ``` +### i18n + +To build the translation files: + +```sh +ninja -C build swappy-pot +``` + ## Contributing Pull requests are welcome. This project uses [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/) to automate changelog generation. @@ -137,6 +145,8 @@ ``` npx standard-version --sign git push --follow-tags +# Do the release on Github with manual steps, then: +./script/sign-post-release ``` ## License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.3.0/meson.build new/swappy-1.3.1/meson.build --- old/swappy-1.3.0/meson.build 2021-02-18 01:45:00.000000000 +0100 +++ new/swappy-1.3.1/meson.build 2021-02-20 18:54:26.000000000 +0100 @@ -1,7 +1,7 @@ project( 'swappy', 'c', - version: '1.3.0', + version: '1.3.1', license: 'MIT', meson_version: '>=0.48.0', default_options: [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/swappy-1.3.0/script/sign-post-release new/swappy-1.3.1/script/sign-post-release --- old/swappy-1.3.0/script/sign-post-release 1970-01-01 01:00:00.000000000 +0100 +++ new/swappy-1.3.1/script/sign-post-release 2021-02-20 18:54:26.000000000 +0100 @@ -0,0 +1,60 @@ +#!/bin/bash + +set -e + +declare -r git_root=$(git rev-parse --show-toplevel) +declare -r app_name="swappy" +declare -r release_folder="$git_root/release" + +declare version="" + +die() { + echo "$*" 1>&2 + exit 1 +} + +init() { + command -v gh >/dev/null 2>&1 || { echo >&2 "github cli tool required: pacman -S github-cli"; exit 1; } + + mkdir -p $release_folder + cd $release_folder +} + +get_release_version() { + version=$(git describe | sed 's/^v//') + echo "found latest version: $version" +} + +download_source_for_release() { + echo "downloading source assets..." + curl --output $app_name-$version.zip https://github.com/jtheoof/$app_name/archive/v$version.zip + curl --output $app_name-$version.tar.gz https://github.com/jtheoof/$app_name/archive/v$version.tar.gz +} + +sign_release_source() { + echo "signing source assets..." + gpg --detach-sign $app_name-$version.zip + gpg --detach-sign $app_name-$version.tar.gz +} + +upload_signed_assets_to_release() { + echo "uploading signatures to github release..." + gh release upload v$version $app_name-$version.zip.sig --clobber + gh release upload v$version $app_name-$version.tar.gz.sig --clobber +} + +main() { + init + get_release_version + + if [ -z "$version" ] + then + die "version not found, is the git tag valid?" + fi + + download_source_for_release + sign_release_source + upload_signed_assets_to_release +} + +main "$@"
