Commit 6aa68899 authored by Sebastian Ramacher's avatar Sebastian Ramacher

Require glib 2.28 and GTK+3

Signed-off-by: default avatarSebastian Ramacher <sebastian@ramacher.at>
parent 1e58c96d
......@@ -54,7 +54,8 @@ version.h: version.h.in config.mk
$(ECHO) CC $<
$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${DFLAGS} -o $@ $< -MMD -MF .depend/$@.dep
${OBJECTS} ${DOBJECTS}: config.mk version.h .version-checks/GTK
${OBJECTS} ${DOBJECTS}: config.mk version.h \
.version-checks/GTK .version-checks/GLIB
${PROJECT}: static shared
static: lib${PROJECT}.a
......
......@@ -9,6 +9,7 @@ enhance the user interface that is used by zathura and jumanji.
Requirements
------------
glib (>= 2.28)
gtk3 (>= 3.2)
intltool
......
......@@ -25,7 +25,7 @@ INCLUDEDIR ?= ${PREFIX}/include
LOCALEDIR ?= ${PREFIX}/share/locale
# the GTK+ version to use
GIRARA_GTK_VERSION ?= 3
GIRARA_GTK_VERSION = 3
# version checks
# If you want to disable any of the checks, set *_VERSION_CHECK to 0.
......@@ -34,6 +34,10 @@ GIRARA_GTK_VERSION ?= 3
GTK_VERSION_CHECK ?= 1
GTK_MIN_VERSION = 3.2
GTK_PKG_CONFIG_NAME = gtk+-$(GIRARA_GTK_VERSION).0
# glib
GLIB_VERSION_CHECK ?= 1
GLIB_MIN_VERSION = 2.28
GLIB_PKG_CONFIG_NAME = glib-2.0
# libs
GTK_INC ?= $(shell pkg-config --cflags gtk+-${GIRARA_GTK_VERSION}.0)
......
......@@ -90,12 +90,7 @@ girara_list_clear(girara_list_t* list)
}
if (list->free) {
#if (GLIB_MAJOR_VERSION >= 2) && (GLIB_MINOR_VERSION >= 28)
g_list_free_full(list->start, list->free);
#else
g_list_foreach(list->start, (GFunc)list->free, NULL);
g_list_free(list->start);
#endif
} else {
g_list_free(list->start);
}
......
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