From 63a1806f6533ed0dfb1e0db73ad8bac01854ca6e Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 24 Jan 2021 00:00:52 +0100 Subject: [PATCH] Also link with libX11 for Gtk+ 3 --- data/gtk3/libDesktop.pc.in | 2 +- src/project.conf | 4 ++-- tests/project.conf | 4 ++-- tools/project.conf | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/gtk3/libDesktop.pc.in b/data/gtk3/libDesktop.pc.in index 20c8320..399b743 100644 --- a/data/gtk3/libDesktop.pc.in +++ b/data/gtk3/libDesktop.pc.in @@ -6,6 +6,6 @@ libdir=${exec_prefix}/lib Name: @PACKAGE@ Description: DeforaOS Desktop helper library Version: @VERSION@ -Requires: libSystem gtk+-3.0 +Requires: libSystem gtk+-3.0 x11 Cflags: -I${includedir} Libs: @RPATH@ -L${libdir} -lDesktop diff --git a/src/project.conf b/src/project.conf index 0198031..34278c1 100644 --- a/src/project.conf +++ b/src/project.conf @@ -1,8 +1,8 @@ targets=libDesktop cppflags_force=-I ../include -cflags_force=`pkg-config --cflags libSystem gtk+-3.0` -fPIC +cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11` -fPIC cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector -ldflags_force=`pkg-config --libs libSystem gtk+-3.0` +ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11` ldflags=-Wl,-z,relro -Wl,-z,now dist=Makefile,mimehandler.h mode=gtk3-debug diff --git a/tests/project.conf b/tests/project.conf index 6d3227f..2859537 100644 --- a/tests/project.conf +++ b/tests/project.conf @@ -2,8 +2,8 @@ targets=clint.log,fixme.log,htmllint.log,mime,mimehandler,tests.log,widget,xmlli cppflags_force=-I ../include cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector ldflags=-pie -Wl,-z,relro -Wl,-z,now -cflags_force=`pkg-config --cflags libSystem gtk+-3.0` -ldflags_force=`pkg-config --libs libSystem gtk+-3.0` $(OBJDIR)../src/libDesktop.a +cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11` +ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11` $(OBJDIR)../src/libDesktop.a dist=Makefile,applications/Root.desktop,applications/Widget.desktop,clint.sh,fixme.sh,htmllint.sh,pkgconfig.sh,tests.sh,xmllint.sh mode=gtk3-debug diff --git a/tools/project.conf b/tools/project.conf index 27fdd8f..e0e0c34 100644 --- a/tools/project.conf +++ b/tools/project.conf @@ -1,8 +1,8 @@ targets=widget cppflags_force=-I ../include -cflags_force=`pkg-config --cflags libSystem gtk+-3.0` +cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11` cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector -ldflags_force=`pkg-config --libs libSystem gtk+-3.0` -L $(OBJDIR)../src -lDesktop +ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11` -L $(OBJDIR)../src -lDesktop ldflags=-pie -Wl,-z,relro -Wl,-z,now dist=Makefile,subst.sh mode=gtk3-debug