[arch-commits] Commit in element.io/trunk (PKGBUILD encapsulate-sqlcipher.diff)

Bruno Pagani archange at gemini.archlinux.org
Wed May 11 09:12:44 UTC 2022


    Date: Wednesday, May 11, 2022 @ 09:12:44
  Author: archange
Revision: 1198298

upgpkg: element.io 1.10.12-1

sqlcipher patch upstreamed.

Modified:
  element.io/trunk/PKGBUILD
Deleted:
  element.io/trunk/encapsulate-sqlcipher.diff

----------------------------+
 PKGBUILD                   |    9 +--
 encapsulate-sqlcipher.diff |  105 -------------------------------------------
 2 files changed, 3 insertions(+), 111 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-11 09:08:30 UTC (rev 1198297)
+++ PKGBUILD	2022-05-11 09:12:44 UTC (rev 1198298)
@@ -6,7 +6,7 @@
 _electron=electron17
 pkgbase=element.io
 pkgname=(element-web element-desktop)
-pkgver=1.10.11
+pkgver=1.10.12
 pkgrel=1
 pkgdesc="Glossy Matrix collaboration client — "
 arch=(x86_64)
@@ -19,15 +19,13 @@
         element-desktop-${pkgver}.tar.gz::${_url}-desktop/archive/v${pkgver}.tar.gz
         element-desktop-${pkgver}.tar.gz.asc::${_url}-desktop/releases/download/v${pkgver}/v${pkgver}-src.tar.gz.asc
         autolaunch.patch
-        encapsulate-sqlcipher.diff
         io.element.Element.desktop
         element-desktop.sh)
-sha256sums=('307d6648ccb20eeba0528ea10b09cbb1813372b51f54d5fc7d7f488a0262dcb7'
+sha256sums=('c5934d529fad95a4336e2c09bc5389fcd0d1556493ffe1453607b379e795ada1'
             'SKIP'
-            '74bfc64c872b078d2273cd2c2e51144437e85acc62955c4cba3fa3c8be0ad3d0'
+            'd97f09652d1e320c2564aae113153f5d9506c23a60064ec2c11938e1294b7ee5'
             'SKIP'
             'aaae4ffa41590361dac0c159aecc1166f69e459e89faa9d5cab1202f0277e06f'
-            '22f6e17d36ef8d8a4f48d96a1995348daa5d8add912278d66d05a2426a82c43d'
             '0103f28a32fe31f698836516783c1c70a76a0117b5df7fd0af5c422c224220f9'
             'c1bd9ace215e3ec9af14d7f28b163fc8c8b42e23a2cf04ce6f4ce2fcc465feba')
 validpgpkeys=(712BFBEE92DCA45252DB17D7C7BE97EFA179B100) # Element Releases <releases at riot.im>
@@ -41,7 +39,6 @@
 
   cd ../element-desktop-${pkgver}
   patch -p1 < ../autolaunch.patch
-  patch -p1 < ../encapsulate-sqlcipher.diff
   sed -i 's|"target": "deb"|"target": "dir"|' package.json
   sed -i 's|"https://packages.element.io/desktop/update/"|null|' element.io/release/config.json
   yarn install --no-fund

Deleted: encapsulate-sqlcipher.diff
===================================================================
--- encapsulate-sqlcipher.diff	2022-05-11 09:08:30 UTC (rev 1198297)
+++ encapsulate-sqlcipher.diff	2022-05-11 09:12:44 UTC (rev 1198298)
@@ -1,105 +0,0 @@
-diff --git i/hak/matrix-seshat/build.ts w/hak/matrix-seshat/build.ts
-index 8d50bb1..33ad8d5 100644
---- i/hak/matrix-seshat/build.ts
-+++ w/hak/matrix-seshat/build.ts
-@@ -26,7 +26,7 @@ export default async function(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promi
-     if (hakEnv.isWin()) {
-         await buildOpenSslWin(hakEnv, moduleInfo);
-         await buildSqlCipherWin(hakEnv, moduleInfo);
--    } else if (hakEnv.isMac()) {
-+    } else {
-         await buildSqlCipherUnix(hakEnv, moduleInfo);
-     }
-     await buildMatrixSeshat(hakEnv, moduleInfo);
-@@ -179,12 +179,17 @@ async function buildSqlCipherUnix(hakEnv, moduleInfo) {
-         '--prefix=' + moduleInfo.depPrefix + '',
-         '--enable-tempstore=yes',
-         '--enable-shared=no',
-+        '--enable-tcl=no',
-     ];
- 
-     if (hakEnv.isMac()) {
-         args.push('--with-crypto-lib=commoncrypto');
-     }
- 
-+    if (hakEnv.isLinux()) {
-+        args.push('--with-pic=yes');
-+    }
-+
-     if (!hakEnv.isHost()) {
-         // In the nonsense world of `configure`, it is assumed you are building
-         // a compiler like `gcc`, so the `host` option actually means the target
-@@ -265,12 +270,14 @@ async function buildMatrixSeshat(hakEnv, moduleInfo) {
-     // it for now: we should confirm how much of this it still actually needs.
-     const env = hakEnv.makeGypEnv();
- 
--    if (!hakEnv.isLinux()) {
--        Object.assign(env, {
--            SQLCIPHER_STATIC: 1,
--            SQLCIPHER_LIB_DIR: path.join(moduleInfo.depPrefix, 'lib'),
--            SQLCIPHER_INCLUDE_DIR: path.join(moduleInfo.depPrefix, 'include'),
--        });
-+    Object.assign(env, {
-+        SQLCIPHER_STATIC: 1,
-+        SQLCIPHER_LIB_DIR: path.join(moduleInfo.depPrefix, 'lib'),
-+        SQLCIPHER_INCLUDE_DIR: path.join(moduleInfo.depPrefix, 'include'),
-+    });
-+
-+    if (hakEnv.isLinux()) {
-+        env.RUSTFLAGS = '-Clink-arg=-Wl,-Bsymbolic -Clink-arg=-Wl,--exclude-libs,ALL';
-     }
- 
-     if (hakEnv.isWin()) {
-diff --git i/hak/matrix-seshat/check.ts w/hak/matrix-seshat/check.ts
-index d34247f..ad6533a 100644
---- i/hak/matrix-seshat/check.ts
-+++ w/hak/matrix-seshat/check.ts
-@@ -22,21 +22,19 @@ import { DependencyInfo } from '../../scripts/hak/dep';
- 
- export default async function(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
-     // of course tcl doesn't have a --version
--    if (!hakEnv.isLinux()) {
--        await new Promise<void>((resolve, reject) => {
--            const proc = childProcess.spawn('tclsh', [], {
--                stdio: ['pipe', 'ignore', 'ignore'],
--            });
--            proc.on('exit', (code) => {
--                if (code !== 0) {
--                    reject("Can't find tclsh - have you installed TCL?");
--                } else {
--                    resolve();
--                }
--            });
--            proc.stdin.end();
-+    await new Promise<void>((resolve, reject) => {
-+        const proc = childProcess.spawn('tclsh', [], {
-+            stdio: ['pipe', 'ignore', 'ignore'],
-         });
--    }
-+        proc.on('exit', (code) => {
-+            if (code !== 0) {
-+                reject("Can't find tclsh - have you installed TCL?");
-+            } else {
-+                resolve();
-+            }
-+        });
-+        proc.stdin.end();
-+    });
- 
-     const tools = [
-         ['rustc', '--version'],
-diff --git i/hak/matrix-seshat/fetchDeps.ts w/hak/matrix-seshat/fetchDeps.ts
-index a2fcf34..1ae1286 100644
---- i/hak/matrix-seshat/fetchDeps.ts
-+++ w/hak/matrix-seshat/fetchDeps.ts
-@@ -25,9 +25,7 @@ import HakEnv from '../../scripts/hak/hakEnv';
- import { DependencyInfo } from '../../scripts/hak/dep';
- 
- export default async function(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
--    if (!hakEnv.isLinux()) {
--        await getSqlCipher(hakEnv, moduleInfo);
--    }
-+    await getSqlCipher(hakEnv, moduleInfo);
- 
-     if (hakEnv.isWin()) {
-         await getOpenSsl(hakEnv, moduleInfo);



More information about the arch-commits mailing list