Skip to content

Commit

Permalink
Successful build
Browse files Browse the repository at this point in the history
This build worked based on comment here: signalapp#2662 (comment)

Runs from commandline in linux-unpacked. However, rpm won't install. Haven't tried AppImage.
  • Loading branch information
kemsar committed Dec 13, 2019
1 parent ca61f31 commit baa8dae
Show file tree
Hide file tree
Showing 6 changed files with 374 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app/sql.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { join } = require('path');
const mkdirp = require('mkdirp');
const rimraf = require('rimraf');
const sql = require('@journeyapps/sqlcipher');
const sql = require('@mapbox/node-sqlite3');
const { app, dialog, clipboard } = require('electron');
const { redactAll } = require('../js/modules/privacy');
const { remove: removeUserConfig } = require('./user_config');
Expand Down
13 changes: 12 additions & 1 deletion fedora-build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
#!/usr/bin/env bash
#rm -rf node_modules/
#rm -rf release/
#rm -rf .tmp*
curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | sudo tee /etc/yum.repos.d/yarn.repo
sudo dnf install -y yarn python27 fedora-packager gcc-c++ @development-tools
wget "https://aur.archlinux.org/cgit/aur.git/plain/openssl-linking.patch?h=signal" -O ./patches/openssl-linking.patch
sed -i.bak "s/node\": \"10.13.0/node\": \"$(node --version | sed 's/v//')/" package.json

yarn install --frozen-lockfile
#patch -p1 < ./patches/openssl-linking.patch
#sudo chattr +i node_modules/@journeyapps/sqlcipher/deps/sqlite3.gyp

yarn grunt
yarn icon-gen
yarn test
#yarn test
yarn generate
yarn build-release
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"ready": "yarn clean-transpile && yarn grunt && yarn lint && yarn test-node && yarn test-electron && yarn lint-deps"
},
"dependencies": {
"@journeyapps/sqlcipher": "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#00fd0f8a6623c6683280976d2a92b41d09c744bc",
"@mapbox/node-sqlite3": "https://github.com/mapbox/node-sqlite3.git",
"@sindresorhus/is": "0.8.0",
"backbone": "1.3.3",
"blob-util": "1.3.0",
Expand Down Expand Up @@ -150,7 +150,7 @@
"bower": "1.8.2",
"chai": "4.1.2",
"dashdash": "1.14.1",
"electron": "6.1.4",
"electron": "^6.1.4",
"electron-builder": "21.2.0",
"electron-icon-maker": "0.0.3",
"eslint": "4.14.0",
Expand Down Expand Up @@ -188,7 +188,7 @@
"webpack": "4.4.1"
},
"engines": {
"node": "12.4.0"
"node": "12.13.1"
},
"build": {
"appId": "org.whispersystems.signal-desktop",
Expand Down Expand Up @@ -247,12 +247,12 @@
},
"asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries",
"target": [
"deb",
"AppImage"
"AppImage",
"rpm"
],
"icon": "build/icons/png"
},
"deb": {
"rpm": {
"depends": [
"libnotify4",
"libappindicator1",
Expand Down Expand Up @@ -309,7 +309,7 @@
"node_modules/socks/build/common/*.js",
"node_modules/socks/build/client/*.js",
"node_modules/smart-buffer/build/*.js",
"!node_modules/@journeyapps/sqlcipher/deps/*",
"node_modules/@mapbox/node-sqlite3/deps/*",
"!node_modules/@journeyapps/sqlcipher/build/*",
"!node_modules/@journeyapps/sqlcipher/lib/binding/node-*",
"!node_modules/@journeyapps/sqlcipher/lib/binding/electron-*/msvcp140.dll",
Expand Down
Loading

0 comments on commit baa8dae

Please sign in to comment.