From 9315ac53fcbdb81e3790314e8659dae6eec92274 Mon Sep 17 00:00:00 2001
From: Danny Rawlins <contact@romster.me>
Date: Fri, 24 Sep 2021 19:44:43 +1000
Subject: clementine: 1.4.0rc1-484 -> 1.4.0rc1-733

---
 clementine/.footprint | 10 +++++-----
 clementine/.signature |  8 ++++----
 clementine/Pkgfile    | 10 +++++++---
 3 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'clementine')

diff --git a/clementine/.footprint b/clementine/.footprint
index 3fa16cb78..481db5d34 100644
--- a/clementine/.footprint
+++ b/clementine/.footprint
@@ -4,7 +4,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/clementine-tagreader
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
--rw-r--r--	root/root	usr/share/applications/clementine.desktop
+-rw-r--r--	root/root	usr/share/applications/org.clementine_player.Clementine.desktop
 drwxr-xr-x	root/root	usr/share/clementine/
 drwxr-xr-x	root/root	usr/share/clementine/projectm-presets/
 -rw-r--r--	root/root	usr/share/clementine/projectm-presets/Aderrasi - Agitator.milk
@@ -582,17 +582,17 @@ drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/clementine.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/org.clementine_player.Clementine.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/clementine.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/org.clementine_player.Clementine.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/clementine.svg
+-rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/org.clementine_player.Clementine.svg
 drwxr-xr-x	root/root	usr/share/kservices5/
 -rw-r--r--	root/root	usr/share/kservices5/clementine-feed.protocol
 -rw-r--r--	root/root	usr/share/kservices5/clementine-itms.protocol
 -rw-r--r--	root/root	usr/share/kservices5/clementine-itpc.protocol
 -rw-r--r--	root/root	usr/share/kservices5/clementine-zune.protocol
 drwxr-xr-x	root/root	usr/share/metainfo/
--rw-r--r--	root/root	usr/share/metainfo/clementine.appdata.xml
+-rw-r--r--	root/root	usr/share/metainfo/org.clementine_player.Clementine.appdata.xml
diff --git a/clementine/.signature b/clementine/.signature
index 47b2da1f8..22642f29d 100644
--- a/clementine/.signature
+++ b/clementine/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38DFoaOo/hwYwijWVSXGlaWEVKfnysFUzvkuX7CIvakeNHTWuAvPEVnOx4OofU3wfYgfQxSRQ2g8lbVpaZbvVwc=
-SHA256 (Pkgfile) = 3540898ff01543e0304522d21c3a9eb1c5ec2edd44e56259cad8fa6f49b8aae6
-SHA256 (.footprint) = 07474b487f0cefadeb11340667c106af2ef76ecff104ffc38691f945c1d9ec66
-SHA256 (clementine-1.4.0rc1-484.tar.gz) = bb09533e28e2a499427b23458345f1671eacdbbf24b4cbd645a3d4033a9c01c6
+RWSagIOpLGJF396zc2f8Qx15lmEgf7U2ppedcAsjyvmizCk4oCbAwUMXHT3k3jr1OE433gKH/Q36iIMHVhttwXxQdWLcLzuBCAo=
+SHA256 (Pkgfile) = b5c96b6952c6c688dc48fa928a3a0bdde68644dc44922c14ef31614f59943dea
+SHA256 (.footprint) = 7a1b1a4c2faed55f8a14609ac4a658d76a07a42dfac537ab6945a08f29845c05
+SHA256 (clementine-1.4.0rc1-733.tar.gz) = 2925efd227cc9baa435cd2ddb14dc876d2ab4894e796a5a8bfb98f81e81a16f8
 SHA256 (clementine-gcc6.patch) = 05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee
diff --git a/clementine/Pkgfile b/clementine/Pkgfile
index a737d92fc..ce29afb0c 100644
--- a/clementine/Pkgfile
+++ b/clementine/Pkgfile
@@ -4,9 +4,10 @@
 # Depends on: boost crypto++ glew gst-plugins-bad gst-plugins-good gst-plugins-ugly protobuf qt5
 
 name=clementine
-version=1.4.0rc1-484
+version=1.4.0rc1-733
+_tag=$version-g679a0ee54
 release=1
-source=(https://github.com/clementine-player/Clementine/archive/$version-g2d8a56b7c/$name-$version.tar.gz
+source=(https://github.com/clementine-player/Clementine/archive/$_tag/$name-$version.tar.gz
 	clementine-gcc6.patch)
 
 build() {
@@ -15,7 +16,10 @@ build() {
 	# calling ccache and CCACHE_PREFIX
 	PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')
 
-	cmake -S Clementine-$version-g2d8a56b7c -B build -G Ninja \
+	# -Wl,--as-needed breaks linking
+	LDFLAGS=$(echo ${LDFLAGS} | awk -v RS=' ' -v ORS=' ' '/-Wl,--as-needed/ {next} {print}')
+
+	cmake -S Clementine-$_tag -B build -G Ninja \
 		-D CMAKE_INSTALL_PREFIX=/usr \
 		-D CMAKE_BUILD_TYPE=Release \
 		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-- 
cgit v1.2.3