# HG changeset patch # User cannam # Date 1232392350 0 # Mon Jan 19 19:12:30 2009 +0000 # Branch wmx # Node ID 97171595654b4e3da3fdac0bb1b3286b4f0a3ab4 # Parent 9d48a513994600c022909c4de8e95b351685a87e * patch from Richard Zidlicky for old freetype libraries diff --git a/Makefile.in b/Makefile.in --- a/Makefile.in +++ b/Makefile.in @@ -45,6 +45,11 @@ -chown root:wheel @bindir@/wmx -rm -f @bindir@/wmx.old +install-rpm: + mkdir -p $(DESTDIR)/usr/bin/ + cp wmx $(DESTDIR)/usr/bin/wmx + + # DO NOT DELETE -- make depend depends on it Border.o: Border.C Border.h General.h Config.h Rotated.h Client.h \ Manager.h listmacro.h background.xpm diff --git a/Menu.C b/Menu.C --- a/Menu.C +++ b/Menu.C @@ -56,6 +56,10 @@ FcPattern *pattern = FcPatternCreate(); FcPatternAddString(pattern, FC_FAMILY, (FcChar8 *)fi); FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); + +#ifndef FC_WEIGHT_REGULAR +#define FC_WEIGHT_REGULAR FC_WEIGHT_MEDIUM +#endif FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_REGULAR); FcPatternAddInteger(pattern, FC_PIXEL_SIZE, CONFIG_MENU_FONT_SIZE); FcConfigSubstitute(FcConfigGetCurrent(), pattern, FcMatchPattern);