From 2f69d35595c00c99a12574814922e39c2862ab2e Mon Sep 17 00:00:00 2001 From: pips Date: Tue, 23 Sep 2025 20:09:12 +0200 Subject: [PATCH] feat(project): configure --- .gitmodules | 3 +++ Dockerfile.builder | 30 +++++++++++++++++++++++++----- Makefile | 10 ++++------ README.md | 19 ++++++++++++++----- deb-package/DEBIAN/control | 17 +++++++++-------- upstream | 1 + 6 files changed, 56 insertions(+), 24 deletions(-) create mode 100644 .gitmodules create mode 160000 upstream diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c7dd9ed --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "upstream"] + path = upstream + url = https://github.com/Alexays/Waybar diff --git a/Dockerfile.builder b/Dockerfile.builder index 5ce7e81..cd1470e 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -1,8 +1,28 @@ -# use specific image if relevant (rust, golang) FROM ubuntu:24.04 RUN apt-get update && \ - apt-get install -y make \ - # other packages to build \ - - + apt-get install -y curl \ + cmake \ + meson \ + clang-tidy \ + gobject-introspection \ + libpipewire-0.3-dev \ + libsndio-dev \ + libdbusmenu-gtk3-dev \ + libevdev-dev \ + libfmt-dev \ + libgirepository1.0-dev \ + libgtk-3-dev \ + libgtkmm-3.0-dev \ + libinput-dev \ + libjsoncpp-dev \ + libmpdclient-dev \ + libnl-3-dev \ + libnl-genl-3-dev \ + libpulse-dev \ + libsigc++-2.0-dev \ + libspdlog-dev \ + libwayland-dev \ + scdoc \ + upower \ + libxkbregistry-dev diff --git a/Makefile b/Makefile index 98140fa..55f5be3 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,14 @@ - -package = mypackage.deb +package = waybar-main.deb .PHONY: compile compile: - cd upstream && echo compile + cd upstream && meson setup build && ninja -C build .PHONY: dpkg dpkg: mkdir -p deb-package/usr/bin/ - cp upstream/bin deb-package/usr/bin/ + cp upstream/build/waybar deb-package/usr/bin/ chmod -R o-w deb-package/ - sed -i "s|%date%|`date +%Y%m%d`|g" deb-package/DEBIAN/control - sed -i "s|%hash%|$(commit_abbrev)|g" deb-package/DEBIAN/control + sed -i "s|%date%|`date +%Y%m%d%H%M%S`|g" deb-package/DEBIAN/control dpkg-deb --build deb-package/ $(package) @curl --user CIBot:$(password) --upload-file $(package) $(CI_FORGE_URL)/api/packages/$(CI_REPO_OWNER)/debian/pool/noble/main/upload diff --git a/README.md b/README.md index 84455ed..0f0b9bd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,15 @@ -# Template for external project package building +# Unofficial dpkg waybar build from main branch -- git submodule add upstream -- Makefile: change package name & compile / dpkg target instructions -- Dockerfile.builder: required deb packages / base image -- deb-package/DEBIAN/control: Package name, depends, conflict & description +waybar is a highly customizable Wayland bar: + +- + +All credit to Alexays and other contributors of this great project! + +This repo provide semi-automatic build of main branch to ubuntu 24.04 (noble) +dpkg package: + + + +License file in this repo only apply to build & packaging step files, waybar is +licensed as MIT License, see upstream project for details. diff --git a/deb-package/DEBIAN/control b/deb-package/DEBIAN/control index 280352a..f4798ba 100644 --- a/deb-package/DEBIAN/control +++ b/deb-package/DEBIAN/control @@ -1,12 +1,13 @@ -Package: mypackage-main -Version: 0.0.1~git%date%.%hash%-1 +Package: waybar-main +Version: 0.0.1~git%date%-1 Section: base Priority: optional Architecture: amd64 Maintainer: pips -Homepage: https://example.com -Suggests: suggeted-packages -Depends: depends (>= X.Y.Z), packages (>= X.Y) -Conflicts: package-from-official-repo -Description: Description of mypackage - Auto packaging of mypackage following main dev branch +Homepage: https://forge.e5150.fr/ext/waybar +Depends: libatkmm-1.6-1v5 (>= 2.28.4), libc6 (>= 2.38), libcairomm-1.0-1v5 (>= 1.14.5), libdate-tz3 (>= 3.0.1), libdbusmenu-gtk3-4 (>= 0.4.2), libevdev2 (>= 0.9.1), libfmt9 (>= 9.1.0+ds1), libgcc-s1 (>= 4.3), libglib2.0-0t64 (>= 2.79.0), libglibmm-2.4-1t64 (>= 2.66.7), libgtk-3-0t64 (>= 3.21.4), libgtk-layer-shell0 (>= 0.1.0), libgtkmm-3.0-1t64 (>= 3.24.8), libinput10 (>= 0.15.0), libjack-jackd2-0 (>= 1.9.10+20150825) | libjack-0.125, libjsoncpp25 (>= 1.9.5), libmpdclient2t64 (>= 2.0), libnl-3-200 (>= 3.2.27), libnl-genl-3-200 (>= 3.2.7), libplayerctl2 (>= 2.4.1), libpulse0 (>= 0.99.1), libsigc++-2.0-0v5 (>= 2.8.0), libsndio7.0 (>= 1.8.1), libspdlog1.12-fmt9, libstdc++6 (>= 13.1), libudev1 (>= 183), libupower-glib3 (>= 0.99.8), libwayland-client0 (>= 1.20.0), libwireplumber-0.4-0 (>= 0.3.95), libxkbregistry0 (>= 1.0.0), init-system-helpers (>= 1.52) +Suggests: fonts-font-awesome, libappindicator3-1 +Conflicts: waybar +Replaces: waybar +Description: waybar build from main + Auto packaging of waybar following main dev branch diff --git a/upstream b/upstream new file mode 160000 index 0000000..41de896 --- /dev/null +++ b/upstream @@ -0,0 +1 @@ +Subproject commit 41de8964f1e3278edf07902ad68ca5e01e7abeeb