Skip to content

Commit 0453e6a

Browse files
bengotowbengotow
committed
Add more missing packages to deb, rpm metadata
1 parent 501a2a4 commit 0453e6a

3 files changed

Lines changed: 60 additions & 16 deletions

File tree

‎.github/workflows/build-linux.yaml‎

Lines changed: 57 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
apt-get install -f -y
134134
135135
# Install xvfb and additional runtime libraries for Electron
136-
apt-get install -y xvfb libatk-bridge2.0-0 libgbm1
136+
apt-get install -y xvfb libatk-bridge2.0-0 libgbm1 libgtk-3-0 libasound2
137137
138138
# Verify installation succeeded
139139
dpkg -l | grep mailspring || (echo '✗ Mailspring package not installed' && exit 1)
@@ -158,17 +158,29 @@ jobs:
158158
exit 1
159159
fi
160160
161-
# Verify mailsync binary exists
161+
# Verify mailsync binary exists (check multiple locations)
162162
if [ -f /usr/share/mailspring/mailsync ]; then
163163
echo 'Found mailsync binary at /usr/share/mailspring/mailsync'
164+
MAILSYNC_PATH=/usr/share/mailspring/mailsync
165+
elif [ -f /usr/share/mailspring/mailsync.bin ]; then
166+
echo 'Found mailsync binary at /usr/share/mailspring/mailsync.bin'
167+
MAILSYNC_PATH=/usr/share/mailspring/mailsync.bin
168+
elif [ -f /usr/share/mailspring/resources/app.asar.unpacked/mailsync ]; then
169+
echo 'Found mailsync binary at /usr/share/mailspring/resources/app.asar.unpacked/mailsync'
170+
MAILSYNC_PATH=/usr/share/mailspring/resources/app.asar.unpacked/mailsync
171+
elif [ -f /usr/share/mailspring/resources/app.asar.unpacked/mailsync.bin ]; then
172+
echo 'Found mailsync binary at /usr/share/mailspring/resources/app.asar.unpacked/mailsync.bin'
173+
MAILSYNC_PATH=/usr/share/mailspring/resources/app.asar.unpacked/mailsync.bin
164174
else
165-
echo '✗ mailsync binary not found at /usr/share/mailspring/mailsync'
175+
echo '✗ mailsync binary not found'
176+
echo 'Files in /usr/share/mailspring/:'
177+
ls -la /usr/share/mailspring/ | head -30
166178
exit 1
167179
fi
168180
169181
# Run mailsync --help (no X11 required for mailsync)
170182
echo 'Running mailsync --help...'
171-
/usr/share/mailspring/mailsync --help > /tmp/mailsync-help.txt 2>&1 || true
183+
\$MAILSYNC_PATH --help > /tmp/mailsync-help.txt 2>&1 || true
172184
cat /tmp/mailsync-help.txt
173185
174186
# Verify mailsync help output (should contain usage info)
@@ -202,7 +214,7 @@ jobs:
202214
203215
# Install dependencies first
204216
cd /workspace
205-
dnf install -y xorg-x11-server-Xvfb which
217+
dnf install -y xorg-x11-server-Xvfb which alsa-lib
206218
207219
# Install the RPM package (dnf will auto-resolve dependencies)
208220
dnf install -y *.rpm
@@ -230,17 +242,37 @@ jobs:
230242
exit 1
231243
fi
232244
233-
# Verify mailsync binary exists
245+
# Verify mailsync binary exists (check multiple possible locations and names)
234246
if [ -f /usr/share/mailspring/mailsync ]; then
235247
echo 'Found mailsync binary at /usr/share/mailspring/mailsync'
248+
MAILSYNC_PATH=/usr/share/mailspring/mailsync
249+
elif [ -f /usr/share/mailspring/mailsync.bin ]; then
250+
echo 'Found mailsync binary at /usr/share/mailspring/mailsync.bin'
251+
MAILSYNC_PATH=/usr/share/mailspring/mailsync.bin
252+
elif [ -f /usr/share/mailspring/resources/app.asar.unpacked/mailsync ]; then
253+
echo 'Found mailsync binary at /usr/share/mailspring/resources/app.asar.unpacked/mailsync'
254+
MAILSYNC_PATH=/usr/share/mailspring/resources/app.asar.unpacked/mailsync
255+
elif [ -f /usr/share/mailspring/resources/app.asar.unpacked/mailsync.bin ]; then
256+
echo 'Found mailsync binary at /usr/share/mailspring/resources/app.asar.unpacked/mailsync.bin'
257+
MAILSYNC_PATH=/usr/share/mailspring/resources/app.asar.unpacked/mailsync.bin
258+
elif [ -f /usr/local/share/mailspring/mailsync ]; then
259+
echo 'Found mailsync binary at /usr/local/share/mailspring/mailsync'
260+
MAILSYNC_PATH=/usr/local/share/mailspring/mailsync
261+
elif [ -f /usr/local/share/mailspring/mailsync.bin ]; then
262+
echo 'Found mailsync binary at /usr/local/share/mailspring/mailsync.bin'
263+
MAILSYNC_PATH=/usr/local/share/mailspring/mailsync.bin
236264
else
237-
echo '✗ mailsync binary not found at /usr/share/mailspring/mailsync'
265+
echo '✗ mailsync binary not found'
266+
echo 'Searching for mailsync in RPM files:'
267+
rpm -ql mailspring | grep -i mailsync || echo 'No mailsync found in package'
268+
echo 'Files in /usr/share/mailspring/:'
269+
ls -la /usr/share/mailspring/ | head -30
238270
exit 1
239271
fi
240272
241273
# Run mailsync --help (no X11 required for mailsync)
242274
echo 'Running mailsync --help...'
243-
/usr/share/mailspring/mailsync --help > /tmp/mailsync-help.txt 2>&1 || true
275+
\$MAILSYNC_PATH --help > /tmp/mailsync-help.txt 2>&1 || true
244276
cat /tmp/mailsync-help.txt
245277
246278
# Verify mailsync help output (should contain usage info)
@@ -269,9 +301,9 @@ jobs:
269301
set -e
270302
echo '=== Testing Mailspring installation on Arch Linux ==='
271303
272-
# Update package database and install required tools
304+
# Update package database and install required tools and libraries
273305
pacman -Syu --noconfirm
274-
pacman -S --noconfirm xorg-server-xvfb binutils
306+
pacman -S --noconfirm xorg-server-xvfb binutils nspr nss gtk3 alsa-lib
275307
276308
# Extract the DEB package manually (ar + tar)
277309
cd /workspace
@@ -305,17 +337,29 @@ jobs:
305337
exit 1
306338
fi
307339
308-
# Verify mailsync binary exists
340+
# Verify mailsync binary exists (check multiple locations)
309341
if [ -f /usr/share/mailspring/mailsync ]; then
310342
echo 'Found mailsync binary at /usr/share/mailspring/mailsync'
343+
MAILSYNC_PATH=/usr/share/mailspring/mailsync
344+
elif [ -f /usr/share/mailspring/mailsync.bin ]; then
345+
echo 'Found mailsync binary at /usr/share/mailspring/mailsync.bin'
346+
MAILSYNC_PATH=/usr/share/mailspring/mailsync.bin
347+
elif [ -f /usr/share/mailspring/resources/app.asar.unpacked/mailsync ]; then
348+
echo 'Found mailsync binary at /usr/share/mailspring/resources/app.asar.unpacked/mailsync'
349+
MAILSYNC_PATH=/usr/share/mailspring/resources/app.asar.unpacked/mailsync
350+
elif [ -f /usr/share/mailspring/resources/app.asar.unpacked/mailsync.bin ]; then
351+
echo 'Found mailsync binary at /usr/share/mailspring/resources/app.asar.unpacked/mailsync.bin'
352+
MAILSYNC_PATH=/usr/share/mailspring/resources/app.asar.unpacked/mailsync.bin
311353
else
312-
echo '✗ mailsync binary not found at /usr/share/mailspring/mailsync'
354+
echo '✗ mailsync binary not found'
355+
echo 'Files in /usr/share/mailspring/:'
356+
ls -la /usr/share/mailspring/ | head -30
313357
exit 1
314358
fi
315359
316360
# Run mailsync --help (no X11 required for mailsync)
317361
echo 'Running mailsync --help...'
318-
/usr/share/mailspring/mailsync --help > /tmp/mailsync-help.txt 2>&1 || true
362+
\$MAILSYNC_PATH --help > /tmp/mailsync-help.txt 2>&1 || true
319363
cat /tmp/mailsync-help.txt
320364
321365
# Verify mailsync help output (should contain usage info)

‎app/build/resources/linux/debian/control.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: <%= name %>
22
Version: <%= version %>
3-
Depends: libsecret-1-dev, libgtk2.0-0, libudev0 | libudev1, libgcrypt11 | libgcrypt20, libnotify4, libxtst6, libnss3, gvfs-bin | libglib2.0-bin, xdg-utils, libtidy-dev, libcurl4 | libcurl3, libssl3 | libssl1.1, libsasl2-2, libgbm1, libatk-bridge2.0-0
3+
Depends: libasound2, libatk-bridge2.0-0, libatspi2.0-0, libcurl4, libgbm1, libgcrypt20, libglib2.0-bin, libgtk-3-0 (>= 3.10.0), libnotify4, libnss3, libsasl2-2, libsecret-1-0, libssl3, libtidy5deb1, libudev1, libxss1, libxtst6, xdg-utils
44
Suggests: gir1.2-gnomekeyring-1.0
55
Section: <%= section %>
66
Priority: optional

‎app/build/resources/linux/redhat/mailspring.spec.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ AutoReqProv: no # Avoid libchromiumcontent.so missing dependency
88

99
%ifarch i386 i486 i586 i686
1010
Recommends: lsb-core-noarch
11-
Requires: libXss.so.1, libsecret-1.so.0, (libtidy.so.5 or libtidy.so.58), ca-certificates, libcurl.so.4, libssl.so.3, libcrypto.so.3, libsasl2.so.3, mesa-libgbm
11+
Requires: libasound.so.2, libXss.so.1, libsecret-1.so.0, (libtidy.so.5 or libtidy.so.58), ca-certificates, libcurl.so.4, libssl.so.3, libcrypto.so.3, libsasl2.so.3, mesa-libgbm, gtk3, at-spi2-core, xdg-utils, libnotify
1212
%if 0%{?rhel} >= 8
1313
Requires: libappindicator-gtk3
1414
%else
1515
Requires: libappindicator
1616
%endif
1717
%else
1818
Recommends: lsb-core-noarch
19-
Requires: libXss.so.1()(64bit), libsecret-1.so.0()(64bit), (libtidy.so.5()(64bit) or libtidy.so.58()(64bit)), ca-certificates, libcurl.so.4()(64bit), libssl.so.3()(64bit), libcrypto.so.3()(64bit), libsasl2.so.3()(64bit), mesa-libgbm
19+
Requires: libasound.so.2()(64bit), libXss.so.1()(64bit), libsecret-1.so.0()(64bit), (libtidy.so.5()(64bit) or libtidy.so.58()(64bit)), ca-certificates, libcurl.so.4()(64bit), libssl.so.3()(64bit), libcrypto.so.3()(64bit), libsasl2.so.3()(64bit), mesa-libgbm, gtk3, at-spi2-core, xdg-utils, libnotify
2020
%if 0%{?rhel} >= 8
2121
Requires: libappindicator-gtk3
2222
%else

0 commit comments

Comments
 (0)