Merge branch 'release/0.3.0'

.gitignore

@@ -6,3 +6,5 @@
 build
 compile_commands.json
 .ycm_extra_conf.*
+subprojects/girara
+subprojects/zathura

.gitlab-ci.yml

+stages:
+  - build
+  - test
+
+# Cache
+cache: &dependency_cache
+  key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
+  paths:
+    - subprojects/girara
+    - subprojects/zathura
+
+# 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:
+    <<: *dependency_cache
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - build
+  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:
+    <<: *dependency_cache
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - build
+  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:
+    <<: *dependency_cache
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - build
+  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:
+    <<: *dependency_cache
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - build
+  except:
+    - tags

LICENSE

-Copyright (c) 2011-2018 pwmt.org
+Copyright (c) 2011-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

README

@@ -5,7 +5,7 @@ rendering library.
 
 Requirements
 ------------
-zathura (>= 0.2.0)
+zathura (>= 0.4.4)
 girara
 poppler-glib (>= 0.18)
 

meson.build

 project('zathura-pdf-poppler', 'c',
-  version: '0.2.9',
+  version: '0.3.0',
   meson_version: '>=0.43',
   default_options: 'c_std=c11'
 )
@@ -15,13 +15,24 @@ metainfodir = join_paths(datadir, 'metainfo')
 desktopdir = join_paths(datadir, 'applications')
 
 # required dependencies
-zathura = dependency('zathura', version: '>=0.3.9')
-girara = dependency('girara-gtk3')
+zathura = dependency('zathura', version: '>=0.4.4', fallback: ['zathura', 'zathura_dependency'])
+girara = dependency('girara-gtk3', fallback: ['girara', 'girara_dependency'])
 glib = dependency('glib-2.0')
 poppler = dependency('poppler-glib', version: '>=0.18')
 
 build_dependencies = [zathura, girara, glib, poppler]
 
+if get_option('plugindir') == ''
+  if zathura.type_name() == 'pkgconfig'
+    plugindir = zathura.get_pkgconfig_variable('plugindir')
+  else
+    zathura_subproject = subproject('zathura')
+    plugindir = zathura_subproject.get_variable('plugindir')
+  endif
+else
+  plugindir = get_option('plugindir')
+endif
+
 # defines
 defines = [
   '-DVERSION_MAJOR=@0@'.format(version_array[0]),
@@ -62,7 +73,7 @@ pdf = shared_module('pdf-poppler',
   dependencies: build_dependencies,
   c_args: defines + flags,
   install: true,
-  install_dir: zathura.get_pkgconfig_variable('plugindir')
+  install_dir: plugindir
 )
 
 subdir('data')

meson_options.txt

+option('plugindir',
+  type: 'string',
+  value: '',
+  description: 'Install to a different location than Zathura\'s plugin directory'
+)

subprojects/girara.wrap

+[wrap-git]
+directory=girara
+url=https://git.pwmt.org/pwmt/girara.git
+revision=develop

subprojects/zathura.wrap

+[wrap-git]
+directory=zathura
+url=https://git.pwmt.org/pwmt/zathura.git
+revision=develop

zathura-pdf-poppler/attachments.c

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #include <girara/utils.h>
 

zathura-pdf-poppler/document.c

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #include "plugin.h"
 #include "utils.h"

zathura-pdf-poppler/forms.c

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #include "plugin.h"
 

zathura-pdf-poppler/image.c

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #include "plugin.h"
 #include "utils.h"
 
-static void pdf_zathura_image_free(void* image);
+static void
+pdf_zathura_image_free(void* data)
+{
+  zathura_image_t* image = data;
+  if (image != NULL) {
+    g_free(image->data);
+  }
+  g_free(image);
+}
 
 girara_list_t*
 pdf_page_images_get(zathura_page_t* page, void* data, zathura_error_t* error)
@@ -104,18 +112,3 @@ error_ret:
 
   return NULL;
 }
-
-static void
-pdf_zathura_image_free(void* data)
-{
-  if (data == NULL) {
-    return;
-  }
-
-  zathura_image_t* image = data;
-  if (image->data != NULL) {
-    g_free(image->data);
-  }
-
-  g_free(image);
-}

zathura-pdf-poppler/index.c

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #include "plugin.h"
 #include "utils.h"

zathura-pdf-poppler/links.c

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #include "plugin.h"
 #include "utils.h"

zathura-pdf-poppler/meta.c

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #include <string.h>
 
@@ -34,7 +34,8 @@ pdf_document_get_information(zathura_document_t* document, void* data, zathura_e
     { "subject",  ZATHURA_DOCUMENT_INFORMATION_SUBJECT },
     { "keywords", ZATHURA_DOCUMENT_INFORMATION_KEYWORDS },
     { "creator",  ZATHURA_DOCUMENT_INFORMATION_CREATOR },
-    { "producer", ZATHURA_DOCUMENT_INFORMATION_PRODUCER }
+    { "producer", ZATHURA_DOCUMENT_INFORMATION_PRODUCER },
+    { "format",   ZATHURA_DOCUMENT_INFORMATION_FORMAT }
   };
 
   char* string_value;

zathura-pdf-poppler/page.c

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #include "plugin.h"
 

zathura-pdf-poppler/plugin.c

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #include "plugin.h"
 

zathura-pdf-poppler/plugin.h

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #ifndef PDF_H
 #define PDF_H

zathura-pdf-poppler/render.c

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #include "plugin.h"
 

zathura-pdf-poppler/search.c

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #include <string.h>
 

zathura-pdf-poppler/select.c

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #include "plugin.h"
 

zathura-pdf-poppler/utils.c

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #include "utils.h"
 

zathura-pdf-poppler/utils.h

-/* See LICENSE file for license and copyright information */
+/* SPDX-License-Identifier: Zlib */
 
 #ifndef UTILS_H
 #define UTILS_H