From d9245d341ed1f258a3dd1073cdfa656115c5b26d Mon Sep 17 00:00:00 2001 From: Ruben Beltran del Rio Date: Mon, 23 Mar 2026 20:52:55 +0100 Subject: Adapt rest of packaging to use meson --- build-aux/arch/PKGBUILD | 9 +++-- build-aux/debian/changelog | 36 +++++++++++++++++ build-aux/debian/control | 29 ++++++++++++++ build-aux/debian/copyright | 10 +++++ build-aux/debian/rules | 5 +++ build-aux/debian/source/format | 1 + build-aux/rpm/map.spec | 89 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 175 insertions(+), 4 deletions(-) create mode 100644 build-aux/debian/changelog create mode 100644 build-aux/debian/control create mode 100644 build-aux/debian/copyright create mode 100755 build-aux/debian/rules create mode 100644 build-aux/debian/source/format create mode 100644 build-aux/rpm/map.spec (limited to 'build-aux') diff --git a/build-aux/arch/PKGBUILD b/build-aux/arch/PKGBUILD index 66ae6e0..330828c 100644 --- a/build-aux/arch/PKGBUILD +++ b/build-aux/arch/PKGBUILD @@ -9,21 +9,22 @@ license=('AGPL-3.0-or-later') depends=('gtk4>=4.18.0' 'libadwaita>=1.7.0' 'gtksourceview5>=5.16.0' 'cairo>=1.18.0') makedepends=(cargo 'meson>=1.0.0' gettext) options=('!debug') -source=() -sha256sums=() +source=("map-${pkgver}.tar.xz") +sha256sums=('SKIP') prepare() { - cd "$startdir/src" + cd "${pkgname}-${pkgver}" export RUSTUP_TOOLCHAIN=stable cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')" } build() { - cd "$startdir/src" + cd "${pkgname}-${pkgver}" meson setup --prefix /usr _build . meson compile -C _build } package() { + cd "${pkgname}-${pkgver}" meson install -C _build --destdir $pkgdir } diff --git a/build-aux/debian/changelog b/build-aux/debian/changelog new file mode 100644 index 0000000..361da8f --- /dev/null +++ b/build-aux/debian/changelog @@ -0,0 +1,36 @@ +map (1.0.4) unstable; urgency=low + + * Fix rendering issue with icon in about page when installing via flatpak + * Use breakpoints to render preferences correctly in mobile screens + * Stop building rpms for fedora 42 and add fedora 44 + + -- Rubén Beltrán del Río Mon, 30 Mar 2026 00:00:00 +0000 + +map (1.0.3) unstable; urgency=low + + * Add about window with a reference of the language + * Brand colors for flathub provide better contrast + * New icon + * Summary that's more descriptive for a layperson + * Disable horizontal layout at smaller window sizes to make usage easier on phones + * Use Adwaita window and toolbar + + -- Rubén Beltrán del Río Fri, 27 Mar 2026 00:00:00 +0000 + +map (1.0.2) unstable; urgency=low + + * Add adwaita feature to relm4 + + -- Rubén Beltrán del Río Sat, 24 Jan 2026 00:00:00 +0000 + +map (1.0.1) unstable; urgency=low + + * Add adwaita feature to relm4 + + -- Rubén Beltrán del Río Mon, 19 Jan 2026 01:00:00 +0000 + +map (1.0.0) unstable; urgency=low + + * Initial release + + -- Rubén Beltrán del Río Mon, 19 Jan 2026 00:00:00 +0000 diff --git a/build-aux/debian/control b/build-aux/debian/control new file mode 100644 index 0000000..d0daada --- /dev/null +++ b/build-aux/debian/control @@ -0,0 +1,29 @@ +Source: map +Maintainer: Rubén Beltrán del Río +Section: graphics +Build-Depends: debhelper-compat (= 13), + meson (>= 1.0.0), + cargo, + rustc (>= 1.92.0), + pkg-config, + libglib2.0-dev (>= 2.84.0), + libgtk-4-dev (>= 4.18.0), + libadwaita-1-dev (>= 1.7.0), + libgtksourceview-5-dev (>= 5.16.0), + gettext, + appstream-util, + desktop-file-utils +Standards-Version: 4.7.4 +Homepage: https://map.tranquil.systems/map-for-linux +Vcs-Browser: https://git.sr.ht/~rbdr/map-linux +Vcs-Git: https://git.sr.ht/~rbdr/map-linux +Rules-Requires-Root: no + +Package: map +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Wardley Map editor for Linux + Map is a wardley map editor for linux that uses a simple language to easily + create and edit maps that visualize an evolving environment. Draw components, + link dependencies, create groups, write notes, or add inertia and evolution + markers, and see your map change in an instant. diff --git a/build-aux/debian/copyright b/build-aux/debian/copyright new file mode 100644 index 0000000..e7a8a68 --- /dev/null +++ b/build-aux/debian/copyright @@ -0,0 +1,10 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Map +Upstream-Contact: Rubén Beltrán del Río +Source: https://map.tranquil.systems/map-for-linux + +Files: * +Copyright: Copyright 2026 Rubén Beltrán del Río +License: AGPL-3.0-or-later + On Debian systems, the full text of the GNU Affero General Public + License version 3 can be found in /usr/share/common-licenses/AGPL-3 diff --git a/build-aux/debian/rules b/build-aux/debian/rules new file mode 100755 index 0000000..2bc4511 --- /dev/null +++ b/build-aux/debian/rules @@ -0,0 +1,5 @@ +#!/usr/bin/make -f +%: + dh $@ --buildsystem=meson + +override_dh_auto_test: diff --git a/build-aux/debian/source/format b/build-aux/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/build-aux/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/build-aux/rpm/map.spec b/build-aux/rpm/map.spec new file mode 100644 index 0000000..d0b5981 --- /dev/null +++ b/build-aux/rpm/map.spec @@ -0,0 +1,89 @@ +%global app_id systems.tranquil.Map + +Name: map +Version: 1.0.4 +Release: 1%{?dist} +Summary: Wardley Map editor for Linux + +License: AGPL-3.0-or-later +URL: https://map.tranquil.systems/map-for-linux +Source0: %{name}-%{version}.tar.xz +Source1: %{name}-%{version}-vendor.tar.xz + +BuildRequires: meson >= 1.0.0 +BuildRequires: rust >= 1.92 +BuildRequires: cargo +BuildRequires: gettext +BuildRequires: pkgconfig(glib-2.0) >= 2.84.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.84.0 +BuildRequires: pkgconfig(gtk4) >= 4.18.0 +BuildRequires: pkgconfig(libadwaita-1) >= 1.7.0 +BuildRequires: pkgconfig(gtksourceview-5) >= 5.16.0 + +Requires: gtk4 >= 4.18.0 +Requires: libadwaita >= 1.7.0 +Requires: gtksourceview5 >= 5.16.0 + +%description +A Wardley Map editor for Linux, built with GTK4 and libadwaita. + +%prep +%autosetup -p1 +%autosetup -T -D -a1 + +mkdir -p .cargo +cat > .cargo/config.toml << 'EOF' +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" +EOF + +%build +%meson +%meson_build + +%install +%meson_install + +%check +%meson_test +desktop-file-validate %{buildroot}%{_datadir}/applications/%{app_id}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{app_id}.metainfo.xml + +%files +%license LICENSE +%doc README.md +%{_bindir}/map +%{_datadir}/applications/%{app_id}.desktop +%{_datadir}/metainfo/%{app_id}.metainfo.xml +%{_datadir}/icons/hicolor/scalable/apps/%{app_id}.svg +%{_datadir}/icons/hicolor/symbolic/apps/%{app_id}-symbolic.svg +%{_datadir}/dbus-1/services/%{app_id}.service +%{_datadir}/gtksourceview-5/language-specs/wmap.lang +%{_datadir}/locale/*/LC_MESSAGES/%{app_id}.mo + +%changelog +* Mon Mar 30 2026 Rubén Beltrán del Río - 1.0.4-1 +- Fix rendering issue with icon in about page when installing via flatpak +- Use breakpoints to render preferences correctly in mobile screens + (KNOWN ISSUE: For sizes under 377 px, the templates screen will move slightly) +- Stop building rpms for fedora 42 and add fedora 44 + +* Fri Mar 27 2026 Rubén Beltrán del Río - 1.0.3-1 +- Add about window with a reference of the language +- Brand colors for flathub provide better contrast +- New icon +- Summary that's more descriptive for a layperson +- Disable horizontal layout at smaller window sizes to make usage easier on phones +- Use Adwaita window and toolbar + +* Sat Jan 24 2026 Rubén Beltrán del Río - 1.0.2-1 +- Add adwaita feature to relm4 + +* Mon Jan 19 2026 Rubén Beltrán del Río - 1.0.1-1 +- Add adwaita feature to relm4 + +* Mon Jan 19 2026 Rubén Beltrán del Río - 1.0.0-1 +- Initial release -- cgit