Merge branch 'release/0.2.8'

.gitignore

 *.o
 *~
-.depend
 djvu.so
 *swp
-zathura-version-check
+build

Doxyfile

-# See LICENSE file for license and copyright information
-
-# General information
-PROJECT_NAME          = zathura-djvu
-OUTPUT_DIRECTORY      = ./doc/
-OUTPUT_LANGUAGE       = English
-TAB_SIZE              = 2
-EXTRACT_ALL           = YES
-OPTIMIZE_OUTPUT_FOR_C = YES
-DOXYFILE_ENCODING     = UTF-8
-TYPEDEF_HIDES_STRUCT  = YES
-
-# Warning and progress messages
-QUIET                = YES
-WARNINGS             = YES
-WARN_IF_UNDOCUMENTED = YES
-
-# Input files
-INPUT         =
-FILE_PATTERNS = *.h *.c
-RECURSIVE     = YES
-
-# Output files
-GENERATE_HTML  = YES
-GENERATE_LATEX = NO
-GENERATE_RTF   = NO
-GENERATE_XML   = NO
-
-SOURCE_BROWSER = YES

Makefile

-# See LICENSE file for license and copyright information
-
-include config.mk
-include common.mk
-
-PROJECT  = zathura-djvu
-PLUGIN   = djvu
-SOURCE   = $(sort $(wildcard *.c))
-HEADER   = $(sort $(wildcard *.h))
-OBJECTS  = ${SOURCE:.c=.o}
-DOBJECTS = ${SOURCE:.c=.do}
-
-CPPFLAGS += "-DVERSION_MAJOR=${VERSION_MAJOR}"
-CPPFLAGS += "-DVERSION_MINOR=${VERSION_MINOR}"
-CPPFLAGS += "-DVERSION_REV=${VERSION_REV}"
-
-all: options ${PLUGIN}.so
-
-zathura-version-check:
-ifneq ($(ZATHURA_VERSION_CHECK), 0)
-	$(error "The minimum required version of zathura is ${ZATHURA_MIN_VERSION}")
-endif
-	$(QUIET)touch zathura-version-check
-
-options:
-	$(ECHO) ${PLUGIN} build options:
-	$(ECHO) "CFLAGS  = ${CFLAGS}"
-	$(ECHO) "LDFLAGS = ${LDFLAGS}"
-	$(ECHO) "DFLAGS  = ${DFLAGS}"
-	$(ECHO) "CC      = ${CC}"
-
-%.o: %.c
-	$(ECHO) CC $<
-	@mkdir -p .depend
-	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $< -MMD -MF .depend/$@.dep
-
-%.do: %.c
-	$(ECHO) CC $<
-	@mkdir -p .depend
-	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${DFLAGS} -o $@ $< -MMD -MF .depend/$@.dep
-
-${OBJECTS}:  config.mk zathura-version-check
-${DOBJECTS}: config.mk zathura-version-check
-
-${PLUGIN}.so: ${OBJECTS}
-	$(ECHO) LD $@
-	$(QUIET)${CC} -shared ${LDFLAGS} -o $@ $(OBJECTS) ${LIBS}
-
-${PLUGIN}-debug.so: ${DOBJECTS}
-	$(ECHO) LD $@
-	$(QUIET)${CC} -shared ${LDFLAGS} -o $@ $(DOBJECTS) ${LIBS}
-
-clean:
-	$(QUIET)rm -rf ${OBJECTS} ${DOBJECTS} $(PLUGIN).so $(PLUGIN)-debug.so \
-		doc .depend ${PROJECT}-${VERSION}.tar.gz zathura-version-check
-
-debug: options ${PLUGIN}-debug.so
-
-dist: clean
-	$(QUIET)mkdir -p ${PROJECT}-${VERSION}
-	$(QUIET)cp -R LICENSE Makefile config.mk common.mk Doxyfile \
-		${HEADER} ${SOURCE} AUTHORS ${PROJECT}.desktop \
-		${PROJECT}-${VERSION}
-	$(QUIET)tar -cf ${PROJECT}-${VERSION}.tar ${PROJECT}-${VERSION}
-	$(QUIET)gzip ${PROJECT}-${VERSION}.tar
-	$(QUIET)rm -rf ${PROJECT}-${VERSION}
-
-doc: clean
-	$(QUIET)doxygen Doxyfile
-
-install: all
-	$(ECHO) installing ${PLUGIN} plugin
-	$(QUIET)mkdir -p ${DESTDIR}${PLUGINDIR}
-	$(QUIET)cp -f ${PLUGIN}.so ${DESTDIR}${PLUGINDIR}
-	$(QUIET)mkdir -m 755 -p ${DESTDIR}${DESKTOPPREFIX}
-	$(ECHO) installing desktop file
-	$(QUIET)install -m 644 ${PROJECT}.desktop ${DESTDIR}${DESKTOPPREFIX}
-
-
-uninstall:
-	$(ECHO) uninstalling ${PLUGIN} plugin
-	$(QUIET)rm -f ${DESTDIR}${PLUGINDIR}/${PLUGIN}.so
-	$(QUIET)rmdir --ignore-fail-on-non-empty ${DESTDIR}${PLUGINDIR} 2> /dev/null
-	$(ECHO) removing desktop file
-	$(QUIET)rm -f ${DESTDIR}${DESKTOPPREFIX}/${PROJECT}.desktop
-	$(QUIET)rmdir --ignore-fail-on-non-empty ${DESTDIR}${DESKTOPPREFIX} 2> /dev/null
-
--include $(wildcard .depend/*.dep)
-
-.PHONY: all options clean debug doc dist install uninstall

common.mk

-# See LICENSE file for license and copyright information
-
-ifeq "$(VERBOSE)" "0"
-ECHO=@echo
-QUIET=@
-else
-ECHO=@\#
-QUIET=
-endif

config.mk

-# See LICENSE file for license and copyright information
-
-VERSION_MAJOR = 0
-VERSION_MINOR = 2
-VERSION_REV = 7
-VERSION = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}
-
-# minimum required zathura version
-ZATHURA_MIN_VERSION = 0.3.8
-ZATHURA_VERSION_CHECK ?= $(shell pkg-config --atleast-version=$(ZATHURA_MIN_VERSION) zathura; echo $$?)
-ZATHURA_GTK_VERSION ?= $(shell pkg-config --variable=GTK_VERSION zathura)
-
-# paths
-PREFIX ?= /usr
-LIBDIR ?= ${PREFIX}/lib
-DESKTOPPREFIX ?= ${PREFIX}/share/applications
-
-# libs
-CAIRO_INC ?= $(shell pkg-config --cflags cairo)
-CAIRO_LIB ?= $(shell pkg-config --libs cairo)
-
-GLIB_INC ?= $(shell pkg-config --cflags glib-2.0)
-GLIB_LIB ?= $(shell pkg-config --libs glib-2.0)
-
-DJVU_INC ?= $(shell pkg-config --cflags ddjvuapi)
-DJVU_LIB ?= $(shell pkg-config --libs ddjvuapi)
-
-GIRARA_INC ?= $(shell pkg-config --cflags girara-gtk${ZATHURA_GTK_VERSION})
-GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk${ZATHURA_GTK_VERSION})
-
-ZATHURA_INC ?= $(shell pkg-config --cflags zathura)
-PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura)
-ifeq (,${PLUGINDIR})
-PLUGINDIR = ${LIBDIR}/zathura
-endif
-
-INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC}
-LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB}
-
-# pre-processor flags
-CPPFLAGS += -D_FILE_OFFSET_BITS=64
-
-# compiler flags
-CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length -Wextra $(INCS)
-
-# linker flags
-LDFLAGS += -fPIC
-
-# debug
-DFLAGS ?= -g
-
-# compiler
-CC ?= gcc
-LD ?= ld
-
-# set to something != 0 if you want verbose build output
-VERBOSE ?= 0

data/meson.build

+install_data('org.pwmt.zathura-djvu.metainfo.xml', install_dir: metainfodir)
+install_data('org.pwmt.zathura-djvu.desktop', install_dir: desktopdir)

data/org.pwmt.zathura-djvu.desktop

+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Zathura
+Comment=A minimalistic document viewer
+Exec=zathura %U
+Terminal=false
+NoDisplay=true
+Categories=Office;Viewer;
+MimeType=image/vnd.djvu;image/vnd.djvu+multipage;

data/org.pwmt.zathura-djvu.metainfo.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2015-2018 pwmt.org -->
+<component type="addon">
+  <id>org.pwmt.zathura-djvu</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>Zlib</project_license>
+  <extends>org.pwmt.zathura</extends>
+  <name>Zathura-DjVU</name>
+  <summary>DjVU plugin for zathura</summary>
+  <url type="homepage">https://pwmt.org/projects/zathura-djvu/</url>
+  <update_contact>zathura@lists.pwmt.org</update_contact>
+</component>

meson.build

+project('zathura-djvu', 'c',
+  version: '0.2.8',
+  meson_version: '>=0.43',
+  default_options: 'c_std=c11'
+)
+
+version = meson.project_version()
+version_array = version.split('.')
+
+cc = meson.get_compiler('c')
+
+datadir = get_option('datadir')
+desktopdir = join_paths(datadir, 'applications')
+metainfodir = join_paths(datadir, 'metainfo')
+
+# required dependencies
+zathura = dependency('zathura', version: '>=0.3.8')
+girara = dependency('girara-gtk3')
+glib = dependency('glib-2.0')
+cairo = dependency('cairo')
+djvu = dependency('ddjvuapi')
+
+build_dependencies = [zathura, girara, glib, cairo, djvu]
+
+# defines
+defines = [
+  '-DVERSION_MAJOR=@0@'.format(version_array[0]),
+  '-DVERSION_MINOR=@0@'.format(version_array[1]),
+  '-DVERSION_REV=@0@'.format(version_array[2]),
+  '-D_DEFAULT_SOURCE',
+]
+
+# compile flags
+flags = [
+  '-Wall',
+  '-Wextra',
+  '-pedantic',
+  '-Werror=implicit-function-declaration',
+  '-Werror=vla',
+  '-fvisibility=hidden'
+]
+flags = cc.get_supported_arguments(flags)
+
+sources = files(
+  'zathura-djvu/djvu.c',
+  'zathura-djvu/page-text.c'
+)
+
+djvu = shared_module('djvu',
+  sources,
+  dependencies: build_dependencies,
+  c_args: defines + flags,
+  install: true,
+  install_dir: zathura.get_pkgconfig_variable('plugindir')
+)
+
+subdir('data')

zathura-djvu.desktop

-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Zathura
-Comment=A minimalistic document viewer
-Comment[ca]=Un visualitzador de documents minimalista
-Comment[de]=Ein minimalistischer Dokumenten-Betrachter
-Comment[el]=Ένας ελαφρύς προβολέας κειμένων 
-Comment[eo]=Malpeza dokumento spektanto
-Comment[es_CL]=Un visor de documentos minimalista
-Comment[fr]=Un visionneur de document minimaliste
-Comment[he]=מציג מסמכים מינימליסטי
-Comment[id_ID]=Pembaca dokumen minimalis
-Comment[it]=Un visualizzatore di documenti minimalista
-Comment[pl]=Minimalistyczna przeglądarka dokumentów
-Comment[pt_BR]=Um visualizador de documentos minimalista
-Comment[ru]=Минималистичный просмотрщик документов
-Comment[tr]=Minimalist bir belge görüntüleyicisi
-Comment[uk_UA]=Легкий переглядач документів
-Exec=zathura %U
-Terminal=false
-NoDisplay=true
-Categories=Office;Viewer;
-MimeType=image/vnd.djvu;

djvu.c → zathura-djvu/djvu.c

@@ -35,7 +35,8 @@ ZATHURA_PLUGIN_REGISTER_WITH_FUNCTIONS(
     .page_render_cairo       = djvu_page_render_cairo
   }),
   ZATHURA_PLUGIN_MIMETYPES({
-    "image/vnd.djvu"
+    "image/vnd.djvu",
+    "image/vnd.djvu+multipage"
   })
 )