diff --git a/extragear/kdevelop/kdevelop/kdevelop.py b/extragear/kdevelop/kdevelop/kdevelop.py index d12bf3d2..e65c2cfe 100644 --- a/extragear/kdevelop/kdevelop/kdevelop.py +++ b/extragear/kdevelop/kdevelop/kdevelop.py @@ -1,93 +1,88 @@ import info from Blueprints.CraftVersion import CraftVersion import subprocess import sys class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() self.description = "KDE Integrated Development Environment for C/C++/QML/JS/Python/PHP/..." self.webpage = "https://kdevelop.org" self.displayName = "KDevelop" def registerOptions(self): self.options.dynamic.registerOption("fullKDevelop", False) self.options.dynamic.registerOption("fullPlasma", False) def setDependencies(self): self.buildDependencies["virtual/base"] = None self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None self.buildDependencies["dev-utils/7zip"] = None + self.runtimeDependencies["libs/llvm-meta/clang"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["libs/qt5/qtdeclarative"] = None + self.runtimeDependencies["libs/qt5/qtquickcontrols"] = None + self.runtimeDependencies["libs/qt5/qtwebengine"] = None self.runtimeDependencies["kde/frameworks/tier1/breeze-icons"] = None self.runtimeDependencies["kde/frameworks/tier1/karchive"] = None self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = None self.runtimeDependencies["kde/frameworks/tier1/kguiaddons"] = None self.runtimeDependencies["kde/frameworks/tier1/ki18n"] = None self.runtimeDependencies["kde/frameworks/tier3/kiconthemes"] = None self.runtimeDependencies["kde/frameworks/tier3/kinit"] = None self.runtimeDependencies["kde/frameworks/tier1/kitemmodels"] = None self.runtimeDependencies["kde/frameworks/tier1/kitemviews"] = None self.runtimeDependencies["kde/frameworks/tier2/kjobwidgets"] = None self.runtimeDependencies["kde/frameworks/tier3/kcmutils"] = None self.runtimeDependencies["kde/frameworks/tier3/knewstuff"] = None self.runtimeDependencies["kde/frameworks/tier3/knotifyconfig"] = None self.runtimeDependencies["kde/frameworks/tier3/kparts"] = None self.runtimeDependencies["kde/frameworks/tier3/kservice"] = None self.runtimeDependencies["kde/frameworks/tier1/sonnet"] = None self.runtimeDependencies["kde/frameworks/tier3/ktexteditor"] = None self.runtimeDependencies["kde/frameworks/tier1/threadweaver"] = None self.runtimeDependencies["kde/frameworks/tier1/kwindowsystem"] = None self.runtimeDependencies["kde/frameworks/tier3/kxmlgui"] = None self.runtimeDependencies["kde/kdesdk/libkomparediff2"] = None + self.runtimeDependencies["kdesupport/grantlee"] = None self.runtimeDependencies["data/hicolor-icon-theme"] = None - self.runtimeDependencies["libs/llvm-meta/clang"] = None - - # handle kdevplatform merge into kdevelop.git - if self.buildTarget != "master" and CraftVersion(self.buildTarget) < CraftVersion("5.2"): - self.runtimeDependencies["extragear/kdevelop/kdevplatform"] = None - else: - self.runtimeDependencies["libs/qt5/qtquickcontrols"] = None - self.runtimeDependencies["libs/qt5/qtwebengine"] = None - self.runtimeDependencies["kdesupport/grantlee"] = None if self.options.dynamic.fullPlasma: self.runtimeDependencies["kde/frameworks/tier3/krunner"] = None self.runtimeDependencies["kde/frameworks/tier3/plasma-framework"] = None if self.options.dynamic.fullKDevelop: self.packagingDependencies["extragear/kdevelop/kdev-python"] = None self.packagingDependencies["extragear/kdevelop/kdev-php"] = None self.runtimeDependencies["extragear/kdevelop-pg-qt"] = None # Install extra plugins shipped by Kate self.runtimeDependencies["kde/applications/kate"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) def preArchive(self): if CraftVersion(self.buildTarget) > CraftVersion("5.3.0"): installColorSchemesScript = os.path.join(self.sourceDir(), 'release-scripts/install_colorschemes.py') CraftCore.log.info(f"Executing: {installColorSchemesScript}") subprocess.check_call([sys.executable, installColorSchemesScript, os.path.join(self.archiveDir(), "bin/data")]) return super().preArchive() def createPackage(self): self.blacklist_file.append(os.path.join(self.packageDir(), 'blacklist.txt')) self.whitelist_file.append(os.path.join(self.packageDir(), 'whitelist.txt')) self.defines["shortcuts"] = [{"name" : "KDevelop", "target" : "bin/kdevelop.exe"}, {"name" : "KDevelop - Microsoft Visual C++ compiler", "target":"bin/kdevelop-msvc.bat"}] self.defines["icon"] = os.path.join(self.packageDir(), "kdevelop.ico") self.ignoredPackages.append("binary/mysql") return TypePackager.createPackage(self) diff --git a/extragear/kdevelop/kdevplatform/kdevplatform.py b/extragear/kdevelop/kdevplatform/kdevplatform.py deleted file mode 100644 index 3b29721d..00000000 --- a/extragear/kdevelop/kdevplatform/kdevplatform.py +++ /dev/null @@ -1,44 +0,0 @@ -import info - - -class subinfo(info.infoclass): - def setTargets(self): - self.versionInfo.setDefaultValues() - self.description = 'Framework to build IDE-like applications' - - def setDependencies(self): - self.buildDependencies["virtual/base"] = None - self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None - self.buildDependencies["dev-utils/7zip"] = None - self.buildDependencies["libs/boost/boost-headers"] = None - self.runtimeDependencies["libs/qt5/qtquickcontrols"] = None - self.runtimeDependencies["libs/qt5/qtwebkit"] = None - self.runtimeDependencies["libs/qt5/qtbase"] = None - self.runtimeDependencies["kde/frameworks/tier1/karchive"] = None - self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = None - self.runtimeDependencies["kde/frameworks/tier1/kguiaddons"] = None - self.runtimeDependencies["kde/frameworks/tier1/ki18n"] = None - self.runtimeDependencies["kde/frameworks/tier1/kitemmodels"] = None - self.runtimeDependencies["kde/frameworks/tier1/kitemviews"] = None - self.runtimeDependencies["kde/frameworks/tier2/kjobwidgets"] = None - self.runtimeDependencies["kde/frameworks/tier3/kcmutils"] = None - self.runtimeDependencies["kde/frameworks/tier3/knewstuff"] = None - self.runtimeDependencies["kde/frameworks/tier3/knotifyconfig"] = None - self.runtimeDependencies["kde/frameworks/tier3/kparts"] = None - self.runtimeDependencies["kde/frameworks/tier3/kservice"] = None - self.runtimeDependencies["kde/frameworks/tier1/sonnet"] = None - self.runtimeDependencies["kde/frameworks/tier3/ktexteditor"] = None - self.runtimeDependencies["kde/frameworks/tier1/threadweaver"] = None - self.runtimeDependencies["kde/frameworks/tier1/kwindowsystem"] = None - self.runtimeDependencies["kde/frameworks/tier3/kxmlgui"] = None - self.runtimeDependencies["kde/frameworks/tier3/kdeclarative"] = None - self.runtimeDependencies["kde/kdesdk/libkomparediff2"] = None - self.runtimeDependencies["kdesupport/grantlee"] = None - - -from Package.CMakePackageBase import * - - -class Package(CMakePackageBase): - def __init__(self): - CMakePackageBase.__init__(self) diff --git a/extragear/kdevelop/version.ini b/extragear/kdevelop/version.ini index 9defb932..77be06ad 100644 --- a/extragear/kdevelop/version.ini +++ b/extragear/kdevelop/version.ini @@ -1,10 +1,10 @@ [General] name = KDevelop tags = v5.2.1 -branches = master;5.1;5.2;5.3 +branches = master;5.2;5.3 tarballs = 5.2.80;5.3.0;5.3.1 defaulttarget = 5.3.1 tarballUrl = http://download.kde.org/stable/kdevelop/${VERSION}/src/${PACKAGE_NAME}-${VERSION}.tar.xz tarballDigestUrl = http://download.kde.org/stable/kdevelop/${VERSION}/src/${PACKAGE_NAME}-${VERSION}.tar.xz.sha256 tarballInstallSrc = ${PACKAGE_NAME}-${VERSION} gitUrl = git://anongit.kde.org/${PACKAGE_NAME}