mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-12-28 05:56:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use glib-compile-resource instead of sed magic

Browse source 
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
This commit is contained in:
Sebastian Ramacher 2017-05-30 23:10:06 +02:00
parent 8c5b4a83cf
commit 2c6ab6b092
6 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -10,7 +10,7 @@
# generated files # generated files
dbus-interface-definitions.c dbus-interface-definitions.c
css-definitions.c css-definitions.*
zathura.1 zathura.1
zathurarc.5 zathurarc.5

15
Makefile
View file

@ -85,16 +85,17 @@ ${PROJECT}/version.h: ${PROJECT}/version.h.in config.mk
-e 's/ZVABI/${ZATHURA_ABI_VERSION}/' ${PROJECT}/version.h.in > ${PROJECT}/version.h.tmp -e 's/ZVABI/${ZATHURA_ABI_VERSION}/' ${PROJECT}/version.h.in > ${PROJECT}/version.h.tmp
$(QUIET)mv ${PROJECT}/version.h.tmp ${PROJECT}/version.h $(QUIET)mv ${PROJECT}/version.h.tmp ${PROJECT}/version.h
${PROJECT}/css-definitions.c: data/zathura.css_t ${PROJECT}/css-definitions.%: data/zathura-css.gresource.xml config.mk
$(QUIET)echo '#include "css-definitions.h"' > $@.tmp $(call colorecho,GEN,$@)
$(QUIET)echo 'const char* CSS_TEMPLATE_INDEX =' >> $@.tmp @mkdir -p ${DEPENDDIR}/$(dir $@)
$(QUIET)sed 's/^\(.*\)$$/"\1\\n"/' $< >> $@.tmp $(QUIET)$(GLIB_COMPILE_RESOURCES) --generate --c-name=zathura_css --internal \
$(QUIET)echo ';' >> $@.tmp --dependency-file=$(DEPENDDIR)/$@.dep \
$(QUIET)mv $@.tmp $@ --sourcedir=data --target=$@ data/zathura-css.gresource.xml
# common dependencies # common dependencies
${OBJECTS} ${OBJECTS_DEBUG} ${OBJECTS_GCOV}: config.mk ${PROJECT}/version.h \ ${OBJECTS} ${OBJECTS_DEBUG} ${OBJECTS_GCOV}: config.mk \
${PROJECT}/version.h ${PROJECT}/css-definitions.h \
.version-checks/GIRARA .version-checks/GLIB .version-checks/GTK .version-checks/GIRARA .version-checks/GLIB .version-checks/GTK
# rlease build # rlease build

3
config.mk
View file

@ -32,6 +32,9 @@ GTK_PKG_CONFIG_NAME = gtk+-3.0
# pkg-config binary # pkg-config binary
PKG_CONFIG ?= pkg-config PKG_CONFIG ?= pkg-config
# glib-compile-resources
GLIB_COMPILE_RESOURCES ?= glib-compile-resources
# database # database
# To disable support for the sqlite backend set WITH_SQLITE to 0. # 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) WITH_SQLITE ?= $(shell (${PKG_CONFIG} --atleast-version=3.5.9 sqlite3 && echo 1) || echo 0)

6
data/zathura-css.gresource.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/pwmt/zathura/CSS">
<file compressed="true">zathura.css_t</file>
</gresource>
</gresources>

8
zathura/css-definitions.h
View file

@ -1,8 +0,0 @@
/* See LICENSE file for license and copyright information */
#ifndef GIRARA_CSS_DEFINITIONS_H
#define GIRARA_CSS_DEFINITIONS_H
extern const char* CSS_TEMPLATE_INDEX;
#endif

15
zathura/zathura.c
View file

@ -251,10 +251,17 @@ init_css(zathura_t* zathura)
g_free(color); g_free(color);
} }
char* css = g_strdup_printf("%s\n%s", girara_template_get_base(csstemplate), GResource* css_resource = zathura_css_get_resource();
CSS_TEMPLATE_INDEX); GBytes* css_data = g_resource_lookup_data(css_resource,
girara_template_set_base(csstemplate, css); "/org/pwmt/zathura/CSS/zathura.css_t",
g_free(css); G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
if (css_data != NULL) {
char* css = g_strdup_printf("%s\n%s", girara_template_get_base(csstemplate),
g_bytes_get_data(css_data, NULL));
girara_template_set_base(csstemplate, css);
g_free(css);
g_bytes_unref(css_data);
}
} }
static void static void