Merge branch 'release/0.5.13'

Author: sebastinas

.github/workflows/build.yaml

@@ -17,7 +17,7 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Build and test
         run: |
           mkdir build
@@ -42,7 +42,7 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Build and test
         run: |
           mkdir build
@@ -67,7 +67,7 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Build and test
         run: |
           mkdir build

data/meson.build

@@ -44,11 +44,12 @@ if desktop_file_validate.found()
   )
 endif
 
-appstream_util = find_program('appstream-util', required: get_option('tests'), native: true)
-if appstream_util.found()
-  test('validate-appdata',
-    appstream_util,
-    args: ['validate-relax', '--nonet', appdata.full_path()]
+appstreamcli = find_program('appstreamcli', required: get_option('tests'), native: true)
+if appstreamcli.found()
+  test(
+    'validate-appdata',
+    appstreamcli,
+    args: ['validate', '--no-net', appdata.full_path()],
   )
 endif
 

data/org.pwmt.zathura.appdata.xml.in

@@ -4,8 +4,11 @@
   <id>org.pwmt.zathura</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>Zlib</project_license>
+  <developer id="org.pwmt">
+    <name>pwmt</name>
+  </developer>
   <name>Zathura</name>
-  <summary>A minimalistic document viewer</summary>
+  <summary>Minimalistic document viewer</summary>
   <description>
     <p>
       Zathura is a highly customizable and functional document viewer. It
@@ -26,30 +29,52 @@
   </description>
   <launchable type="desktop-id">org.pwmt.zathura.desktop</launchable>
   <url type="homepage">https://pwmt.org/projects/zathura</url>
-  <url type="bugtracker">https://bugs.pwmt.org/project/zathura</url>
+  <url type="bugtracker">https://github.com/pwmt/zathura/issues</url>
+  <url type="donation">https://pwmt.org/help/donate</url>
+  <url type="contact">https://pwmt.org/contact</url>
+  <url type="translate">https://github.com/pwmt/zathura/tree/develop/po</url>
+  <url type="vcs-browser">https://github.com/pwmt/zathura</url>
+  <url type="help">https://pwmt.org/projects/zathura/documentation/</url>
   <screenshots>
     <screenshot type="default">
       <image>https://pwmt.org/static/img/zathura-cover.png</image>
+      <caption>Reading a PDF file</caption>
     </screenshot>
     <screenshot>
       <image>https://pwmt.org/static/img/zathura-completion.png</image>
+      <caption>Opening a file with the `open` command</caption>
     </screenshot>
     <screenshot>
       <image>https://pwmt.org/static/img/zathura-follow.png</image>
+      <caption>Following links</caption>
     </screenshot>
     <screenshot>
       <image>https://pwmt.org/static/img/zathura-bookmarks.png</image>
+      <caption>Listing and selecting bookmakrs</caption>
     </screenshot>
   </screenshots>
   <translation type="gettext">zathura</translation>
   <provides>
     <binary>zathura</binary>
   </provides>
-  <content_rating type="oars-1.0" />
+  <content_rating type="oars-1.1" />
+  <recommends>
+    <control>keyboard</control>
+    <control>pointing</control>
+    <control>touch</control>
+  </recommends>
   <releases>
+    <release version="0.5.13" date="2025-09-23">
+      <description>
+        <p>Validate appstream files with appstreamcli</p>
+        <p>Split page-padding into page-h-padding and page-v-padding</p>
+        <p>Fix memory leak and callback type error (#767)</p>
+        <p>Warn if plugins do not support exporting images or attachments (#334)</p>
+      </description>
+    </release>
     <release version="0.5.12" date="2025-07-03">
       <description>
-        <p>A shortcut to open files via file chooser dialog</p>
+        <p>Add shortcut to open files via file chooser dialog</p>
         <p>Refactor rendering of pages</p>
         <p>Add lightness adjustment for recolering</p>
         <p>Initial support for OpenBSD sandbox</p>
@@ -131,12 +156,12 @@
     </release>
     <release version="0.5.1" date="2022-09-09">
       <description>
-        <p>seccomp: Make glibc fallback to clone instead of using clone3</p>
+        <p>`seccomp`: Make glibc fallback to clone instead of using clone3</p>
       </description>
     </release>
     <release version="0.5.0" date="2022-09-08">
       <description>
-        <p>magic is now a required dependency</p>
+        <p>`magic` is now a required dependency</p>
         <p>Various fixes and improvements</p>
       </description>
     </release>
@@ -524,7 +549,7 @@
         <p>Configureable modes</p>
         <p>Smooth scrolling</p>
         <p>Extended statusbar string manipulation</p>
-        <p>function</p>
+        <p>`function`</p>
         <p>Strip executable</p>
         <p>Updated manpage</p>
       </description>
@@ -536,10 +561,10 @@
         <p>Updated the behaviour of sc_scroll</p>
         <p>Half/Full-page scrolling</p>
         <p>Check document health in sc_reload</p>
-        <p>tabbed support</p>
+        <p>`tabbed` support</p>
         <p>Define look with the set function</p>
         <p>Implemented map function</p>
-        <p>zathurarc file</p>
+        <p>`zathurarc` file</p>
         <p>Prevent buffer overflow in realpath</p>
         <p>Strip executeable</p>
         <p>Key evaluation when buffer is not empty</p>
@@ -595,7 +620,7 @@
         <p>Marker support</p>
         <p>Highlight search results</p>
         <p>Buffered commands</p>
-        <p>set Function</p>
+        <p>`set` Function</p>
         <p>Revert video function</p>
         <p>Command completion</p>
       </description>

doc/man/zathura.1.rst

@@ -187,16 +187,28 @@ Index mode
 
   k, j
     Move to upper or lower entry
-  l
+  Up, Down
+    Move to upper or lower entry
+  ^u, ^d
+    Scroll and move up or down by half a screen
+  l, Right, zo
     Expand entry
-  L
+  zO
+    Expand entry recursively
+  L, zR
     Expand all entries
-  h
+  h, Left, zc
     Collapse entry
-  H
+  zC
+    Collapse entry recursively
+  H, zM
     Collapse all entries
-  space, Return
+  space, Return, ^j
     Select and open entry
+  gg, G
+    Goto to the first or last entry
+  Tab, Escape, ^[, ^c
+    Hide index and switch to normal mode
 
 
 Mouse bindings

doc/man/zathurarc.5.rst

@@ -380,10 +380,12 @@ They can also be combined with modifiers:
   * bottom
   * backward
   * collapse
+  * collapse-recursive
   * collapse-all
   * default
   * down
   * expand
+  * expand-recursive
   * expand-all
   * forward
   * full-down
@@ -787,8 +789,14 @@ zathura
   * Value type: Integer
   * Default value: 15
 
-*page-padding*
-  The page padding defines the gap in pixels between each rendered page.
+*page-v-padding*
+  Vertical page padding defines the vertical gap in pixels between each rendered page.
+
+  * Value type: Integer
+  * Default value: 1
+
+*page-h-padding*
+  Horizontal page padding defines the horizontal gap in pixels between each rendered page.
 
   * Value type: Integer
   * Default value: 1

meson.build

@@ -1,5 +1,5 @@
 project('zathura', 'c',
-  version: '0.5.12',
+  version: '0.5.13',
   meson_version: '>=1',
   default_options: ['c_std=c17', 'warning_level=3'],
 )

tests/meson.build

@@ -75,26 +75,5 @@ if get_option('tests').allowed()
         'LIBGL_DEBUG=quiet'
       ]
     )
-
-    # need the equivalent of xvfb for wayland
-    if seccomp.found() or landlock
-      sandbox = executable('test_sandbox', files('test_sandbox.c'),
-        dependencies: build_dependencies + [libzathura_sandbox_dep] + sandbox_dependencies,
-        include_directories: include_directories,
-        c_args: defines + sandbox_defines + flags
-      )
-      test('sandbox', xvfb,
-        args: xvfb_args + [sandbox],
-        timeout: 60*60,
-        protocol: 'tap',
-        env: [
-          'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
-          'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
-          'NO_AT_BRIDGE=1',
-          'MESA_LOG=null',
-          'LIBGL_DEBUG=quiet'
-        ]
-      )
-    endif
   endif
 endif

zathura/adjustment.c

@@ -140,10 +140,3 @@ bool page_is_visible(zathura_document_t* document, unsigned int page_number) {
   return (fabs(pos_x - page_x) < 0.5 * (double)(view_width + cell_width) / (double)doc_width &&
           fabs(pos_y - page_y) < 0.5 * (double)(view_height + cell_height) / (double)doc_height);
 }
-
-void zathura_adjustment_set_value(GtkAdjustment* adjustment, gdouble value) {
-  const gdouble lower        = gtk_adjustment_get_lower(adjustment);
-  const gdouble upper_m_size = gtk_adjustment_get_upper(adjustment) - gtk_adjustment_get_page_size(adjustment);
-
-  gtk_adjustment_set_value(adjustment, MAX(lower, MIN(upper_m_size, value)));
-}

zathura/adjustment.h

@@ -74,12 +74,4 @@ void page_number_to_position(zathura_document_t* document, unsigned int page_num
  */
 bool page_is_visible(zathura_document_t* document, unsigned int page_number);
 
-/**
- * Set the adjustment value while enforcing its limits
- *
- * @param adjustment Adjustment instance
- * @param value Adjustment value
- */
-void zathura_adjustment_set_value(GtkAdjustment* adjustment, gdouble value);
-
 #endif /* ZATHURA_ADJUSTMENT_H */

zathura/callbacks.c

@@ -314,14 +314,18 @@ void cb_page_layout_value_changed(girara_session_t* session, const char* name, g
   unsigned int first_page_column = find_first_page_column(first_page_column_list, pages_per_row);
   g_free(first_page_column_list);
 
-  unsigned int page_padding = 1;
-  girara_setting_get(zathura->ui.session, "page-padding", &page_padding);
+  unsigned int page_v_padding = 1;
+  girara_setting_get(zathura->ui.session, "page-v-padding", &page_v_padding);
+
+  unsigned int page_h_padding = 1;
+  girara_setting_get(zathura->ui.session, "page-h-padding", &page_h_padding);
 
   bool page_right_to_left = false;
   girara_setting_get(zathura->ui.session, "page-right-to-left", &page_right_to_left);
 
-  zathura_document_set_page_layout(zathura_get_document(zathura), page_padding, pages_per_row, first_page_column);
-  zathura_document_widget_set_mode(zathura, page_padding, pages_per_row, first_page_column, page_right_to_left);
+  zathura_document_set_page_layout(zathura_get_document(zathura), page_v_padding, page_h_padding, pages_per_row,
+                                   first_page_column);
+  zathura_document_widget_set_mode(zathura, page_v_padding, page_h_padding, page_right_to_left);
 }
 
 void cb_index_row_activated(GtkTreeView* tree_view, GtkTreePath* path, GtkTreeViewColumn* UNUSED(column), void* data) {