gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-18 20:10:29 +01:00
Code Issues Projects Releases Wiki Activity

Repair compilation when Pango support is enabled

Browse Source 
It seems there have been changes in the way Pango's header files are
installed in recent versions, probably to allow having multiple versions
together on a system.

Because one public header from WINGs has to include Pango's header, we must
include the search path provided by Pango into our WINGs search path that
are returned by pkg-config (the .pc file).

They are then also added to WindowMaker and WPrefs which use the header but
can't rely on the path from the .pc file which has not been installed yet.

Reported-by: Carlos R. Mafra <crmafra@gmail.com>
Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2021-05-29 23:02:37 +02:00
committed by Carlos R. Mafra
parent f049635fa5
commit ae78e88eef
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WINGs/Makefile.am
View File

@@ -107,7 +107,7 @@ WINGs.pc: Makefile
@echo 'Requires: wrlib WUtil' >> $@ @echo 'Requires: wrlib WUtil' >> $@
@echo 'Libs: $(lib_search_path) -lWINGs' >> $@ @echo 'Libs: $(lib_search_path) -lWINGs' >> $@
@echo 'Libs.private: $(XFT_LIBS) $(PANGOLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@ @echo 'Libs.private: $(XFT_LIBS) $(PANGOLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
@echo 'Cflags: $(inc_search_path)' >> $@ @echo 'Cflags: $(inc_search_path) @PANGO_CFLAGS@' >> $@
WUtil.pc: Makefile WUtil.pc: Makefile
@echo "Generating $@" @echo "Generating $@"

2
WPrefs.app/Makefile.am
View File

@@ -45,7 +45,7 @@ WPrefs_SOURCES = \
# KeyboardSettings.c \ # KeyboardSettings.c \
# Themes.c # Themes.c
AM_CFLAGS = AM_CFLAGS = @PANGO_CFLAGS@
AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \ AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
-I$(top_builddir)/wrlib -I$(top_srcdir)/WINGs -I$(top_builddir)/WINGs \ -I$(top_builddir)/wrlib -I$(top_srcdir)/WINGs -I$(top_builddir)/WINGs \

2
src/Makefile.am
View File

@@ -148,7 +148,7 @@ xmodifier.hack_nf.c: xmodifier.c $(top_srcdir)/script/nested-func-to-macro.sh
endif endif
AM_CFLAGS = AM_CFLAGS = @PANGO_CFLAGS@
AM_CPPFLAGS = $(DFLAGS) \ AM_CPPFLAGS = $(DFLAGS) \
-I$(top_builddir)/wrlib \ -I$(top_builddir)/wrlib \