Skip to content

Commit

Permalink
Merge tag 'v1.10.14' into sc
Browse files Browse the repository at this point in the history
* Builds Windows 32-bit builds once more! ([\element-hq#369](element-hq#369)). Fixes element-hq/element-web#13175.
* Option to disable hardware acceleration ([\element-hq#365](element-hq#365)). Fixes element-hq/element-web#13648. Contributed by @novocaine.
* Make Lao translation available ([\#22358](element-hq/element-web#22358)). Fixes element-hq/element-web#22327.
* Option to disable hardware acceleration on Element Desktop ([\#22295](element-hq/element-web#22295)). Contributed by @novocaine.
* Configure custom home.html via `.well-known/matrix/client["io.element.embedded_pages"]["home_url"]` for all your element-web/desktop users ([\#7790](matrix-org/matrix-react-sdk#7790)). Contributed by @johannes-krude.
* Live location sharing - open location in OpenStreetMap ([\#8695](matrix-org/matrix-react-sdk#8695)). Contributed by @kerryarchibald.
* Show a dialog when Jitsi encounters an error ([\#8701](matrix-org/matrix-react-sdk#8701)). Fixes element-hq/element-web#22284.
* Add support for setting the `avatar_url` of widgets by integration managers. ([\#8550](matrix-org/matrix-react-sdk#8550)). Contributed by @Fox32.
* Add an option to ignore (block) a user when reporting their events ([\#8471](matrix-org/matrix-react-sdk#8471)).
* Add the option to disable hardware acceleration ([\#8655](matrix-org/matrix-react-sdk#8655)). Contributed by @novocaine.
* Slightly better presentation of read receipts to screen reader users ([\#8662](matrix-org/matrix-react-sdk#8662)). Fixes element-hq/element-web#22293. Contributed by @pvagner.
* Add jump to related event context menu item ([\#6775](matrix-org/matrix-react-sdk#6775)). Fixes element-hq/element-web#19883.
* Add public room directory hook ([\#8626](matrix-org/matrix-react-sdk#8626)).
* Revert back to using libsqlcipher0 for Debian & Ubuntu packages of Desktop ([\element-hq#367](element-hq#367)). Fixes element-hq/element-web#22325.
* Stop Jitsi if we time out while connecting to a video room ([\#22301](element-hq/element-web#22301)). Fixes element-hq/element-web#22283.
* Remove inline margin from UTD error message inside a reply tile on ThreadView ([\#8708](matrix-org/matrix-react-sdk#8708)). Fixes element-hq/element-web#22376. Contributed by @luixxiul.
* Move unread notification dots of the threads list to the expected position ([\#8700](matrix-org/matrix-react-sdk#8700)). Fixes element-hq/element-web#22350. Contributed by @luixxiul.
* Prevent overflow of grid items on a bubble with UTD generally ([\#8697](matrix-org/matrix-react-sdk#8697)). Contributed by @luixxiul.
* Create 'Unable To Decrypt' grid layout for hidden events on a bubble layout ([\#8704](matrix-org/matrix-react-sdk#8704)). Fixes element-hq/element-web#22365. Contributed by @luixxiul.
* Fix - AccessibleButton does not set disabled attribute ([\#8682](matrix-org/matrix-react-sdk#8682)). Contributed by @kerryarchibald.
* Fix font not resetting when logging out ([\#8670](matrix-org/matrix-react-sdk#8670)). Fixes element-hq/element-web#17228.
* Fix local aliases section of room settings not working for some homeservers (ie ([\#8698](matrix-org/matrix-react-sdk#8698)). Fixes element-hq/element-web#22337.
* Align EventTile_line with display name on message bubble ([\#8692](matrix-org/matrix-react-sdk#8692)). Fixes element-hq/element-web#22343. Contributed by @luixxiul.
* Convert references to direct chat -> direct message ([\#8694](matrix-org/matrix-react-sdk#8694)). Contributed by @novocaine.
* Improve combining diacritics for U+20D0 to U+20F0 in Chrome ([\#8687](matrix-org/matrix-react-sdk#8687)).
* Make the empty thread panel fill BaseCard ([\#8690](matrix-org/matrix-react-sdk#8690)). Fixes element-hq/element-web#22338. Contributed by @luixxiul.
* Fix edge case around composer handling gendered facepalm emoji ([\#8686](matrix-org/matrix-react-sdk#8686)).
* Fix a grid blowout due to nowrap displayName on a bubble with UTD ([\#8688](matrix-org/matrix-react-sdk#8688)). Fixes element-hq/element-web#21914. Contributed by @luixxiul.
* Apply the same max-width to image tile on the thread timeline as message bubble ([\#8669](matrix-org/matrix-react-sdk#8669)). Fixes element-hq/element-web#22313. Contributed by @luixxiul.
* Fix dropdown button size for picture-in-picture CallView ([\#8680](matrix-org/matrix-react-sdk#8680)). Fixes element-hq/element-web#22316. Contributed by @luixxiul.
* Live location sharing - fix square border for image-less avatar (PSF-1052) ([\#8679](matrix-org/matrix-react-sdk#8679)). Contributed by @kerryarchibald.
* Stop connecting to a video room if the widget messaging disappears ([\#8660](matrix-org/matrix-react-sdk#8660)).
* Fix file button and audio player overflowing from message bubble ([\#8666](matrix-org/matrix-react-sdk#8666)). Fixes element-hq/element-web#22308. Contributed by @luixxiul.
* Don't show broken composer format bar when selection is whitespace ([\#8673](matrix-org/matrix-react-sdk#8673)). Fixes element-hq/element-web#10788.
* Fix media upload http 413 handling ([\#8674](matrix-org/matrix-react-sdk#8674)).
* Fix emoji picker for editing thread responses ([\#8671](matrix-org/matrix-react-sdk#8671)). Fixes matrix-org/element-web-rageshakes#13129.
* Map attribution while sharing live location is now visible ([\#8621](matrix-org/matrix-react-sdk#8621)). Fixes element-hq/element-web#22236. Contributed by @weeman1337.
* Fix info tile overlapping the time stamp on TimelineCard ([\#8639](matrix-org/matrix-react-sdk#8639)). Fixes element-hq/element-web#22256. Contributed by @luixxiul.
* Fix position of wide images on IRC / modern layout ([\#8667](matrix-org/matrix-react-sdk#8667)). Fixes element-hq/element-web#22309. Contributed by @luixxiul.
* Fix other user's displayName being wrapped on the bubble message layout ([\#8456](matrix-org/matrix-react-sdk#8456)). Fixes element-hq/element-web#22004. Contributed by @luixxiul.
* Set spacing declarations to elements in mx_EventTile_mediaLine ([\#8665](matrix-org/matrix-react-sdk#8665)). Fixes element-hq/element-web#22307. Contributed by @luixxiul.
* Fix wide image overflowing from the thumbnail container ([\#8663](matrix-org/matrix-react-sdk#8663)). Fixes element-hq/element-web#22303. Contributed by @luixxiul.
* Fix styles of "Show all" link button on ReactionsRow ([\#8658](matrix-org/matrix-react-sdk#8658)). Fixes element-hq/element-web#22300. Contributed by @luixxiul.
* Automatically log in after registration ([\#8654](matrix-org/matrix-react-sdk#8654)). Fixes element-hq/element-web#19305. Contributed by @justjanne.
* Fix offline status in window title not working reliably ([\#8656](matrix-org/matrix-react-sdk#8656)).
* Align input area with event body's first letter in a thread on IRC/modern layout ([\#8636](matrix-org/matrix-react-sdk#8636)). Fixes element-hq/element-web#22252. Contributed by @luixxiul.
* Fix crash on null idp for SSO buttons ([\#8650](matrix-org/matrix-react-sdk#8650)). Contributed by @hughns.
* Don't open the regular browser or our context menu on right-clicking the `Options` button in the message action bar ([\#8648](matrix-org/matrix-react-sdk#8648)). Fixes element-hq/element-web#22279.
* Show notifications even when Element is focused ([\#8590](matrix-org/matrix-react-sdk#8590)). Contributed by @sumnerevans.
* Remove padding from the buttons on edit message composer of a event tile on a thread ([\#8632](matrix-org/matrix-react-sdk#8632)). Contributed by @luixxiul.
* ensure metaspace changes correctly notify listeners ([\#8611](matrix-org/matrix-react-sdk#8611)). Fixes element-hq/element-web#21006. Contributed by @justjanne.
* Hide image banner on stickers, they have a tooltip already ([\#8641](matrix-org/matrix-react-sdk#8641)). Fixes element-hq/element-web#22244.
* Adjust EditMessageComposer style declarations ([\#8631](matrix-org/matrix-react-sdk#8631)). Fixes element-hq/element-web#22231. Contributed by @luixxiul.
  • Loading branch information
su-ex committed Jun 7, 2022
2 parents 4ece24b + 35d7c33 commit bb2a41e
Show file tree
Hide file tree
Showing 24 changed files with 696 additions and 341 deletions.
48 changes: 35 additions & 13 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,23 @@ on:
pull_request: { }
push:
branches: [ develop, master ]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
windows:
name: Windows
strategy:
matrix:
include:
- target: x86_64-pc-windows-msvc
arch: x64
- target: i686-pc-windows-msvc
arch: x86
build-args: --ia32
name: Windows (${{ matrix.arch }})
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Cache .hak
uses: actions/cache@v3
Expand All @@ -17,11 +28,10 @@ jobs:
path: |
./.hak
- name: Install nmake
- name: Set up build tools
uses: ilammy/msvc-dev-cmd@v1

- name: Install Microsoft Build Tools
uses: microsoft/setup-msbuild@v1.1
with:
arch: ${{ matrix.arch }}

# ActiveTCL package on choco is from 2015,
# this one is newer but includes more than we need
Expand All @@ -41,6 +51,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: ${{ matrix.target }}

- uses: actions/setup-node@v3
with:
Expand All @@ -51,19 +62,24 @@ jobs:
run: "yarn install --pure-lockfile"

- name: Build Natives
shell: pwsh
run: |
refreshenv
yarn build:native
yarn build:native --target ${{ matrix.target }}
- name: Build App
run: "yarn build --publish never"
run: "yarn build --publish never -w ${{ matrix.build-args }}"

linux:
name: Linux
strategy:
matrix:
include:
- sqlcipher: system
- sqlcipher: static
static: 1
name: 'Linux (sqlcipher: ${{ matrix.sqlcipher }})'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Cache .hak
uses: actions/cache@v3
Expand All @@ -77,6 +93,10 @@ jobs:
with:
toolchain: stable

- name: Install libsqlcipher-dev
if: matrix.sqlcipher == 'system'
run: sudo apt-get install -y libsqlcipher-dev

- uses: actions/setup-node@v3
with:
cache: "yarn"
Expand All @@ -87,15 +107,17 @@ jobs:

- name: Build Natives
run: "yarn build:native"
env:
SQLCIPHER_STATIC: ${{ matrix.static }}

- name: Build App
run: "yarn build --publish never"

macos:
name: macOS
name: macOS (universal)
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Cache .hak
uses: actions/cache@v3
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Pull Request
on:
pull_request_target:
types: [ opened, edited, labeled, unlabeled, synchronize ]
concurrency: ${{ github.workflow }}-${{ github.event.pull_request.head.ref }}
jobs:
changelog:
name: Preview Changelog
Expand Down
36 changes: 1 addition & 35 deletions .github/workflows/static_analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,41 +23,7 @@ jobs:

i18n_lint:
name: "i18n Check"
runs-on: ubuntu-latest
permissions:
pull-requests: read
steps:
- uses: actions/checkout@v2

- name: "Get modified files"
id: changed_files
if: github.event_name == 'pull_request' && github.actor != 'RiotTranslateBot'
uses: tj-actions/changed-files@v19
with:
files: |
src/i18n/strings/*
files_ignore: |
src/i18n/strings/en_EN.json
- name: "Assert only en_EN was modified"
if: |
github.event_name == 'pull_request' &&
github.actor != 'RiotTranslateBot' &&
steps.changed_files.outputs.any_modified == 'true'
run: |
echo "You can only modify en_EN.json, do not touch any of the other i18n files as Weblate will be confused"
exit 1
- uses: actions/setup-node@v3
with:
cache: 'yarn'

# Does not need branch matching as only analyses this layer
- name: Install Deps
run: "yarn install --pure-lockfile"

- name: i18n Check
run: "yarn run diff-i18n"
uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop

js_lint:
name: "ESLint"
Expand Down
60 changes: 60 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,63 @@
Changes in [1.10.14](https://github.com/vector-im/element-desktop/releases/tag/v1.10.14) (2022-06-07)
=====================================================================================================

## ✨ Features
* Builds Windows 32-bit builds once more! ([\#369](https://github.com/vector-im/element-desktop/pull/369)). Fixes vector-im/element-web#13175.
* Option to disable hardware acceleration ([\#365](https://github.com/vector-im/element-desktop/pull/365)). Fixes vector-im/element-web#13648. Contributed by @novocaine.
* Make Lao translation available ([\#22358](https://github.com/vector-im/element-web/pull/22358)). Fixes vector-im/element-web#22327.
* Option to disable hardware acceleration on Element Desktop ([\#22295](https://github.com/vector-im/element-web/pull/22295)). Contributed by @novocaine.
* Configure custom home.html via `.well-known/matrix/client["io.element.embedded_pages"]["home_url"]` for all your element-web/desktop users ([\#7790](https://github.com/matrix-org/matrix-react-sdk/pull/7790)). Contributed by @johannes-krude.
* Live location sharing - open location in OpenStreetMap ([\#8695](https://github.com/matrix-org/matrix-react-sdk/pull/8695)). Contributed by @kerryarchibald.
* Show a dialog when Jitsi encounters an error ([\#8701](https://github.com/matrix-org/matrix-react-sdk/pull/8701)). Fixes vector-im/element-web#22284.
* Add support for setting the `avatar_url` of widgets by integration managers. ([\#8550](https://github.com/matrix-org/matrix-react-sdk/pull/8550)). Contributed by @Fox32.
* Add an option to ignore (block) a user when reporting their events ([\#8471](https://github.com/matrix-org/matrix-react-sdk/pull/8471)).
* Add the option to disable hardware acceleration ([\#8655](https://github.com/matrix-org/matrix-react-sdk/pull/8655)). Contributed by @novocaine.
* Slightly better presentation of read receipts to screen reader users ([\#8662](https://github.com/matrix-org/matrix-react-sdk/pull/8662)). Fixes vector-im/element-web#22293. Contributed by @pvagner.
* Add jump to related event context menu item ([\#6775](https://github.com/matrix-org/matrix-react-sdk/pull/6775)). Fixes vector-im/element-web#19883.
* Add public room directory hook ([\#8626](https://github.com/matrix-org/matrix-react-sdk/pull/8626)).

## 🐛 Bug Fixes
* Revert back to using libsqlcipher0 for Debian & Ubuntu packages of Desktop ([\#367](https://github.com/vector-im/element-desktop/pull/367)). Fixes vector-im/element-web#22325.
* Stop Jitsi if we time out while connecting to a video room ([\#22301](https://github.com/vector-im/element-web/pull/22301)). Fixes vector-im/element-web#22283.
* Remove inline margin from UTD error message inside a reply tile on ThreadView ([\#8708](https://github.com/matrix-org/matrix-react-sdk/pull/8708)). Fixes vector-im/element-web#22376. Contributed by @luixxiul.
* Move unread notification dots of the threads list to the expected position ([\#8700](https://github.com/matrix-org/matrix-react-sdk/pull/8700)). Fixes vector-im/element-web#22350. Contributed by @luixxiul.
* Prevent overflow of grid items on a bubble with UTD generally ([\#8697](https://github.com/matrix-org/matrix-react-sdk/pull/8697)). Contributed by @luixxiul.
* Create 'Unable To Decrypt' grid layout for hidden events on a bubble layout ([\#8704](https://github.com/matrix-org/matrix-react-sdk/pull/8704)). Fixes vector-im/element-web#22365. Contributed by @luixxiul.
* Fix - AccessibleButton does not set disabled attribute ([\#8682](https://github.com/matrix-org/matrix-react-sdk/pull/8682)). Contributed by @kerryarchibald.
* Fix font not resetting when logging out ([\#8670](https://github.com/matrix-org/matrix-react-sdk/pull/8670)). Fixes vector-im/element-web#17228.
* Fix local aliases section of room settings not working for some homeservers (ie ([\#8698](https://github.com/matrix-org/matrix-react-sdk/pull/8698)). Fixes vector-im/element-web#22337.
* Align EventTile_line with display name on message bubble ([\#8692](https://github.com/matrix-org/matrix-react-sdk/pull/8692)). Fixes vector-im/element-web#22343. Contributed by @luixxiul.
* Convert references to direct chat -> direct message ([\#8694](https://github.com/matrix-org/matrix-react-sdk/pull/8694)). Contributed by @novocaine.
* Improve combining diacritics for U+20D0 to U+20F0 in Chrome ([\#8687](https://github.com/matrix-org/matrix-react-sdk/pull/8687)).
* Make the empty thread panel fill BaseCard ([\#8690](https://github.com/matrix-org/matrix-react-sdk/pull/8690)). Fixes vector-im/element-web#22338. Contributed by @luixxiul.
* Fix edge case around composer handling gendered facepalm emoji ([\#8686](https://github.com/matrix-org/matrix-react-sdk/pull/8686)).
* Fix a grid blowout due to nowrap displayName on a bubble with UTD ([\#8688](https://github.com/matrix-org/matrix-react-sdk/pull/8688)). Fixes vector-im/element-web#21914. Contributed by @luixxiul.
* Apply the same max-width to image tile on the thread timeline as message bubble ([\#8669](https://github.com/matrix-org/matrix-react-sdk/pull/8669)). Fixes vector-im/element-web#22313. Contributed by @luixxiul.
* Fix dropdown button size for picture-in-picture CallView ([\#8680](https://github.com/matrix-org/matrix-react-sdk/pull/8680)). Fixes vector-im/element-web#22316. Contributed by @luixxiul.
* Live location sharing - fix square border for image-less avatar (PSF-1052) ([\#8679](https://github.com/matrix-org/matrix-react-sdk/pull/8679)). Contributed by @kerryarchibald.
* Stop connecting to a video room if the widget messaging disappears ([\#8660](https://github.com/matrix-org/matrix-react-sdk/pull/8660)).
* Fix file button and audio player overflowing from message bubble ([\#8666](https://github.com/matrix-org/matrix-react-sdk/pull/8666)). Fixes vector-im/element-web#22308. Contributed by @luixxiul.
* Don't show broken composer format bar when selection is whitespace ([\#8673](https://github.com/matrix-org/matrix-react-sdk/pull/8673)). Fixes vector-im/element-web#10788.
* Fix media upload http 413 handling ([\#8674](https://github.com/matrix-org/matrix-react-sdk/pull/8674)).
* Fix emoji picker for editing thread responses ([\#8671](https://github.com/matrix-org/matrix-react-sdk/pull/8671)). Fixes matrix-org/element-web-rageshakes#13129.
* Map attribution while sharing live location is now visible ([\#8621](https://github.com/matrix-org/matrix-react-sdk/pull/8621)). Fixes vector-im/element-web#22236. Contributed by @weeman1337.
* Fix info tile overlapping the time stamp on TimelineCard ([\#8639](https://github.com/matrix-org/matrix-react-sdk/pull/8639)). Fixes vector-im/element-web#22256. Contributed by @luixxiul.
* Fix position of wide images on IRC / modern layout ([\#8667](https://github.com/matrix-org/matrix-react-sdk/pull/8667)). Fixes vector-im/element-web#22309. Contributed by @luixxiul.
* Fix other user's displayName being wrapped on the bubble message layout ([\#8456](https://github.com/matrix-org/matrix-react-sdk/pull/8456)). Fixes vector-im/element-web#22004. Contributed by @luixxiul.
* Set spacing declarations to elements in mx_EventTile_mediaLine ([\#8665](https://github.com/matrix-org/matrix-react-sdk/pull/8665)). Fixes vector-im/element-web#22307. Contributed by @luixxiul.
* Fix wide image overflowing from the thumbnail container ([\#8663](https://github.com/matrix-org/matrix-react-sdk/pull/8663)). Fixes vector-im/element-web#22303. Contributed by @luixxiul.
* Fix styles of "Show all" link button on ReactionsRow ([\#8658](https://github.com/matrix-org/matrix-react-sdk/pull/8658)). Fixes vector-im/element-web#22300. Contributed by @luixxiul.
* Automatically log in after registration ([\#8654](https://github.com/matrix-org/matrix-react-sdk/pull/8654)). Fixes vector-im/element-web#19305. Contributed by @justjanne.
* Fix offline status in window title not working reliably ([\#8656](https://github.com/matrix-org/matrix-react-sdk/pull/8656)).
* Align input area with event body's first letter in a thread on IRC/modern layout ([\#8636](https://github.com/matrix-org/matrix-react-sdk/pull/8636)). Fixes vector-im/element-web#22252. Contributed by @luixxiul.
* Fix crash on null idp for SSO buttons ([\#8650](https://github.com/matrix-org/matrix-react-sdk/pull/8650)). Contributed by @hughns.
* Don't open the regular browser or our context menu on right-clicking the `Options` button in the message action bar ([\#8648](https://github.com/matrix-org/matrix-react-sdk/pull/8648)). Fixes vector-im/element-web#22279.
* Show notifications even when Element is focused ([\#8590](https://github.com/matrix-org/matrix-react-sdk/pull/8590)). Contributed by @sumnerevans.
* Remove padding from the buttons on edit message composer of a event tile on a thread ([\#8632](https://github.com/matrix-org/matrix-react-sdk/pull/8632)). Contributed by @luixxiul.
* ensure metaspace changes correctly notify listeners ([\#8611](https://github.com/matrix-org/matrix-react-sdk/pull/8611)). Fixes vector-im/element-web#21006. Contributed by @justjanne.
* Hide image banner on stickers, they have a tooltip already ([\#8641](https://github.com/matrix-org/matrix-react-sdk/pull/8641)). Fixes vector-im/element-web#22244.
* Adjust EditMessageComposer style declarations ([\#8631](https://github.com/matrix-org/matrix-react-sdk/pull/8631)). Fixes vector-im/element-web#22231. Contributed by @luixxiul.

Changes in [1.10.13](https://github.com/vector-im/element-desktop/releases/tag/v1.10.13) (2022-05-24)
=====================================================================================================

Expand Down
4 changes: 3 additions & 1 deletion dockerbuild/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ RUN apt-get -qq update && apt-get -qq dist-upgrade && \
# libsecret-1-dev and libgnome-keyring-dev are required even for prebuild keytar
apt-get -qq install --no-install-recommends qtbase5-dev bsdtar build-essential autoconf libssl-dev gcc-multilib g++-multilib lzip rpm python libcurl4 git git-lfs ssh unzip tcl \
libsecret-1-dev libgnome-keyring-dev \
libopenjp2-tools && \
libopenjp2-tools \
# Used by seshat (when not SQLCIPHER_STATIC) \
libsqlcipher-dev && \
# git-lfs
git lfs install && \
apt-get purge -y --auto-remove && rm -rf /var/lib/apt/lists/*
Expand Down
13 changes: 12 additions & 1 deletion docs/native-node-modules.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ using yarn at the root of this project:

yarn add matrix-seshat

You will have to rebuild the native libraries against electron's version of
You will have to rebuild the native libraries against electron's version
of node rather than your system node, using the `electron-build-env` tool.
This is also needed to when pulling in changes to Seshat using `yarn link`.

Expand All @@ -66,6 +66,17 @@ as usual using:

yarn start

### Statically linking libsqlcipher

On Windows & macOS we always statically link libsqlcipher for it is not generally available.
On Linux by default we will use a system package, on debian & ubuntu this is `libsqlcipher0`,
but this is problematic for some other packages.
By including `SQLCIPHER_STATIC=1` in the build environment, the build scripts will statically link sqlcipher,
note that this will want a `libcrypto1.1` shared library available in the system.

More info can be found at https://github.com/matrix-org/seshat/issues/102
and https://github.com/vector-im/element-web/issues/20926.

## Compiling for specific architectures

### macOS
Expand Down
15 changes: 12 additions & 3 deletions docs/windows-requirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@

If you want to build native modules, make sure that the following tools are installed on your system.

- [Git for Windows](https://git-scm.com/download/win)
- [Node 14](https://nodejs.org)
- [Python 3](https://www.python.org/downloads/)
- [Python 3](https://www.python.org/downloads/) (if you type 'python' into command prompt it will offer to install it from the windows store)
- [Strawberry Perl](https://strawberryperl.com/)
- [Rust](https://rustup.rs/)
- [Rustup](https://rustup.rs/)
- [NASM](https://www.nasm.us/)
- [Build Tools for Visual Studio 2019](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019) with the following configuration:
- On the Workloads tab:
- Desktop & Mobile -> C++ build tools
Expand All @@ -17,10 +19,17 @@ If you want to build native modules, make sure that the following tools are inst
- C++ CMake tools for Windows

Once installed make sure all those utilities are accessible in your `PATH`.

If you want to be able to build x86 targets from an x64 host install the right toolchain:
```cmd
rustup toolchain install stable-i686-pc-windows-msvc
rustup target add i686-pc-windows-msvc
```

In order to load all the C++ utilities installed by Visual Studio you can run the following in a terminal window.

```
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
```

You can replace `amd64` with `x86` depending on your CPU architecture.
4 changes: 2 additions & 2 deletions element.io/nightly/control.template
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Vendor: support@element.io
Architecture: amd64
Maintainer: support@element.io
Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0
Recommends: libappindicator3-1
Recommends: libappindicator3-1, libsqlcipher0
Section: net
Priority: extra
Homepage: https://element.io/
Description:
Description:
riot.im A feature-rich client for Matrix.org (nightly unstable build).
4 changes: 2 additions & 2 deletions element.io/release/control.template
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ Vendor: support@element.io
Architecture: amd64
Maintainer: support@element.io
Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0
Recommends: libappindicator3-1
Recommends: libappindicator3-1, libsqlcipher0
Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
Section: net
Priority: extra
Homepage: https://element.io/
Description:
Description:
A feature-rich client for Matrix.org
Loading

0 comments on commit bb2a41e

Please sign in to comment.