diff --git a/kde/applications/labplot/labplot.py b/kde/applications/labplot/labplot.py index 65be4620..31df3a2e 100644 --- a/kde/applications/labplot/labplot.py +++ b/kde/applications/labplot/labplot.py @@ -1,84 +1,83 @@ import info class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() self.description = "Interactive graphing and analysis of scientific data" self.webpage = "https://labplot.kde.org/" self.displayName = "LabPlot2" for ver in ['2.5.0', '2.6.0', '2.7.0']: self.targets[ver] = 'http://download.kde.org/stable/labplot/%s/labplot-%s.tar.xz' % (ver, ver) for ver in ['2.6.0']: self.targetInstSrc[ver] = 'labplot-2.6' for ver in ['2.5.0', '2.7.0']: self.targetInstSrc[ver] = 'labplot-%s' % ver self.defaultTarget = 'master' def setDependencies(self): self.runtimeDependencies["virtual/base"] = None self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None self.buildDependencies["dev-utils/png2ico"] = None self.runtimeDependencies["libs/gsl"] = None self.runtimeDependencies["libs/cfitsio"] = None self.runtimeDependencies["libs/libfftw"] = None self.runtimeDependencies["libs/liblz4"] = None - self.runtimeDependencies["libs/hdf5"] = None self.runtimeDependencies["libs/netcdf"] = None + self.runtimeDependencies["kde/applications/cantor"] = None self.runtimeDependencies["libs/qt5/qtserialport"] = None self.runtimeDependencies["kde/frameworks/tier1/karchive"] = None self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = None self.runtimeDependencies["kde/frameworks/tier1/ki18n"] = None self.runtimeDependencies["kde/frameworks/tier1/sonnet"] = None self.runtimeDependencies["kde/frameworks/tier1/kcoreaddons"] = None self.runtimeDependencies["kde/frameworks/tier1/syntax-highlighting"] = None self.runtimeDependencies["kde/frameworks/tier2/kcrash"] = None self.runtimeDependencies["kde/frameworks/tier2/kdoctools"] = None self.runtimeDependencies["kde/frameworks/tier3/kdeclarative"] = None self.runtimeDependencies["kde/frameworks/tier3/kio"] = None self.runtimeDependencies["kde/frameworks/tier3/knewstuff"] = None self.runtimeDependencies["kde/frameworks/tier4/kdelibs4support"] = None - self.runtimeDependencies["kde/applications/cantor"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) self.subinfo.options.configure.args += "-DENABLE_TESTS=OFF" def createPackage(self): self.blacklist_file.append(os.path.join(self.packageDir(), 'blacklist.txt')) self.defines["appname"] = "labplot2" self.defines["website"] = "https://labplot.kde.org/" self.defines["executable"] = "bin\\labplot2.exe" self.defines["shortcuts"] = [{"name" : "LabPlot2", "target" : "bin/labplot2.exe", "description" : self.subinfo.description, "icon" : "$INSTDIR\\labplot2.ico" }] self.defines["icon"] = os.path.join(self.packageDir(), "labplot2.ico") #self.defines["icon_png"] = os.path.join(self.packageDir(), ".assets", "150-apps-okular.png") #self.defines["icon_png_44"] = os.path.join(self.packageDir(), ".assets", "44-apps-okular.png") # TODO #self.defines["registry_hook"] = ("""WriteRegStr SHCTX "Software\\Classes\\*\\shell\\EditWithKate" "" "Edit with Kate"\n""" # """WriteRegStr SHCTX "Software\\Classes\\*\\shell\\EditWithKate\\command" "" '"$INSTDIR\\bin\\kate.exe" "%V"'\n""") self.defines["mimetypes"] = ["application/x-labplot2"] self.defines["file_types"] = [".lml"] self.ignoredPackages.append("binary/mysql") self.ignoredPackages.append("binary/r-base") self.ignoredPackages.append("kde/frameworks/kemoticons") self.ignoredPackages.append("kde/frameworks/kdesignerplugin") self.ignoredPackages.append("libs/dbus") self.ignoredPackages.append("libs/llvm-meta") if isinstance(self, AppxPackager): self.defines["display_name"] = "LabPlot" #return super().createPackage() return TypePackager.createPackage(self) diff --git a/libs/netcdf/netcdf.py b/libs/netcdf/netcdf.py index 58a272b2..69854734 100644 --- a/libs/netcdf/netcdf.py +++ b/libs/netcdf/netcdf.py @@ -1,38 +1,38 @@ import info from Package.CMakePackageBase import * class subinfo(info.infoclass): def setTargets(self): self.svnTargets['master'] = "[git]https://github.com/Unidata/netcdf-c.git" for ver in ["4.6.0", "4.7.3"]: self.targets[ver] = f"https://github.com/Unidata/netcdf-c/archive/v{ver}.tar.gz" self.archiveNames[ver] = f"v{ver}.tar.gz" self.targetInstSrc[ver] = f"netcdf-c-{ver}" self.targetDigests['4.6.0'] = ( ['6d740356399aac12290650325a05aec2fe92c1905df10761b2b0100994197725'], CraftHash.HashAlgorithm.SHA256) self.targetDigests['4.7.3'] = ( ['05d064a2d55147b83feff3747bea13deb77bef390cb562df4f9f9f1ce147840d'], CraftHash.HashAlgorithm.SHA256) self.description = 'A set of software libraries and self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data' self.defaultTarget = '4.7.3' def setDependencies(self): self.runtimeDependencies["virtual/base"] = None - self.runtimeDependencies["libs/hdf5"] = None + self.buildDependencies["libs/hdf5"] = None self.runtimeDependencies["libs/libcurl"] = None class Package(CMakePackageBase): def __init__(self, **args): CMakePackageBase.__init__(self) self.supportsNinja = False if CraftCore.compiler.isMSVC(): self.subinfo.options.make.supportsMultijob = False hdf5dir = os.path.join(CraftStandardDirs.craftRoot(), "cmake", "hdf5") # -DBUILD_TESTSETS=OFF -DENABLE_PARALLEL_TESTS=OFF -DENABLE_UNIT_TESTS=OFF self.subinfo.options.configure.args = f"-DHDF5_DIR={hdf5dir} -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF" if CraftCore.compiler.isMSVC(): self.subinfo.options.configure.args += " -DCMAKE_CXX_FLAGS='-DH5_BUILT_AS_DYNAMIC_LIB'" def createPackage(self): self.ignoredPackages.append("libs/dbus") return TypePackager.createPackage(self)