[arch-commits] Commit in amarok/repos/extra-x86_64 (8 files)

Antonio Rojas arojas at archlinux.org
Wed Dec 20 19:08:35 UTC 2017


    Date: Wednesday, December 20, 2017 @ 19:08:34
  Author: arojas
Revision: 313415

archrelease: copy trunk to extra-x86_64

Added:
  amarok/repos/extra-x86_64/PKGBUILD
    (from rev 313414, amarok/trunk/PKGBUILD)
  amarok/repos/extra-x86_64/amarok-no-qtwebkit.patch
    (from rev 313414, amarok/trunk/amarok-no-qtwebkit.patch)
  amarok/repos/extra-x86_64/amarok-plasma5.7.patch
    (from rev 313414, amarok/trunk/amarok-plasma5.7.patch)
  amarok/repos/extra-x86_64/taglib_version_detect.patch
    (from rev 313414, amarok/trunk/taglib_version_detect.patch)
Deleted:
  amarok/repos/extra-x86_64/PKGBUILD
  amarok/repos/extra-x86_64/amarok-no-qtwebkit.patch
  amarok/repos/extra-x86_64/amarok-plasma5.7.patch
  amarok/repos/extra-x86_64/taglib_version_detect.patch

-----------------------------+
 PKGBUILD                    |  117 ++++++++++++++++++++----------------------
 amarok-no-qtwebkit.patch    |   78 ++++++++++++++--------------
 amarok-plasma5.7.patch      |   36 ++++++------
 taglib_version_detect.patch |   52 +++++++++---------
 4 files changed, 141 insertions(+), 142 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-20 19:07:51 UTC (rev 313414)
+++ PKGBUILD	2017-12-20 19:08:34 UTC (rev 313415)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=amarok
-pkgver=2.8.0
-pkgrel=17
-pkgdesc="The powerful music player for KDE"
-arch=("x86_64")
-url="http://amarok.kde.org/"
-license=('GPL2' 'LGPL2.1' 'FDL')
-depends=('kdebase-runtime' 'mariadb' 'taglib-extras'
-        'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'qtscriptgenerator')
-makedepends=('automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' 'libmygpo-qt')
-optdepends=("libgpod: support for Apple iPod audio devices"
-            "libmtp: support for portable media devices"
-            "loudmouth: backend needed by mp3tunes for syncing"
-            "ifuse: support for Apple iPod Touch and iPhone"
-            "libmygpo-qt: gpodder.net Internet Service"
-            "gst-libav: MP3 codecs"
-            "audiocd-kio4: audio CD support")
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        taglib_version_detect.patch amarok-ffmpeg3.patch::"https://git.reviewboard.kde.org/r/126682/diff/raw/"
-        amarok-no-qtwebkit.patch amarok-plasma5.7.patch)
-sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
-          '8b2752a0fe78621bdb9ccdb763919ea265b52b06'
-          '819cb060cd9c63b576cc433f835cb4c175b07fd0'
-          '9f905eba9e5ead6d704f0cd28e389857c29dc15d'
-          '9908c154bf583a1755acf59f9d2790aaff503162')
-
-prepare() {
-  mkdir build
-
-  cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../taglib_version_detect.patch
-# Fix build against ffmpeg 3.0
-  patch -p1 -i ../amarok-ffmpeg3.patch
-# Disable applets that require qtwebkit
-  patch -p1 -i ../amarok-no-qtwebkit.patch
-# Fix tooltips MPRIS controls in Plasma 5.7
-  patch -p1 -i ../amarok-plasma5.7.patch
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_NepomukCore=OFF \
-    -DWITH_Soprano=OFF
-  make
-}
-
-package(){
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Copied: amarok/repos/extra-x86_64/PKGBUILD (from rev 313414, amarok/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-12-20 19:08:34 UTC (rev 313415)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=amarok
+pkgver=2.8.0
+pkgrel=18
+pkgdesc="The powerful music player for KDE"
+arch=("x86_64")
+url="http://amarok.kde.org/"
+license=('GPL2' 'LGPL2.1' 'FDL')
+depends=('kdebase-runtime' 'mariadb' 'taglib-extras'
+        'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'qtscriptgenerator')
+makedepends=('automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' 'libmygpo-qt')
+optdepends=("libgpod: support for Apple iPod audio devices"
+            "libmtp: support for portable media devices"
+            "loudmouth: backend needed by mp3tunes for syncing"
+            "ifuse: support for Apple iPod Touch and iPhone"
+            "libmygpo-qt: gpodder.net Internet Service"
+            "gst-libav: MP3 codecs")
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+        taglib_version_detect.patch amarok-ffmpeg3.patch::"https://git.reviewboard.kde.org/r/126682/diff/raw/"
+        amarok-no-qtwebkit.patch amarok-plasma5.7.patch)
+sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
+          '8b2752a0fe78621bdb9ccdb763919ea265b52b06'
+          '819cb060cd9c63b576cc433f835cb4c175b07fd0'
+          '9f905eba9e5ead6d704f0cd28e389857c29dc15d'
+          '9908c154bf583a1755acf59f9d2790aaff503162')
+
+prepare() {
+  mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../taglib_version_detect.patch
+# Fix build against ffmpeg 3.0
+  patch -p1 -i ../amarok-ffmpeg3.patch
+# Disable applets that require qtwebkit
+  patch -p1 -i ../amarok-no-qtwebkit.patch
+# Fix tooltips MPRIS controls in Plasma 5.7
+  patch -p1 -i ../amarok-plasma5.7.patch
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_NepomukCore=OFF \
+    -DWITH_Soprano=OFF
+  make
+}
+
+package(){
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Deleted: amarok-no-qtwebkit.patch
===================================================================
--- amarok-no-qtwebkit.patch	2017-12-20 19:07:51 UTC (rev 313414)
+++ amarok-no-qtwebkit.patch	2017-12-20 19:08:34 UTC (rev 313415)
@@ -1,39 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9094f5e332..a7d5d106a4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -84,7 +84,7 @@ include_directories(
-     ${CMAKE_CURRENT_BINARY_DIR}/shared
- )
- 
--find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml QtWebKit REQUIRED )
-+find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml REQUIRED )
- find_package( KDE4 4.8.4 REQUIRED )
- 
- include( KDE4Defaults )
-diff --git a/src/context/applets/CMakeLists.txt b/src/context/applets/CMakeLists.txt
-index f4d5456d9f..cad9036681 100644
---- a/src/context/applets/CMakeLists.txt
-+++ b/src/context/applets/CMakeLists.txt
-@@ -1,18 +1,18 @@
- add_subdirectory( albums )
- add_subdirectory( currenttrack )
--add_subdirectory( info )
-+# add_subdirectory( info )
- add_subdirectory( labels )
- add_subdirectory( lyrics )
- add_subdirectory( photos )
- add_subdirectory( tabs )
--add_subdirectory( wikipedia )
-+# add_subdirectory( wikipedia )
- 
- if( QT_QTOPENGL_FOUND )
-     add_subdirectory( analyzer )
- endif()
- 
- if( LIBLASTFM_FOUND )
--    add_subdirectory( upcomingevents )
-+#    add_subdirectory( upcomingevents )
-     add_subdirectory( similarartists )
- endif()
- 

Copied: amarok/repos/extra-x86_64/amarok-no-qtwebkit.patch (from rev 313414, amarok/trunk/amarok-no-qtwebkit.patch)
===================================================================
--- amarok-no-qtwebkit.patch	                        (rev 0)
+++ amarok-no-qtwebkit.patch	2017-12-20 19:08:34 UTC (rev 313415)
@@ -0,0 +1,39 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9094f5e332..a7d5d106a4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,7 +84,7 @@ include_directories(
+     ${CMAKE_CURRENT_BINARY_DIR}/shared
+ )
+ 
+-find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml QtWebKit REQUIRED )
++find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml REQUIRED )
+ find_package( KDE4 4.8.4 REQUIRED )
+ 
+ include( KDE4Defaults )
+diff --git a/src/context/applets/CMakeLists.txt b/src/context/applets/CMakeLists.txt
+index f4d5456d9f..cad9036681 100644
+--- a/src/context/applets/CMakeLists.txt
++++ b/src/context/applets/CMakeLists.txt
+@@ -1,18 +1,18 @@
+ add_subdirectory( albums )
+ add_subdirectory( currenttrack )
+-add_subdirectory( info )
++# add_subdirectory( info )
+ add_subdirectory( labels )
+ add_subdirectory( lyrics )
+ add_subdirectory( photos )
+ add_subdirectory( tabs )
+-add_subdirectory( wikipedia )
++# add_subdirectory( wikipedia )
+ 
+ if( QT_QTOPENGL_FOUND )
+     add_subdirectory( analyzer )
+ endif()
+ 
+ if( LIBLASTFM_FOUND )
+-    add_subdirectory( upcomingevents )
++#    add_subdirectory( upcomingevents )
+     add_subdirectory( similarartists )
+ endif()
+ 

Deleted: amarok-plasma5.7.patch
===================================================================
--- amarok-plasma5.7.patch	2017-12-20 19:07:51 UTC (rev 313414)
+++ amarok-plasma5.7.patch	2017-12-20 19:08:34 UTC (rev 313415)
@@ -1,18 +0,0 @@
-diff --git a/src/dbus/mpris2/MediaPlayer2.cpp b/src/dbus/mpris2/MediaPlayer2.cpp
-index cbe1a2a..a1d1bda 100644
---- a/src/dbus/mpris2/MediaPlayer2.cpp
-+++ b/src/dbus/mpris2/MediaPlayer2.cpp
-@@ -94,11 +94,7 @@ QString MediaPlayer2::Identity() const
- 
- QString MediaPlayer2::DesktopEntry() const
- {
--    // Amarok desktop file is installed in $prefix/share/applications/kde4/
--    // rather than in $prefix/share/applications. The standard way to
--    // represent this dir is with a "kde4-" prefix. See:
--    // http://standards.freedesktop.org/menu-spec/1.0/go01.html#term-desktop-file-id
--    return QLatin1String("kde4-amarok");
-+    return QLatin1String("amarok");
- }
- 
- QStringList MediaPlayer2::SupportedUriSchemes() const
-

Copied: amarok/repos/extra-x86_64/amarok-plasma5.7.patch (from rev 313414, amarok/trunk/amarok-plasma5.7.patch)
===================================================================
--- amarok-plasma5.7.patch	                        (rev 0)
+++ amarok-plasma5.7.patch	2017-12-20 19:08:34 UTC (rev 313415)
@@ -0,0 +1,18 @@
+diff --git a/src/dbus/mpris2/MediaPlayer2.cpp b/src/dbus/mpris2/MediaPlayer2.cpp
+index cbe1a2a..a1d1bda 100644
+--- a/src/dbus/mpris2/MediaPlayer2.cpp
++++ b/src/dbus/mpris2/MediaPlayer2.cpp
+@@ -94,11 +94,7 @@ QString MediaPlayer2::Identity() const
+ 
+ QString MediaPlayer2::DesktopEntry() const
+ {
+-    // Amarok desktop file is installed in $prefix/share/applications/kde4/
+-    // rather than in $prefix/share/applications. The standard way to
+-    // represent this dir is with a "kde4-" prefix. See:
+-    // http://standards.freedesktop.org/menu-spec/1.0/go01.html#term-desktop-file-id
+-    return QLatin1String("kde4-amarok");
++    return QLatin1String("amarok");
+ }
+ 
+ QStringList MediaPlayer2::SupportedUriSchemes() const
+

Deleted: taglib_version_detect.patch
===================================================================
--- taglib_version_detect.patch	2017-12-20 19:07:51 UTC (rev 313414)
+++ taglib_version_detect.patch	2017-12-20 19:08:34 UTC (rev 313415)
@@ -1,26 +0,0 @@
-diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
-index 76b83ac..21a10a8 100644
---- a/cmake/modules/FindTaglib.cmake
-+++ b/cmake/modules/FindTaglib.cmake
-@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
- 
-   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
- 
--  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
-      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
-      set(TAGLIB_FOUND FALSE)
--  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
-+  else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
- 
-      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
- 
-@@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
-         set(TAGLIB_FOUND TRUE)
-      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
-      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
--  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
-+  endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) 
-   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
- 
- else(TAGLIBCONFIG_EXECUTABLE)

Copied: amarok/repos/extra-x86_64/taglib_version_detect.patch (from rev 313414, amarok/trunk/taglib_version_detect.patch)
===================================================================
--- taglib_version_detect.patch	                        (rev 0)
+++ taglib_version_detect.patch	2017-12-20 19:08:34 UTC (rev 313415)
@@ -0,0 +1,26 @@
+diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+index 76b83ac..21a10a8 100644
+--- a/cmake/modules/FindTaglib.cmake
++++ b/cmake/modules/FindTaglib.cmake
+@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
+ 
+   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+ 
+-  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+      set(TAGLIB_FOUND FALSE)
+-  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ 
+      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+ 
+@@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
+         set(TAGLIB_FOUND TRUE)
+      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
++  endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) 
+   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+ 
+ else(TAGLIBCONFIG_EXECUTABLE)



More information about the arch-commits mailing list