Attachment 253577 Details for Bug 281438 – A patxh that updates bcompare to v4.4.7 and applies Vladimir's feedback

[patch] A patxh that updates bcompare to v4.4.7 and applies Vladimir's feedback

0001-Update-bcompare-to-v4.4.7-incl.-Vladimir-Druzenko-s-.patch (text/plain), 4.92 KB, created by Matías Pizarro on 2024-09-15 02:49:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matías Pizarro

Created: 2024-09-15 02:49:12 UTC

Size: 4.92 KB

patch

obsolete

>From 28540833b8b0caaabbe0c20487c0c22bfa6dabec Mon Sep 17 00:00:00 2001
>From: matias pizarro <matias@pizarro.net>
>Date: Sun, 15 Sep 2024 04:46:53 +0200
>Subject: [PATCH] Update bcompare to v4.4.7, incl. Vladimir Druzenko's feedback
>
>---
> editors/linux-bcompare/Makefile | 34 ++++++++++++++++++++-------------
> editors/linux-bcompare/distinfo | 10 +++++-----
> 2 files changed, 26 insertions(+), 18 deletions(-)
>
>diff --git a/editors/linux-bcompare/Makefile b/editors/linux-bcompare/Makefile
>index 0a6b0f8b05..6e9be6a829 100644
>--- a/editors/linux-bcompare/Makefile
>+++ b/editors/linux-bcompare/Makefile
>@@ -1,8 +1,8 @@
> PORTNAME=	bcompare
>-DISTVERSION=	4.3.7
>-DISTVERSIONSUFFIX=	.25118
>+DISTVERSION=	4.4.7
>+DISTVERSIONSUFFIX=	.28397
> CATEGORIES=	editors devel linux
>-MASTER_SITES=	http://scootersoftware.com/
>+MASTER_SITES=	https://scootersoftware.com/files/
> PKGNAMEPREFIX=	linux-
> EXTRACT_SUFX=	.rpm
> 
>@@ -25,20 +25,24 @@ NO_BUILD=	yes
> 
> NO_WRKSUBDIR=	true
> 
>+DISTNAME_amd64=	${DISTNAME}.x86_64
>+DISTNAME_i386=	${DISTNAME}.i386
>+
> DATA_FILTER=	-type d -o -name *\.html -o -name *\.js -o -name *\.css -o \
> 		-name *\.gif -o -name *\.png -o -name *\.jpg -o -name \
> 		*\.desktop -o -name mime\.types -o -name README -o -name \
> 		BCompare.mad -o -name RPM-GPG-KEY-scootersoftware -o -name \
> 		scootersoftware.repo
> 
>-DISTNAME_amd64=	${DISTNAME}.x86_64
>-DISTNAME_i386=	${DISTNAME}.i386
> LIB_FILES=	libQt4Pas.so.5 lib7z.so libunrar.so nosched.so
> PROGRAM_FILES=	BCompare bcmount32 bcmount64
> SCRIPT_FILES=	bcmount.sh kde_context_menu
> 
> .include <bsd.port.options.mk>
> 
>+post-patch:
>+	${REINPLACE_CMD} -e 's|^#!/usr/bin/sh$$|#!/bin/sh|' ${BCLIB_SRC}/bcmount.sh
>+
> .if ${ARCH} == i386
> LIBDIR=		lib
> EXTRA_PATCHES=	${PATCHDIR}/extra-patch-usr_bin_bcompare_i386
>@@ -52,31 +56,35 @@ PLIST_SUB+=	QT4AMD64=""
> BCLIB_SRC=	${WRKSRC}/usr/${LIBDIR}/beyondcompare
> BCLIB_STG=	${STAGEDIR}${PREFIX}/lib/beyondcompare
> 
>-SHEBANG_FILES=	${BCLIB_SRC}/bcmount.sh ${BCLIB_SRC}/kde_context_menu
>+SHEBANG_FILES=	${BCLIB_SRC}/kde_context_menu
> 
> pre-install:
>-	${LINUXBASE}/usr/bin/gcc -Wall -fPIC -shared ${FILESDIR}/nosched.c -ldl -o ${BCLIB_SRC}/nosched.so
>+	${LINUXBASE}/usr/bin/gcc --sysroot=${LINUXBASE} -Wall -fPIC -shared \
>+		${FILESDIR}/nosched.c -ldl -o ${BCLIB_SRC}/nosched.so
> 
> do-install:
> # bin
>-	(cd ${WRKSRC}/usr/bin && ${INSTALL_SCRIPT} bcompare ${STAGEDIR}${PREFIX}/bin)
>+	${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/bcompare ${STAGEDIR}${PREFIX}/bin
> # lib
> 	(cd ${BCLIB_SRC}     && ${COPYTREE_SHARE}  .                ${BCLIB_STG} "${DATA_FILTER}")
> 	(cd ${BCLIB_SRC}     && ${INSTALL_PROGRAM} ${PROGRAM_FILES} ${BCLIB_STG})
> 	(cd ${BCLIB_SRC}     && ${INSTALL_SCRIPT}  ${SCRIPT_FILES}  ${BCLIB_STG})
> 	(cd ${BCLIB_SRC}     && ${INSTALL_LIB}     ${LIB_FILES}     ${BCLIB_STG})
> .if ${ARCH} == amd64
>-	(cd ${BCLIB_SRC}/qt4 && ${INSTALL_LIB}     $$(ls *.so.4)    ${BCLIB_STG}/qt4)
>+	${INSTALL_LIB} ${BCLIB_SRC}/qt4/*.so.4 ${BCLIB_STG}/qt4
> .endif
>-	(cd ${BCLIB_SRC}/ext && ${INSTALL_LIB}     $$(ls *.so)      ${BCLIB_STG}/ext)
>+	${INSTALL_LIB} ${BCLIB_SRC}/ext/*.so   ${BCLIB_STG}/ext
> 	${LN} -sf ${LINUXBASE}/usr/${LIBDIR}/libbz2.so.1.0.6 ${BCLIB_STG}/libbz2.so.1.0
> # data
> 	(cd ${WRKSRC}/usr/share && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share)
> 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps
> 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps
> 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps
>-	${LN} -sf ../../../../pixmaps/bcompare.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/bcompare.png
>-	${LN} -sf ../../../../pixmaps/bcomparefull32.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/bcompare.png
>-	${LN} -sf ../../../../pixmaps/bcompare.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/bcompare.png
>+	${LN} -sf ../../../../pixmaps/bcompare.png \
>+		${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/bcompare.png
>+	${LN} -sf ../../../../pixmaps/bcomparefull32.png \
>+		${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/bcompare.png
>+	${LN} -sf ../../../../pixmaps/bcompare.png \
>+		${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/bcompare.png
> 
> .include <bsd.port.mk>
>diff --git a/editors/linux-bcompare/distinfo b/editors/linux-bcompare/distinfo
>index d3915c5a20..bd699cbbe4 100644
>--- a/editors/linux-bcompare/distinfo
>+++ b/editors/linux-bcompare/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1601823220
>-SHA256 (bcompare-4.3.7.25118.i386.rpm) = 71a72fa4318b7afedb03ec7147523d3aa47e26b090e1a170316990eb88268828
>-SIZE (bcompare-4.3.7.25118.i386.rpm) = 12675958
>-SHA256 (bcompare-4.3.7.25118.x86_64.rpm) = c913df4d0df858c4d1de62ee269b82a3e231b7408e36ee43ba672fd07e97dee0
>-SIZE (bcompare-4.3.7.25118.x86_64.rpm) = 18808757
>+TIMESTAMP = 1703173253
>+SHA256 (bcompare-4.4.7.28397.i386.rpm) = 26401171e6235d125814eafa5653359ed9c7d8d34145f2ac6302331c2607147f
>+SIZE (bcompare-4.4.7.28397.i386.rpm) = 13054732
>+SHA256 (bcompare-4.4.7.28397.x86_64.rpm) = aeea6fd6c0edc2043928861348d648acaeba5f93a8ff247cda3c3476437734b8
>+SIZE (bcompare-4.4.7.28397.x86_64.rpm) = 19068518
>-- 
>2.46.0
>

Actions: View | Diff

Attachments on bug 281438: 253498 | 253577