diff --git a/extragear/atcore/atcore.py b/extragear/atcore/atcore.py index ed071d95..dcf490d3 100644 --- a/extragear/atcore/atcore.py +++ b/extragear/atcore/atcore.py @@ -1,36 +1,34 @@ import info class subinfo(info.infoclass): def setTargets(self): self.svnTargets['master'] = 'git://anongit.kde.org/atcore|master' self.svnTargets['1.0'] = 'git://anongit.kde.org/atcore|1.0' self.defaultTarget = '1.0' self.displayName = "AtCoreTest" + self.webpage = "https://atelier.kde.org" self.description = "The KDE core of Atelier Printer Host" def setDependencies(self): - self.buildDependencies["kde/frameworks/extra-cmake-modules"] = "default" - self.runtimeDependencies["libs/qt5/qtbase"] = "default" - self.runtimeDependencies["libs/qt5/qtserialport"] = "default" - self.runtimeDependencies["libs/qt5/qtcharts"] = "default" + self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None + self.runtimeDependencies["libs/qt5/qtbase"] = None + self.runtimeDependencies["libs/qt5/qtserialport"] = None + self.runtimeDependencies["libs/qt5/qtcharts"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) if self.buildTarget != "1.0": self.subinfo.options.configure.args = "-DBUILD_GUI=ON " - self.blacklist_file.append(os.path.join(self.packageDir(), 'blacklist.txt')) - def createPackage(self): + self.blacklist_file.append(os.path.join(self.packageDir(), 'blacklist.txt')) self.defines["executable"] = "bin\\atcore-gui.exe" self.defines["appname"] = "atcore-gui" - self.defines["website"] = "https://atelier.kde.org" self.defines["icon"] = os.path.join(self.packageDir(), "atcore.ico") - - return TypePackager.createPackage(self) + return super().createPackage() diff --git a/extragear/atelier/atelier.py b/extragear/atelier/atelier.py index ddf65f2e..ac158036 100644 --- a/extragear/atelier/atelier.py +++ b/extragear/atelier/atelier.py @@ -1,40 +1,39 @@ import info from CraftConfig import * from CraftOS.osutils import OsUtils class subinfo( info.infoclass ): def setTargets( self ): self.svnTargets[ 'master' ] = 'git://anongit.kde.org/atelier|master' self.defaultTarget = 'master' self.description = 'Atelier Printer Host' + self.webpage = "https://atelier.kde.org" self.displayName = "Atelier" def setDependencies( self ): - self.buildDependencies["kde/frameworks/extra-cmake-modules"] = "default" - self.runtimeDependencies["kde/frameworks/tier1/ki18n"] = "default" - self.runtimeDependencies["kde/frameworks/tier3/kconfigwidgets"] = "default" - self.runtimeDependencies["kde/frameworks/tier3/kxmlgui"] = "default" - self.runtimeDependencies["kde/frameworks/tier3/ktexteditor"] = "default" + self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None + self.runtimeDependencies["kde/frameworks/tier1/ki18n"] = None + self.runtimeDependencies["kde/frameworks/tier3/kconfigwidgets"] = None + self.runtimeDependencies["kde/frameworks/tier3/kxmlgui"] = None + self.runtimeDependencies["kde/frameworks/tier3/ktexteditor"] = None self.runtimeDependencies["extragear/atcore"] = "master" - self.runtimeDependencies["libs/qt5/qtbase"] = "default" - self.runtimeDependencies["libs/qt5/qtserialport"] = "default" - self.runtimeDependencies["libs/qt5/qtcharts"] = "default" - self.runtimeDependencies["libs/qt5/qt3d"] = "default" - self.runtimeDependencies["libs/qt5/qtmultimedia"] = "default" - self.runtimeDependencies["kdesupport/qwt"] = "default" + self.runtimeDependencies["libs/qt5/qtbase"] = None + self.runtimeDependencies["libs/qt5/qtserialport"] = None + self.runtimeDependencies["libs/qt5/qtcharts"] = None + self.runtimeDependencies["libs/qt5/qt3d"] = None + self.runtimeDependencies["libs/qt5/qtmultimedia"] = None + self.runtimeDependencies["kdesupport/qwt"] = None from Package.CMakePackageBase import * class Package( CMakePackageBase ): def __init__(self): CMakePackageBase.__init__(self) - self.blacklist_file.append(os.path.join(self.packageDir(), 'blacklist.txt')) def createPackage(self): + self.blacklist_file.append(os.path.join(self.packageDir(), 'blacklist.txt')) self.defines[ "executable" ] = "bin\\atelier.exe" - self.defines[ "version" ] = "1.0" - self.defines[ "website" ] = "https://atelier.kde.org" self.defines[ "icon" ] = os.path.join(self.packageDir(), "atelier.ico") - return TypePackager.createPackage(self) + return super().createPackage()