From 56edc90808313680dc35e28ce2f3f92c0d22f4e0 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 12 Jan 2020 16:38:39 +1100 Subject: [PATCH] clementine: 1.3.1.r771.75f18dab2 -> 1.4.0rc1 --- clementine/.signature | 7 +++---- clementine/Pkgfile | 9 +++------ clementine/clementine-gcc6.patch | 22 ---------------------- 3 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 clementine/clementine-gcc6.patch diff --git a/clementine/.signature b/clementine/.signature index 17067d896..8423df59b 100644 --- a/clementine/.signature +++ b/clementine/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37b3D+PTdECNhPU1z1cIVYLHqeyzKknEwlwZxCgLxdhz4BgGTuRz+BedKyyMhaQ/H6RNQHZHT5bLdGCcBZ3C4wc= -SHA256 (Pkgfile) = 4f5f25aaebc24f1afaa5db367b1536be133fdd12248a1f4f0e6635ec6f9a8c3a +RWSagIOpLGJF3xf8CK49dubDkrvIBHlRorJX018lMUeBMmlWrG0a4F9ISWpnkCKQYPGezfcp6FejfoclVeVomMoNXRfBXDc9Cg8= +SHA256 (Pkgfile) = 3c76ae71451822e0f79e4aead035b5bb03f4556b09036c4fb1b8a5a9995b1548 SHA256 (.footprint) = 07474b487f0cefadeb11340667c106af2ef76ecff104ffc38691f945c1d9ec66 -SHA256 (75f18dab23f0842713a4200a7e362efd51b12e31.zip) = 87a79a39430f3144dedbc5fd8136b815b99665c25792496f3c7e13ff459c89c8 -SHA256 (clementine-gcc6.patch) = 05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee +SHA256 (clementine-1.4.0rc1.tar.gz) = ad493a1954594283d41a1575341118e19098463ba5626a37b893d8384e0a1f7b diff --git a/clementine/Pkgfile b/clementine/Pkgfile index 788315ed2..b4c45af58 100644 --- a/clementine/Pkgfile +++ b/clementine/Pkgfile @@ -5,15 +5,12 @@ # Depends on: boost crypto++ glew gst-plugins-bad gst-plugins-good gst-plugins-ugly protobuf qt5 name=clementine -version=1.3.1.r771.75f18dab2 +version=1.4.0rc1 release=1 -source=(https://github.com/clementine-player/Clementine/archive/75f18dab23f0842713a4200a7e362efd51b12e31.zip - clementine-gcc6.patch) +source=(https://github.com/clementine-player/Clementine/archive/$version/$name-$version.tar.gz) build() { - cd Clementine-75f18dab23f0842713a4200a7e362efd51b12e31 - - patch -p1 -i $SRC/clementine-gcc6.patch + cd Clementine-$version install -d build cd build diff --git a/clementine/clementine-gcc6.patch b/clementine/clementine-gcc6.patch deleted file mode 100644 index 24c38735e..000000000 --- a/clementine/clementine-gcc6.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e31278c05666f8ae0e819bd831c65e8766ba2679 Mon Sep 17 00:00:00 2001 -From: Bigard Florian -Date: Mon, 9 May 2016 11:55:34 +0200 -Subject: [PATCH] Fix projectm compilation with GCC 6 (#5371) - ---- - 3rdparty/libprojectm/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/3rdparty/libprojectm/CMakeLists.txt b/3rdparty/libprojectm/CMakeLists.txt -index e6287f176..0ef785c49 100644 ---- a/3rdparty/libprojectm/CMakeLists.txt -+++ b/3rdparty/libprojectm/CMakeLists.txt -@@ -24,6 +24,8 @@ set(BUILD_PROJECTM_STATIC ON) - set(DISABLE_NATIVE_PRESETS ON) - set(DISABLE_MILKDROP_PRESETS OFF) - -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98") -+ - if(DISABLE_NATIVE_PRESETS) - ADD_DEFINITIONS(-DDISABLE_NATIVE_PRESETS) - endif(DISABLE_NATIVE_PRESETS)