Attachment 254972 Details for Bug 282570 – Patch for libqb

[patch] Patch for libqb

libqb-fixup.patch (text/plain), 2.53 KB, created by Daniel Engberg on 2024-11-05 19:04:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-11-05 19:04:45 UTC

Size: 2.53 KB

patch

obsolete

>diff --git a/devel/libqb/Makefile b/devel/libqb/Makefile
>index e2c063a14175..b5ee7a1ac967 100644
>--- a/devel/libqb/Makefile
>+++ b/devel/libqb/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=		libqb
> DISTVERSION=		2.0.8
>-PORTREVISION=		1
>+PORTREVISION=		2
> CATEGORIES=		devel
> MASTER_SITES=		https://github.com/ClusterLabs/${PORTNAME}/releases/download/v${DISTVERSION}/
> 
>@@ -11,39 +11,37 @@ WWW=			https://github.com/ClusterLabs/libqb/wiki
> LICENSE=		LGPL21
> LICENSE_FILE=		${WRKSRC}/COPYING
> 
>-# HACK, see https://github.com/freebsd/poudriere/issues/1131#issuecomment-2073099527
>-BUILD_DEPENDS=		${TEST_DEPENDS}
> TEST_DEPENDS=		checkmk:devel/check
> 
>-USES=			cpe gmake libtool pkgconfig python tar:xz
>+USES=			cpe gmake libtool pathfix pkgconfig tar:xz
> CPE_VENDOR=		clusterlabs
> USE_LDCONFIG=		yes
> 
> GNU_CONFIGURE=		yes
>-CONFIGURE_ARGS=		--with-socket-dir=${QB_SOCKET_DIR} \
>-			PACKAGE_STRING="${PORTNAME} ${DISTVERSION}" \
>-			PACKAGE_VERSION=${DISTVERSION}
>-
>-INSTALL_TARGET=		install-strip
>-TEST_TARGET=		check
>-
>-LDFLAGS+=		-B${LOCALBASE}/bin
> 
> GROUPS=			haclient
> 
>+QB_SOCKET_DIR?=		/var/run/qb
> PLIST_SUB+=		QB_SOCKET_DIR=${QB_SOCKET_DIR}
> 
>+TEST_TARGET=		check
>+TESTING_UNSAFE=		yes
>+
>+INSTALL_TARGET=		install-strip
>+
>+CONFIGURE_ARGS=		--with-socket-dir=${QB_SOCKET_DIR} \
>+			PACKAGE_STRING="${PORTNAME} ${DISTVERSION}" \
>+			PACKAGE_VERSION=${DISTVERSION}
>+
> OPTIONS_DEFINE=		DOCS DOXYGEN EXAMPLES
> OPTIONS_SUB=		yes
> 
>-DOXYGEN_IMPLIES=	DOCS
>-DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
>-			libxml2>0:textproc/libxml2
>+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
>+DOXYGEN_USES=		gnome
>+DOXYGEN_USES_OFF=	autoreconf
>+DOXYGEN_USE=		gnome=libxml2:build
> DOXYGEN_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-DOXYGEN_OFF-patch-configure.ac
>-
>-QB_SOCKET_DIR?=		/var/run/qb
>-
>-TESTING_UNSAFE=		yes
>+DOXYGEN_IMPLIES=	DOCS
> 
> post-extract-EXAMPLES-on:
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>diff --git a/devel/libqb/files/patch-configure.ac b/devel/libqb/files/patch-configure.ac
>new file mode 100644
>index 000000000000..a5dde5d92f0c
>--- /dev/null
>+++ b/devel/libqb/files/patch-configure.ac
>@@ -0,0 +1,13 @@
>+--- configure.ac.orig	2024-11-05 18:51:54 UTC
>++++ configure.ac
>+@@ -94,8 +94,8 @@ AC_CHECK_TOOLS([READELF], [eu-readelf readelf], [:])
>+ AM_CONDITIONAL(HAVE_DOXYGEN, test -n "${DOXYGEN}")
>+ AC_CHECK_TOOLS([NM], [eu-nm nm], [:])
>+ AC_CHECK_TOOLS([READELF], [eu-readelf readelf], [:])
>+-AM_PATH_PYTHON([2.6],, [:])
>+-AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
>++#AM_PATH_PYTHON([2.6],, [:])
>++#AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
>+ 
>+ ## local helper functions
>+

Actions: View | Diff

Attachments on bug 282570: 254972