commit e6a8a0f7d45d4f609e5c2cdcd1fb965dae100a1c Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Nov 4 23:02:49 2018 +1100 clementine: various patches for build fix diff --git a/clementine/.signature b/clementine/.signature index 491bfe78..b8df75d5 100644 --- a/clementine/.signature +++ b/clementine/.signature @@ -1,7 +1,11 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zJwtmC4CijgOhlvh+QvRoFC7JV6P9kULmKglpSSXNweL0rpBVV9ps5cXoxmyLCgL0Xj7evYhe+fkILQORU/zwo= -SHA256 (Pkgfile) = 0c5914336a56f950292b34cd7794c7bbe557264179636dec690cf5c26bf5a1e4 +RWSagIOpLGJF3zNaD4Jnb42XpS7EiU+5XcjaMp6SG6uLDMDlw0eLsNg4U/wstquJOrieOLPss+SPCfxiYbdKVR0KXp1Reqd+AQ4= +SHA256 (Pkgfile) = 1a7f75b509368a94ea67c2601e36ff4822eaac77581572eaeaafd7d2dc353d6a SHA256 (.footprint) = 3f1bad4230e6fa52cf3322aee039d5ce640d26e8fbe4aac8df657f1b7ad8938b SHA256 (1.3.1.tar.gz) = f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c +SHA256 (f371fcb89f1441b50eab5015fc1bdcbd630d19ee.patch) = a5ada5c81b6e1540d7c87014f08f6fbeb4eec9f5ad3ebf2305bada9e9a76ac9d +SHA256 (8a6cc8b5069265e1e92e22def985e22c5955e503.patch) = 77e32aae6f035523d5cfb8adb45cb0857ebed751b7fcd1f250a2972c79f6282e +SHA256 (75f9439843a0e9cdc26cd739d5e1dbd93bd974bc.patch) = d4dbd7f09da7a554f86237476b96e3ca097117b7ab2acd706088c72203d8b64f +SHA256 (ddfa5e63f1ef0e243a007efbe576fceb9b2442e8.patch) = 9c02acd0a2b70ce8d0b6574161df692fc08c9e9c3061a4a7b78be7805b279dc7 SHA256 (clementine-gcc6.patch) = 05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee SHA256 (clementine-1.3.1-chromaprint-1.4.0.patch) = 4cc9c9df599df4a595c6acf4e129a54296c0a8e537627435e3df14e1e95447b0 diff --git a/clementine/Pkgfile b/clementine/Pkgfile index 3ec66c66..dbdef917 100644 --- a/clementine/Pkgfile +++ b/clementine/Pkgfile @@ -2,12 +2,16 @@ # URL: http://www.clementine-player.org/ # Packager: Chris Farrell, timcowchip at gmail dot com # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: boost chromaprint crypto++ glew gst-plugins-bad gst-plugins-good gst-plugins-ugly libechonest protobuf qca glu +# Depends on: boost crypto++ glew glu gst-plugins-bad gst-plugins-good gst-plugins-ugly libechonest protobuf name=clementine version=1.3.1 -release=2 +release=3 source=(https://github.com/clementine-player/Clementine/archive/$version.tar.gz + https://github.com/clementine-player/Clementine/pull/5974/commits/f371fcb89f... + https://github.com/clementine-player/Clementine/commit/8a6cc8b5069265e1e92e2... + https://github.com/clementine-player/Clementine/commit/75f9439843a0e9cdc26cd... + https://github.com/clementine-player/Clementine/commit/ddfa5e63f1ef0e243a007... clementine-gcc6.patch clementine-1.3.1-chromaprint-1.4.0.patch) @@ -17,6 +21,18 @@ build() { patch -p1 -i $SRC/clementine-gcc6.patch patch -p1 -i $SRC/clementine-1.3.1-chromaprint-1.4.0.patch + # [PATCH] Fix compilation with crypto++ >= 6.0.0 + patch -p1 -i $SRC/f371fcb89f1441b50eab5015fc1bdcbd630d19ee.patch + + # [PATCH] Add missing <functional> includes (#5630) + patch -p1 -i $SRC/8a6cc8b5069265e1e92e22def985e22c5955e503.patch + + # [PATCH 1/3] disconnect GVolumeMonitor signals from GioLister before destroying it fixes #5369 + patch -p1 -i $SRC/75f9439843a0e9cdc26cd739d5e1dbd93bd974bc.patch + + # [PATCH] Fix channels loading for DI.fm services after API domain changes (#6023) + patch -p1 -i $SRC/ddfa5e63f1ef0e243a007efbe576fceb9b2442e8.patch + install -d build cd build @@ -27,7 +43,8 @@ build() { cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE='Release' + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-catch-value" make make DESTDIR=$PKG install