From f49bff7169bdef95acefd86e482cffc6c1e330ee Mon Sep 17 00:00:00 2001 From: windowsboy111 Date: Sat, 6 May 2023 17:14:49 +0800 Subject: [PATCH] chore: sync with Terra 38 --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- anda/desktops/lomiri/lomiri.spec | 5 +- anda/desktops/unityx-shell/unityx-shell.spec | 12 +--- anda/fonts/sarasa-gothic/anda.hcl | 6 ++ .../sarasa-gothic/sarasa-gothic-fonts.spec | 63 +++++++++++++++++++ anda/fonts/sarasa-gothic/update.rhai | 1 + anda/lib/gtk4-layer-shell/anda.hcl | 5 ++ .../gtk4-layer-shell/gtk4-layer-shell.spec | 63 +++++++++++++++++++ anda/lib/gtk4-layer-shell/update.rhai | 1 + anda/tools/ops2deb/anda.hcl | 5 ++ anda/tools/ops2deb/ops2deb.spec | 40 ++++++++++++ anda/tools/ops2deb/update.rhai | 1 + 12 files changed, 193 insertions(+), 11 deletions(-) create mode 100644 anda/fonts/sarasa-gothic/anda.hcl create mode 100644 anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec create mode 100644 anda/fonts/sarasa-gothic/update.rhai create mode 100644 anda/lib/gtk4-layer-shell/anda.hcl create mode 100644 anda/lib/gtk4-layer-shell/gtk4-layer-shell.spec create mode 100644 anda/lib/gtk4-layer-shell/update.rhai create mode 100644 anda/tools/ops2deb/anda.hcl create mode 100644 anda/tools/ops2deb/ops2deb.spec create mode 100644 anda/tools/ops2deb/update.rhai diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6c3f4ddcaa..fbc0151853 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,6 +1,6 @@ --- name: Bug report -about: Report an issue with a package (or Terra itsself) +about: Report an issue with a package (or Terra itself) title: '[BUG] ' labels: bug assignees: '' diff --git a/anda/desktops/lomiri/lomiri.spec b/anda/desktops/lomiri/lomiri.spec index 35de24c195..d939386ef3 100644 --- a/anda/desktops/lomiri/lomiri.spec +++ b/anda/desktops/lomiri/lomiri.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri -%global commit 49d67f32d4710ce5fb9597fe52b97b6c152d5b4f +%global commit a1a1b1f25714a0f5cddf3905edc38dc6e6b49228 %forgemeta Name: lomiri @@ -58,8 +58,11 @@ Recommends: lomiri-session Requires: lomiri-system-settings Requires: qmenumodel Requires: xorg-x11-server-Xwayland +Requires: ayatana-indicator-sound Requires: ayatana-indicator-messages Requires: ayatana-indicator-datetime +Requires: ayatana-indicator-notifications +Requires: ayatana-indicator-session Requires: lomiri-sounds Requires: lomiri-ui-toolkit Requires: lomiri-download-manager diff --git a/anda/desktops/unityx-shell/unityx-shell.spec b/anda/desktops/unityx-shell/unityx-shell.spec index 57f9ae87bb..cbadc5ba2f 100644 --- a/anda/desktops/unityx-shell/unityx-shell.spec +++ b/anda/desktops/unityx-shell/unityx-shell.spec @@ -97,7 +97,6 @@ This package contains the development files the core Unity library. %package -n plotinus Summary: Automatic testing for Unity -Requires: %{name}%{?_isa} = %{version}-%{release} %description -n plotinus This package contains the autopilot framework, which allows for triggering @@ -157,6 +156,8 @@ chrpath --delete %{buildroot}%{_libdir}/libunityx-core-6.0.so.9.0.0 pushd %{buildroot} ln -s %{_libdir}/unity .%{_libdir}/unityx +rm -rf .%{_datadir}/unityx +ln -s %{_datadir}/unity .%{_datadir}/unityx popd %find_lang unityx @@ -180,14 +181,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libdir}/libunityx-core-6.0.so.* %{_datadir}/glib-2.0/schemas/org.unityd.UnityX.gschema.xml %{_datadir}/glib-2.0/schemas/org.unityd.UnityX.user-interface.gschema.xml -%dir %{_datadir}/unityx -%dir %{_datadir}/unityx/icons -%{_datadir}/unityx/icons/dash-widgets.json -%{_datadir}/unityx/icons/*.png -%{_datadir}/unityx/icons/*.svg -%{_datadir}/unityx/icons/searchingthedashlegalnotice.html -%dir %{_datadir}/unityx/themes/ -%{_datadir}/unityx/themes/dash-widgets.json +%{_datadir}/unityx %{_datadir}/xsessions/unityx.desktop %files -n plotinus diff --git a/anda/fonts/sarasa-gothic/anda.hcl b/anda/fonts/sarasa-gothic/anda.hcl new file mode 100644 index 0000000000..8e9dfc42f0 --- /dev/null +++ b/anda/fonts/sarasa-gothic/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "sarasa-gothic-fonts.spec" + } +} diff --git a/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec new file mode 100644 index 0000000000..5ffaff3ce3 --- /dev/null +++ b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec @@ -0,0 +1,63 @@ +Name: sarasa-gothic-fonts +Version: 0.40.6 +Release: %autorelease +URL: https://github.com/be5invis/Sarasa-Gothic +Source0: %url/releases/download/v%version/sarasa-gothic-ttc-%version.7z +Source1: %url/releases/download/v%version/sarasa-gothic-super-ttc-%version.7z +Source2: https://raw.githubusercontent.com/be5invis/Sarasa-Gothic/v%version/LICENSE +Source3: https://raw.githubusercontent.com/be5invis/Sarasa-Gothic/v%version/README.md +License: OFL-1.1 +Summary: Sarasa Gothic / 更纱黑体 / 更紗黑體 / 更紗ゴシック / 사라사 고딕 +BuildArch: noarch +BuildRequires: p7zip-plugins + +%description +A CJK programming font based on Iosevka and Source Han Sans. + +%package -n sarasa-gothic-super-fonts +Summary: Sarasa Gothic / 更纱黑体 / 更紗黑體 / 更紗ゴシック / 사라사 고딕 + +%description -n sarasa-gothic-super-fonts +A CJK programming font based on Iosevka and Source Han Sans. + + +%prep +mkdir ttc +cd ttc +7z e %SOURCE0 +cd .. +mkdir super +cd super +7z e %SOURCE1 + +%build + +%install +mkdir -p %buildroot/%_datadir/{fonts/sarasa-gothic{,-super},{licenses,doc}/sarasa-gothic{,-super}-fonts} +cd ttc +install -Dm644 *.ttc %buildroot/%_datadir/fonts/sarasa-gothic/ +cd .. +cd super +install -Dm644 *.ttc %buildroot/%_datadir/fonts/sarasa-gothic-super/ +cd .. +install -Dm644 %SOURCE2 %buildroot/%_datadir/licenses/%name/ +install -Dm644 %SOURCE3 %buildroot/%_datadir/doc/%name/ +install -Dm644 %SOURCE2 %buildroot/%_datadir/licenses/sarasa-gothic-super-fonts/ +install -Dm644 %SOURCE3 %buildroot/%_datadir/doc/sarasa-gothic-super-fonts/ + + +%files +%doc README.md +%license LICENSE +%defattr(-,root,root,0755) +/%{_datadir}/fonts/sarasa-gothic/ + +%files -n sarasa-gothic-super-fonts +%doc README.md +%license LICENSE +%defattr(-,root,root,0755) +/%{_datadir}/fonts/sarasa-gothic-super/ + +%changelog +* Wed Apr 26 2023 windowsboy111 - 0.40.6 +- Initial package diff --git a/anda/fonts/sarasa-gothic/update.rhai b/anda/fonts/sarasa-gothic/update.rhai new file mode 100644 index 0000000000..0cb79856c4 --- /dev/null +++ b/anda/fonts/sarasa-gothic/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("be5invis/Sarasa-Gothic")); diff --git a/anda/lib/gtk4-layer-shell/anda.hcl b/anda/lib/gtk4-layer-shell/anda.hcl new file mode 100644 index 0000000000..5d3ecca5f1 --- /dev/null +++ b/anda/lib/gtk4-layer-shell/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "gtk4-layer-shell.spec" + } +} diff --git a/anda/lib/gtk4-layer-shell/gtk4-layer-shell.spec b/anda/lib/gtk4-layer-shell/gtk4-layer-shell.spec new file mode 100644 index 0000000000..38ddc0d231 --- /dev/null +++ b/anda/lib/gtk4-layer-shell/gtk4-layer-shell.spec @@ -0,0 +1,63 @@ +Name: gtk4-layer-shell +Version: 1.0.0 +Release: 1%?dist +Summary: A library to create panels and other desktop components for Wayland using the Layer Shell protocol and GTK4 +License: MIT +URL: https://github.com/wmww/gtk4-layer-shell +Source0: %url/archive/refs/tags/v%version.tar.gz +BuildRequires: meson ninja-build python3.11 vala +BuildRequires: libwayland-client gtk4-devel gobject-introspection gtk-doc + +%description +A library for using the Layer Shell Wayland protocol with GTK4. With this library +you can build desktop shell components such as panels, notifications and wallpapers. +You can use it to anchor your windows to a corner or edge of the output, or stretch +them across the entire output. This Library is compatible with C, C++ and any +language that supports GObject introspection files (Python, Vala, etc). + + +%package doc +Summary: gtk4-layer-shell documentation generated by gtk-doc + +%description doc +%summary. + + +%package vapi +Summary: gtk4-layer-shell vapi data + +%description vapi +%summary. + + +%prep +%autosetup + +%build +%meson -Ddocs=true +%meson_build + +%install +%meson_install + + +%files +%doc README.md +%license LICENSE +/usr/include/gtk4-layer-shell/gtk4-layer-shell.h +/usr/lib64/girepository-1.0/Gtk4LayerShell-1.0.typelib +/usr/lib64/libgtk4-layer-shell.so* +/usr/lib64/pkgconfig/gtk4-layer-shell-0.pc +/usr/share/gir-1.0/Gtk4LayerShell-1.0.gir + +%files doc +/usr/share/gtk-doc/html/gtk-layer-shell + +%files vapi +/usr/share/vala/vapi/gtk4-layer-shell-0.deps +/usr/share/vala/vapi/gtk4-layer-shell-0.vapi + + +%changelog +* Fri Apr 28 2023 windowsboy111 +- Initial package. diff --git a/anda/lib/gtk4-layer-shell/update.rhai b/anda/lib/gtk4-layer-shell/update.rhai new file mode 100644 index 0000000000..8285090f3d --- /dev/null +++ b/anda/lib/gtk4-layer-shell/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("wmww/gtk4-layer-shell")); diff --git a/anda/tools/ops2deb/anda.hcl b/anda/tools/ops2deb/anda.hcl new file mode 100644 index 0000000000..dfb28b862a --- /dev/null +++ b/anda/tools/ops2deb/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "ops2deb.spec" + } +} diff --git a/anda/tools/ops2deb/ops2deb.spec b/anda/tools/ops2deb/ops2deb.spec new file mode 100644 index 0000000000..e8e546a5c3 --- /dev/null +++ b/anda/tools/ops2deb/ops2deb.spec @@ -0,0 +1,40 @@ +%global debug_package %nil +%define _python_dist_allow_version_zero # upstream issue? + +Name: python3-ops2deb +Version: 2.4.1 +Release: 1%?dist +Summary: Generate Debian packages for common devops tools +License: MIT +URL: https://github.com/upciti/ops2deb +Source0: %url/archive/refs/tags/%version.tar.gz +BuildRequires: python3-devel poetry python3.10 +BuildRequires: python3dist(setuptools) + +%description +ops2deb is designed to generate Debian packages for common devops tools, but can be used to package any portable application. +It consumes a configuration file and outputs .deb packages. ops2deb can also track new releases of upstream applications and +automatically bump application versions in its configuration file. + + +%prep +%autosetup -n ops2deb-%version + +%build +poetry build + +%install +python3.10 -m ensurepip +python3.10 -m pip install installer +python3.10 -m installer --destdir=%buildroot dist/*.whl +rm -rf %buildroot/%python3_sitelib/*/__pycache__ + +%files +%license LICENSE +%doc README.md +/usr/bin/ops2deb +/usr/lib/python3*/site-packages/ops2deb* + +%changelog +* Fri Apr 28 2023 windowsboy111 - 2.4.1-1 +- Initial package. diff --git a/anda/tools/ops2deb/update.rhai b/anda/tools/ops2deb/update.rhai new file mode 100644 index 0000000000..1acc0dceb8 --- /dev/null +++ b/anda/tools/ops2deb/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("upciti/ops2deb"));