From 58ff3794d28629b198b7c7c6097d12b51ea2c0f2f810e1cd6261f9417c0369aa Mon Sep 17 00:00:00 2001 From: Bruno Pitrus Date: Tue, 21 May 2024 22:00:48 +0000 Subject: [PATCH] Accepting request 1175640 from home:dziobian:gulgul-ultron:19 - New upstream release 2024.5.0 * no changelog provided - Use new %electron_rebuild and %electron_check_native macros in specfile OBS-URL: https://build.opensuse.org/request/show/1175640 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/bitwarden?expand=0&rev=54 --- _service | 4 +-- bitwarden-2024.4.3.obscpio | 3 -- bitwarden-2024.5.0.obscpio | 3 ++ bitwarden.changes | 7 +++++ bitwarden.obsinfo | 6 ++-- bitwarden.spec | 56 ++--------------------------------- no-sourcemaps.patch | 2 +- node-vendor.tar.zst | 4 +-- remove-unnecessary-deps.patch | 22 +++++++------- 9 files changed, 32 insertions(+), 75 deletions(-) delete mode 100644 bitwarden-2024.4.3.obscpio create mode 100644 bitwarden-2024.5.0.obscpio diff --git a/_service b/_service index cd3cc6a..6e5e854 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git https://github.com/bitwarden/clients.git - desktop-v2024.4.3 - 2024.4.3 + desktop-v2024.5.0 + 2024.5.0 bitwarden bitwarden_license/* diff --git a/bitwarden-2024.4.3.obscpio b/bitwarden-2024.4.3.obscpio deleted file mode 100644 index b6336dd..0000000 --- a/bitwarden-2024.4.3.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d220947941c7be2c627c4aa51e7869475a811dbe6545550c45b967243816f05 -size 36523021 diff --git a/bitwarden-2024.5.0.obscpio b/bitwarden-2024.5.0.obscpio new file mode 100644 index 0000000..f23bd4d --- /dev/null +++ b/bitwarden-2024.5.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13d896e1b850054f37d8e455a9764e5feb0a0fc3a8d2eaeb7cc1cea1ba9a48be +size 36655629 diff --git a/bitwarden.changes b/bitwarden.changes index bab7828..e1ecbbf 100644 --- a/bitwarden.changes +++ b/bitwarden.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 21 21:38:33 UTC 2024 - Bruno Pitrus + +- New upstream release 2024.5.0 + * no changelog provided +- Use new %electron_rebuild and %electron_check_native macros in specfile + ------------------------------------------------------------------- Mon May 6 18:31:43 UTC 2024 - Bruno Pitrus diff --git a/bitwarden.obsinfo b/bitwarden.obsinfo index aa4ed20..600f2fc 100644 --- a/bitwarden.obsinfo +++ b/bitwarden.obsinfo @@ -1,4 +1,4 @@ name: bitwarden -version: 2024.4.3 -mtime: 1715000695 -commit: edbbfe751c7f94ce01a2865e05cb2a9c3b89d56c +version: 2024.5.0 +mtime: 1716237070 +commit: a22d83fd57beae492dfbdfa7e29223309d2dcc16 diff --git a/bitwarden.spec b/bitwarden.spec index f936e6e..6334c53 100644 --- a/bitwarden.spec +++ b/bitwarden.spec @@ -18,7 +18,7 @@ # Name: bitwarden -Version: 2024.4.3 +Version: 2024.5.0 Release: 0 Summary: A secure and free password manager for all of your devices Group: Productivity/Security @@ -136,9 +136,6 @@ mv -v libs/angular/src/scss/bwicons/fonts/bwi-font.woff %{_builddir} rm -rvf libs/angular/src/scss/bwicons/fonts -mkdir %{_builddir}/cargo - - #Rust config cd apps/desktop/desktop_native tar --zstd -xf %SOURCE4 @@ -151,46 +148,8 @@ jq -cj '.files={}' .cargo-checksum.json >tmp && mv tmp .cargo-checksum.json && p done -# Make `node` and `npm` binaries refer to Electron -%if 0%{?suse_version} -NODEJS_DEFAULT_VER=$(echo %nodejs_version|sed 's/\..*//') -%else -NODEJS_DEFAULT_VER= -%endif - - -# Electron has a little known feature that make it work like a nodejs binary. -# We make use of it since the system node may be too bleeding-edge -# and to avoid building the same modules twice. -# Not all scripts work when run under electron, -# but importantly npm/yarn and GYP do. -mkdir %{_builddir}/path - - - -cp -v /dev/stdin %{_builddir}/path/node << EOF -#!/bin/sh -ELECTRON_RUN_AS_NODE=1 exec %{_libdir}/electron/electron "\$@" -EOF - -# HACK: This will refer to /usr/bin/npm17 on openSUSE, /usr/bin/npm on Fedora which are Node scripts -cp -v /dev/stdin %{_builddir}/path/npm << EOF -#!/bin/sh -exec node %{_bindir}/npm${NODEJS_DEFAULT_VER} "\$@" -EOF - -cp -v /dev/stdin %{_builddir}/path/npx << EOF -#!/bin/sh -exec node %{_bindir}/npx${NODEJS_DEFAULT_VER} "\$@" -EOF - - -chmod +x %{_builddir}/path/* - - %build -export PATH="%{_builddir}/cargo:$PATH" %ifarch %ix86 export RUSTC_BOOTSTRAP=1 %endif @@ -216,7 +175,7 @@ auditable='auditable -vv' -PATH="%{_builddir}/path:$PATH" npm rebuild --verbose --foreground-scripts --nodedir=%{_includedir}/electron +%electron_rebuild cd apps/desktop pushd desktop_native @@ -300,16 +259,7 @@ find . -type d -empty -print -delete %endif %check -# Sanity check that we don't have unresolved symbols, and only call napi_* functions (which are ABI stable, unlike node_* ones) -pushd %{buildroot}%{_libdir}/%{name} -find . -name '*.node' -print0 | xargs -0 -t -IXXX sh -c '! ldd -d -r XXX | \ -grep '\''^undefined symbol'\'' | \ -grep -v '\''^undefined symbol: napi_'\'' ' - -# Check that all native modules are loadable. -find . -name '*.node' -print0 | xargs -0 -t -IXXX env ELECTRON_RUN_AS_NODE=1 %{_libdir}/electron/electron -e 'require("XXX")' -popd - +%electron_check_native %files diff --git a/no-sourcemaps.patch b/no-sourcemaps.patch index 0c782c8..4dda8da 100644 --- a/no-sourcemaps.patch +++ b/no-sourcemaps.patch @@ -3,7 +3,7 @@ @@ -6,7 +6,7 @@ "target": "ES2016", "module": "ES2020", - "lib": ["es5", "es6", "es7", "dom"], + "lib": ["es5", "es6", "es7", "dom", "ES2021"], - "sourceMap": true, + "sourceMap": false, "allowSyntheticDefaultImports": true, diff --git a/node-vendor.tar.zst b/node-vendor.tar.zst index aba4589..f9079f4 100644 --- a/node-vendor.tar.zst +++ b/node-vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18ffde20107c8f026c322d5626b55ec13f7c45da668a46e2271335fe283c37d4 -size 35026643 +oid sha256:b33a6719b27a8d03bc6a78e7fbfec25fa247e3743395e43d3dadb436b022fe9b +size 35002226 diff --git a/remove-unnecessary-deps.patch b/remove-unnecessary-deps.patch index dae4c0b..fe0d83a 100644 --- a/remove-unnecessary-deps.patch +++ b/remove-unnecessary-deps.patch @@ -60,17 +60,17 @@ "@types/node": "18.19.29", - "@types/node-fetch": "2.6.4", "@types/node-forge": "1.3.11", - "@types/node-ipc": "9.2.0", + "@types/node-ipc": "9.2.3", "@types/papaparse": "5.3.14", - "@types/proper-lockfile": "4.1.4", -- "@types/react": "16.14.57", +- "@types/react": "16.14.60", - "@types/retry": "0.12.5", + "@types/semver": "^7.3.4", "@types/zxcvbn": "4.4.4", -- "@typescript-eslint/eslint-plugin": "7.4.0", -- "@typescript-eslint/parser": "7.4.0", +- "@typescript-eslint/eslint-plugin": "7.7.1", +- "@typescript-eslint/parser": "7.7.1", - "@webcomponents/custom-elements": "1.6.0", - "autoprefixer": "10.4.18", + "autoprefixer": "10.4.19", - "base64-loader": "1.0.0", - "chromatic": "10.9.6", "concurrently": "8.2.2", @@ -102,7 +102,7 @@ "html-webpack-plugin": "5.6.0", - "husky": "9.0.11", - "jest-junit": "16.0.0", - "jest-mock-extended": "3.0.5", + "jest-mock-extended": "3.0.6", - "jest-preset-angular": "14.0.3", - "lint-staged": "15.2.2", "mini-css-extract-plugin": "2.8.1", @@ -112,10 +112,10 @@ "postcss": "8.4.38", "postcss-loader": "8.1.1", - "prettier": "3.2.2", -- "prettier-plugin-tailwindcss": "0.5.13", +- "prettier-plugin-tailwindcss": "0.5.14", - "process": "0.11.10", -- "react": "18.2.0", -- "react-dom": "18.2.0", +- "react": "18.3.1", +- "react-dom": "18.3.1", "regedit": "^3.0.3", - "remark-gfm": "3.0.1", "rimraf": "5.0.5", @@ -123,7 +123,7 @@ "sass-loader": "13.3.3", - "storybook": "7.6.17", - "style-loader": "3.3.4", -- "tailwindcss": "3.4.1", +- "tailwindcss": "3.4.3", - "ts-jest": "29.1.2", "ts-loader": "9.5.1", "tsconfig-paths-webpack-plugin": "4.1.0", @@ -187,7 +187,7 @@ - "qrious": "4.0.2", "rxjs": "7.8.1", - "tabbable": "6.2.0", - "tldts": "6.1.16", + "tldts": "6.1.18", "utf-8-validate": "6.0.3", "zone.js": "0.13.3", "zxcvbn": "4.4.2"