Merge branch 'release/0.3.9'

df34d8f1 · Sebastian Ramacher · 3093c795 · f46ea6a5 · df34d8f1 · df34d8f1
Commit df34d8f1 authored Mar 16, 2018 by Sebastian Ramacher
--- a/.gitignore
+++ b/.gitignore
@@ -21,15 +21,9 @@ zathura-*.tar.gz
 *.patch

 # build dirs
-.depend
 .tx
 build/
 gcov/
-doc/_build
-
-# version file
-version.h
-.version-checks/

 # development files
 .clang_complete

--- a/LICENSE
+++ b/LICENSE
-Copyright (c) 2009-2017 pwmt.org
+Copyright (c) 2009-2018 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/Makefile
+++ b/Makefile
-# See LICENSE file for license and copyright information
-
-include config.mk
-include colors.mk
-include common.mk
-
-# source files
-OSOURCE       = $(sort $(wildcard ${PROJECT}/*.c) \
-                ${PROJECT}/resources.c)
-SOURCE_FILTER =
-
-ifneq (${WITH_SQLITE},0)
-CPPFLAGS += -DWITH_SQLITE
-else
-SOURCE_FILTER += ${PROJECT}/database-sqlite.c
-endif
-
-ifneq ($(WITH_MAGIC),0)
-CPPFLAGS += -DWITH_MAGIC
-endif
-
-ifneq ($(WITH_SYNCTEX),0)
-CPPFLAGS += -DWITH_SYNCTEX
-endif
-
-ifneq ($(wildcard ${VALGRIND_SUPPRESSION_FILE}),)
-VALGRIND_ARGUMENTS += --suppressions=${VALGRIND_SUPPRESSION_FILE}
-endif
-
-ifeq (,$(findstring -DZATHURA_PLUGINDIR,${CPPFLAGS}))
-CPPFLAGS += -DZATHURA_PLUGINDIR=\"${PLUGINDIR}\"
-endif
-ifeq (,$(findstring -DGETTEXT_PACKAGE,${CPPFLAGS}))
-CPPFLAGS += -DGETTEXT_PACKAGE=\"${PROJECT}\"
-endif
-ifeq (,$(findstring -DLOCALEDIR,${CPPFLAGS}))
-CPPFLAGS += -DLOCALEDIR=\"${LOCALEDIR}\"
-endif
-
-SOURCE        = $(filter-out $(SOURCE_FILTER),$(OSOURCE))
-OBJECTS       = $(addprefix ${BUILDDIR_RELEASE}/,${SOURCE:.c=.o})
-OBJECTS_DEBUG = $(addprefix ${BUILDDIR_DEBUG}/,${SOURCE:.c=.o})
-OBJECTS_GCOV  = $(addprefix ${BUILDDIR_GCOV}/,${SOURCE:.c=.o})
-HEADERINST    = $(addprefix ${PROJECT}/,version.h document.h macros.h page.h types.h plugin-api.h links.h)
-
-all: options ${PROJECT} po build-manpages
-
-# pkg-config based version checks
-.version-checks/%: config.mk
-	$(QUIET)test $($(*)_VERSION_CHECK) -eq 0 || \
-		${PKG_CONFIG} --atleast-version $($(*)_MIN_VERSION) $($(*)_PKG_CONFIG_NAME) || ( \
-		echo "The minimum required version of $(*) is $($(*)_MIN_VERSION)" && \
-		false \
-	)
-	@mkdir -p .version-checks
-	$(QUIET)touch $@
-
-options:
-	@echo ${PROJECT} build options:
-	@echo "CFLAGS  = ${CFLAGS}"
-	@echo "LIBS    = ${LIBS}"
-	@echo "DFLAGS  = ${DFLAGS}"
-	@echo "CC      = ${CC}"
-
-# generated files
-
-${PROJECT}/version.h: ${PROJECT}/version.h.in config.mk
-	$(QUIET)sed -e 's/ZVMAJOR/${ZATHURA_VERSION_MAJOR}/' \
-		-e 's/ZVMINOR/${ZATHURA_VERSION_MINOR}/' \
-		-e 's/ZVREV/${ZATHURA_VERSION_REV}/' \
-		-e 's/ZVAPI/${ZATHURA_API_VERSION}/' \
-		-e 's/ZVABI/${ZATHURA_ABI_VERSION}/' ${PROJECT}/version.h.in > ${PROJECT}/version.h.tmp
-	$(QUIET)mv ${PROJECT}/version.h.tmp ${PROJECT}/version.h
-
-${PROJECT}/resources.%: data/zathura.gresource.xml config.mk
-	$(call colorecho,GEN,$@)
-	@mkdir -p ${DEPENDDIR}/$(dir $@)
-	$(QUIET)$(GLIB_COMPILE_RESOURCES) --generate --c-name=zathura_resources --internal \
-		--dependency-file=$(DEPENDDIR)/$@.dep \
-		--sourcedir=data --target=$@ data/zathura.gresource.xml
-
-# common dependencies
-
-${OBJECTS} ${OBJECTS_DEBUG} ${OBJECTS_GCOV}: config.mk \
-	.version-checks/GIRARA \
-	.version-checks/GLIB \
-	.version-checks/GTK \
-	${PROJECT}/version.h \
-	${PROJECT}/resources.h
-
-# rlease build
-
-${BUILDDIR_RELEASE}/%.o: %.c
-	$(call colorecho,CC,$<)
-	@mkdir -p ${DEPENDDIR}/$(dir $@)
-	@mkdir -p $(dir $(abspath $@))
-	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $< -MMD -MF ${DEPENDDIR}/$@.dep
-
-${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}: ${OBJECTS}
-	$(call colorecho,CC,$@)
-	@mkdir -p ${BUILDDIR_RELEASE}/${BINDIR}
-	$(QUIET)${CC} ${SFLAGS} ${LDFLAGS} \
-		-o ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT} ${OBJECTS} ${LIBS}
-
-${PROJECT}: ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}
-
-release: ${PROJECT}
-
-run: release
-	$(QUIET)./${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}
-
-# debug build
-
-${BUILDDIR_DEBUG}/%.o: %.c
-	$(call colorecho,CC,$<)
-	@mkdir -p ${DEPENDDIR}/$(dir $@)
-	@mkdir -p $(dir $(abspath $@))
-	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${DFLAGS} \
-		-o $@ $< -MMD -MF ${DEPENDDIR}/$@.dep
-
-${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}: ${OBJECTS_DEBUG}
-	$(call colorecho,CC,$@)
-	@mkdir -p ${BUILDDIR_DEBUG}/${BINDIR}
-	$(QUIET)${CC} ${LDFLAGS} \
-		-o ${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT} ${OBJECTS_DEBUG} ${LIBS}
-
-debug: ${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}
-
-run-debug: debug
-	$(QUIET)./${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}
-
-# gcov build
-
-${BUILDDIR_GCOV}/%.o: %.c
-	$(call colorecho,CC,$<)
-	@mkdir -p ${DEPENDDIR}/$(dir $@)
-	@mkdir -p $(dir $(abspath $@))
-	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${GCOV_CFLAGS} \
-		-o $@ $< -MMD -MF ${DEPENDDIR}/$@.dep
-
-${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}: ${OBJECTS_GCOV}
-	$(call colorecho,CC,$@)
-	@mkdir -p ${BUILDDIR_GCOV}/${BINDIR}
-	$(QUIET)${CC} ${LDFLAGS} ${GCOV_CFLAGS} ${GCOV_LDFLAGS} \
-		-o ${BUILDDIR_GCOV}/${BINDIR}/${PROJECT} ${OBJECTS_GCOV} ${LIBS}
-
-gcov: options ${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}
-	$(QUIET)${MAKE} -C tests run-gcov
-	$(call colorecho,LCOV,"Analyse data")
-	$(QUIET)${LCOV_EXEC} ${LCOV_FLAGS}
-	$(call colorecho,LCOV,"Generate report")
-	$(QUIET)${GENHTML_EXEC} ${GENHTML_FLAGS}
-
-run-gcov: ${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}
-	$(QUIET)./${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}
-
-# clean
-
-clean:
-	$(QUIET)rm -rf \
-		${BUILDDIR} \
-		${DEPENDDIR} \
-		${TARFILE} \
-		${TARDIR} \
-		${PROJECT}.pc \
-		${PROJECT}/version.h \
-		${PROJECT}/version.h.tmp \
-		${PROJECT}/resources.c \
-		${PROJECT}/resources.h \
-		$(PROJECT).info \
-		gcov \
-		.version-checks
-	$(QUIET)$(MAKE) -C tests clean
-	$(QUIET)$(MAKE) -C po clean
-	$(QUIET)$(MAKE) -C doc clean
-
-${PROJECT}.pc: ${PROJECT}.pc.in config.mk
-	$(QUIET)echo project=${PROJECT} > ${PROJECT}.pc
-	$(QUIET)echo version=${VERSION} >> ${PROJECT}.pc
-	$(QUIET)echo apiversion=${ZATHURA_API_VERSION} >> ${PROJECT}.pc
-	$(QUIET)echo abiversion=${ZATHURA_ABI_VERSION} >> ${PROJECT}.pc
-	$(QUIET)echo includedir=${INCLUDEDIR} >> ${PROJECT}.pc
-	$(QUIET)echo plugindir=${PLUGINDIR} >> ${PROJECT}.pc
-	$(QUIET)echo GTK_VERSION=3 >> ${PROJECT}.pc
-	$(QUIET)cat ${PROJECT}.pc.in >> ${PROJECT}.pc
-
-valgrind: debug
-	 $(QUIET)G_SLICE=always-malloc G_DEBUG=gc-friendly ${VALGRIND} ${VALGRIND_ARGUMENTS} \
-		 ${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}
-
-gdb: debug
-	$(QUIET)cgdb ${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}
-
-test: ${OBJECTS}
-	$(QUIET)$(MAKE) -C tests run
-
-dist: clean build-manpages
-	$(QUIET)tar -czf $(TARFILE) --exclude=.gitignore \
-		--transform 's,^,zathura-$(VERSION)/,' \
-		`git ls-files` \
-		doc/_build/$(PROJECT).1 doc/_build/$(PROJECT)rc.5
-
-doc:
-	$(QUIET)$(MAKE) -C doc
-
-po:
-	$(QUIET)${MAKE} -C po
-
-update-po:
-	$(QUIET)${MAKE} -C po update-po
-
-build-manpages:
-	$(QUIET)${MAKE} -C doc man
-
-install-manpages: build-manpages
-	$(call colorecho,INSTALL,"man pages")
-	$(QUIET)mkdir -m 755 -p ${DESTDIR}${MANPREFIX}/man1 ${DESTDIR}${MANPREFIX}/man5
-ifneq "$(wildcard doc/_build/${PROJECT}.1)" ""
-	$(QUIET)install -m 644 doc/_build/${PROJECT}.1 ${DESTDIR}${MANPREFIX}/man1
-endif
-ifneq "$(wildcard doc/_build/${PROJECT}rc.5)" ""
-	$(QUIET)install -m 644 doc/_build/${PROJECT}rc.5 ${DESTDIR}${MANPREFIX}/man5
-endif
-
-install-headers: ${PROJECT}.pc
-	$(call colorecho,INSTALL,"header files")
-	$(QUIET)mkdir -m 755 -p ${DESTDIR}${INCLUDEDIR}/${PROJECT}
-	$(QUIET)install -m 644 ${HEADERINST} ${DESTDIR}${INCLUDEDIR}/${PROJECT}
-
-	$(call colorecho,INSTALL,"pkgconfig file")
-	$(QUIET)mkdir -m 755 -p ${DESTDIR}${LIBDIR}/pkgconfig
-	$(QUIET)install -m 644 ${PROJECT}.pc ${DESTDIR}${LIBDIR}/pkgconfig
-
-install-dbus:
-	$(call colorecho,INSTALL,"D-Bus interface definitions")
-	$(QUIET)mkdir -m 755 -p $(DESTDIR)$(DBUSINTERFACEDIR)
-	$(QUIET)install -m 644 data/org.pwmt.zathura.xml $(DESTDIR)$(DBUSINTERFACEDIR)
-
-install-appdata:
-	$(call colorecho,INSTALL,"AppData file")
-	$(QUIET)mkdir -m 755 -p $(DESTDIR)$(APPDATAPREFIX)
-	$(QUIET)install -m 644 data/$(PROJECT).appdata.xml $(DESTDIR)$(APPDATAPREFIX)
-
-install: all install-headers install-manpages install-dbus install-appdata
-	$(call colorecho,INSTALL,"executeable file")
-	$(QUIET)mkdir -m 755 -p ${DESTDIR}${PREFIX}/bin
-	$(QUIET)install -m 755 ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT} ${DESTDIR}${PREFIX}/bin
-	$(QUIET)mkdir -m 755 -p ${DESTDIR}${DESKTOPPREFIX}
-	$(call colorecho,INSTALL,"desktop file")
-	$(QUIET)install -m 644 ${PROJECT}.desktop ${DESTDIR}${DESKTOPPREFIX}
-	$(MAKE) -C po install
-
-uninstall-headers:
-	$(call colorecho,UNINSTALL,"header files")
-	$(QUIET)rm -rf ${DESTDIR}${INCLUDEDIR}/${PROJECT}
-	$(call colorecho,UNINSTALL,"pkgconfig file")
-	$(QUIET)rm -f ${DESTDIR}${LIBDIR}/pkgconfig/${PROJECT}.pc
-
-uninstall: uninstall-headers
-	$(ECHO) removing executable file
-	$(call colorecho,UNINSTALL,"executeable")
-	$(QUIET)rm -f ${DESTDIR}${PREFIX}/bin/${PROJECT}
-	$(call colorecho,UNINSTALL,"man pages")
-	$(QUIET)rm -f ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
-	$(QUIET)rm -f ${DESTDIR}${MANPREFIX}/man5/${PROJECT}rc.5
-	$(call colorecho,UNINSTALL,"desktop file")
-	$(QUIET)rm -f ${DESTDIR}${DESKTOPPREFIX}/${PROJECT}.desktop
-	$(call colorecho,UNINSTALL,"D-Bus interface definitions")
-	$(QUIET)rm -f $(DESTDIR)$(DBUSINTERFACEDIR)/org.pwmt.zathura.xml
-	$(call colorecho,UNINSTALL,"AppData file")
-	$(QUIET)rm -f $(DESTDIR)$(APPDATAPREFIX)/$(PROJECT).appdata.xml
-	$(MAKE) -C po uninstall
-
-DEPENDS = ${DEPENDDIRS:^=${DEPENDDIR}/}$(addprefix ${DEPENDDIR}/,${OBJECTS:.o=.o.dep})
-include ${DEPENDS}
-
-.PHONY: all options clean doc debug valgrind gdb dist doc install uninstall \
-	test po install-headers uninstall-headers update-po install-manpages \
-	build-manpages install-dbus
--- a/README
+++ b/README
 zathura - a document viewer
 ===========================
+
 zathura is a highly customizable and functional document viewer based on the
 girara user interface library and several document libraries.

 Requirements
 ------------
-gtk3 (>= 3.6)
+
+meson (>= 0.45)
+gtk3 (>= 3.22)
 glib (>= 2.50)
 girara (>= 0.2.8)
 sqlite3 (optional, >= 3.5.9)
-check (for tests)
+check (optional, for tests)
 intltool
 libmagic from file(1) (optional, for mime-type detection)
 libsynctex from TeXLive (optional, for SyncTeX support)
+libseccomp (optional, for sandbox support)
 Sphinx (optional, for manpages and HTML documentation)
 doxygen (optional, for HTML documentation)
 breathe (optional, for HTML documentation)
 sphinx_rtd_theme (optional, for HTML documentation)

-Please note that you need to have a working pkg-config installation and that the
-Makefile is only compatible with GNU make. If you don't have a working
-pkg-config installation please set the GTK_INC, GTK_LIB, GIRARA_INC, GIRARA_LIB,
-SQLITE_INC and SQLITE_LIB variables accordingly.
-
-Also note that Sphinx is needed to build the manpages.  If it is not
-installed, the man pages won't be built. For the HTML documentation, doxygen,
-breathe and sphinx_rtd_theme are needed in addition to Sphinx.
+Note that Sphinx is needed to build the manpages.  If it is not installed, the
+man pages won't be built. For the HTML documentation, doxygen, breathe and
+sphinx_rtd_theme are needed in addition to Sphinx.

-If you don't want to build with support for sqlite databases, you can set
-WITH_SQLITE=0 and sqlite support won't be available.
+If you don't want to build with support for sqlite databases, you can configure
+the build system with -Denable-sqlite=false and sqlite support won't be available.

-The use of magic to detect mime types is optional and can be disabled by setting
-WITH_MAGIC=0.
+The use of magic to detect mime types is optional and can be disabled by
+configuring the build system with -Denable-magic=false.

-If you pass these flags as a command line argument to make, you have to ensure
-to pass the same flags when executing the install target.
-
-If you want to build zathura's documentation, please install all python
-dependencies from the ./doc/requirements.txt file.
+The use of seccomp to create a sandboxed environment is optional and can be
+enabled by configure the build system with -Denable-seccomp=true. Note that the
+sandbox is currently only available as experimental preview. Some commands,
+shortcuts and other functionality might break.

 Installation
 ------------
-To build and install zathura:

-  make install
+To build and install zathura using meson's ninja backend:

-Uninstall
---------
-To delete zathura from your system, just type:
+  meson build
+  cd build
+  ninja
+  ninja install

-  make uninstall
+Note that the default backend for meson might vary based on the platform. Please
+refer to the meson documentation for platform specific dependencies.

 Bugs
 ----
+
 Please report bugs at http://bugs.pwmt.org or contact us on our mailing list at
 zathura@lists.pwmt.org.
--- a/colors.mk
+++ b/colors.mk
-# See LICENSE file for license and copyright information
-
-ifeq ($(COLOR),1)
-# GCC diagnostics colors
-DIAGNOSTICS_COLOR_AVAILABLE ?= $(shell ($(CC) -fdiagnostics-color=always -E - </dev/null >/dev/null 2>/dev/null && echo 1) || echo 0)
-ifeq ($(DIAGNOSTICS_COLOR_AVAILABLE),1)
-CPPFLAGS     += -fdiagnostics-color=always
-endif
-
-# colorful output
-TPUT ?= /usr/bin/tput
-TPUT_AVAILABLE ?= $(shell ${TPUT} -V 2>/dev/null)
-
-ifdef TPUT_AVAILABLE
-COLOR_NORMAL  = `$(TPUT) sgr0`
-COLOR_ACTION  = `$(TPUT) bold``$(TPUT) setaf 3`
-COLOR_COMMENT = `$(TPUT) bold``$(TPUT) setaf 2`
-COLOR_BRACKET = `$(TPUT) setaf 4`
-define colorecho
-	@echo $(COLOR_BRACKET)" ["$(COLOR_ACTION)$1$(COLOR_BRACKET)"] "$(COLOR_COMMENT)$2$(COLOR_BRACKET) $(COLOR_NORMAL)
-endef
-else
-define colorecho
-	@echo " [$1]" $2
-endef
-endif
-else
-define colorecho
-	@echo " [$1]" $2
-endef
-endif
--- a/common.mk
+++ b/common.mk
-# See LICENSE file for license and copyright information
-
-ifeq "$(VERBOSE)" "0"
-ECHO=@echo
-QUIET=@
-else
-ECHO=@\#
-QUIET=
-endif
--- a/config.mk
+++ b/config.mk
-# See LICENSE file for license and copyright information
-# zathura make config
-
-# project
-PROJECT = zathura
-
-ZATHURA_VERSION_MAJOR = 0
-ZATHURA_VERSION_MINOR = 3
-ZATHURA_VERSION_REV = 8
-# If the API changes, the API version and the ABI version have to be bumped.
-ZATHURA_API_VERSION = 2
-# If the ABI breaks for any reason, this has to be bumped.
-ZATHURA_ABI_VERSION = 3
-VERSION = ${ZATHURA_VERSION_MAJOR}.${ZATHURA_VERSION_MINOR}.${ZATHURA_VERSION_REV}
-
-# version checks
-# If you want to disable any of the checks, set *_VERSION_CHECK to 0.
-
-# girara
-GIRARA_VERSION_CHECK ?= 1
-GIRARA_MIN_VERSION = 0.2.8
-GIRARA_PKG_CONFIG_NAME = girara-gtk3
-# glib
-GLIB_VERSION_CHECK ?= 1
-GLIB_MIN_VERSION = 2.50
-GLIB_PKG_CONFIG_NAME = glib-2.0
-# GTK
-GTK_VERSION_CHECK ?= 1
-GTK_MIN_VERSION = 3.6
-GTK_PKG_CONFIG_NAME = gtk+-3.0
-
-# pkg-config binary
-PKG_CONFIG ?= pkg-config
-
-# glib-compile-resources
-GLIB_COMPILE_RESOURCES ?= glib-compile-resources
-
-# database
-# To disable support for the sqlite backend set WITH_SQLITE to 0.
-WITH_SQLITE ?= $(shell (${PKG_CONFIG} --atleast-version=3.5.9 sqlite3 && echo 1) || echo 0)
-
-# synctex
-# To disable support for synctex with libsynctex set WITH_SYNCTEX to 0.
-WITH_SYNCTEX ?= $(shell (${PKG_CONFIG} synctex && echo 1) || echo 0)
-
-# mimetype detection
-# To disable support for mimetype detction with libmagic set WITH_MAGIC to 0.
-WITH_MAGIC ?= 1
-
-# paths
-PREFIX ?= /usr
-MANPREFIX ?= ${PREFIX}/share/man
-DESKTOPPREFIX ?= ${PREFIX}/share/applications
-APPDATAPREFIX ?= ${PREFIX}/share/metainfo
-LIBDIR ?= ${PREFIX}/lib
-INCLUDEDIR ?= ${PREFIX}/include
-DBUSINTERFACEDIR ?= ${PREFIX}/share/dbus-1/interfaces
-VIMFTPLUGINDIR ?= ${PREFIX}/share/vim/addons/ftplugin
-DEPENDDIR ?= .depend
-BUILDDIR ?= build
-BUILDDIR_RELEASE ?= ${BUILDDIR}/release
-BUILDDIR_DEBUG ?= ${BUILDDIR}/debug
-BUILDDIR_GCOV ?= ${BUILDDIR}/gcov
-BINDIR ?= bin
-
-# plugin directory
-PLUGINDIR ?= ${LIBDIR}/zathura
-# locale directory
-LOCALEDIR ?= ${PREFIX}/share/locale
-
-# libs
-ifeq (${GTK_INC}-${GTK_LIB},-)
-PKG_CONFIG_LIBS += gtk+-3.0
-else
-INCS += ${GTK_INC}
-LIBS += ${GTK_LIB}
-endif
-
-ifeq (${GLIB_INC}-${GLIB_LIB},-)
-PKG_CONFIG_LIBS += gthread-2.0 gmodule-no-export-2.0 glib-2.0
-else
-INCS += ${GLIB_INC}
-LIBS += ${GLIB_LIB}
-endif
-
-ifeq (${GIRARA_INC}-${GIRARA_LIB},-)
-PKG_CONFIG_LIBS += girara-gtk3
-else
-INCS += ${GIRARA_INC}
-LIBS += ${GIRARA_LIB}
-endif
-
-ifneq (${WITH_SQLITE},0)
-ifeq (${SQLITE_INC}-${SQLITE_LIB},-)
-PKG_CONFIG_LIBS += sqlite3
-else
-INCS += ${SQLITE_INC}
-LIBS += ${SQLITE_LIB}
-endif
-endif
-
-ifneq (${WITH_MAGIC},0)
-MAGIC_INC ?=
-MAGIC_LIB ?= -lmagic
-
-INCS += ${MAGIC_INC}
-LIBS += ${MAGIC_LIB}
-endif
-
-ifneq ($(WITH_SYNCTEX),0)
-ifeq (${SYNCTEX_INC}-${SYNCTEX_LIB},-)
-PKG_CONFIG_LIBS += synctex
-else
-INCS += ${SYNCTEX_INC}
-LIBS += ${SYNCTEX_LIB}
-endif
-endif
-
-ifneq (${PKG_CONFIG_LIBS},)
-INCS += $(shell ${PKG_CONFIG} --cflags ${PKG_CONFIG_LIBS})
-LIBS += $(shell ${PKG_CONFIG} --libs ${PKG_CONFIG_LIBS})
-endif
-LIBS += -lpthread -lm
-
-# pre-processor flags
-CPPFLAGS += -D_FILE_OFFSET_BITS=64
-
-# compiler flags
-CFLAGS += -std=c11 -pedantic -Wall -Wno-format-zero-length -Wextra $(INCS)
-
-# debug
-DFLAGS ?= -g
-
-# linker flags
-LDFLAGS += -rdynamic
-
-# compiler
-CC ?= gcc
-
-# strip
-SFLAGS ?= -s
-
-# msgfmt
-MSGFMT ?= msgfmt
-
-# gcov & lcov
-GCOV_CFLAGS=-fprofile-arcs -ftest-coverage
-GCOV_LDFLAGS=-fprofile-arcs
-LCOV_OUTPUT=gcov
-LCOV_EXEC=lcov
-LCOV_FLAGS=--base-directory . --directory ${BUILDDIR_GCOV} --capture --rc \
-					 lcov_branch_coverage=1 --output-file ${BUILDDIR_GCOV}/$(PROJECT).info
-GENHTML_EXEC=genhtml
-GENHTML_FLAGS=--rc lcov_branch_coverage=1 --output-directory ${LCOV_OUTPUT} ${BUILDDIR_GCOV}/$(PROJECT).info
-
-# valgrind
-VALGRIND = valgrind
-VALGRIND_ARGUMENTS = --tool=memcheck --leak-check=yes --leak-resolution=high \
-	--show-reachable=yes --log-file=zathura-valgrind.log
-VALGRIND_SUPPRESSION_FILE = zathura.suppression
-
-# set to something != 0 if you want verbose build output
-VERBOSE ?= 0
-
-# gettext package name
-GETTEXT_PACKAGE ?= ${PROJECT}
-
-# colors
-COLOR ?= 1
-
-# dist
-TARFILE = ${PROJECT}-${VERSION}.tar.gz
-TARDIR = ${PROJECT}-${VERSION}
--- a/data/meson.build
+++ b/data/meson.build
+gnome = import('gnome')
+zathura_resources = gnome.compile_resources(
+  'resources',
+  'zathura.gresource.xml',
+  c_name: 'zathura_resources',
+  dependencies: files('zathura.css_t', 'org.pwmt.zathura.xml')
+)
+
+install_data('org.pwmt.zathura.xml', install_dir: dbusinterfacesdir)
+install_data('org.pwmt.zathura.png', install_dir: join_paths(datadir, 'icons', 'hicolor', '128x128'))
+
+i18n = import('i18n')
+podir = join_paths(meson.source_root(), 'po')
+
+desktop = i18n.merge_file('desktop',
+  input: 'org.pwmt.zathura.desktop.in',
+  output: 'org.pwmt.zathura.desktop',
+  install: true,
+  install_dir: desktopdir,
+  po_dir: podir,
+  type: 'desktop'
+)
+
+appdata = i18n.merge_file('appdata',
+  input: 'org.pwmt.zathura.appdata.xml.in',
+  output: 'org.pwmt.zathura.appdata.xml',
+  install: true,
+  install_dir: metainfodir,
+  po_dir: podir,
+)
+
+desktop_file_validate = find_program('desktop-file-validate', required: false)
+if desktop_file_validate.found()
+  test('validate-desktop',
+    desktop_file_validate,
+    args: [desktop.full_path()]
+  )
+endif
+
+appstream_util = find_program('appstream-util', required: false)
+if appstream_util.found()
+  test('validate-appdata',