Skip to content

Commit

Permalink
AppImage fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
itsManjeet committed May 15, 2024
1 parent 9e5ed14 commit 7ba6d6d
Show file tree
Hide file tree
Showing 10 changed files with 165 additions and 6 deletions.
73 changes: 73 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"files.associations": {
"any": "cpp",
"array": "cpp",
"atomic": "cpp",
"bit": "cpp",
"*.tcc": "cpp",
"bitset": "cpp",
"cctype": "cpp",
"chrono": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"compare": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"forward_list": "cpp",
"list": "cpp",
"map": "cpp",
"set": "cpp",
"string": "cpp",
"unordered_map": "cpp",
"vector": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"functional": "cpp",
"iterator": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"numeric": "cpp",
"optional": "cpp",
"random": "cpp",
"ratio": "cpp",
"regex": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"fstream": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"mutex": "cpp",
"new": "cpp",
"numbers": "cpp",
"ostream": "cpp",
"ranges": "cpp",
"semaphore": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"stop_token": "cpp",
"streambuf": "cpp",
"thread": "cpp",
"cinttypes": "cpp",
"typeinfo": "cpp",
"valarray": "cpp",
"variant": "cpp"
}
}
2 changes: 1 addition & 1 deletion elements/apps/initial-setup.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
id: initial-setup
version: 0.1.7
version: 0.2.0
about: System Initial Setup
merge:
- ostree-branch.yml
Expand Down
15 changes: 15 additions & 0 deletions elements/apps/tumbler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@ id: tumbler
version: 4.18.2
about: D-Bus thumbnailing service based on the thumbnail management D-Bus Specification

prepare-appimage: |-
install -vDm 0644 /dev/stdin %{install-root}%{datadir}/applications/tumbler.desktop << "EOF"
[Desktop Entry]
Name=Tumbler
Comment=Thumbnail service
Icon=org.xfce.tumbler
Exec=tumblerd
Terminal=false
Type=Application
Categories=System;
EOF
mkdir -p %{install-root}%{bindir}/
ln -sv ../lib/tumbler-1/tumblerd %{install-root}%{bindir}/tumblerd
sources:
- https://archive.xfce.org/src/xfce/tumbler/%{version:2}/tumbler-%{version}.tar.bz2

Expand Down
1 change: 1 addition & 0 deletions elements/apps/welcome-tour.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ prepare-appimage: |-
Exec=env WELCOME_TOUR_AUTOSTART=1 %{bindir}/welcome-tour
Terminal=false
Type=Application
Categories=System;
EOF
install -Dm0644 /files/AppImage.svg %{install-root}%{datadir}/icons/welcome-tour.svg
Expand Down
2 changes: 1 addition & 1 deletion elements/components/debian-archive-keyring.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
id: debian-archive-keyring
version: 2021.1.1
version: 2023.4
about: GnuPG archive keys of the debian archive
release: 0
depends:
Expand Down
4 changes: 3 additions & 1 deletion elements/components/debootstrap.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
id: debootstrap
version: 1.0.132
version: 1.0.134
about: Bootstrap a basic debian system

depends:
- components/binutils.yml
- components/perl.yml
- components/wget.yml
- components/gnupg.yml
- components/debian-archive-keyring.yml

sources:
- https://salsa.debian.org/installer-team/debootstrap/-/archive/%{version}/debootstrap-%{version}.tar.bz2
script: |
Expand Down
2 changes: 1 addition & 1 deletion elements/components/jetring.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
id: jetring
version: 0.31
version: 0.30
about: GPG keyring maintenance using changesets

script: |-
Expand Down
39 changes: 38 additions & 1 deletion elements/components/xfce4/xfce4-session.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,44 @@ pre-script: |-
configure: >-
--disable-debug
post-script: |-
install -vDm0644 /dev/stdin %{install-root}%{sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml << "EOF"
<?xml version="1.0" encoding="UTF-8"?>
<channel name="xfce4-session" version="1.0">
<property name="general" type="empty">
<property name="FailsafeSessionName" type="string" value="Failsafe"/>
<property name="LockCommand" type="string" value=""/>
</property>
<property name="sessions" type="empty">
<property name="Failsafe" type="empty">
<property name="IsFailsafe" type="bool" value="true"/>
<property name="Count" type="int" value="5"/>
<property name="Client0_Command" type="array">
<value type="string" value="xfwm4"/>
</property>
<property name="Client0_Priority" type="int" value="15"/>
<property name="Client0_PerScreen" type="bool" value="false"/>
<property name="Client1_Command" type="array">
<value type="string" value="xfsettingsd"/>
</property>
<property name="Client1_Priority" type="int" value="20"/>
<property name="Client1_PerScreen" type="bool" value="false"/>
<property name="Client2_Command" type="array">
<value type="string" value="xfce4-panel"/>
</property>
<property name="Client2_Priority" type="int" value="25"/>
<property name="Client2_PerScreen" type="bool" value="false"/>
<property name="Client3_Command" type="array">
<value type="string" value="xfdesktop"/>
</property>
<property name="Client3_Priority" type="int" value="35"/>
<property name="Client3_PerScreen" type="bool" value="false"/>
</property>
</property>
</channel>
EOF
depends:
- components/libwnck.yml
- components/xfce4/libxfce4ui.yml
Expand All @@ -20,4 +58,3 @@ depends:
sources:
- https://archive.xfce.org/src/xfce/xfce4-session/%{version:2}/xfce4-session-%{version}.tar.bz2
- patches/xfce4/source-system-xinitrc-scripts.patch
# TODO: fix update url
31 changes: 31 additions & 0 deletions elements/image-builder/debian.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
id: debian
version: 12
about: Debian bootstrap image

variables:
codename: bookworm

capabilities:
- CAP_SYS_CHROOT
- CAP_SYS_ADMIN

build-depends:
- components/debootstrap.yml

script: |-
mkdir -p rootfs
ARCH="%{arch}"
case "%{arch}" in
x86_64)
ARCH="amd64"
;;
esac
debootstrap --arch "${ARCH}" --no-check-gpg %{codename} $PWD/rootfs \
http://deb.debian.org/debian/
mkdir -pv %{install-root}
echo "compressing rootfs"
tar -caf %{install-root}/bootstrap-%{id}-%{version}-%{codename}-%{arch}.tar.zst -C $PWD/rootfs .
2 changes: 1 addition & 1 deletion src/initial-setup
Submodule initial-setup updated 1 files
+4 −2 src/Worker.cxx

0 comments on commit 7ba6d6d

Please sign in to comment.