Skip to content

Commit b1fd9c7

Browse files
committed
#3650 qtkeychain: add libsecret to the Linux build dependencies
Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
1 parent 0c9d96f commit b1fd9c7

26 files changed

Lines changed: 54 additions & 12 deletions

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## 26.6.10
44

5+
- Added libsecret to the Linux build dependencies so qtkeychain can use the
6+
Secret Service backend instead of falling back to KWallet on non-KDE desktops
7+
(for [#3650](https://github.com/pbek/QOwnNotes/issues/3650))
58
- The **Insert checkbox list item** action now automatically uses the existing
69
**Create checkbox list** behavior when multiple lines are selected, so selected
710
lines are converted consistently with the dedicated list action

build-systems/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN apt-get -y install bash \
1919
python3 python3-pip osc xz-utils git rsync qttools5-dev-tools \
2020
qt5-qmake qtbase5-dev libqt5svg5-dev qtdeclarative5-dev \
2121
libqt5websockets5-dev libqt5x11extras5-dev \
22+
libsecret-1-dev \
2223
qt6-base-dev qt6-declarative-dev libqt6svg6-dev libqt6websockets6-dev \
2324
libqt6svg6 libqt6svgwidgets6 libqt6websockets6 libqt6core5compat6 \
2425
libqt6core5compat6-dev gh curl python3-m2crypto \

build-systems/aur/.SRCINFO

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ pkgbase = qownnotes
1818
depends = aspell
1919
depends = botan
2020
depends = libgit2
21+
depends = libsecret
2122
source = https://github.com/pbek/QOwnNotes/releases/download/vVERSION-STRING/qownnotes-VERSION-STRING.tar.xz
2223
sha256sums = ARCHIVE-SHA256
2324

build-systems/aur/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'armv7h' 'aarch64')
1010
url='https://www.qownnotes.org/'
1111
license=('GPL2')
1212
groups=('qownnotes')
13-
depends=('qt6-base' 'qt6-svg' 'qt6-declarative' 'qt6-websockets' 'aspell' 'botan' 'libgit2')
13+
depends=('qt6-base' 'qt6-svg' 'qt6-declarative' 'qt6-websockets' 'aspell' 'botan' 'libgit2' 'libsecret')
1414
makedepends=('qt6-tools' 'cmake')
1515
source=("https://github.com/pbek/QOwnNotes/releases/download/v${pkgver}/qownnotes-${pkgver}.tar.xz")
1616
sha256sums=('ARCHIVE-SHA256')

build-systems/flatpak/org.qownnotes.QOwnNotes.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"--socket=x11",
1212
"--share=ipc",
1313
"--share=network",
14-
"--device=dri"
14+
"--device=dri",
15+
"--talk-name=org.freedesktop.secrets"
1516
],
1617
"modules": [
1718
{

build-systems/gentoo/qownnotes.ebuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ DEPEND="
2020
>=dev-qt/qtwebsockets-6.9:6
2121
>=dev-qt/qtdeclarative-6.9:6
2222
>=dev-qt/qtsvg-6.9:6
23+
app-crypt/libsecret
2324
"
2425
RDEPEND="${DEPEND}"
2526

build-systems/github/aqt/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
77
python3-pip \
88
build-essential \
99
libdbus-1-3 \
10+
libsecret-1-dev \
1011
libpulse-mainloop-glib0
1112

1213
RUN pip3 install aqtinstall
@@ -21,4 +22,4 @@ RUN aqt ${QT_HOST} desktop list-qt ${QT} ${QT_TARGET} ${QT_ARCH} -m ${QT_MODULES
2122
ENV PATH /opt/qt/${QT}/gcc_64/bin:$PATH
2223
ENV QT_PLUGIN_PATH /opt/qt/${QT}/gcc_64/plugins/
2324
ENV QML_IMPORT_PATH /opt/qt/${QT}/gcc_64/qml/
24-
ENV QML2_IMPORT_PATH /opt/qt/${QT}/gcc_64/qml/
25+
ENV QML2_IMPORT_PATH /opt/qt/${QT}/gcc_64/qml/

build-systems/github/snap.qt6/snapcraft.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ parts:
8080
- libqt6svg6-dev
8181
- libqt6websockets6-dev
8282
- libqt6core5compat6-dev
83+
- libsecret-1-dev
8384
- qt6-l10n-tools
8485
- qt6-tools-dev-tools
8586
stage-packages:
@@ -105,6 +106,8 @@ parts:
105106
- libqt6quick6
106107
# -- Qt6 OpenGL (required by libqt6quick6) --
107108
- libqt6opengl6t64
109+
# -- Secret Service keychain backend --
110+
- libsecret-1-0
108111
# -- Proxy support (libqt6network6t64 links to libproxy) --
109112
# libproxy1v5 ships libpxbackend-1.0.so in a private sub-directory;
110113
# the layout section above makes that path visible to the linker.

build-systems/github/ubuntu22-dev/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y \
1919
libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0 \
2020
libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-util1 libxcb-xfixes0 \
2121
libxcb-xinerama0 libxcb1 libxkbcommon-x11-0 \
22+
libsecret-1-dev \
2223
g++ xz-utils qt5-qmake qtbase5-dev libqt5svg5-dev qtdeclarative5-dev \
2324
libqt5xmlpatterns5-dev libqt5websockets5-dev libqt5x11extras5-dev cmake qttools5-dev ccache libsm-dev \
2425
libfuse-dev fuse file \

build-systems/nix/default-cmake-qt5.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
wrapQtAppsHook,
1414
botan3,
1515
libgit2,
16+
libsecret,
1617
pkg-config,
1718
xvfb-run,
1819
installShellFiles,
@@ -53,7 +54,10 @@ stdenv.mkDerivation {
5354
libgit2
5455
aspell
5556
]
56-
++ lib.optionals stdenv.isLinux [ qtwayland ];
57+
++ lib.optionals stdenv.isLinux [
58+
libsecret
59+
qtwayland
60+
];
5761

5862
cmakeFlags = [
5963
# "-DQON_QT6_BUILD=ON"

0 commit comments

Comments
 (0)