Merge pull request #333 from bebehei/gtk3
depend on gtk3 instead of gtk2
This commit is contained in:
commit
111fcaf583
@ -11,7 +11,7 @@ addons:
|
|||||||
- libpango1.0-dev
|
- libpango1.0-dev
|
||||||
- libcairo2-dev
|
- libcairo2-dev
|
||||||
- libnotify-dev
|
- libnotify-dev
|
||||||
- libgtk2.0-dev
|
- libgtk-3-dev
|
||||||
dist: trusty
|
dist: trusty
|
||||||
sudo: false
|
sudo: false
|
||||||
language: c
|
language: c
|
||||||
|
2
Makefile
2
Makefile
@ -87,6 +87,6 @@ test-clean:
|
|||||||
rm -f test/test test/*.o
|
rm -f test/test test/*.o
|
||||||
|
|
||||||
dunstify: dunstify.o
|
dunstify: dunstify.o
|
||||||
${CC} ${CFLAGS} -o $@ dunstify.o $(shell pkg-config --libs --cflags glib-2.0 libnotify gdk-2.0)
|
${CC} ${CFLAGS} -o $@ dunstify.o $(shell pkg-config --libs --cflags glib-2.0 libnotify gdk-3.0)
|
||||||
|
|
||||||
.PHONY: all clean dist install uninstall
|
.PHONY: all clean dist install uninstall
|
||||||
|
@ -23,7 +23,7 @@ Dunst has a number of build dependencies that must be present before attempting
|
|||||||
- libxdg-basedir
|
- libxdg-basedir
|
||||||
- glib
|
- glib
|
||||||
- pango/cairo
|
- pango/cairo
|
||||||
- libgtk2.0
|
- libgtk-3-dev
|
||||||
|
|
||||||
Checkout the [wiki][wiki] for more information.
|
Checkout the [wiki][wiki] for more information.
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC}
|
|||||||
|
|
||||||
pkg_config_packs := dbus-1 x11 xscrnsaver \
|
pkg_config_packs := dbus-1 x11 xscrnsaver \
|
||||||
"glib-2.0 >= 2.36" gio-2.0 \
|
"glib-2.0 >= 2.36" gio-2.0 \
|
||||||
pangocairo gdk-2.0 xrandr xinerama
|
pangocairo gdk-3.0 xrandr xinerama
|
||||||
|
|
||||||
# check if we need libxdg-basedir
|
# check if we need libxdg-basedir
|
||||||
ifeq (,$(findstring STATIC_CONFIG,$(CFLAGS)))
|
ifeq (,$(findstring STATIC_CONFIG,$(CFLAGS)))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user