Attachment 131504 Details for Bug 175585 – deskutils_cdcat.diff

[patch] deskutils_cdcat.diff

deskutils_cdcat.diff (text/x-diff), 6.23 KB, created by tkato432 on 2013-11-22 18:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-11-22 18:00:01 UTC

Size: 6.23 KB

patch

obsolete

>diff -urN /usr/ports/deskutils/cdcat/Makefile deskutils/cdcat/Makefile
>--- /usr/ports/deskutils/cdcat/Makefile	2013-11-22 07:07:06.000000000 +0900
>+++ deskutils/cdcat/Makefile	2013-11-23 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/deskutils/cdcat/Makefile 334499 2013-11-21 16:09:47Z makc $
> 
> PORTNAME=	cdcat
>-PORTVERSION=	2.1
>-PORTREVISION=	1
>+PORTVERSION=	2.3.1
> CATEGORIES=	deskutils
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
> 		GOOGLE_CODE:lib7zip
>@@ -19,7 +18,8 @@
> LICENSE_COMB=	multi
> 
> BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/archivers/p7zip:patch \
>-		${NONEXISTENT}:${PORTSDIR}/multimedia/mediainfo:build
>+		${NONEXISTENT}:${PORTSDIR}/multimedia/mediainfo:build \
>+		cryptopp>0:${PORTSDIR}/security/cryptopp
> LIB_DEPENDS=	libtar.so:${PORTSDIR}/devel/libtar \
> 		libexif.so:${PORTSDIR}/graphics/libexif
> 
>@@ -28,30 +28,29 @@
> CONFIGURE_WRKSRC=	${WRKSRC}/src
> BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
> 
>-USES=		qmake
> USE_BZIP2=	yes
>-USE_QT4=	corelib gui xml \
>-		linguist_build moc_build uic_build
>-INSTALLS_ICONS=	yes
>-
>-QMAKE_ARGS+=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
>+USES=		qmake:norecursive
>+USE_QT4=	corelib gui xml linguist_build moc_build uic_build
>+QMAKE_ARGS=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
> 		INCLUDEPATH+="${MIF_WRKSRC}/MediaInfoLib/Source" \
> 		INCLUDEPATH+="${MIF_WRKSRC}/ZenLib/Source" \
> 		LIBS+="${L7Z_WRKSRC}/Lib7Zip/lib7zip.a" \
> 		LIBS+="${MIF_WRKSRC}/MediaInfoLib/Project/GNU/Library/.libs/libmediainfo.a" \
> 		LIBS+="${MIF_WRKSRC}/ZenLib/Project/GNU/Library/.libs/libzen.a" \
>+		LIBS+="${LOCALBASE}/lib/libcryptopp.a" \
> 		LIBS+="-lz -lbz2 -ltar -lexif" \
> 		DEFINES+="MEDIAINFO_STATIC" \
> 		DEFINES+="MEDIAINFO_UNICODE" \
> 		DEFINES+="USE_LIBEXIF"
>-QMAKE_PRO=	${PORTNAME}.pro
>+QMAKE_SOURCE_PATH=	${PORTNAME}.pro
>+INSTALLS_ICONS=	yes
> 
> # spoof tinderbox: build deps for multimedia/mediainfo
> USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
> 
> PORTDOCS=	Authors ChangeLog README TRANSLATORS_README
> PLIST_FILES=	bin/${PORTNAME} %%DATADIR%%/${PORTNAME}.png
>-.for lang in cz de el es fr hu id it pl pt sk sr
>+.for lang in cz de el es fr hu id it pl pt ru sk sr
> PLIST_FILES+=	%%DATADIR%%/translations/${PORTNAME}_${lang}.qm
> .endfor
> .for size in 16 22 32 48 64
>@@ -60,8 +59,11 @@
> PLIST_FILES+=	share/icons/hicolor/scalable/apps/${PORTNAME}_logo.svg
> PLIST_DIRS=	%%DATADIR%%/translations %%DATADIR%%
> 
>+DESKTOP_ENTRIES="CdCat" "Hyper's CD Catalog" "${DATADIR}/${PORTNAME}.png" \
>+		"${PORTNAME}" "AudioVideo;Qt;" ""
>+
> L7Z_NAME=	lib7zip
>-L7Z_VERSION=	1.6.3
>+L7Z_VERSION=	1.6.5
> L7Z_DISTFILE=	${L7Z_NAME}-${L7Z_VERSION}.tar.gz
> L7Z_WRKSRC=	${WRKDIR}/${L7Z_NAME}
> 
>@@ -76,9 +78,13 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>-		'/LIBS/s|^|#|' ${BUILD_WRKSRC}/${QMAKE_PRO}
>+		'/LIBS/s|^|#|' ${BUILD_WRKSRC}/${PORTNAME}.pro
> 	@${REINPLACE_CMD} -e \
> 		's|/dev/sr0|/dev/cd0|' ${BUILD_WRKSRC}/config.cpp
>+.for i in newdbdialog.cpp wdbfile.h
>+	@${REINPLACE_CMD} -e \
>+		's|crypto++/|cryptopp/|' ${BUILD_WRKSRC}/${i}
>+.endfor
> 	@${REINPLACE_CMD} -e \
> 		's|-ldl||' ${L7Z_WRKSRC}/Test7Zip/Makefile.in
> 
>@@ -87,29 +93,32 @@
> 		CC="${CC}" CFLAGS="${CFLAGS}" \
> 		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
> 		P7ZIP_SOURCE_DIR="${P7Z_WRKSRC}"
>-	@${LRELEASE} ${BUILD_WRKSRC}/${QMAKE_PRO}
>+	@${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro
> 
> pre-build:
>-	@cd ${L7Z_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \
>+	@cd ${L7Z_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
> 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
> 
> do-install:
>-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
>+	(cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
>+		${STAGEDIR}${PREFIX}/bin)
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
>-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${STAGEDIR}${DATADIR}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}.png \
>+		${STAGEDIR}${DATADIR})
> 	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
>-	${INSTALL_DATA} ${BUILD_WRKSRC}/lang/*.qm ${STAGEDIR}${DATADIR}/translations
>+	(cd ${BUILD_WRKSRC}/lang && ${INSTALL_DATA} *.qm \
>+		${STAGEDIR}${DATADIR}/translations)
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
>-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo.svg \
>-		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}_logo.svg
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}_logo.svg \
>+		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps)
> .for size in 16 22 32 48 64
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps
>-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_logo_${size}x${size}.png \
>-		${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTNAME}_logo_${size}x${size}.png \
>+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/${PORTNAME}_logo.png)
> .endfor
>-.if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
>-.endif
>+.for i in ${PORTDOCS}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
>+.endfor
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/deskutils/cdcat/distinfo deskutils/cdcat/distinfo
>--- /usr/ports/deskutils/cdcat/distinfo	2013-11-06 21:52:37.000000000 +0900
>+++ deskutils/cdcat/distinfo	2013-11-23 00:00:00.000000000 +0900
>@@ -1,4 +1,4 @@
>-SHA256 (cdcat-2.1.tar.bz2) = ad332b374307835d5daadfdcc8a06937cf3c57fe3a87cf58dc41b368ba6e8204
>-SIZE (cdcat-2.1.tar.bz2) = 383337
>-SHA256 (lib7zip-1.6.3.tar.gz) = 03e6aecefbb7ed8c927fb0736c7192a4661ace7884a35f4147df7356b1a23860
>-SIZE (lib7zip-1.6.3.tar.gz) = 356121
>+SHA256 (cdcat-2.3.1.tar.bz2) = 7cb1bbd7646faf93359acda5835f510766c82e612bca577282571f13a8d5f01c
>+SIZE (cdcat-2.3.1.tar.bz2) = 428708
>+SHA256 (lib7zip-1.6.5.tar.gz) = a6fb9118657c71db5b40068cd6ddd35430818aaa21aa2d0af4d6c3309e9f2a38
>+SIZE (lib7zip-1.6.5.tar.gz) = 359986
>diff -urN /usr/ports/deskutils/cdcat/files/patch-src__exportcdcatdb.cpp deskutils/cdcat/files/patch-src__exportcdcatdb.cpp
>--- /usr/ports/deskutils/cdcat/files/patch-src__exportcdcatdb.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ deskutils/cdcat/files/patch-src__exportcdcatdb.cpp	2013-11-23 00:00:00.000000000 +0900
>@@ -0,0 +1,10 @@
>+--- src/exportcdcatdb.cpp.orig
>++++ src/exportcdcatdb.cpp
>+@@ -30,6 +30,7 @@
>+ #include <QGridLayout>
>+ #include <QVBoxLayout>
>+ #include <iostream>
>++#include <unistd.h>
>+ 
>+ #include "icons.h"
>+ #include "cdcat.h"

Actions: View | Diff

Attachments on bug 175585: 131497 | 131498 | 131499 | 131500 | 131501 | 131502 | 131503 | 131504 | 131505