Date: Sat, 3 Jul 2021 21:06:54 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f13f6da2d715 - main - net-p2p/eiskaltdcpp-gtk: unbreak the build Message-ID: <202107032106.163L6sYk043804@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=f13f6da2d71535438f3e008df572b414dc88d093 commit f13f6da2d71535438f3e008df572b414dc88d093 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2021-07-03 21:02:42 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2021-07-03 21:02:49 +0000 net-p2p/eiskaltdcpp-gtk: unbreak the build Pango requires HarfBuzz since version 1.44, modify `FindGTK?.cmake' files so they become aware of this. PR: 249879 --- net-p2p/eiskaltdcpp-gtk/Makefile | 2 -- .../eiskaltdcpp-lib/files/patch-cmake_FindGTK2.cmake | 20 ++++++++++++++++++++ .../eiskaltdcpp-lib/files/patch-cmake_FindGTK3.cmake | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile index a76fa7878485..c3f921b1c922 100644 --- a/net-p2p/eiskaltdcpp-gtk/Makefile +++ b/net-p2p/eiskaltdcpp-gtk/Makefile @@ -10,8 +10,6 @@ COMMENT= EiskaltDC++ client GTK graphic interface LICENSE= GPLv3 -BROKEN= Doesn't compile with Pango 1.46.2 or newer - PR 249879 - RUN_DEPENDS= eiskaltdcpp-data>=0:net-p2p/eiskaltdcpp-data LIB_DEPENDS= libeiskaltdcpp.so:net-p2p/eiskaltdcpp-lib diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK2.cmake b/net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK2.cmake new file mode 100644 index 000000000000..78059eb51549 --- /dev/null +++ b/net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK2.cmake @@ -0,0 +1,20 @@ +--- cmake/FindGTK2.cmake.orig 2015-04-19 21:57:16 UTC ++++ cmake/FindGTK2.cmake +@@ -167,6 +167,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) + gtkmm-2.4 + libglade-2.0 + libglademm-2.4 ++ harfbuzz + pango-1.0 + pangomm-1.4 + sigc++-2.0 +@@ -455,6 +456,9 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) + _GTK2_FIND_LIBRARY (GTK2_CAIRO_LIBRARY cairo false false) + + _GTK2_FIND_INCLUDE_DIR(GTK2_FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h) ++ ++ _GTK2_FIND_INCLUDE_DIR(GTK2_HARFBUZZ_INCLUDE_DIR hb.h) ++ _GTK2_FIND_LIBRARY (GTK2_HARFBUZZ_LIBRARY harfbuzz false false) + + _GTK2_FIND_INCLUDE_DIR(GTK2_PANGO_INCLUDE_DIR pango/pango.h) + _GTK2_FIND_LIBRARY (GTK2_PANGO_LIBRARY pango false true) diff --git a/net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK3.cmake b/net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK3.cmake new file mode 100644 index 000000000000..ddce82b2bd2d --- /dev/null +++ b/net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK3.cmake @@ -0,0 +1,20 @@ +--- cmake/FindGTK3.cmake.orig 2015-04-19 21:57:16 UTC ++++ cmake/FindGTK3.cmake +@@ -128,6 +128,7 @@ function(_GTK3_FIND_INCLUDE_DIR _var _hdr) + gtkmm-2.4 + libglade-2.0 + libglademm-2.4 ++ harfbuzz + pango-1.0 + pangomm-1.4 + sigc++-2.2 +@@ -421,6 +422,9 @@ foreach(_GTK3_component ${GTK3_FIND_COMPONENTS}) + _GTK3_FIND_LIBRARY (GTK3_CAIRO_LIBRARY cairo false false) + + _GTK3_FIND_INCLUDE_DIR(GTK3_FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h) ++ ++ _GTK3_FIND_INCLUDE_DIR(GTK3_HARFBUZZ_INCLUDE_DIR hb.h) ++ _GTK3_FIND_LIBRARY (GTK3_HARFBUZZ_LIBRARY harfbuzz false false) + + _GTK3_FIND_INCLUDE_DIR(GTK3_PANGO_INCLUDE_DIR pango/pango.h) + _GTK3_FIND_LIBRARY (GTK3_PANGO_LIBRARY pango false true)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107032106.163L6sYk043804>