diff options
-rw-r--r-- | .SRCINFO | 32 | ||||
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | PKGBUILD | 88 | ||||
-rw-r--r-- | kscd.cpp.patch | 22 | ||||
-rw-r--r-- | kscd.kcfg.patch | 13 | ||||
-rw-r--r-- | qurl.patch | 12 |
6 files changed, 133 insertions, 37 deletions
@@ -1,26 +1,42 @@ -# Generated by mksrcinfo v8 -# Tue Feb 12 15:33:51 UTC 2019 pkgbase = kscd-git pkgdesc = KDE CD player. (GIT version) - pkgver = v17.08.3.24.gaf73a1c + pkgver = 17.08.3.24.gaf73a1c pkgrel = 1 - url = https://www.kde.org/applications/multimedia/kscd/ + url = https://kde.org/applications/en/unmaintained/org.kde.kscd arch = x86_64 license = GPL2 + checkdepends = appstream makedepends = extra-cmake-modules makedepends = git + makedepends = qt5-tools makedepends = python + depends = gcc-libs + depends = glibc + depends = qt5-base + depends = qt5-svg + depends = kconfig5 + depends = kconfigwidgets5 + depends = kcoreaddons5 + depends = kdbusaddons5 + depends = ki18n5 + depends = kwidgetsaddons5 depends = phonon-qt5 - depends = solid - depends = kxmlgui + depends = solid5 + depends = kxmlgui5 depends = libdiscid depends = libmusicbrainz5 + depends = libmusicbrainz5.so depends = hicolor-icon-theme provides = kscd conflicts = kdemultimedia-kscd conflicts = kscd - source = git://anongit.kde.org/kscd.git#branch=kf5 + source = git+https://invent.kde.org/multimedia/kscd.git#branch=kf5 + source = qurl.patch + source = kscd.kcfg.patch + source = kscd.cpp.patch sha256sums = SKIP + sha256sums = d1c8a39c0e7a45b71224a167064c14d7f204102197d879a0a0f2aa25c17eaa88 + sha256sums = b9646957cf85c8f08930c38a353f22246332b35bde5914b32ae1d3a20eb1302e + sha256sums = ed6024197b4775895dc8f8c8ee55a69e4463eaccc18a44b5e65cd0d4ccde2c92 pkgname = kscd-git - diff --git a/.gitignore b/.gitignore index 05c6d4d4c97b..dc95da15535a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ !.gitignore !.SRCINFO !PKGBUILD +!kscd.cpp.patch +!kscd.kcfg.patch +!qurl.patch @@ -1,52 +1,82 @@ # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com> pkgname=kscd-git -pkgver=v17.08.3.24.gaf73a1c +pkgver=17.08.3.24.gaf73a1c pkgrel=1 pkgdesc="KDE CD player. (GIT version)" arch=('x86_64') -url='https://www.kde.org/applications/multimedia/kscd/' +url='https://kde.org/applications/en/unmaintained/org.kde.kscd' license=('GPL2') -depends=('phonon-qt5' - 'solid' - 'kxmlgui' - 'libdiscid' - 'libmusicbrainz5' - 'hicolor-icon-theme' - ) -conflicts=('kdemultimedia-kscd' - 'kscd' - ) +depends=( + 'gcc-libs' # libgcc_s.so libstdc++.so + 'glibc' # libc.so libm.so + 'qt5-base' # libQt5Core.so libQt5DBus.so libQt5Gui.so libQt5Widgets.so + 'qt5-svg' # libQt5Svg.so + 'kconfig5' # libKF5ConfigCore.so libKF5ConfigGui.so + 'kconfigwidgets5' # libKF5ConfigWidgets.so + 'kcoreaddons5' # libKF5CoreAddons.so + 'kdbusaddons5' # libKF5DBusAddons.so + 'ki18n5' # libKF5I18n.so + 'kwidgetsaddons5' # libKF5WidgetsAddons.so + 'phonon-qt5' # libphonon4qt5.so + 'solid5' # libKF5Solid.so + 'kxmlgui5' # libKF5XmlGui.so + 'libdiscid' # libdiscid.so + 'libmusicbrainz5' 'libmusicbrainz5.so' + 'hicolor-icon-theme' +) +makedepends=( + 'extra-cmake-modules' + 'git' + 'qt5-tools' + 'python' +) +checkdepends=('appstream') +conflicts=( + 'kdemultimedia-kscd' + 'kscd' +) provides=('kscd') -makedepends=('extra-cmake-modules' - 'git' - 'python' - ) -source=('git://anongit.kde.org/kscd.git#branch=kf5') -sha256sums=('SKIP') +source=( + 'git+https://invent.kde.org/multimedia/kscd.git#branch=kf5' + 'qurl.patch' + 'kscd.kcfg.patch' + 'kscd.cpp.patch' +) +sha256sums=( + 'SKIP' + 'd1c8a39c0e7a45b71224a167064c14d7f204102197d879a0a0f2aa25c17eaa88' + 'b9646957cf85c8f08930c38a353f22246332b35bde5914b32ae1d3a20eb1302e' + 'ed6024197b4775895dc8f8c8ee55a69e4463eaccc18a44b5e65cd0d4ccde2c92' +) -pkgver() { +pkgver(){ cd kscd # _ver="$(cat CMakeLists.txt | grep -m3 -e MAJOR -e MINOR -e RELEASE | cut -d '"' -f2 | paste -sd'.')" # echo "${_ver}.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" - echo "$(git describe --long --tags | tr - .)" + echo "$(git describe --long --tags | tr - . | tr -d v)" } -prepare() { - mkdir -p build +prepare(){ + patch -d kscd -p1 -i "${srcdir}/qurl.patch" + patch -d kscd -p1 -i "${srcdir}/kscd.kcfg.patch" + patch -d kscd -p1 -i "${srcdir}/kscd.cpp.patch" } -build() { - cd build - cmake ../kscd \ +build(){ + cmake -S kscd -B build \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DKDE_INSTALL_LIBDIR=lib \ - -DBUILD_TESTING=OFF + -DBUILD_TESTING=ON - make + LC_ALL=C cmake --build build } -package() { - make -C build DESTDIR="${pkgdir}" install +check(){ + ctest --test-dir build --output-on-failure +} + +package(){ + DESTDIR="${pkgdir}" cmake --install build } diff --git a/kscd.cpp.patch b/kscd.cpp.patch new file mode 100644 index 000000000000..656a9451ee8f --- /dev/null +++ b/kscd.cpp.patch @@ -0,0 +1,22 @@ +diff --git a/kscd.cpp b/kscd.cpp +index d8996f1..1827a5c 100644 +--- a/kscd.cpp ++++ b/kscd.cpp +@@ -337,7 +337,7 @@ void KSCD::changeVolume(qreal value) + + void KSCD::configureShortcuts() + { +- KShortcutsDialog::configure(m_actions, KShortcutsEditor::LetterShortcutsAllowed, this, true); ++ KShortcutsDialog::showDialog(m_actions, KShortcutsEditor::LetterShortcutsAllowed, this); + } + + void KSCD::ejectShortcut() +@@ -761,7 +761,7 @@ void KSCD::writeSettings() + + void KSCD::configureKeys() + { +- KShortcutsDialog::configure(m_actions, KShortcutsEditor::LetterShortcutsAllowed, this, true); ++ KShortcutsDialog::showDialog(m_actions, KShortcutsEditor::LetterShortcutsAllowed, this); + } + + /** diff --git a/kscd.kcfg.patch b/kscd.kcfg.patch new file mode 100644 index 000000000000..5f65b447b15c --- /dev/null +++ b/kscd.kcfg.patch @@ -0,0 +1,13 @@ +diff --git a/kscd.kcfg b/kscd.kcfg +index c6f8daf..8f2f124 100644 +--- a/kscd.kcfg ++++ b/kscd.kcfg +@@ -28,7 +28,7 @@ + <whatsthis>Change the font of the text in the panel</whatsthis> + </entry> + <entry name="url" type="String"> +- <default code="true">QStandardPaths::standardLocations(QStandardPaths::DataLocation).last() + QLatin1String("kscd/skin/default.svg")</default> ++ <default code="true">QStandardPaths::standardLocations(QStandardPaths::DataLocation).last() + QLatin1String("/skin/default.svg")</default> + <label>The skin that will be use for the application</label> + <whatsthis>Change the skin of the application</whatsthis> + </entry> diff --git a/qurl.patch b/qurl.patch new file mode 100644 index 000000000000..07d8a62c85c3 --- /dev/null +++ b/qurl.patch @@ -0,0 +1,12 @@ +diff --git a/mbmanager.cpp b/mbmanager.cpp +index 1f3d245..9f0b301 100644 +--- a/mbmanager.cpp ++++ b/mbmanager.cpp +@@ -32,6 +32,7 @@ + */ + #include "mbmanager.h" + ++#include <QUrl> + #include <QDebug> + #include <QDesktopServices> +
\ No newline at end of file |