Merge branch 'release/0.2.6'

LICENSE

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

Makefile

@@ -28,10 +28,11 @@ endif
 
 options:
 	$(ECHO) ${PLUGIN} build options:
-	$(ECHO) "CFLAGS  = ${CFLAGS}"
-	$(ECHO) "LDFLAGS = ${LDFLAGS}"
-	$(ECHO) "DFLAGS  = ${DFLAGS}"
-	$(ECHO) "CC      = ${CC}"
+	$(ECHO) "CFLAGS     = ${CFLAGS}"
+	$(ECHO) "LDFLAGS    = ${LDFLAGS}"
+	$(ECHO) "DFLAGS     = ${DFLAGS}"
+	$(ECHO) "CC         = ${CC}"
+	$(ECHO) "PKG_CONFIG = ${PKG_CONFIG}"
 
 %.o: %.c
 	$(ECHO) CC $<
@@ -64,6 +65,7 @@ dist: clean
 	$(QUIET)mkdir -p ${PROJECT}-${VERSION}
 	$(QUIET)cp -R LICENSE Makefile config.mk common.mk Doxyfile \
 		${HEADER} ${SOURCE} AUTHORS ${PROJECT}.desktop \
+		${PROJECT}.metainfo.xml \
 		${PROJECT}-${VERSION}
 	$(QUIET)tar -cf ${PROJECT}-${VERSION}.tar ${PROJECT}-${VERSION}
 	$(QUIET)gzip ${PROJECT}-${VERSION}.tar
@@ -79,6 +81,9 @@ install: all
 	$(QUIET)mkdir -m 755 -p ${DESTDIR}${DESKTOPPREFIX}
 	$(ECHO) installing desktop file
 	$(QUIET)install -m 644 ${PROJECT}.desktop ${DESTDIR}${DESKTOPPREFIX}
+	$(ECHO) installing AppData file
+	$(QUIET)mkdir -m 755 -p $(DESTDIR)$(APPDATAPREFIX)
+	$(QUIET)install -m 644 $(PROJECT).metainfo.xml $(DESTDIR)$(APPDATAPREFIX)
 
 uninstall:
 	$(ECHO) uninstalling ${PLUGIN} plugin
@@ -87,6 +92,8 @@ uninstall:
 	$(ECHO) removing desktop file
 	$(QUIET)rm -f ${DESTDIR}${DESKTOPPREFIX}/${PROJECT}.desktop
 	$(QUIET)rmdir --ignore-fail-on-non-empty ${DESTDIR}${DESKTOPPREFIX} 2> /dev/null
+	$(ECHO) removing AppData file
+	$(QUIET)rm -f $(DESTDIR)$(APPDATAPREFIX)/$(PROJECT).metainfo.xml
 
 -include $(wildcard .depend/*.dep)
 

config.mk

@@ -2,31 +2,34 @@
 
 VERSION_MAJOR = 0
 VERSION_MINOR = 2
-VERSION_REV = 5
+VERSION_REV = 6
 VERSION = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}
 
+PKG_CONFIG ?= pkg-config
+
 # minimum required zathura version
 ZATHURA_MIN_VERSION = 0.2.0
-ZATHURA_VERSION_CHECK ?= $(shell pkg-config --atleast-version=$(ZATHURA_MIN_VERSION) zathura; echo $$?)
-ZATHURA_GTK_VERSION ?= $(shell pkg-config --variable=GTK_VERSION zathura)
+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
+APPDATAPREFIX ?= ${PREFIX}/share/appdata
 
 # libs
-CAIRO_INC ?= $(shell pkg-config --cflags cairo)
-CAIRO_LIB ?= $(shell pkg-config --libs cairo)
+CAIRO_INC ?= $(shell $(PKG_CONFIG) --cflags cairo)
+CAIRO_LIB ?= $(shell $(PKG_CONFIG) --libs cairo)
 
-PDF_INC ?= $(shell pkg-config --cflags poppler-glib)
-PDF_LIB ?= $(shell pkg-config --libs poppler-glib)
+PDF_INC ?= $(shell $(PKG_CONFIG) --cflags poppler-glib)
+PDF_LIB ?= $(shell $(PKG_CONFIG) --libs poppler-glib)
 
-GIRARA_INC ?= $(shell pkg-config --cflags girara-gtk${ZATHURA_GTK_VERSION})
-GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk${ZATHURA_GTK_VERSION})
+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)
+ZATHURA_INC ?= $(shell $(PKG_CONFIG) --cflags zathura)
+PLUGINDIR ?= $(shell $(PKG_CONFIG) --variable=plugindir zathura)
 ifeq (,${PLUGINDIR})
 PLUGINDIR = ${LIBDIR}/zathura
 endif
@@ -35,7 +38,7 @@ INCS = ${CAIRO_INC} ${PDF_INC} ${ZATHURA_INC} ${GIRARA_INC}
 LIBS = ${GIRARA_LIB} ${CAIRO_LIB} ${PDF_LIB}
 
 # flags
-CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
+CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
 
 # debug
 DFLAGS ?= -g

document.c

@@ -25,7 +25,7 @@ pdf_document_open(zathura_document_t* document)
       zathura_document_get_password(document), &gerror);
 
   if (poppler_document == NULL) {
-    if(gerror != NULL && gerror->code == POPPLER_ERROR_ENCRYPTED) {
+    if (gerror != NULL && gerror->code == POPPLER_ERROR_ENCRYPTED) {
       error = ZATHURA_ERROR_INVALID_PASSWORD;
     } else {
       error = ZATHURA_ERROR_UNKNOWN;

zathura-pdf-poppler.desktop

@@ -17,7 +17,7 @@ Comment[pt_BR]=Um visualizador de documentos minimalista
 Comment[ru]=Минималистичный просмотрщик документов
 Comment[tr]=Minimalist bir belge görüntüleyicisi
 Comment[uk_UA]=Легкий переглядач документів
-Exec=zathura %f
+Exec=zathura %U
 Terminal=false
 NoDisplay=true
 Categories=Office;Viewer;

zathura-pdf-poppler.metainfo.xml

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