Merge branch 'release/0.4.5'

67818f90 · Sebastian Ramacher · 78205781 · f41cfd37 · 67818f90 · 67818f90
Commit 67818f90 authored Jan 06, 2020 by Sebastian Ramacher
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 *.pc
 *.sw[a-z]
 *.pyc
+tags

 # generated files
 resources.*
@@ -24,6 +25,7 @@ zathura-*.tar.gz
 .tx
 build/
 gcov/
+subprojects/girara

 # development files
 .clang_complete

--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+stages:
+  - build
+  - test
+
+# Cache
+cache: &girara_cache
+  key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
+  paths:
+    - subprojects/girara
+
+# Archlinux
+build:archlinux:
+  tags:
+    - pwmt
+  stage: build
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/archlinux:latest
+  script:
+    - mkdir -p build && cd build
+    - meson ..
+    - ninja
+  cache:
+    <<: *girara_cache
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - build
+  except:
+    - tags
+
+test:archlinux:
+  tags:
+    - pwmt
+  stage: test
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/archlinux:latest
+  script:
+    - cd build
+    - ninja test
+  cache:
+    <<: *girara_cache
+    policy: pull
+  dependencies:
+    - build:archlinux
+  except:
+    - tags
+
+# Debian 10 (Buster)
+build:debian-buster:
+  tags:
+    - pwmt
+  stage: build
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:buster
+  script:
+    - mkdir -p build && cd build
+    - meson ..
+    - ninja
+  cache:
+    <<: *girara_cache
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - build
+  except:
+    - tags
+
+test:debian-buster:
+  tags:
+    - pwmt
+  stage: test
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:buster
+  script:
+    - cd build
+    - ninja test
+  cache:
+    <<: *girara_cache
+    policy: pull
+  dependencies:
+    - build:debian-buster
+  except:
+    - tags
+
+# Ubuntu 18.04 LTS (Bionic Beaver)
+build:ubuntu-bionic:
+  tags:
+    - pwmt
+  stage: build
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:bionic
+  script:
+    - mkdir -p build && cd build
+    - meson ..
+    - ninja
+  cache:
+    <<: *girara_cache
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - build
+  except:
+    - tags
+
+test:ubuntu-bionic:
+  tags:
+    - pwmt
+  stage: test
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:bionic
+  script:
+    - cd build
+    - ninja test
+  cache:
+    <<: *girara_cache
+    policy: pull
+  dependencies:
+    - build:ubuntu-bionic
+  except:
+    - tags
+
+# Ubuntu 19.10 (Eoan Ermine)
+build:ubuntu-eoan:
+  tags:
+    - pwmt
+  stage: build
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:eoan
+  script:
+    - mkdir -p build && cd build
+    - meson ..
+    - ninja
+  cache:
+    <<: *girara_cache
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - build
+  except:
+    - tags
+
+test:ubuntu-eoan:
+  tags:
+    - pwmt
+  stage: test
+  image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:eoan
+  script:
+    - cd build
+    - ninja test
+  cache:
+    <<: *girara_cache
+    policy: pull
+  dependencies:
+    - build:ubuntu-eoan
+  except:
+    - tags
--- a/LICENSE
+++ b/LICENSE
-Copyright (c) 2009-2019 pwmt.org
+Copyright (c) 2009-2020 pwmt.org

 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

--- a/data/zsh-completion.in
+++ b/data/zsh-completion.in
@@ -2,51 +2,54 @@

 local -a all_opts
 all_opts=(
-  '(-c --config-dir=DIR)'{-c,--config-dir}'[Path to config directory]:config directory:_files -/'
-  '(-d --data-dir=DIR)'{-d,--data-dir}'[Path to data directory]:data directory:_files -/'
-  '--cache-dir=DIR[Path to cache directory]:cache directory:_files -/'
-  '(-p --plugins-dir=DIR)'{-p,--plugins-dir}'[Path to plugins directory]:plugins directory:_files -/'
-  '(-e --reparent=XID)'{-e,--reparent}'[Reparents to window specified by XID (X11)]:xid'
-  '(-w --password=password)'{-w,--password}'[Document password]:password'
-  '(-P --page=page)'{-p,--page}'[Page number to go to]:page number'
-  '(-l --log-level=level)'{-l,--log-level}'[Log level]:level:(error warning info debug)'
-  '(-x --snyctex-editor-command=cmd)'{-x,--synxtec-editor-command}'[Synctex editor (forwarded to the synctex command)]:command'
-  '--synctex-forward=position[Move to given synctex position]:position'
-  '--synctex-pid=pid[Highlight position in given process]:pid'
-  '--mode=mode[Start in a non-default mode]:mode:(presentation fullscreen)'
-  '--fork[Fork into the background]'
-  '-h --help[Show help message]'
-  '-v --version[Print version information]'
+  '(-c --config-dir)'{-c,--config-dir=}'[specify path to config directory]:config directory:_files -/'
+  '(-d --data-dir)'{-d,--data-dir=}'[specify path to data directory]:data directory:_files -/'
+  '--cache-dir=[specify path to cache directory]:cache directory:_files -/'
+  '(-p --plugins-dir)'{-p,--plugins-dir=}'[specify path to plugins directory]:plugins directory:_files -/'
+  '(-e --reparent)'{-e,--reparent=}'[reparent to window specified by XID (X11)]: :_x_window'
+  '(-w --password)'{-w,--password=}'[specify a password for the document]:password'
+  '(-P --page)'{-p,--page=}'[open the document at the given page number]:page number'
+  '(-l --log-level)'{-l,--log-level=}'[set log level]:level:(error warning info debug)'
+  '(-x --synctex-editor-command)'{-x,--synctex-editor-command=}'[specify synctex editor (forwarded to the synctex command)]:command'
+  '--synctex-forward=[move to the given position]:position'
+  '--synctex-pid=[highlight position in given process]:pid:_pids'
+  '--mode[start in a non-default mode]:mode:(presentation fullscreen)'
+  '--fork[fork into the background]'
+  '(- :)'{-h,--help}'[show help message]'
+  '(- :)'{-v,--version}'[print version information]'
  '*:file:->files'
 )

-local context state state_descr line
+local curcontext="$curcontext" state state_descr line ret=1
 typeset -A opt_args
-_arguments -S "$all_opts[@]" && return 0
+_arguments -C -s -S "$all_opts[@]" && ret=0

-local exts
+local PLUGIN
+local -a exts
 for PLUGIN in @PLUGINDIR@/lib*.so; do
  case ${PLUGIN##*/} in
    libpdf-poppler.so)
-      exts="$exts|pdf|PDF"
+      exts+=( pdf PDF )
      ;;
    libpdf-mupdf.so)
-      exts="$exts|pdf|PDF|epub|oxps"
+      exts+=( pdf PDF epub oxps )
      ;;
    libps.so)
-      exts="$exts|ps|eps|epsi|epsf"
+      exts+=( ps eps epsi epsf )
      ;;
    libdjvu.so)
-      exts="$exts|djvu|djv"
+      exts+=( djvu djv )
      ;;
    libcb.so)
-      exts="$exts|cb7|cbr|cbz|cbt|rar|zip|7z|tar"
+      exts+=( cb7 cbr cbz cbt rar zip 7z tar )
      ;;
  esac
 done

 case $state in
  (files)
-    _files -g "*.($exts)"
+    _wanted files expl file _files -g "*.(${(j:|:)exts:-pdf})(-.)" && ret=0
    ;;
 esac
+
+return ret
--- a/doc/man/zathura.1.rst
+++ b/doc/man/zathura.1.rst
@@ -16,11 +16,6 @@ Options

 .. include:: _options.txt

-Environment variables
---------------------
-
-.. include:: _env.txt
-
 Mouse and key bindings
 ----------------------

@@ -41,6 +36,11 @@ Synctex support

 .. include:: _synctex.txt

+Environment variables
+---------------------
+
+.. include:: _env.txt
+
 Known bugs
 ----------


--- a/doc/man/zathurarc.5.rst
+++ b/doc/man/zathurarc.5.rst
--- a/meson.build
+++ b/meson.build
 project('zathura', 'c',
-  version: '0.4.4',
+  version: '0.4.5',
  meson_version: '>=0.47',
  default_options: 'c_std=c11',
 )
@@ -37,7 +37,7 @@ plugindir = join_paths(get_option('libdir'), 'zathura')

 # required dependencies
 libm = cc.find_library('m', required: false)
-girara = dependency('girara-gtk3', version: '>=0.3.3')
+girara = dependency('girara-gtk3', version: '>=0.3.3', fallback: ['girara', 'girara_dependency'])
 glib = dependency('glib-2.0', version: '>=2.50')
 gio = dependency('gio-unix-2.0', required: host_machine.system() != 'windows')
 gthread = dependency('gthread-2.0', version: '>=2.50')
@@ -193,5 +193,7 @@ pkg.generate(
  ]
 )

+zathura_dependency = declare_dependency(link_with: zathura, include_directories: include_directories)
+
 subdir('doc')
 subdir('tests')
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zathura\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-06 22:48+0200\n"
+"POT-Creation-Date: 2020-01-06 10:17+0100\n"
 "PO-Revision-Date: 2019-08-11 19:46+0000\n"
 "Last-Translator: abouzakaria kov <zakariakov@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/pwmt/zathura/language/ar/)\n"
@@ -594,59 +594,59 @@ msgstr "الرابط: : %s"
 msgid "Link: Invalid"
 msgstr "الرابط: غير صالح"

-#: zathura/main.c:147
+#: zathura/main.c:145
 msgid "Reparents to window specified by xid (X11)"
 msgstr ""

-#: zathura/main.c:148
+#: zathura/main.c:146
 msgid "Path to the config directory"
 msgstr "المسار إلى دليل التكوين"

-#: zathura/main.c:149
+#: zathura/main.c:147
 msgid "Path to the data directory"
 msgstr "المسار إلى دليل البيانات"

-#: zathura/main.c:150
+#: zathura/main.c:148
 msgid "Path to the cache directory"
 msgstr "المسار إلى دليل ذاكرة التخزين المؤقت"

-#: zathura/main.c:151
+#: zathura/main.c:149
 msgid "Path to the directories containing plugins"
 msgstr "الطريق إلى الأدلة التي تحتوي على الإضافات"

-#: zathura/main.c:152
+#: zathura/main.c:150
 msgid "Fork into the background"
 msgstr ""

-#: zathura/main.c:153
+#: zathura/main.c:151
 msgid "Document password"
 msgstr "كلمة مرور المستند"

-#: zathura/main.c:154
+#: zathura/main.c:152
 msgid "Page number to go to"
 msgstr "الذهاب إلى رقم الصفحة "

-#: zathura/main.c:155
+#: zathura/main.c:153
 msgid "Log level (debug, info, warning, error)"
 msgstr "مستوى السجل (تصحيح ، معلومات ، تحذير ، خطأ)"

-#: zathura/main.c:156
+#: zathura/main.c:154
 msgid "Print version information"
 msgstr "طباعة معلومات إلاصدار "

-#: zathura/main.c:158
+#: zathura/main.c:155
 msgid "Synctex editor (forwarded to the synctex command)"
 msgstr "محرر Synctex (تم إعادة توجيهه إلى أمر synctex)"

-#: zathura/main.c:159
+#: zathura/main.c:156
 msgid "Move to given synctex position"
 msgstr "الانتقال إلى موضع synctex المحدد"

-#: zathura/main.c:160
+#: zathura/main.c:157
 msgid "Highlight given position in the given process"
 msgstr "تمييز على موضع معين في عملية معينة"

-#: zathura/main.c:162
+#: zathura/main.c:158
 msgid "Start in a non-default mode"
 msgstr "البدء في وضع غير افتراضي"

@@ -687,7 +687,7 @@ msgstr "النمط غير موجود: %s"
 msgid "This document does not contain any index"
 msgstr "لا يحتوي هذا المستند على أي فهرس"

-#: zathura/zathura.c:304 zathura/zathura.c:1456
+#: zathura/zathura.c:304 zathura/zathura.c:1466
 msgid "[No name]"
 msgstr "[لا اسم]"

@@ -695,18 +695,18 @@ msgstr "[لا اسم]"
 msgid "Could not read file from stdin and write it to a temporary file."
 msgstr "لا يمكن قراءة الملف من المصدر وكتابته إلى ملف مؤقت."

-#: zathura/zathura.c:847
+#: zathura/zathura.c:851
 msgid "Could not read file from GIO and copy it to a temporary file."
 msgstr "تعذرت قراءة الملف من GIO ونسخه إلى ملف مؤقت."

-#: zathura/zathura.c:936
+#: zathura/zathura.c:940
 msgid "Enter password:"
 msgstr "أدخل كلمة المرور:"

-#: zathura/zathura.c:971
+#: zathura/zathura.c:979
 msgid "Unsupported file type. Please install the necessary plugin."
 msgstr "نوع ملف غير مدعوم. الرجاء تثبيت المكون الإضافي اللازم."

-#: zathura/zathura.c:981
+#: zathura/zathura.c:989
 msgid "Document does not contain any pages"
 msgstr "لا يحتوي المستند على أي صفحات"
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zathura\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-06 22:48+0200\n"
+"POT-Creation-Date: 2020-01-06 10:17+0100\n"
 "PO-Revision-Date: 2019-08-11 19:46+0000\n"
 "Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
 "Language-Team: Catalan (http://www.transifex.com/pwmt/zathura/language/ca/)\n"
@@ -590,59 +590,59 @@ msgstr "Enllaç: %s"
 msgid "Link: Invalid"
 msgstr "Enllaç: Invàlid"

-#: zathura/main.c:147
+#: zathura/main.c:145
 msgid "Reparents to window specified by xid (X11)"
 msgstr "Reassigna a la finestra especificada per xid (X11)"

-#: zathura/main.c:148
+#: zathura/main.c:146
 msgid "Path to the config directory"
 msgstr "Ruta al directori de configuració"

-#: zathura/main.c:149
+#: zathura/main.c:147
 msgid "Path to the data directory"
 msgstr "Camí al directori de dades"

-#: zathura/main.c:150
+#: zathura/main.c:148
 msgid "Path to the cache directory"
 msgstr ""

-#: zathura/main.c:151
+#: zathura/main.c:149
 msgid "Path to the directories containing plugins"
 msgstr "Camí al directori que conté els plugins"

-#: zathura/main.c:152
+#: zathura/main.c:150
 msgid "Fork into the background"
 msgstr "Bifurca en segon pla"

-#: zathura/main.c:153
+#: zathura/main.c:151
 msgid "Document password"
 msgstr "Contrasenya del document"

-#: zathura/main.c:154
+#: zathura/main.c:152
 msgid "Page number to go to"
 msgstr ""

-#: zathura/main.c:155
+#: zathura/main.c:153
 msgid "Log level (debug, info, warning, error)"
 msgstr "Nivell de registre (depuració, informació, advertiments, errors)"

-#: zathura/main.c:156
+#: zathura/main.c:154
 msgid "Print version information"
 msgstr "Imprimeix informació sobre la versió"

-#: zathura/main.c:158
+#: zathura/main.c:155
 msgid "Synctex editor (forwarded to the synctex command)"
 msgstr "Editor synctex (reenviat a l'ordre synctex)"

-#: zathura/main.c:159
+#: zathura/main.c:156
 msgid "Move to given synctex position"
 msgstr ""

-#: zathura/main.c:160
+#: zathura/main.c:157
 msgid "Highlight given position in the given process"
 msgstr ""

-#: zathura/main.c:162
+#: zathura/main.c:158
 msgid "Start in a non-default mode"
 msgstr ""

@@ -683,7 +683,7 @@ msgstr ""
 msgid "This document does not contain any index"
 msgstr "Aquest document no conté cap índex"

-#: zathura/zathura.c:304 zathura/zathura.c:1456
+#: zathura/zathura.c:304 zathura/zathura.c:1466
 msgid "[No name]"
 msgstr "[Sense nom]"

@@ -691,18 +691,18 @@ msgstr "[Sense nom]"
 msgid "Could not read file from stdin and write it to a temporary file."
 msgstr ""

-#: zathura/zathura.c:847
+#: zathura/zathura.c:851
 msgid "Could not read file from GIO and copy it to a temporary file."
 msgstr ""

-#: zathura/zathura.c:936
+#: zathura/zathura.c:940
 msgid "Enter password:"
 msgstr ""

-#: zathura/zathura.c:971
+#: zathura/zathura.c:979
 msgid "Unsupported file type. Please install the necessary plugin."
 msgstr ""

-#: zathura/zathura.c:981
+#: zathura/zathura.c:989
 msgid "Document does not contain any pages"
 msgstr ""
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zathura\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-06 22:48+0200\n"
+"POT-Creation-Date: 2020-01-06 10:17+0100\n"
 "PO-Revision-Date: 2019-08-11 19:46+0000\n"
 "Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
 "Language-Team: Czech (http://www.transifex.com/pwmt/zathura/language/cs/)\n"
@@ -594,59 +594,59 @@ msgstr "Odkaz: %s"
 msgid "Link: Invalid"
 msgstr "Odkaz: Neplatný"

-#: zathura/main.c:147
+#: zathura/main.c:145
 msgid "Reparents to window specified by xid (X11)"
 msgstr "Propojí s oknem udaným xid (X11)"

-#: zathura/main.c:148
+#: zathura/main.c:146
 msgid "Path to the config directory"
 msgstr "Cesta k adresáři se souborem s nastavením"

-#: zathura/main.c:149
+#: zathura/main.c:147
 msgid "Path to the data directory"
 msgstr "Cesta k adresáři s daty"

-#: zathura/main.c:150
+#: zathura/main.c:148
 msgid "Path to the cache directory"
 msgstr "Cesta k adresáři s vyrovnávací pamětí"

-#: zathura/main.c:151
+#: zathura/main.c:149
 msgid "Path to the directories containing plugins"
 msgstr "Cesta k adresářům s přídavnými moduly"

-#: zathura/main.c:152
+#: zathura/main.c:150
 msgid "Fork into the background"
 msgstr "Forknout se na pozadí"

-#: zathura/main.c:153
+#: zathura/main.c:151
 msgid "Document password"
 msgstr "Heslo k dokumentu"

-#: zathura/main.c:154
+#: zathura/main.c:152
 msgid "Page number to go to"
 msgstr "Číslo strany, na kterou jít"

-#: zathura/main.c:155
+#: zathura/main.c:153
 msgid "Log level (debug, info, warning, error)"
 msgstr "Úroveň logování (debug, info, warning, error)"

-#: zathura/main.c:156
+#: zathura/main.c:154
 msgid "Print version information"
 msgstr "Zobrazit údaje o verzi"

-#: zathura/main.c:158
+#: zathura/main.c:155
 msgid "Synctex editor (forwarded to the synctex command)"
 msgstr "Editor Synctex (předáno příkazu synctex)"

-#: zathura/main.c:159
+#: zathura/main.c:156
 msgid "Move to given synctex position"
 msgstr "Přesunout se na udanou polohu synctex"

-#: zathura/main.c:160
+#: zathura/main.c:157
 msgid "Highlight given position in the given process"
 msgstr "Zvýraznit zadanou polohu v daném procesu"

-#: zathura/main.c:162
+#: zathura/main.c:158
 msgid "Start in a non-default mode"
 msgstr "Spustit v ne-výchozím režimu"

@@ -687,7 +687,7 @@ msgstr "Vzor nenalezen: %s"
 msgid "This document does not contain any index"
 msgstr "Tento dokument neobsahuje žádný rejstřík"

-#: zathura/zathura.c:304 zathura/zathura.c:1456
+#: zathura/zathura.c:304 zathura/zathura.c:1466
 msgid "[No name]"
 msgstr "[Nepojmenovaný]"

@@ -696,20 +696,20 @@ msgid "Could not read file from stdin and write it to a temporary file."
 msgstr ""
 "Nepodařilo se přečíst soubor z stdin a zapsat jej do dočasného souboru."

-#: zathura/zathura.c:847
+#: zathura/zathura.c:851
 msgid "Could not read file from GIO and copy it to a temporary file."
 msgstr ""
 "Nepodařilo se přečíst soubor z GIO a zkopírovat jej do dočasného souboru."

-#: zathura/zathura.c:936
+#: zathura/zathura.c:940
 msgid "Enter password:"
 msgstr "Zadat heslo:"

-#: zathura/zathura.c:971
+#: zathura/zathura.c:979
 msgid "Unsupported file type. Please install the necessary plugin."
 msgstr ""
 "Nepodporovaný typ souboru. Nainstalujte, prosím, nezbytný přídavný modul."

-#: zathura/zathura.c:981
+#: zathura/zathura.c:989
 msgid "Document does not contain any pages"
 msgstr "Dokument neobsahuje žádné strany"
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zathura\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-06 22:48+0200\n"
+"POT-Creation-Date: 2020-01-06 10:17+0100\n"
 "PO-Revision-Date: 2019-08-11 19:46+0000\n"
 "Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
 "Language-Team: German (http://www.transifex.com/pwmt/zathura/language/de/)\n"
@@ -598,59 +598,59 @@ msgstr "Verknüpfung: %s"
 msgid "Link: Invalid"
 msgstr "Verknüpfung: ungültig"