From c5e83435b5c200975d8e1376173ee358b3743c43 Mon Sep 17 00:00:00 2001 From: Martin Cejp Date: Mon, 26 Oct 2020 12:05:20 +0100 Subject: [PATCH 1/7] Fix Fedora 32 build error (hb.h: No such file or directory) --- src/client_handler/Makefile | 3 ++- src/cpp_utils/Makefile | 3 ++- src/subprocess/Makefile | 3 ++- src/subprocess/Makefile-libcefpythonapp | 3 ++- tools/cython_setup.py | 2 ++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/client_handler/Makefile b/src/client_handler/Makefile index d217660ef..5bfaccd13 100644 --- a/src/client_handler/Makefile +++ b/src/client_handler/Makefile @@ -50,7 +50,8 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \ -I/usr/lib64/glib-2.0/include \ -I/usr/lib/gtk-2.0/include \ -I/usr/lib/gtk-2.0/gtk-unix-print-2.0 \ - -I/usr/lib/glib-2.0/include + -I/usr/lib/glib-2.0/include \ + -I/usr/include/harfbuzz $(OUT): $(OBJ) diff --git a/src/cpp_utils/Makefile b/src/cpp_utils/Makefile index 338fd960b..5f2ba828c 100644 --- a/src/cpp_utils/Makefile +++ b/src/cpp_utils/Makefile @@ -11,7 +11,8 @@ INC = -I./../ -I/usr/include/gtk-2.0 \ -I/usr/include/atk-1.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include \ -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \ -I/usr/lib64/glib-2.0/include -I/usr/lib64/gtk-2.0/include \ - -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include + -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include \ + -I/usr/include/harfbuzz .cpp.o: $(CXX) $(INC) $(CCFLAGS) -c $< -o $@ diff --git a/src/subprocess/Makefile b/src/subprocess/Makefile index f52b72df7..c92ad54c8 100644 --- a/src/subprocess/Makefile +++ b/src/subprocess/Makefile @@ -24,7 +24,8 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \ -I/usr/lib64/glib-2.0/include \ -I/usr/lib/gtk-2.0/include \ -I/usr/lib/gtk-2.0/gtk-unix-print-2.0 \ - -I/usr/lib/glib-2.0/include + -I/usr/lib/glib-2.0/include \ + -I/usr/include/harfbuzz ifeq ($(UNAME_S), Linux) LIB_DIRS = -L$(CEF_BIN) \ diff --git a/src/subprocess/Makefile-libcefpythonapp b/src/subprocess/Makefile-libcefpythonapp index 23fbde392..f3a9e6427 100644 --- a/src/subprocess/Makefile-libcefpythonapp +++ b/src/subprocess/Makefile-libcefpythonapp @@ -49,7 +49,8 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \ -I/usr/lib64/glib-2.0/include \ -I/usr/lib/gtk-2.0/include \ -I/usr/lib/gtk-2.0/gtk-unix-print-2.0 \ - -I/usr/lib/glib-2.0/include + -I/usr/lib/glib-2.0/include \ + -I/usr/include/harfbuzz $(OUT): $(OBJ) @echo [CEFPYTHONAPP] Creating library $(OUT) from $(OBJ)... diff --git a/tools/cython_setup.py b/tools/cython_setup.py index 4f0cafc6e..03408a1e7 100644 --- a/tools/cython_setup.py +++ b/tools/cython_setup.py @@ -327,6 +327,7 @@ def get_include_dirs(): '/usr/lib/gtk-2.0/include', '/usr/lib/gtk-2.0/gtk-unix-print-2.0', '/usr/lib/glib-2.0/include', + '/usr/include/harfbuzz', ]) elif LINUX: include_dirs.extend([LINUX_DIR]) @@ -353,6 +354,7 @@ def get_include_dirs(): '/usr/lib/gtk-2.0/include', '/usr/lib/gtk-2.0/gtk-unix-print-2.0', '/usr/lib/glib-2.0/include', + '/usr/include/harfbuzz', ]) return include_dirs From 258c525885faa8292da963d508ab7348f25a88fb Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sun, 14 Feb 2021 16:11:20 +0100 Subject: [PATCH 2/7] Update client_handler/Makefile --- src/client_handler/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client_handler/Makefile b/src/client_handler/Makefile index 5bfaccd13..36ced785b 100644 --- a/src/client_handler/Makefile +++ b/src/client_handler/Makefile @@ -37,6 +37,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \ -I/usr/include/glib-2.0 \ -I/usr/include/cairo \ -I/usr/include/pango-1.0 \ + -I/usr/include/harfbuzz \ -I/usr/include/gdk-pixbuf-2.0 \ -I/usr/include/atk-1.0 \ -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \ @@ -51,7 +52,6 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \ -I/usr/lib/gtk-2.0/include \ -I/usr/lib/gtk-2.0/gtk-unix-print-2.0 \ -I/usr/lib/glib-2.0/include \ - -I/usr/include/harfbuzz $(OUT): $(OBJ) From 1b532da31febcd9af8a9fcc5c329945585b0dc84 Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sun, 14 Feb 2021 16:12:03 +0100 Subject: [PATCH 3/7] Update client_handler/Makefile --- src/client_handler/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client_handler/Makefile b/src/client_handler/Makefile index 36ced785b..25e645ff7 100644 --- a/src/client_handler/Makefile +++ b/src/client_handler/Makefile @@ -51,7 +51,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \ -I/usr/lib64/glib-2.0/include \ -I/usr/lib/gtk-2.0/include \ -I/usr/lib/gtk-2.0/gtk-unix-print-2.0 \ - -I/usr/lib/glib-2.0/include \ + -I/usr/lib/glib-2.0/include $(OUT): $(OBJ) From 3caf8ae51883f0391f32b30f59e8c9d3ee576bd4 Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sun, 14 Feb 2021 16:12:36 +0100 Subject: [PATCH 4/7] Update cpp_utils/Makefile --- src/cpp_utils/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cpp_utils/Makefile b/src/cpp_utils/Makefile index 5f2ba828c..e6a6a2fe5 100644 --- a/src/cpp_utils/Makefile +++ b/src/cpp_utils/Makefile @@ -7,12 +7,11 @@ OUT = libcpp_utils.a INC = -I./../ -I/usr/include/gtk-2.0 \ -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/gtk-2.0/include \ -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/cairo \ - -I/usr/include/pango-1.0 -I/usr/include/gdk-pixbuf-2.0 \ + -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/gdk-pixbuf-2.0 \ -I/usr/include/atk-1.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include \ -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \ -I/usr/lib64/glib-2.0/include -I/usr/lib64/gtk-2.0/include \ - -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include \ - -I/usr/include/harfbuzz + -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include .cpp.o: $(CXX) $(INC) $(CCFLAGS) -c $< -o $@ From 792a6ee2215080a884bf6db6344b95bb53903887 Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sun, 14 Feb 2021 16:13:24 +0100 Subject: [PATCH 5/7] Update subprocess/Makefile --- src/subprocess/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/subprocess/Makefile b/src/subprocess/Makefile index c92ad54c8..adc34fca4 100644 --- a/src/subprocess/Makefile +++ b/src/subprocess/Makefile @@ -11,6 +11,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \ -I/usr/include/glib-2.0 \ -I/usr/include/cairo \ -I/usr/include/pango-1.0 \ + -I/usr/include/harfbuzz \ -I/usr/include/gdk-pixbuf-2.0 \ -I/usr/include/atk-1.0 \ -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \ @@ -24,8 +25,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \ -I/usr/lib64/glib-2.0/include \ -I/usr/lib/gtk-2.0/include \ -I/usr/lib/gtk-2.0/gtk-unix-print-2.0 \ - -I/usr/lib/glib-2.0/include \ - -I/usr/include/harfbuzz + -I/usr/lib/glib-2.0/include ifeq ($(UNAME_S), Linux) LIB_DIRS = -L$(CEF_BIN) \ From c65c7769e1f5d90670a3825b87beb716e02040e3 Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sun, 14 Feb 2021 16:14:29 +0100 Subject: [PATCH 6/7] Update subprocess/Makefile-libcefpythonapp --- src/subprocess/Makefile-libcefpythonapp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/subprocess/Makefile-libcefpythonapp b/src/subprocess/Makefile-libcefpythonapp index f3a9e6427..e8a6b852b 100644 --- a/src/subprocess/Makefile-libcefpythonapp +++ b/src/subprocess/Makefile-libcefpythonapp @@ -36,6 +36,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \ -I/usr/include/glib-2.0 \ -I/usr/include/cairo \ -I/usr/include/pango-1.0 \ + -I/usr/include/harfbuzz \ -I/usr/include/gdk-pixbuf-2.0 \ -I/usr/include/atk-1.0 \ -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \ @@ -49,8 +50,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \ -I/usr/lib64/glib-2.0/include \ -I/usr/lib/gtk-2.0/include \ -I/usr/lib/gtk-2.0/gtk-unix-print-2.0 \ - -I/usr/lib/glib-2.0/include \ - -I/usr/include/harfbuzz + -I/usr/lib/glib-2.0/include $(OUT): $(OBJ) @echo [CEFPYTHONAPP] Creating library $(OUT) from $(OBJ)... From a9d90d189951348c5a0fb0eef3c94452df232cea Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sun, 14 Feb 2021 16:18:10 +0100 Subject: [PATCH 7/7] Update tools/cython_setup.py --- tools/cython_setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cython_setup.py b/tools/cython_setup.py index 03408a1e7..52482cbae 100644 --- a/tools/cython_setup.py +++ b/tools/cython_setup.py @@ -318,6 +318,7 @@ def get_include_dirs(): '/usr/include/gtk-unix-print-2.0', '/usr/include/cairo', '/usr/include/pango-1.0', + '/usr/include/harfbuzz', '/usr/include/gdk-pixbuf-2.0', '/usr/include/atk-1.0', # Fedora @@ -327,7 +328,6 @@ def get_include_dirs(): '/usr/lib/gtk-2.0/include', '/usr/lib/gtk-2.0/gtk-unix-print-2.0', '/usr/lib/glib-2.0/include', - '/usr/include/harfbuzz', ]) elif LINUX: include_dirs.extend([LINUX_DIR]) @@ -338,6 +338,7 @@ def get_include_dirs(): '/usr/include/gtk-unix-print-2.0', '/usr/include/cairo', '/usr/include/pango-1.0', + '/usr/include/harfbuzz', '/usr/include/gdk-pixbuf-2.0', '/usr/include/atk-1.0', # Ubuntu @@ -354,7 +355,6 @@ def get_include_dirs(): '/usr/lib/gtk-2.0/include', '/usr/lib/gtk-2.0/gtk-unix-print-2.0', '/usr/lib/glib-2.0/include', - '/usr/include/harfbuzz', ]) return include_dirs