[arch-commits] Commit in clementine/repos/community-x86_64 (4 files)

Antonio Rojas arojas at archlinux.org
Tue Mar 3 15:24:56 UTC 2020


    Date: Tuesday, March 3, 2020 @ 15:24:51
  Author: arojas
Revision: 589779

archrelease: copy trunk to community-x86_64

Added:
  clementine/repos/community-x86_64/PKGBUILD
    (from rev 589778, clementine/trunk/PKGBUILD)
  clementine/repos/community-x86_64/clementine-gcc6.patch
    (from rev 589778, clementine/trunk/clementine-gcc6.patch)
Deleted:
  clementine/repos/community-x86_64/PKGBUILD
  clementine/repos/community-x86_64/clementine-gcc6.patch

-----------------------+
 PKGBUILD              |  138 ++++++++++++++----------------------------------
 clementine-gcc6.patch |   44 +++++++--------
 2 files changed, 63 insertions(+), 119 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-03 15:24:20 UTC (rev 589778)
+++ PKGBUILD	2020-03-03 15:24:51 UTC (rev 589779)
@@ -1,97 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: BlackEagle <ike.devolder at gmail.com>
-# Contributor: Dany Martineau <dany.luc.martineau at gmail.com>
-
-pkgname=clementine
-pkgver=1.3.1.r831.664c5a31f
-pkgrel=3
-pkgdesc='A modern music player and library organizer'
-url=https://www.clementine-player.org/
-license=(GPL)
-arch=(x86_64)
-depends=(
-  chromaprint
-  crypto++
-  fftw
-  glew
-  glib2
-  gst-plugins-base-libs
-  gstreamer
-  libcdio
-  libgl
-  libgpod
-  liblastfm-qt5
-  libmtp
-  libmygpo-qt5
-  libpulse
-  libx11
-  protobuf
-  qt5-base
-  qt5-x11extras
-  sqlite
-  zlib
-)
-makedepends=(
-  boost
-  cmake
-  git
-  mesa
-  qt5-tools
-  sparsehash
-)
-optdepends=(
-  'gst-plugins-base: "Base" plugin libraries'
-  'gst-plugins-good: "Good" plugin libraries'
-  'gst-plugins-bad: "Bad" plugin libraries'
-  'gst-plugins-ugly: "Ugly" plugin libraries'
-  'gst-libav: Libav plugin'
-  'gvfs: Various devices support'
-)
-source=(
-  git+https://github.com/clementine-player/Clementine.git#commit=664c5a31f9cf519af5a4c3adcb30dbbc73d037d6
-  clementine-gcc6.patch
-)
-sha256sums=(
-  SKIP
-  05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee
-)
-
-pkgver() {
-  cd Clementine
-
-  git describe --tags | sed 's/-/.r/; s/-g/./'
-}
-
-prepare() {
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build
-
-  cd Clementine
-
-  # Fix build with GCC 6
-  patch -p1 -i ../clementine-gcc6.patch
-  # https://github.com/clementine-player/Clementine/pull/5630
-  git cherry-pick -n 8a6cc8b5069265e1e92e22def985e22c5955e503
-  # FS#58413
-  git cherry-pick -n -m 1 75f9439843a0e9cdc26cd739d5e1dbd93bd974bc
-  # Fix DI.FM
-  git cherry-pick -n ddfa5e63f1ef0e243a007efbe576fceb9b2442e8
-}
-
-build() {
-  cd build
-
-  cmake ../Clementine \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  make DESTDIR="${pkgdir}" -C build install
-}
-
-# vim: ts=2 sw=2 et:

Copied: clementine/repos/community-x86_64/PKGBUILD (from rev 589778, clementine/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-03 15:24:51 UTC (rev 589779)
@@ -0,0 +1,41 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: BlackEagle <ike.devolder at gmail.com>
+# Contributor: Dany Martineau <dany.luc.martineau at gmail.com>
+
+pkgname=clementine
+pkgver=1.4.0rc1
+pkgrel=1
+pkgdesc='A modern music player and library organizer'
+url=https://www.clementine-player.org/
+license=(GPL)
+arch=(x86_64)
+depends=(chromaprint crypto++ glew gst-plugins-base-libs libcdio libgpod liblastfm-qt5 libmtp libmygpo-qt5 protobuf qt5-x11extras)
+makedepends=(boost cmake qt5-tools sparsehash)
+optdepends=(
+  'gst-plugins-base: "Base" plugin libraries'
+  'gst-plugins-good: "Good" plugin libraries'
+  'gst-plugins-bad: "Bad" plugin libraries'
+  'gst-plugins-ugly: "Ugly" plugin libraries'
+  'gst-libav: Libav plugin'
+  'gvfs: Various devices support'
+)
+source=("https://github.com/clementine-player/Clementine/releases/download/$pkgver/$pkgname-$pkgver.tar.xz")
+
+sha256sums=('96ba2f5f3ece47b2c1065e980dcc37ada93ea42cf37b794ee804514ce4a65459')
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  make DESTDIR="$pkgdir" -C build install
+}

Deleted: clementine-gcc6.patch
===================================================================
--- clementine-gcc6.patch	2020-03-03 15:24:20 UTC (rev 589778)
+++ clementine-gcc6.patch	2020-03-03 15:24:51 UTC (rev 589779)
@@ -1,22 +0,0 @@
-From e31278c05666f8ae0e819bd831c65e8766ba2679 Mon Sep 17 00:00:00 2001
-From: Bigard Florian <florian.bigard at gmail.com>
-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)

Copied: clementine/repos/community-x86_64/clementine-gcc6.patch (from rev 589778, clementine/trunk/clementine-gcc6.patch)
===================================================================
--- clementine-gcc6.patch	                        (rev 0)
+++ clementine-gcc6.patch	2020-03-03 15:24:51 UTC (rev 589779)
@@ -0,0 +1,22 @@
+From e31278c05666f8ae0e819bd831c65e8766ba2679 Mon Sep 17 00:00:00 2001
+From: Bigard Florian <florian.bigard at gmail.com>
+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)



More information about the arch-commits mailing list