Attachment 200664 Details for Bug 234534 – clementine-qt5.patch

[patch] clementine-qt5.patch

clementine-qt5.patch (text/plain), 8.40 KB, created by Val Packett on 2018-12-31 19:41:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2018-12-31 19:41:11 UTC

Size: 8.40 KB

patch

obsolete

>diff --git c/audio/clementine-player/Makefile i/audio/clementine-player/Makefile
>index 3472eb1908a0..af3c62887253 100644
>--- c/audio/clementine-player/Makefile
>+++ i/audio/clementine-player/Makefile
>@@ -2,30 +2,27 @@
> # $FreeBSD$
> 
> PORTNAME=	clementine
>-DISTVERSIONPREFIX=	v
>-DISTVERSION=		1.3.1-441
>-DISTVERSIONSUFFIX=	-gc01b7bc
>-PORTREVISION=	7
>+PORTVERSION=	g20181205
> CATEGORIES=	audio
> PKGNAMESUFFIX=	-player
> 
>+PATCH_SITES=	https://github.com/jonaski/${GH_PROJECT}/commit/
>+PATCHFILES=	6f189d95.patch:-p1
>+
> MAINTAINER=	sbruno@FreeBSD.org
>-COMMENT=	Cross-platform music player based on Amarok 1.4
>+COMMENT=	Modern music player and library organizer
> 
> LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-DEPRECATED=		Qt4 has been EOL since december 2015
>-EXPIRATION_DATE=	2019-03-15
>-
> BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
> LIB_DEPENDS=	libtag.so:audio/taglib \
> 		libchromaprint.so:audio/chromaprint \
> 		libprotobuf.so:devel/protobuf \
>-		libqca.so:devel/qca@qt4 \
>-		libqjson.so:devel/qjson@qt4 \
>+		libqca-qt5.so:devel/qca@qt5 \
>+		libqjson-qt5.so:devel/qjson@qt5 \
> 		libfftw3.so:math/fftw3 \
>-		libechonest.so:audio/libechonest \
>+		libechonest5.so:audio/libechonest \
> 		libcryptopp.so:security/cryptopp
> 
> BROKEN_powerpc64=	fails to compile: tagreader.cpp: undefined reference to TagLib::String::String
>@@ -33,33 +30,32 @@ BROKEN_powerpc64=	fails to compile: tagreader.cpp: undefined reference to TagLib
> USE_GITHUB=	yes
> GH_ACCOUNT=	${PORTNAME}${PKGNAMESUFFIX}
> GH_PROJECT=	Clementine
>+GH_TAGNAME=	453270c8b5015f39a44fd34c659e811c6b8048cf # qt5 branch
> 
> USES=		cmake \
>+		qt:5 \
>+		gl \
> 		compiler:c++11-lib \
> 		desktop-file-utils \
> 		gettext-tools \
> 		pkgconfig \
>-		qt:4 sqlite
>-USE_CXXSTD=	c++11
>+		sqlite
> 
>-USE_GL=		gl glew glu
>-USE_XORG=	x11
>+USE_GL=		gl glu glew
> 
>-CONFLICTS_BUILD=	qt-3.*
>-USE_QT=		corelib \
>+USE_QT=	core \
>+		concurrent \
> 		dbus \
> 		gui \
> 		imageformats \
> 		qmake_build \
> 		linguist_build \
>-		moc_build \
> 		network \
> 		opengl \
>-		qtestlib \
>-		rcc_build \
>+		testlib \
> 		sql \
>-		uic_build \
>-		webkit \
>+		widgets \
>+		x11extras \
> 		xml
> 
> USE_GSTREAMER1=	cdparanoia \
>@@ -70,6 +66,7 @@ USE_GSTREAMER1=	cdparanoia \
> 		lame \
> 		mpg123 \
> 		neon \
>+		opus \
> 		shout2 \
> 		soup \
> 		taglib \
>@@ -84,7 +81,16 @@ CFLAGS+=	-Wno-inconsistent-missing-override \
> 
> CMAKE_ARGS+=	-DCMAKE_LIBRARY_PATH:PATH="${LOCALBASE}/lib:${PREFIX}/lib" \
> 		-DENABLE_DBUS=ON \
>-		-DENABLE_SPOTIFY_BLOB=OFF
>+		-DENABLE_SPOTIFY_BLOB=OFF \
>+		-DCRYPTOPP_LIBS=${LOCALBASE}/lib/libcryptopp.so \
>+		-DCRYPTOPP_INCLUDEDIR=${LOCALBASE}/include/cryptopp \
>+		-DCRYPTOPP_LIBDIR=${LOCALBASE}/lib \
>+		-DCRYPTOPP_LDFLAGS=-lcryptopp \
>+		-DCRYPTOPP_LIBRARIES=cryptopp \
>+		-DCRYPTOPP_LIBRARY_DIRS=${LOCALBASE}/lib \
>+		-DCRYPTOPP_cryptopp_INCLUDEDIR=${LOCALBASE}/include/cryptopp \
>+		-DCRYPTOPP_cryptopp_LIBDIR=${LOCALBASE}/lib \
>+		-DCRYPTOPP_FOUND=1
> 
> OPTIONS_DEFINE=		AMAZON \
> 			AUDIOCD \
>@@ -158,6 +164,7 @@ DROPBOX_BUILD_DEPENDS=	sparsehash>=2.0.2:devel/sparsehash
> DROPBOX_CMAKE_ON=	-DENABLE_DROPBOX=ON
> DROPBOX_CMAKE_OFF=	-DENABLE_DROPBOX=OFF
> 
>+GIO_USES=		gnome
> GIO_USE=		GNOME=glib20
> GIO_CMAKE_ON=		-DENABLE_GIO=ON
> GIO_CMAKE_OFF=		-DENABLE_GIO=OFF
>@@ -173,7 +180,7 @@ GPOD_LIB_DEPENDS=	libgpod.so:audio/libgpod \
> GPOD_CMAKE_ON=		-DENABLE_LIBGPOD=ON
> GPOD_CMAKE_OFF=		-DENABLE_LIBGPOD=OFF
> 
>-LASTFM_LIB_DEPENDS=	liblastfm.so:audio/liblastfm
>+LASTFM_LIB_DEPENDS=	liblastfm5.so:audio/liblastfm-qt5
> LASTFM_CMAKE_ON=	-DENABLE_LIBLASTFM=ON
> LASTFM_CMAKE_OFF=	-DENABLE_LIBLASTFM=OFF
> 
>diff --git c/audio/clementine-player/distinfo i/audio/clementine-player/distinfo
>index ed0082c62a89..df3af14e4204 100644
>--- c/audio/clementine-player/distinfo
>+++ i/audio/clementine-player/distinfo
>@@ -1,3 +1,5 @@
>-TIMESTAMP = 1527263085
>-SHA256 (clementine-player-Clementine-v1.3.1-441-gc01b7bc_GH0.tar.gz) = 78082a523dc21b6ddf17fd7bd3ab7734634bce93dacdc1a50efb4dda4e346be6
>-SIZE (clementine-player-Clementine-v1.3.1-441-gc01b7bc_GH0.tar.gz) = 8468459
>+TIMESTAMP = 1546283735
>+SHA256 (clementine-player-Clementine-g20181205-453270c8b5015f39a44fd34c659e811c6b8048cf_GH0.tar.gz) = e19ffb54b532caf2755cb0cf0999f743e4dec6a00996d265180e4a547231b4bc
>+SIZE (clementine-player-Clementine-g20181205-453270c8b5015f39a44fd34c659e811c6b8048cf_GH0.tar.gz) = 8527453
>+SHA256 (6f189d95.patch) = a4d0d811de1fd9425d91ce51d8f22499dcc5d69a5849d960901e1fa71123398d
>+SIZE (6f189d95.patch) = 1427
>diff --git c/audio/clementine-player/files/patch-dist_clementine.desktop i/audio/clementine-player/files/patch-dist_clementine.desktop
>index b1cb3319eb8e..6ed44ba66255 100644
>--- c/audio/clementine-player/files/patch-dist_clementine.desktop
>+++ i/audio/clementine-player/files/patch-dist_clementine.desktop
>@@ -1,6 +1,6 @@
>---- dist/clementine.desktop.orig	2016-04-19 15:08:35 UTC
>+--- dist/clementine.desktop.orig	2018-03-11 17:39:57 UTC
> +++ dist/clementine.desktop
>-@@ -26,8 +26,8 @@ Comment[sr]=Ð ÐµÐ¿ÑÐ¾Ð´ÑÐºÑÑÐµ Ð¼ÑÐ
>+@@ -31,8 +31,8 @@ Comment[sr]=Ð ÐµÐ¿ÑÐ¾Ð´ÑÐºÑÑÐµ Ð¼ÑÐ·Ð¸ÐºÑ Ð¸ las
>  Comment[sr@ijekavian]=Ð ÐµÐ¿ÑÐ¾Ð´ÑÐºÑÑÐµ Ð¼ÑÐ·Ð¸ÐºÑ Ð¸ last.fm ÑÐ¾ÐºÐ¾Ð²Ðµ
>  Comment[sr@ijekavianlatin]=Reprodukuje muziku i last.fm tokove
>  Comment[sr@latin]=Reprodukuje muziku i last.fm tokove
>@@ -11,3 +11,57 @@
>  Icon=clementine
>  Terminal=false
>  Categories=AudioVideo;Player;Qt;Audio;
>+@@ -42,7 +42,7 @@ Actions=Play;Pause;Stop;StopAfterCurrent;Previous;Next
>+ 
>+ [Desktop Action Play]
>+ Name=Play
>+-Exec=clementine --play
>++Exec=clementine-player --play
>+ Name[af]=Speel
>+ Name[be]=ÐÑÐ°Ð¹Ð³ÑÐ°ÑÑ
>+ Name[bg]=ÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ
>+@@ -94,7 +94,7 @@ Name[zh_TW]=ææ¾
>+ 
>+ [Desktop Action Pause]
>+ Name=Pause
>+-Exec=clementine --pause
>++Exec=clementine-player --pause
>+ Name[be]=ÐÑÑÐ¿ÑÐ½ÑÑÑ
>+ Name[bg]=ÐÐ°ÑÐ·Ð°
>+ Name[br]=Ehan
>+@@ -141,7 +141,7 @@ Name[zh_TW]=æ«å
>+ 
>+ [Desktop Action Stop]
>+ Name=Stop
>+-Exec=clementine --stop
>++Exec=clementine-player --stop
>+ Name[be]=Ð¡Ð¿ÑÐ½ÑÑÑ
>+ Name[bg]=Ð¡Ð¿Ð¸ÑÐ°Ð½Ðµ
>+ Name[br]=Paouez
>+@@ -191,7 +191,7 @@ Name[zh_TW]=åæ¢
>+ 
>+ [Desktop Action StopAfterCurrent]
>+ Name=Stop after this track
>+-Exec=clementine --stop-after-current
>++Exec=clementine-player --stop-after-current
>+ Name[be]=Ð¡Ð¿ÑÐ½ÑÑÑ Ð¿Ð°ÑÑÐ»Ñ Ð³ÑÑÐ°Ð³Ð° ÑÑÑÐºÑ
>+ Name[bg]=Ð¡Ð¿ÑÐ¸ ÑÐ»ÐµÐ´ ÑÐ°Ð·Ð¸ Ð¿ÐµÑÐµÐ½
>+ Name[br]=Paouez goude ar roud-maÃ±
>+@@ -238,7 +238,7 @@ Name[zh_TW]=å¨éé¦æä¹å¾åæ¢
>+ 
>+ [Desktop Action Previous]
>+ Name=Previous
>+-Exec=clementine --previous
>++Exec=clementine-player --previous
>+ Name[af]=Vorige
>+ Name[be]=ÐÐ°Ð¿ÑÑÑÐ´Ð½Ñ
>+ Name[bg]=ÐÑÐµÐ´Ð¸ÑÐ½Ð°
>+@@ -287,7 +287,7 @@ Name[zh_TW]=å¾å
>+ 
>+ [Desktop Action Next]
>+ Name=Next
>+-Exec=clementine --next
>++Exec=clementine-player --next
>+ Name[af]=Volgende
>+ Name[be]=ÐÐ°Ð»ÐµÐ¹
>+ Name[bg]=Ð¡Ð»ÐµÐ´Ð²Ð°ÑÐ°
>diff --git c/audio/clementine-player/files/patch-src_CMakeLists.txt i/audio/clementine-player/files/patch-src_CMakeLists.txt
>index 593d4c1efd93..4f1a88a357b3 100644
>--- c/audio/clementine-player/files/patch-src_CMakeLists.txt
>+++ i/audio/clementine-player/files/patch-src_CMakeLists.txt
>@@ -10,9 +10,9 @@
>    )
> @@ -1380,6 +1381,7 @@ add_executable(clementine
>  
>- if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
>+ if (FREEBSD)
>    target_link_libraries(clementine execinfo)
> +  set_target_properties(clementine PROPERTIES OUTPUT_NAME clementine-player)
>- endif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
>+ endif (FREEBSD)
>  
>  target_link_libraries(clementine
>diff --git c/audio/clementine-player/pkg-plist i/audio/clementine-player/pkg-plist
>index f1bdabd7507e..59ef76b646bb 100644
>--- c/audio/clementine-player/pkg-plist
>+++ i/audio/clementine-player/pkg-plist
>@@ -1,14 +1,14 @@
> bin/clementine-player
> bin/clementine-tagreader
>-share/appdata/clementine.appdata.xml
> share/applications/clementine.desktop
> share/icons/hicolor/128x128/apps/clementine.png
> share/icons/hicolor/64x64/apps/clementine.png
> share/icons/hicolor/scalable/apps/clementine.svg
>-share/kde4/services/clementine-feed.protocol
>-share/kde4/services/clementine-itms.protocol
>-share/kde4/services/clementine-itpc.protocol
>-share/kde4/services/clementine-zune.protocol
>+share/kservices5/clementine-feed.protocol
>+share/kservices5/clementine-itms.protocol
>+share/kservices5/clementine-itpc.protocol
>+share/kservices5/clementine-zune.protocol
>+share/metainfo/clementine.appdata.xml
> %%VISUALISATION%%%%DATADIR%%/projectm-presets/Aderrasi - Agitator.milk
> %%VISUALISATION%%%%DATADIR%%/projectm-presets/Aderrasi - Aimless (Gravity Directive Mix).milk
> %%VISUALISATION%%%%DATADIR%%/projectm-presets/Aderrasi - Aimless (Spirogravity Mix).milk

Actions: View | Diff

Attachments on bug 234534: 200664