netbird/FreeBSD-ports
0
0
Fork 0
mirror of https://github.com/netbirdio/FreeBSD-ports.git synced 2026-05-22 18:42:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

textproc/libxml++: Fix pkgconfig pc file

Browse Source 
The libxml++-50.pc isn't generated from pc.in file - it's
generated by meson. So remove the patch-libxml++.pc.in and add
patch-libxml++_meson.build file.
While I'm here pet portfmt.

Approved by:	portmgr (blanket, runtime fix)
This commit is contained in:
Zsolt Udvari
2025-05-22 20:17:17 +02:00
parent 589bcd7b25
commit 55d4ea0f91
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
textproc/libxml++/Makefile
+6 -5
View File
@@ -1,5 +1,6 @@
PORTNAME= libxml++
DISTVERSION= 5.4.0
PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= GNOME \
https://github.com/libxmlplusplus/libxmlplusplus/releases/download/${DISTVERSION}/
@@ -16,11 +17,11 @@ USES= compiler:c++17-lang gnome meson pkgconfig tar:xz
USE_GNOME= libxml2
USE_LDCONFIG= yes
MESON_ARGS= -Ddefault_library=both \
-Dbuild-examples=false \
-Dbuild-manual=false
MESON_ARGS= -Dbuild-examples=false \
-Dbuild-manual=false \
-Ddefault_library=both
PLIST_SUB= VERSION=5.0 \
API_VERSION=5.0
PLIST_SUB= API_VERSION=5.0 \
VERSION=5.0
.include <bsd.port.mk>
textproc/libxml++/files/patch-libxml++.pc.in
-8
View File
@@ -1,8 +0,0 @@
--- libxml++.pc.in.orig 2021-05-27 10:36:45 UTC
+++ libxml++.pc.in
@@ -16,4 +16,4 @@ Libs: -L${libdir} -lxml++@MSVC_TOOLSET_VER@-@LIBXMLXX_
URL: https://libxmlplusplus.github.io/libxmlplusplus/
Requires: @LIBXMLXX_MODULES@
Libs: -L${libdir} -lxml++@MSVC_TOOLSET_VER@-@LIBXMLXX_API_VERSION@ @LIBXML2_LIB_NO_PKGCONFIG@
-Cflags: -I${includedir}/@LIBXMLXX_MODULE_NAME@ -I${libdir}/@LIBXMLXX_MODULE_NAME@/include
+Cflags: -I${includedir}/@LIBXMLXX_MODULE_NAME@ -I${includedir}/@LIBXMLXX_MODULE_NAME@/include
textproc/libxml++/files/patch-libxml++_meson.build
+11
View File
@@ -0,0 +1,11 @@
--- libxml++/meson.build.orig 2025-05-22 18:00:46 UTC
+++ libxml++/meson.build
@@ -143,7 +143,7 @@ pkg_config.generate(xmlxx_library,
requires: xmlxx_pc_requires,
libraries: libxml2_lib_pkgconfig,
subdirs: [xmlxx_pcname],
- extra_cflags: ['-I${libdir}/' + xmlxx_pcname + '/include'],
+ extra_cflags: ['-I${includedir}/' + xmlxx_pcname + '/include'],
)
# This is used when building example programs and test programs.
textproc/libxml++/files/patch-meson.build
+3 -3
View File
@@ -1,4 +1,4 @@
--- meson.build.orig 2024-01-11 13:10:47 UTC
--- meson.build.orig 2024-08-13 14:23:04 UTC
+++ meson.build
@@ -98,7 +98,7 @@ install_datadir = get_option('datadir')
install_includedir = get_option('includedir')
@@ -9,8 +9,8 @@
# Dependencies.
# xmlxx_build_dep: Dependencies when building the libxml++ library.
@@ -370,7 +370,7 @@ xmlxxconfig_h_meson = files('libxml++config.h.meson')
)
@@ -295,7 +295,7 @@ xmlxxconfig_h_meson = files('libxml++config.h.meson')
endif
xmlxxconfig_h_meson = files('libxml++config.h.meson')
-install_includeconfigdir = install_libdir / xmlxx_pcname / 'include'