Attachment 101577 Details for Bug 141147 – file.diff

[patch] file.diff

file.diff (text/plain), 7.35 KB, created by Veniamin on 2009-12-03 20:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Veniamin

Created: 2009-12-03 20:20:01 UTC

Size: 7.35 KB

patch

obsolete

>diff -ruN qmpdclient.orig/Makefile qmpdclient/Makefile
>--- qmpdclient.orig/Makefile	2009-12-02 19:07:29.000000000 +0700
>+++ qmpdclient/Makefile	2009-12-02 19:13:35.000000000 +0700
>@@ -6,40 +6,40 @@
> #
> 
> PORTNAME=	qmpdclient
>-PORTVERSION=	1.0.9
>+PORTVERSION=	1.1.2
> CATEGORIES=	audio
>-MASTER_SITES=	http://havtknut.tihlde.org/qmpdclient/files/%SUBDIR%/:src,i18n
>-MASTER_SITE_SUBDIR=	translations/:i18n
>-DISTFILES=	${EXTRACT_ONLY}:src ${I18N_DISTFILES}
>-DIST_SUBDIR=	${DISTNAME}
>-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
>+MASTER_SITES=	http://dump.bitcheese.net/files/dedycec/
>+DISTNAME=	${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=	uyamba@gmail.com
> COMMENT=	Easy to use musicpd client written in QT4
> 
>+USE_BZIP2=	yes
> HAS_CONFIGURE=	yes
> USE_QT_VER=	4
> QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build \
> 		corelib xml gui
> QMAKE_ARGS=	-unix PREFIX=${PREFIX}
>+QMAKE_PRO=	${PORTNAME}.pro
> 
> OPTIONS=	DBUS	"Enable D-BUS support"	off
> 
> DATADIR=	${PREFIX}/share/QMPDClient
> PLIST_FILES=	bin/${PORTNAME}
> 
>-USE_DOS2UNIX=	qmpdclient.pro
>+USE_DOS2UNIX=	${QMAKE_PRO}
>+
>+WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> .include  <bsd.port.pre.mk>
> 
> .if !defined(WITHOUT_NLS)
> QT_COMPONENTS+=	linguist_build
> 
>-TRANSLATIONS=	de_DE fr_FR it_IT nl_NL nn_NO no_NO ru_RU \
>-		sv_SE tr_TR zh_CN zh_TW
>+TRANSLATIONS=	cs_CZ de_DE fr_FR it_IT nl_NL nn_NO pt_BR no_NO \
>+		ru_RU sv_SE tr_TR uk_UA zh_CN zh_TW
> 
> .for lang in ${TRANSLATIONS}
>-I18N_DISTFILES+=${lang}.ts:i18n
> PLIST_FILES+=	${DATADIR_REL}/translations/${lang}.qm
> .endfor
> PLIST_DIRS=	${DATADIR_REL}/translations \
>@@ -53,14 +53,13 @@
> 
> do-configure:
> 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} \
>-		${QMAKE_ARGS} qmpdclient.pro
>+		${QMAKE_ARGS} ${QMAKE_PRO}
> 
> post-build:
> .if !defined(WITHOUT_NLS)
> .for lang in ${TRANSLATIONS}
> 	@${QT_PREFIX}/bin/lrelease-qt4 -compress \
>-		${DISTDIR}/${DIST_SUBDIR}/${lang}.ts \
>-		-qm ${WRKDIR}/${lang}.qm
>+		${WRKSRC}/lang/${lang}.ts
> .endfor
> .else
> 	@${DO_NADA}
>@@ -71,7 +70,7 @@
> .if !defined(WITHOUT_NLS)
> 	${MKDIR} ${DATADIR}/translations
> .for lang in ${TRANSLATIONS}
>-	${INSTALL_DATA} ${WRKDIR}/${lang}.qm \
>+	${INSTALL_DATA} ${WRKSRC}/lang/${lang}.qm \
> 		${DATADIR}/translations/${lang}.qm
> .endfor
> .endif
>diff -ruN qmpdclient.orig/distinfo qmpdclient/distinfo
>--- qmpdclient.orig/distinfo	2009-12-02 19:07:29.000000000 +0700
>+++ qmpdclient/distinfo	2009-12-02 14:32:56.000000000 +0700
>@@ -1,36 +1,3 @@
>-MD5 (qmpdclient-1.0.9/qmpdclient-1.0.9.tar.gz) = 775d9a01b64408ba58997c089c0ed0d5
>-SHA256 (qmpdclient-1.0.9/qmpdclient-1.0.9.tar.gz) = 4b979cbb8429f86cca49ee5b307c3971b16e6e21f6ea303ec55638ccf5025a3b
>-SIZE (qmpdclient-1.0.9/qmpdclient-1.0.9.tar.gz) = 181058
>-MD5 (qmpdclient-1.0.9/de_DE.ts) = a917107d043cf364c801204564bec6d4
>-SHA256 (qmpdclient-1.0.9/de_DE.ts) = 2fc335b6382ca15ab0e563741c059e801c31a96397179b305c5bb2aa9cb00bf7
>-SIZE (qmpdclient-1.0.9/de_DE.ts) = 33591
>-MD5 (qmpdclient-1.0.9/fr_FR.ts) = 0a1a30a6d4e28a0035a8efa2d6a89bd4
>-SHA256 (qmpdclient-1.0.9/fr_FR.ts) = 75c032f0d4c057a0be9483f8926a61aa05b7aadf56ad116b4079fcea46e7f982
>-SIZE (qmpdclient-1.0.9/fr_FR.ts) = 50625
>-MD5 (qmpdclient-1.0.9/it_IT.ts) = 48eaafeec8f41ad27bb0668c7b1552aa
>-SHA256 (qmpdclient-1.0.9/it_IT.ts) = 7f4d65957e249ec27834135dff572121f983b614a51d6a66ba568ea7e5f0135e
>-SIZE (qmpdclient-1.0.9/it_IT.ts) = 46621
>-MD5 (qmpdclient-1.0.9/nl_NL.ts) = 261d84593ba1816fdd9b5d9bb4a847a9
>-SHA256 (qmpdclient-1.0.9/nl_NL.ts) = 8d34f47ee367a65283f47c5efb3dabbe5059d6108df1a8c14060d82ba15fc7ef
>-SIZE (qmpdclient-1.0.9/nl_NL.ts) = 33503
>-MD5 (qmpdclient-1.0.9/nn_NO.ts) = f18e6bd851bad9c4394f8693afe47f02
>-SHA256 (qmpdclient-1.0.9/nn_NO.ts) = 8918cd8285a4523821fd47a07356770e4d55d4ab7af1a4fec9331de9d012e317
>-SIZE (qmpdclient-1.0.9/nn_NO.ts) = 52469
>-MD5 (qmpdclient-1.0.9/no_NO.ts) = 5fb3e92815f4150799fdb46de71e91ad
>-SHA256 (qmpdclient-1.0.9/no_NO.ts) = 101523d75054133163990cb810aa54b2b05bd94e9cab136d9a399b85db412bf1
>-SIZE (qmpdclient-1.0.9/no_NO.ts) = 52527
>-MD5 (qmpdclient-1.0.9/ru_RU.ts) = d9cb99815c9d2e9c60fca520fd4b001d
>-SHA256 (qmpdclient-1.0.9/ru_RU.ts) = 73e4fdd4590655c3396f75fd9747a480e438c0e5957739843d2530c7d1dae93d
>-SIZE (qmpdclient-1.0.9/ru_RU.ts) = 50043
>-MD5 (qmpdclient-1.0.9/sv_SE.ts) = ed7a304f4d07616876b0f8c7a9c32e21
>-SHA256 (qmpdclient-1.0.9/sv_SE.ts) = 911e02dd1d3c4506427791a9d8ab06d6bf24e06ef4c2c6cb8a3bfdcaffbbf414
>-SIZE (qmpdclient-1.0.9/sv_SE.ts) = 49689
>-MD5 (qmpdclient-1.0.9/tr_TR.ts) = 310fdeb5e4b9b9a8b5c4d9206e060dce
>-SHA256 (qmpdclient-1.0.9/tr_TR.ts) = 161bc6dd60e10da1effbb2a3e036180bae47e139fc8fd04485acb32f9cdfadc6
>-SIZE (qmpdclient-1.0.9/tr_TR.ts) = 50289
>-MD5 (qmpdclient-1.0.9/zh_CN.ts) = 61a66795ee2743a99b0d53a663a4bb07
>-SHA256 (qmpdclient-1.0.9/zh_CN.ts) = 8f18409d71a42e2251a6ac41772f8713d26b6f8a9bec4b26800a5e43bff2d2b6
>-SIZE (qmpdclient-1.0.9/zh_CN.ts) = 37807
>-MD5 (qmpdclient-1.0.9/zh_TW.ts) = 8546e682529f1ae64bebae375f97fcfc
>-SHA256 (qmpdclient-1.0.9/zh_TW.ts) = 576cef45eb5c6193c8ff61a01ba37a51fc47079307da8e9814cd7d95ef276996
>-SIZE (qmpdclient-1.0.9/zh_TW.ts) = 46289
>+MD5 (qmpdclient-1.1.2.tar.bz2) = 8a8b25ae6ec66c4c23b4cc95d3e34144
>+SHA256 (qmpdclient-1.1.2.tar.bz2) = 7bd0c2a87e9a6bdd0580b5c99b6450eb8345f90e27c12a601d3f097e797d794d
>+SIZE (qmpdclient-1.1.2.tar.bz2) = 260718
>diff -ruN qmpdclient.orig/files/patch-qmpdclient.pro qmpdclient/files/patch-qmpdclient.pro
>--- qmpdclient.orig/files/patch-qmpdclient.pro	2009-12-02 19:07:29.000000000 +0700
>+++ qmpdclient/files/patch-qmpdclient.pro	2009-12-02 14:48:42.000000000 +0700
>@@ -1,29 +1,20 @@
>---- qmpdclient.pro.orig	2008-05-28 23:32:48.000000000 +0400
>-+++ qmpdclient.pro	2008-05-28 23:36:27.000000000 +0400
>-@@ -1,15 +1,5 @@
>--# installation prefix on *nix/osx
>--PREFIX = /usr/local
>--
>--
>--# Most people need not muck about below here
>--
>--!contains(QT_MAJOR_VERSION, 4){
>--    error(QMPDClient requires Qt 4)
>--}
>--
>--CONFIG += qt debug # release
>--#CONFIG -= debug # Needed to avoid console on win32
>-+CONFIG += qt release
>-+CONFIG -= debug
>+--- qmpdclient.pro.orig	2009-12-02 14:42:07.000000000 +0700
>++++ qmpdclient.pro	2009-12-02 14:48:21.000000000 +0700
>+@@ -8,7 +8,7 @@ CONFIG += qt
>+ # addition ldflags for release build
>+ QMAKE_LFLAGS_RELEASE += -O2 -g0 -s
>+ 
>+-# CONFIG -= debug # Needed to avoid console on win32
>++CONFIG -= debug # Needed to avoid console on win32
>  TEMPLATE = app
>  RESOURCES = qmpdclient.qrc
>- VERSION = 1.0.9
>-@@ -189,13 +179,12 @@
>+ VERSION = 1.1.1
>+@@ -202,13 +202,12 @@ unix {
>          SOURCES += src/qmpdclient_x11.cpp
>  
>          # Check for dbus support
>--        contains(QT_CONFIG, qdbus){
>-+        contains(CONFIG, qdbus){
>+-        contains(QT_CONFIG, dbus) {
>++        contains(CONFIG, dbus) {
>              message(DBus notifier: enabled)
> -            CONFIG += qdbus
>              SOURCES += src/notifications_dbus.cpp
>diff -ruN qmpdclient.orig/pkg-descr qmpdclient/pkg-descr
>--- qmpdclient.orig/pkg-descr	2009-12-02 19:07:29.000000000 +0700
>+++ qmpdclient/pkg-descr	2009-12-02 14:34:15.000000000 +0700
>@@ -2,13 +2,15 @@
> 
> Features:
> 
>-- Multimedia keys support
>-- System tray icon
>-- Announce songs with passive popups
>-- Drag and drop
>-- Stream support
>-- Playlist management
>-- Tag-guessing for untagged files
>-- Directory browser
>+- Covers` display
>+- Lyrics` display
>+- Tag guessing
>+- Internet radio
>+- Storing & using playlists
>+- Last.fm track submission
>+- Tray notifications (Freedestop too)
>+- Skinnable interface with iconsets
>+- Shoutcast (unstable, see shoutcast branch in git)
>+And more
> 
>-WWW: http://havtknut.tihlde.org/
>+WWW: http://bitcheese.net/wiki/QMPDClient

Actions: View | Diff

Attachments on bug 141147: 101577