[arch-commits] Commit in amarok/trunk (3 files)
Antonio Rojas
arojas at archlinux.org
Mon Mar 5 21:15:43 UTC 2018
Date: Monday, March 5, 2018 @ 21:15:42
Author: arojas
Revision: 317856
Use upstream patches
Modified:
amarok/trunk/PKGBUILD
Deleted:
amarok/trunk/amarok-no-qtwebkit.patch
amarok/trunk/taglib_version_detect.patch
-----------------------------+
PKGBUILD | 31 +++++++++++++++++--------------
amarok-no-qtwebkit.patch | 39 ---------------------------------------
taglib_version_detect.patch | 26 --------------------------
3 files changed, 17 insertions(+), 79 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-05 21:07:35 UTC (rev 317855)
+++ PKGBUILD 2018-03-05 21:15:42 UTC (rev 317856)
@@ -13,20 +13,22 @@
depends=('kdebase-runtime' 'mariadb' 'taglib-extras'
'liblastfm' 'ffmpeg' 'libofa' 'qjson' 'qtscriptgenerator')
makedepends=('automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' 'libmygpo-qt' 'qca-qt4')
-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")
+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')
+ taglib_version_detect.patch::"https://cgit.kde.org/amarok.git/patch/?id=fec8817c"
+ amarok-ffmpeg3.patch::"https://git.reviewboard.kde.org/r/126682/diff/raw/"
+ amarok-no-qtwebkit.patch::"https://cgit.kde.org/amarok.git/patch/?id=d65ce101"
+ amarok-plasma5.7.patch::"https://cgit.kde.org/amarok.git/patch/?id=9449ec56")
+sha256sums=('f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6'
+ 'bd7034e519999b6522e72e3961ca758630ad9b4db88557f795cf08956ea3dfee'
+ 'fbb18f1ff234716f6f8d3afd710b50f337453e536eb8288c3a9c4613edd6570f'
+ '6880a314a437100a3496540f2f9a0f2d14a4ff61deeeee07a42ba3f4beb1432b'
+ 'acc0fa104c99be046fa07b01a142f77c323b99943833d2e2139bfdcbec39e4a5')
prepare() {
mkdir build
@@ -48,7 +50,8 @@
-DKDE4_BUILD_TESTS=OFF \
-DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_NepomukCore=OFF \
- -DWITH_Soprano=OFF
+ -DWITH_Soprano=OFF \
+ -DWITH_QTWEBKIT=OFF
make
}
Deleted: amarok-no-qtwebkit.patch
===================================================================
--- amarok-no-qtwebkit.patch 2018-03-05 21:07:35 UTC (rev 317855)
+++ amarok-no-qtwebkit.patch 2018-03-05 21:15:42 UTC (rev 317856)
@@ -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()
-
Deleted: taglib_version_detect.patch
===================================================================
--- taglib_version_detect.patch 2018-03-05 21:07:35 UTC (rev 317855)
+++ taglib_version_detect.patch 2018-03-05 21:15:42 UTC (rev 317856)
@@ -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)
More information about the arch-commits
mailing list