Skip to content

Commit a40b5f4

Browse files
marmarekmarmarek
committed
Merge remote-tracking branch 'origin/pr/633'
* origin/pr/633: Add distinct GUI bookmark package Pull request description: GTK bookmarks can be used by all currently supported file managers: - caja - thunar - nautilus - pcmanfm-qt (yes, it has a fallback for gtk bookmarks) For: QubesOS/qubes-issues#10081 --- Didn't name GTK because I wish to maintain it framework free. Because pcmanfm-qt is using GTK bookmark as fallback, there is currently no need for a QT workaround.
2 parents 4d8b0bb + 75964b0 commit a40b5f4

10 files changed

Lines changed: 72 additions & 19 deletions

File tree

‎archlinux/PKGBUILD.in‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Maintainer: Frédéric Pierret (fepitre) <frederic@invisiblethingslab.com>
22

3-
pkgname=(qubes-vm-core qubes-vm-networking qubes-vm-keyring qubes-vm-caja qubes-vm-nautilus qubes-vm-passwordless-root qubes-vm-thunar qubes-vm-dom0-updates)
3+
pkgname=(qubes-vm-core qubes-vm-networking qubes-vm-keyring qubes-vm-bookmark qubes-vm-caja qubes-vm-nautilus qubes-vm-passwordless-root qubes-vm-thunar qubes-vm-dom0-updates)
44
pkgver=@VERSION@
55
pkgrel=@REL@
66
pkgdesc="The Qubes core files for installation inside a Qubes VM."
@@ -95,6 +95,7 @@ package_qubes-vm-core() {
9595
qubes-vm-nautilus
9696
qubes-vm-networking
9797
qubes-vm-thunar
98+
qubes-vm-bookmark
9899
)
99100
install="archlinux/PKGBUILD.install"
100101

@@ -229,6 +230,22 @@ package_qubes-vm-caja() {
229230
DIST=archlinux
230231
}
231232

233+
package_qubes-vm-bookmark() {
234+
pkgdesc="Qubes integration for GUI bookmarks"
235+
provides=(qubes-core-agent-bookmark=@VERSION@)
236+
conflicts=('qubes-vm-core<4.3.26')
237+
238+
cd "${_pkgnvr}"
239+
make -C qubes-rpc/bookmark install \
240+
DESTDIR="$pkgdir" \
241+
SBINDIR=/usr/bin \
242+
LIBDIR=/usr/lib \
243+
SYSLIBDIR=/usr/lib \
244+
SYSTEM_DROPIN_DIR=/usr/lib/systemd/system \
245+
USER_DROPIN_DIR=/usr/lib/systemd/user \
246+
DIST=archlinux
247+
}
248+
232249
package_qubes-vm-thunar() {
233250
pkgdesc="Qubes OS Thunar addons for inter-VM file copy/move/open"
234251
provides=(qubes-core-agent-thunar=@VERSION@)

‎debian/control‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,19 @@ Description: Qubes core agent
9191
This package includes various daemons necessary for qubes domU support,
9292
such as qrexec services.
9393

94+
Package: qubes-core-agent-bookmark
95+
Architecture: any
96+
Replaces: qubes-core-agent (<< 4.0.0-1)
97+
Breaks: qubes-core-agent (<< 4.0.0-1)
98+
Description: Qubes integration for GUI bookmarks
99+
GUI bookmarks for useful Qubes OS directories.
100+
94101
Package: qubes-core-agent-nautilus
95102
Architecture: any
96103
Depends:
97104
${pythonver:Depends}-nautilus,
98105
qubes-core-qrexec,
106+
qubes-core-agent-bookmark,
99107
Replaces: qubes-core-agent (<< 4.0.0-1)
100108
Breaks: qubes-core-agent (<< 4.0.0-1)
101109
Description: Qubes integration for Nautilus
@@ -106,6 +114,7 @@ Architecture: any
106114
Depends:
107115
${pythonver:Depends}-caja,
108116
qubes-core-qrexec,
117+
qubes-core-agent-bookmark,
109118
Replaces: qubes-core-agent (<< 4.0.0-1)
110119
Breaks: qubes-core-agent (<< 4.0.0-1)
111120
Description: Qubes integration for Caja
@@ -116,6 +125,7 @@ Architecture: any
116125
Depends:
117126
thunar,
118127
qubes-core-qrexec,
128+
qubes-core-agent-bookmark,
119129
Replaces: qubes-core-agent (<< 4.0.0-1)
120130
Breaks: qubes-core-agent (<< 4.0.0-1)
121131
Description: Qubes integration for Thunar
@@ -126,6 +136,7 @@ Architecture: any
126136
Depends:
127137
pcmanfm-qt,
128138
qubes-core-qrexec,
139+
qubes-core-agent-bookmark,
129140
Replaces: qubes-core-agent (<< 4.0.0-1)
130141
Breaks: qubes-core-agent (<< 4.0.0-1)
131142
Description: Qubes integration for PCManFM-Qt

‎debian/qubes-core-agent-bookmarks.install‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/qubes/qvm_bookmark.sh

‎debian/qubes-core-agent-nautilus.install‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
usr/share/nautilus-python/extensions/*
2-
usr/lib/qubes/qvm_nautilus_bookmark.sh

‎qubes-rpc/bookmark/Makefile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
QUBESLIBDIR ?= /usr/lib/qubes
2+
3+
.PHONY: install
4+
5+
install:
6+
install -d $(DESTDIR)$(QUBESLIBDIR)
7+
install -t $(DESTDIR)$(QUBESLIBDIR) -m 0755 *.sh

‎qubes-rpc/bookmark/qvm_bookmark.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/sh
2+
3+
incoming_dir="$HOME/QubesIncoming"
4+
bookmark_created_basename="qubes-incoming-bookmark-created"
5+
6+
dir="$HOME/.config/gtk-3.0"
7+
test -d "$dir" || exit 0
8+
created="$dir/$bookmark_created_basename"
9+
! test -e "$created" || exit 0
10+
printf '%s\n' "file://$incoming_dir" >> "$dir"/bookmarks
11+
touch -- "$created"

‎qubes-rpc/nautilus/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ install:
77
install -d $(DESTDIR)$(NAUTILUSPYEXTDIR)
88
install -t $(DESTDIR)$(NAUTILUSPYEXTDIR) -m 0644 *.py
99
install -d $(DESTDIR)$(QUBESLIBDIR)
10-
install -t $(DESTDIR)$(QUBESLIBDIR) -m 0755 *.sh

‎qubes-rpc/nautilus/qvm_nautilus_bookmark.sh‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎qubes-rpc/qubes.Filecopy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
2-
if [ -f /usr/lib/qubes/qvm_nautilus_bookmark.sh ]
2+
if [ -f /usr/lib/qubes/qvm_bookmark.sh ]
33
then
4-
/usr/lib/qubes/qvm_nautilus_bookmark.sh >/dev/null 2>&1 </dev/null
4+
/usr/lib/qubes/qvm_bookmark.sh >/dev/null 2>&1 </dev/null
55
fi
66
case $1 in
77
('') arg=;;

‎rpm_spec/core-agent.spec.in‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,18 @@ DNF plugin for Qubes specific post-installation actions:
262262
%endif
263263
%endif
264264

265+
%package bookmark
266+
Summary: Qubes integration for GUI bookmarks
267+
Requires: qubes-core-agent = %{version}
268+
Conflicts: qubes-core-vm < 4.0.0
269+
270+
%description bookmark
271+
GUI bookmarks for useful Qubes OS directories.
272+
265273
%package caja
266274
Summary: Qubes integration for Caja
267275
Requires: qubes-core-agent = %{version}
276+
Requires: qubes-core-agent-bookmark = %{version}
268277
%if 0%{?is_opensuse}
269278
Requires: python-caja
270279
%else
@@ -282,6 +291,7 @@ Caja addons for inter-VM file copy/move/open.
282291
%package nautilus
283292
Summary: Qubes integration for Nautilus
284293
Requires: qubes-core-agent = %{version}
294+
Requires: qubes-core-agent-bookmark = %{version}
285295
%if 0%{?is_opensuse}
286296
Requires: python-nautilus-common-files
287297
%else
@@ -296,6 +306,14 @@ BuildRequires: python-nautilus-common-files
296306
%description nautilus
297307
Nautilus addons for inter-VM file copy/move/open.
298308

309+
%package thunar
310+
Summary: Thunar support for Qubes VM tools
311+
Requires: Thunar
312+
Requires: qubes-core-agent-bookmark = %{version}
313+
314+
%description thunar
315+
Thunar support for Qubes VM tools
316+
299317
%package dom0-updates
300318
BuildArch: noarch
301319
Summary: Scripts required to handle dom0 updates
@@ -375,13 +393,6 @@ switching from user to root. Since all the user data in a VM is accessible
375393
already from normal user account, there is not much more to guard there. Qubes
376394
VMs are single user systems.
377395

378-
%package thunar
379-
Summary: Thunar support for Qubes VM tools
380-
Requires: Thunar
381-
382-
%description thunar
383-
Thunar support for Qubes VM tools
384-
385396
%if %{with selinux}
386397
%package selinux
387398
BuildArch: noarch
@@ -506,6 +517,7 @@ make -C qubes-rpc/kde DESTDIR=$RPM_BUILD_ROOT install-kde4
506517
make -C qubes-rpc/kde DESTDIR=$RPM_BUILD_ROOT install-kde5
507518
make -C qubes-rpc/nautilus DESTDIR=$RPM_BUILD_ROOT install
508519
make -C qubes-rpc/thunar DESTDIR=$RPM_BUILD_ROOT install
520+
make -C qubes-rpc/bookmark DESTDIR=$RPM_BUILD_ROOT install
509521

510522
%if 0%{?fedora} >= 41
511523
make -C package-managers PYTHON=%{__python3} DESTDIR=$RPM_BUILD_ROOT install install-dnf5
@@ -1102,6 +1114,9 @@ rm -f %{name}-%{version}
11021114
%endif
11031115
%endif
11041116

1117+
%files bookmark
1118+
/usr/lib/qubes/qvm_bookmark.sh
1119+
11051120
%files caja
11061121
/usr/share/caja-python/extensions/qvm_copy_caja.py*
11071122
/usr/share/caja-python/extensions/qvm_move_caja.py*
@@ -1111,7 +1126,6 @@ rm -f %{name}-%{version}
11111126
/usr/share/nautilus-python/extensions/qvm_copy_nautilus.py*
11121127
/usr/share/nautilus-python/extensions/qvm_move_nautilus.py*
11131128
/usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py*
1114-
/usr/lib/qubes/qvm_nautilus_bookmark.sh
11151129

11161130
%files thunar
11171131
/usr/lib/qubes/qvm-actions.sh

0 commit comments

Comments
 (0)