Replace Evince with Papers

.github/workflows/ci.yml

@@ -31,11 +31,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Install Rust SDK extension
+        run: |
+          flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          flatpak install -y --arch=${{ matrix.configuration.arch }} org.freedesktop.Sdk.Extension.rust-stable//25.08
+
       - name: Build
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6.6
         with:
-          bundle: org.gnome.evince.flatpak
-          manifest-path: org.gnome.evince.json
+          bundle: org.gnome.papers.flatpak
+          manifest-path: org.gnome.papers.json
           repository-name: appcenter
           repository-url: https://flatpak.elementary.io/repo.flatpakrepo
           cache-key: "flatpak-builder-${{ github.sha }}"

.github/workflows/flatpak-x-checker.yml

@@ -19,4 +19,4 @@ jobs:
           EMAIL: builds@elementary.io
           GITHUB_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
         with:
-          args: --update --never-fork org.gnome.evince.json
+          args: --update --never-fork org.gnome.papers.json

.github/workflows/merge.yml

@@ -29,11 +29,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Install Rust SDK extension
+        run: |
+          flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          flatpak install -y --arch=${{ matrix.configuration.arch }} org.freedesktop.Sdk.Extension.rust-stable//25.08
+
       - name: Build
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6.6
         with:
-          bundle: evince.flatpak
-          manifest-path: org.gnome.evince.json
+          bundle: papers.flatpak
+          manifest-path: org.gnome.papers.json
           run-tests: true
           repository-name: appcenter
           repository-url: https://flatpak.elementary.io/repo.flatpakrepo

README.md

@@ -1,2 +1,52 @@
-# evince
-Evince Document Viewer flatpak built against the elementary platform
+# papers
+Papers Document Viewer flatpak built against the elementary platform
+
+## Building, Testing, and Installation
+Run `flatpak-builder` to configure the build environment, download dependencies, build, and install
+
+```bash
+flatpak-builder build org.gnome.papers.json --user --install --force-clean --install-deps-from=appcenter --install-deps-from=flathub
+```
+
+Then execute with
+
+```bash
+flatpak run org.gnome.Papers
+```
+
+## How to generate `generated-sources.json`
+Some code of Papers is written in Rust so it uses Cargo to resolve dependencies of it. However, network access during
+the build process is not recommended in Flatpak.
+[flatpak-cargo-generator](https://github.com/flatpak/flatpak-builder-tools/tree/master/cargo) resolves this problem
+by converting all necessary dependencies listed in the Cargo.lock into a Flatpak manifest file to download them
+as modules at the beginning of the build process.
+
+You'll need:
+
+- git
+- python3-toml
+- python3-tomlkit
+- python3-aiohttp
+- pipx
+
+First prepare the Cargo.lock of Papers. We patch Cargo.lock to add granite, so we need to apply our patch against
+the original source code of Papers:
+
+```
+# The tag name matches with the version of papers in our manifest file
+git clone https://gitlab.gnome.org/GNOME/papers.git -b 48.4 --depth=1
+cd papers/
+git apply <path to add-granite.patch>
+cd ../
+```
+
+Now, we can use flatpak-cargo-generator to generate `generated-sources.json`:
+
+```
+git clone https://github.com/flatpak/flatpak-builder-tools.git --depth=1
+cd flatpak-builder-tools/cargo/
+pipx install poetry
+exec $SHELL -l
+poetry env activate
+python3 ./flatpak-cargo-generator.py ../../papers/Cargo.lock -o generated-sources.json
+```

add-granite.patch

@@ -0,0 +1,62 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index b56566d06..bee57b8d4 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -935,6 +935,37 @@ dependencies = [
+  "system-deps",
+ ]
+
++[[package]]
++name = "granite-rs"
++version = "3.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "583445f6e01a930b829d1a7724f09af98efe8a9e6928c1953e7b7fcf16547db0"
++dependencies = [
++ "bitflags 2.9.3",
++ "gdk4",
++ "gio",
++ "glib",
++ "granite-rs-sys",
++ "gtk4",
++ "libc",
++ "once_cell",
++]
++
++[[package]]
++name = "granite-rs-sys"
++version = "0.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "06f728c0929dcdfec5d5ea5b61b2b10c4b193cdaf1ec6fd8de7c566982c34340"
++dependencies = [
++ "gdk4-sys",
++ "gio-sys",
++ "glib-sys",
++ "gobject-sys",
++ "gtk4-sys",
++ "libc",
++ "system-deps",
++]
++
+ [[package]]
+ name = "graphene-rs"
+ version = "0.21.1"
+@@ -1615,6 +1646,7 @@ dependencies = [
+  "futures",
+  "gettext-rs",
+  "git-version",
++ "granite-rs",
+  "gtk4",
+  "libadwaita",
+  "log",
+diff --git a/shell/Cargo.toml b/shell/Cargo.toml
+index 50262bd35..c9c0aab2e 100644
+--- a/shell/Cargo.toml
++++ b/shell/Cargo.toml
+@@ -23,6 +23,7 @@ gettext-rs = { version = "0.7", features = ["gettext-system"] }
+ lru = "0.16"
+ futures = "0.3"
+ git-version = "0.3"
++granite = { version = "3.0.0", package = "granite-rs", features = ["v7_2"] }
+
+ [dependencies.oo7]
+ version = "0.4"

css.patch

@@ -0,0 +1,58 @@
+diff --git a/shell/resources/papers.css b/shell/resources/papers.css
+index b4effb5cc..ba491a2a8 100644
+--- a/shell/resources/papers.css
++++ b/shell/resources/papers.css
+@@ -1,3 +1,53 @@
++:root {
++  --window-bg-color: @bg_color;
++  --window-fg-color: @fg_color;
++  --accent-color: @accent_color;
++  --shade-color: alpha(@fg_color, 0.15);
++  --yellow-4: @BANANA_500;
++}
++
++.sidebar-pane,
++.navigation-sidebar {
++  background: @insensitive_bg_color;
++}
++
++.sidebar-pane:dir(ltr) {
++  border-right: 1px solid @menu_separator;
++}
++
++.sidebar-pane:dir(rtl) {
++  border-left: 1px solid @menu_separator;
++}
++
++separator.spacer {
++  border-color: transparent;
++}
++
++/* TODO Remove when https://github.com/elementary/granite/issues/897 is fixed */
++button.osd {
++  background: @bg_color;
++  border: transparent;
++  box-shadow:
++    inset 0 -1px 0 0 rgba(255, 255, 255, 0.2),
++    inset 0 1px 0 0 rgba(255, 255, 255, 0.3),
++    inset 1px 0 0 0 rgba(255, 255, 255, 0.07),
++    inset -1px 0 0 0 rgba(255, 255, 255, 0.07),
++    0 0 0 1px rgba(0, 0, 0, 0.1),
++    0 3px 4px rgba(0, 0, 0, 0.15),
++    0 3px 3px -3px rgba(0, 0, 0, 0.35);
++  color: @text_color;
++  min-height: 2em;
++  min-width: 2em;
++}
++
++button.osd:active {
++  background: @insensitive_bg_color;
++}
++
++separator.spacer {
++  border-color: transparent;
++}
++
+ image.symbolic-circular {
+   background-color: color-mix(in srgb, currentColor 8%, transparent);
+   min-width: 32px;

fix-missing-sidebar-icon.patch

@@ -0,0 +1,13 @@
+diff --git a/shell/resources/pps-document-view.blp b/shell/resources/pps-document-view.blp
+index b839b7ce0..3d357d4cf 100644
+--- a/shell/resources/pps-document-view.blp
++++ b/shell/resources/pps-document-view.blp
+@@ -192,7 +192,7 @@ template $PpsDocumentView: Adw.BreakpointBin {
+
+         [start]
+         ToggleButton sidebar_button {
+-          icon-name: "sidebar-show-symbolic";
++          icon-name: "view-sidebar-start-symbolic";
+           action-name: "doc.show-sidebar";
+           tooltip-text: _("Toggle Sidebar");
+         }