Commit 308c9c39 authored by Moritz Lipp's avatar Moritz Lipp

Merge branch 'release/0.2.6'

parents b1a78489 529bd1b2
Pipeline #96 skipped
Copyright (c) 2011-2013 pwmt.org Copyright (c) 2011-2015 pwmt.org
This software is provided 'as-is', without any express or implied This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages warranty. In no event will the authors be held liable for any damages
......
...@@ -28,10 +28,11 @@ endif ...@@ -28,10 +28,11 @@ endif
options: options:
$(ECHO) ${PLUGIN} build options: $(ECHO) ${PLUGIN} build options:
$(ECHO) "CFLAGS = ${CFLAGS}" $(ECHO) "CFLAGS = ${CFLAGS}"
$(ECHO) "LDFLAGS = ${LDFLAGS}" $(ECHO) "LDFLAGS = ${LDFLAGS}"
$(ECHO) "DFLAGS = ${DFLAGS}" $(ECHO) "DFLAGS = ${DFLAGS}"
$(ECHO) "CC = ${CC}" $(ECHO) "CC = ${CC}"
$(ECHO) "PKG_CONFIG = ${PKG_CONFIG}"
%.o: %.c %.o: %.c
$(ECHO) CC $< $(ECHO) CC $<
...@@ -64,6 +65,7 @@ dist: clean ...@@ -64,6 +65,7 @@ dist: clean
$(QUIET)mkdir -p ${PROJECT}-${VERSION} $(QUIET)mkdir -p ${PROJECT}-${VERSION}
$(QUIET)cp -R LICENSE Makefile config.mk common.mk Doxyfile \ $(QUIET)cp -R LICENSE Makefile config.mk common.mk Doxyfile \
${HEADER} ${SOURCE} AUTHORS ${PROJECT}.desktop \ ${HEADER} ${SOURCE} AUTHORS ${PROJECT}.desktop \
${PROJECT}.metainfo.xml \
${PROJECT}-${VERSION} ${PROJECT}-${VERSION}
$(QUIET)tar -cf ${PROJECT}-${VERSION}.tar ${PROJECT}-${VERSION} $(QUIET)tar -cf ${PROJECT}-${VERSION}.tar ${PROJECT}-${VERSION}
$(QUIET)gzip ${PROJECT}-${VERSION}.tar $(QUIET)gzip ${PROJECT}-${VERSION}.tar
...@@ -79,6 +81,9 @@ install: all ...@@ -79,6 +81,9 @@ install: all
$(QUIET)mkdir -m 755 -p ${DESTDIR}${DESKTOPPREFIX} $(QUIET)mkdir -m 755 -p ${DESTDIR}${DESKTOPPREFIX}
$(ECHO) installing desktop file $(ECHO) installing desktop file
$(QUIET)install -m 644 ${PROJECT}.desktop ${DESTDIR}${DESKTOPPREFIX} $(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: uninstall:
$(ECHO) uninstalling ${PLUGIN} plugin $(ECHO) uninstalling ${PLUGIN} plugin
...@@ -87,6 +92,8 @@ uninstall: ...@@ -87,6 +92,8 @@ uninstall:
$(ECHO) removing desktop file $(ECHO) removing desktop file
$(QUIET)rm -f ${DESTDIR}${DESKTOPPREFIX}/${PROJECT}.desktop $(QUIET)rm -f ${DESTDIR}${DESKTOPPREFIX}/${PROJECT}.desktop
$(QUIET)rmdir --ignore-fail-on-non-empty ${DESTDIR}${DESKTOPPREFIX} 2> /dev/null $(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) -include $(wildcard .depend/*.dep)
......
...@@ -2,31 +2,34 @@ ...@@ -2,31 +2,34 @@
VERSION_MAJOR = 0 VERSION_MAJOR = 0
VERSION_MINOR = 2 VERSION_MINOR = 2
VERSION_REV = 5 VERSION_REV = 6
VERSION = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV} VERSION = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}
PKG_CONFIG ?= pkg-config
# minimum required zathura version # minimum required zathura version
ZATHURA_MIN_VERSION = 0.2.0 ZATHURA_MIN_VERSION = 0.2.0
ZATHURA_VERSION_CHECK ?= $(shell pkg-config --atleast-version=$(ZATHURA_MIN_VERSION) zathura; echo $$?) ZATHURA_VERSION_CHECK ?= $(shell $(PKG_CONFIG) --atleast-version=$(ZATHURA_MIN_VERSION) zathura; echo $$?)
ZATHURA_GTK_VERSION ?= $(shell pkg-config --variable=GTK_VERSION zathura) ZATHURA_GTK_VERSION ?= $(shell $(PKG_CONFIG) --variable=GTK_VERSION zathura)
# paths # paths
PREFIX ?= /usr PREFIX ?= /usr
LIBDIR ?= ${PREFIX}/lib LIBDIR ?= ${PREFIX}/lib
DESKTOPPREFIX ?= ${PREFIX}/share/applications DESKTOPPREFIX ?= ${PREFIX}/share/applications
APPDATAPREFIX ?= ${PREFIX}/share/appdata
# libs # libs
CAIRO_INC ?= $(shell pkg-config --cflags cairo) CAIRO_INC ?= $(shell $(PKG_CONFIG) --cflags cairo)
CAIRO_LIB ?= $(shell pkg-config --libs cairo) CAIRO_LIB ?= $(shell $(PKG_CONFIG) --libs cairo)
PDF_INC ?= $(shell pkg-config --cflags poppler-glib) PDF_INC ?= $(shell $(PKG_CONFIG) --cflags poppler-glib)
PDF_LIB ?= $(shell pkg-config --libs poppler-glib) PDF_LIB ?= $(shell $(PKG_CONFIG) --libs poppler-glib)
GIRARA_INC ?= $(shell pkg-config --cflags 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}) GIRARA_LIB ?= $(shell $(PKG_CONFIG) --libs girara-gtk${ZATHURA_GTK_VERSION})
ZATHURA_INC ?= $(shell pkg-config --cflags zathura) ZATHURA_INC ?= $(shell $(PKG_CONFIG) --cflags zathura)
PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura) PLUGINDIR ?= $(shell $(PKG_CONFIG) --variable=plugindir zathura)
ifeq (,${PLUGINDIR}) ifeq (,${PLUGINDIR})
PLUGINDIR = ${LIBDIR}/zathura PLUGINDIR = ${LIBDIR}/zathura
endif endif
...@@ -35,7 +38,7 @@ INCS = ${CAIRO_INC} ${PDF_INC} ${ZATHURA_INC} ${GIRARA_INC} ...@@ -35,7 +38,7 @@ INCS = ${CAIRO_INC} ${PDF_INC} ${ZATHURA_INC} ${GIRARA_INC}
LIBS = ${GIRARA_LIB} ${CAIRO_LIB} ${PDF_LIB} LIBS = ${GIRARA_LIB} ${CAIRO_LIB} ${PDF_LIB}
# flags # flags
CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
# debug # debug
DFLAGS ?= -g DFLAGS ?= -g
......
...@@ -25,7 +25,7 @@ pdf_document_open(zathura_document_t* document) ...@@ -25,7 +25,7 @@ pdf_document_open(zathura_document_t* document)
zathura_document_get_password(document), &gerror); zathura_document_get_password(document), &gerror);
if (poppler_document == NULL) { 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; error = ZATHURA_ERROR_INVALID_PASSWORD;
} else { } else {
error = ZATHURA_ERROR_UNKNOWN; error = ZATHURA_ERROR_UNKNOWN;
......
...@@ -17,7 +17,7 @@ Comment[pt_BR]=Um visualizador de documentos minimalista ...@@ -17,7 +17,7 @@ Comment[pt_BR]=Um visualizador de documentos minimalista
Comment[ru]=Минималистичный просмотрщик документов Comment[ru]=Минималистичный просмотрщик документов
Comment[tr]=Minimalist bir belge görüntüleyicisi Comment[tr]=Minimalist bir belge görüntüleyicisi
Comment[uk_UA]=Легкий переглядач документів Comment[uk_UA]=Легкий переглядач документів
Exec=zathura %f Exec=zathura %U
Terminal=false Terminal=false
NoDisplay=true NoDisplay=true
Categories=Office;Viewer; Categories=Office;Viewer;
......
<?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>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment