From f1da4b0afb476e2518110c4ac0e4207bf635c213 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 30 May 2015 14:46:58 +0200 Subject: Deps: remove qt-gstreamer0 from the alldeps and updates build scripts. There is no more need for qt-gstreamer0 in Plasma5 on slackware-current, and the content of this package clashed with the qt-gstreamer package anyway. --- deps/alldeps.SlackBuild | 6 ++++-- deps/updates.SlackBuild | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/deps/alldeps.SlackBuild b/deps/alldeps.SlackBuild index 74c2aa5..85e8519 100755 --- a/deps/alldeps.SlackBuild +++ b/deps/alldeps.SlackBuild @@ -22,7 +22,6 @@ ALLDEPS=" \ eigen2 \ xapian-core \ OpenAL \ - qt-gstreamer0 \ qt-gstreamer \ qjson \ phonon \ @@ -31,7 +30,6 @@ ALLDEPS=" \ PyQt \ PyQt5 \ qca-qt5 \ - akonadi-qt5 \ libdbusmenu-qt5 \ polkit-qt-1 \ polkit-qt5-1 \ @@ -44,6 +42,10 @@ ALLDEPS=" \ libappindicator \ cfitsio \ " + # needed only by future kdepimlibs-framework + #akonadi-qt5 \ + # Not needed, conflicts with qt-gstreamer files + #qt-gstreamer0 \ # Allow for specification of individual packages to be built: if [ -z "$1" ]; then diff --git a/deps/updates.SlackBuild b/deps/updates.SlackBuild index 22dfb2f..1bfe358 100755 --- a/deps/updates.SlackBuild +++ b/deps/updates.SlackBuild @@ -24,7 +24,6 @@ ALLDEPS=" \ qt5 \ qca-qt5 \ libdbusmenu-qt5 \ - qt-gstreamer0 \ qt-gstreamer \ phonon \ phonon-gstreamer \ @@ -41,6 +40,8 @@ ALLDEPS=" \ " # needed only by future kdepimlibs-framework #akonadi-qt5 \ + # Not needed, conflicts with qt-gstreamer files + #qt-gstreamer0 \ # Allow for specification of individual packages to be built: if [ -z "$1" ]; then -- cgit v1.2.3