mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00
Code Issues Releases Activity

net-p2p/eiskaltdcpp-gtk: unbreak the build

Browse Source 
Pango requires HarfBuzz since version 1.44, modify `FindGTK?.cmake'
files so they become aware of this.

PR:	249879
This commit is contained in:
Alexey Dokuchaev 2021-07-03 21:02:42 +00:00
parent 84b3bda376
commit f13f6da2d7
3 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net-p2p/eiskaltdcpp-gtk/Makefile
View File

@ -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

20
net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK2.cmake Normal file
View File

@ -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)

20
net-p2p/eiskaltdcpp-lib/files/patch-cmake_FindGTK3.cmake Normal file
View File

@ -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)