From 49dd3cde1a957cf554fa1f36c72ba3227888c24c Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Sat, 22 Jul 2023 14:35:37 -0500 Subject: removing font modifications; renamed to freebsd_compile.diff --- freebsd+fontsize.patch | 41 ----------------------------------------- freebsd_compile.diff | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 41 deletions(-) delete mode 100644 freebsd+fontsize.patch create mode 100644 freebsd_compile.diff diff --git a/freebsd+fontsize.patch b/freebsd+fontsize.patch deleted file mode 100644 index a5fd923..0000000 --- a/freebsd+fontsize.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/config.def.h b/config.def.h -index 38952c5..262e5a1 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -14,9 +14,9 @@ static const int showbar = 1; /* 0 means no bar */ - static const int topbar = 1; /* 0 means bottom bar */ - static const int focusonwheel = 0; - static const char *fonts[] = -- { "FiraCode Nerd Font Mono:pixelsize=18:antialias=true:autohint:true", -- "Noto Color Emoji:pixelsize=18:antialias=true:autohint=true" }; --static const char dmenufont[] = "FiraCode Nerd Font Mono:pixelsize=18:antialias=true:autohint:true"; -+ { "FiraCode Nerd Font Mono:pixelsize=24:antialias=true:autohint:true", -+ "Noto Color Emoji:pixelsize=24:antialias=true:autohint=true" }; -+static const char dmenufont[] = "FiraCode Nerd Font Mono:pixelsize=24:antialias=true:autohint:true"; - static const char col_gray1[] = "#222222"; - static const char col_gray2[] = "#444444"; - static const char col_gray3[] = "#bbbbbb"; -diff --git a/config.mk b/config.mk -index ff9e508..2bd91ef 100644 ---- a/config.mk -+++ b/config.mk -@@ -7,8 +7,8 @@ VERSION = 6.2 - PREFIX = /usr/local - MANPREFIX = ${PREFIX}/share/man - --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib -+X11INC = /usr/local/include -+X11LIB = /usr/local/lib - - # Xinerama, comment if you don't want it - XINERAMALIBS = -lXinerama -@@ -16,7 +16,7 @@ XINERAMAFLAGS = -DXINERAMA - - # freetype - FREETYPELIBS = -lfontconfig -lXft --FREETYPEINC = /usr/include/freetype2 -+FREETYPEINC = /usr/local/include/freetype2 - # OpenBSD (uncomment) - #FREETYPEINC = ${X11INC}/freetype2 - #KVMLIB = -lkvm diff --git a/freebsd_compile.diff b/freebsd_compile.diff new file mode 100644 index 0000000..a3eed6c --- /dev/null +++ b/freebsd_compile.diff @@ -0,0 +1,24 @@ +diff --git a/config.mk b/config.mk +index ff9e508..2bd91ef 100644 +--- a/config.mk ++++ b/config.mk +@@ -7,8 +7,8 @@ VERSION = 6.2 + PREFIX = /usr/local + MANPREFIX = ${PREFIX}/share/man + +-X11INC = /usr/X11R6/include +-X11LIB = /usr/X11R6/lib ++X11INC = /usr/local/include ++X11LIB = /usr/local/lib + + # Xinerama, comment if you don't want it + XINERAMALIBS = -lXinerama +@@ -16,7 +16,7 @@ XINERAMAFLAGS = -DXINERAMA + + # freetype + FREETYPELIBS = -lfontconfig -lXft +-FREETYPEINC = /usr/include/freetype2 ++FREETYPEINC = /usr/local/include/freetype2 + # OpenBSD (uncomment) + #FREETYPEINC = ${X11INC}/freetype2 + #KVMLIB = -lkvm -- cgit v1.2.3