Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging #90

Merged
merged 5 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup Version
run: |
VERSION="${GITHUB_REF#refs/*/}"
if [ $VERSION != "stable" ] && [ $VERSION != "staging"] ; then
if [ $VERSION != "stable" ] && [ $VERSION != "staging" ] ; then
VERSION="experimental"
fi
cat > version.yml << EOF
Expand Down
97 changes: 0 additions & 97 deletions .vscode/settings.json

This file was deleted.

21 changes: 15 additions & 6 deletions elements/apps/firefox.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
id: firefox
version: 117.0
version: 120.0
about:
Mozilla Firefox or simply Firefox is a free and open-source web browser developed
by the Mozilla Foundation and its subsidiary, the Mozilla Corporation. Firefox uses
Expand All @@ -12,12 +12,21 @@ script: |-
mkdir -p %{install-root}/%{bindir}

mv firefox %{install-root}/%{libdir}/
install -D -m 0755 /dev/stdin %{install-root}/%{bindir}/firefox << EOF
#!/bin/sh
exec %{libdir}/firefox/firefox --class "Firefox" --name "Firefox" "$@"
EOF
ln -sv %{libdir}/firefox/firefox %{install-root}/%{bindir}/firefox

install -D -m 0644 -t %{install-root}/%{datadir}/applications/ /files/firefox/firefox.desktop
install -D -m 0644 /dev/stdin %{install-root}/%{datadir}/applications/firefox.desktop << "EOF"
[Desktop Entry]
Name=Firefox
Name[en_US]=Firefox
GenericName=Web Browser
GenericName[en_US]=Web Browser
Comment=Free web browser from Mozilla
Exec=firefox %U
Terminal=false
Type=Application
Icon=firefox
Categories=Network;
EOF

rm -rf %{install-root}/%{libdir}/firefox/browser/features
install -vDm644 /dev/stdin %{install-root}/%{libdir}/firefox/distribution/policies.json << "EOF"
Expand Down
1 change: 1 addition & 0 deletions elements/collections/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ depends:
- components/xdg-user-dirs-gtk.yml
- components/xdg-utils.yml
- components/flatpak.yml
- components/power-profiles-daemon.yml

# X11
- components/x11/xserver.yml
Expand Down
2 changes: 1 addition & 1 deletion elements/components/initial-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ merge: [version.yml]
about: System Initial Setup

variables:
commit: f1dae25a548e32a9b309042ed57baeccc9360531
commit: 668a7ae3a5aa10d9ff74af64cf922b6cd82041b3
release: 1

post-script: |-
Expand Down
15 changes: 8 additions & 7 deletions elements/components/nvidia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,6 @@ script: |-
# install -Dm755 "libnvidia-compiler.so.%{version}" "%{install-root}/usr/lib/libnvidia-compiler.so.%{version}"
install -Dm755 "libnvidia-opencl.so.%{version}" "%{install-root}/usr/lib/libnvidia-opencl.so.%{version}"

find "%{install-root}" -type f -name '*.so*' ! -path '*xorg/*' -print0 | while read -d $'\0' _lib; do
_soname=$(dirname "${_lib}")/$(readelf -d "${_lib}" | grep -Po 'SONAME.*: \[\K[^]]*' || true)
_base=$(echo ${_soname} | sed -r 's/(.*)\.so.*/\1.so/')
[[ -e "${_soname}" ]] || ln -s $(basename "${_lib}") "${_soname}"
[[ -e "${_base}" ]] || ln -s $(basename "${_soname}") "${_base}"
done

install -Dm755 nvidia_drv.so "%{install-root}/usr/lib/xorg/modules/drivers/nvidia_drv.so"

# Wayland/GBM
Expand Down Expand Up @@ -194,3 +187,11 @@ script: |-

echo "blacklist nouveau" | install -Dm644 /dev/stdin "%{install-root}/usr/lib/modprobe.d/%{id}.conf"
echo "nvidia-uvm" | install -Dm644 /dev/stdin "%{install-root}/usr/lib/modules-load.d/%{id}.conf"


find "%{install-root}" -type f -name '*.so*' ! -path '*xorg/*' -print0 | while read -d $'\0' _lib; do
_soname=$(dirname "${_lib}")/$(readelf -d "${_lib}" | grep -Po 'SONAME.*: \[\K[^]]*' || true)
_base=$(echo ${_soname} | sed -r 's/(.*)\.so.*/\1.so/')
[[ -e "${_soname}" ]] || ln -s $(basename "${_lib}") "${_soname}"
[[ -e "${_base}" ]] || ln -s $(basename "${_soname}") "${_base}"
done
16 changes: 16 additions & 0 deletions elements/components/power-profiles-daemon.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
id: power-profiles-daemon
version: 0.13
about: Makes power profiles handling available over D-Bus

post-script: |-
install -v -D -m 0644 /dev/stdin %{install-root}%{libdir}/systemd/system-preset/%{id}.preset << "EOF"
enable %{id}.service
EOF

depends:
- components/polkit.yml
- components/upower.yml
- components/py/py-gobject.yml

sources:
- https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/archive/%{version}/power-profiles-daemon-%{version}.tar.gz
7 changes: 7 additions & 0 deletions elements/components/py/py-cups.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
id: py-cups
version: 2.0.1
about: Python bindings to libcups
depends:
- components/cups.yml
sources:
- py-cups-%{version}.tar.gz::https://github.com/OpenPrinting/pycups/archive/v%{version}.tar.gz
15 changes: 15 additions & 0 deletions elements/components/py/py-curl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
id: py-curl
version: 7.45.2
about: Python bindings to curl

pre-script: |-
make

depends:
- components/curl.yml

build-depends:
- components/py/py-setuptools.yml

sources:
- https://github.com/pycurl/pycurl/archive/REL_%{version:_}/python-pycurl-%{version}.tar.gz
2 changes: 1 addition & 1 deletion elements/components/swupd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 0.1.0
about: Software Updater Daemon

variables:
commit: 2d8ef298f6d2f3e918f79053aa571aad3f8bcfcc
commit: 35e069d6ee4e2df2f8c31b5a30ff86e1127a6e74

post-script: |-
install -v -D -m 0755 -t %{install-root}%{bindir} target/release/%{id}
Expand Down
40 changes: 40 additions & 0 deletions elements/components/system-config-printer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
id: system-config-printer
version: 1.5.18
about: A CUPS printer configuration tool and status applet

build-type: autotools

configure: >-
--with-systemdsystemunitdir=%{libdir}/systemd/system
--with-udevdir=%{libdir}/udev
--with-udev-rules
--with-cups-serverbin-dir=%{libdir}/cups

post-script: |-
find %{install-root} -name "*.py" -exec python -mpy_compile {} +
find %{install-root} -name "*.py" -exec python -O -mpy_compile {} +

install -dm755 %{install-root}/usr/share/dbus-1/system.d
mv %{install-root}/etc/dbus-1/system.d/* %{install-root}/usr/share/dbus-1/system.d
rm -rf %{install-root}/etc/dbus-1

# TODO: Why we need to do this manually??
mv %{install-root}/%{libdir}/python3.11/site-packages/cupshelpers-1.0-py3.11.egg/cupshelpers \
%{install-root}/%{libdir}/python3.11/site-packages/

# Show settings on Xfce4 Settings Manager
sed -i '/^Categories=/ s/$/X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;/' %{install-root}/%{datadir}/applications/%{id}.desktop


depends:
- components/gtk.yml
- components/libnotify.yml
- components/libusb.yml
- components/libsecret.yml
- components/py/py-cairo.yml
- components/py/py-dbus.yml
- components/py/py-cups.yml
- components/py/py-curl.yml

sources:
- https://github.com/OpenPrinting/system-config-printer/releases/download/v%{version}/system-config-printer-%{version}.tar.xz
1 change: 1 addition & 0 deletions elements/system/repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ include:
- components/xfce4/thunar-plugins/thunar-archive-plugin.yml

- components/network-manager-applet.yml
- components/system-config-printer.yml

- apps/firefox.yml

Expand Down
Loading