diff --git a/libs/qt5/qtwebkit/qtwebkit.py b/libs/qt5/qtwebkit/qtwebkit.py index b69cf2a9..c789b51b 100644 --- a/libs/qt5/qtwebkit/qtwebkit.py +++ b/libs/qt5/qtwebkit/qtwebkit.py @@ -1,76 +1,76 @@ # -*- coding: utf-8 -*- import info class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() for ver in self.versionInfo.branches(): self.patchToApply[ver] = [("build-with-mysql.diff", 1), ("disable-icu-test.diff", 1)] - branchRegEx = re.compile("\d\.\d\.\d") + branchRegEx = re.compile("\d\.\d+\.\d+") for ver in self.versionInfo.tarballs(): branch = branchRegEx.findall(ver)[0][:-2] del self.targets[ver] if ver in self.targetInstSrc: del self.targetInstSrc[ver] self.svnTargets[ver] = self.svnTargets[branch] self.patchToApply[ver] = self.patchToApply[branch] for ver in self.versionInfo.tags(): branch = branchRegEx.findall(ver)[0][:-2] self.svnTargets[ver] = self.svnTargets[branch] self.patchToApply[ver] = self.patchToApply[branch] def setDependencies(self): self.runtimeDependencies["win32libs/sqlite"] = "default" self.runtimeDependencies["win32libs/icu"] = "default" self.runtimeDependencies["win32libs/libxslt"] = "default" self.runtimeDependencies["win32libs/libxml2"] = "default" self.runtimeDependencies["win32libs/zlib"] = "default" self.runtimeDependencies["libs/qt5/qtbase"] = "default" self.runtimeDependencies["libs/qt5/qtscript"] = "default" self.runtimeDependencies["libs/qt5/qtdeclarative"] = "default" self.runtimeDependencies["libs/qt5/qtmultimedia"] = "default" self.runtimeDependencies["libs/qt5/qtwebchannel"] = "default" self.runtimeDependencies["libs/qt5/qtsensors"] = "default" self.buildDependencies["dev-util/ruby"] = "default" self.buildDependencies["dev-util/winflexbison"] = "default" self.buildDependencies["gnuwin32/gperf"] = "default" from Package.Qt5CorePackageBase import * class QtPackage(Qt5CorePackageBase): def __init__(self, **args): Qt5CorePackageBase.__init__(self) self.subinfo.options.configure.args = "" if OsUtils.isWin(): self.subinfo.options.configure.args += """ "QT_CONFIG+=no-pkg-config" """ if CraftCore.compiler.isMinGW(): self.subinfo.options.configure.args += """ "QMAKE_CXXFLAGS += -g0 -O3" """ self.subinfo.options.configure.args += """ "WEBKIT_CONFIG-=geolocation" """ def fetch(self): print(self.sourceDir()) if os.path.exists(self.sourceDir()): self.system(["git", "reset", "--hard"], cwd=self.sourceDir()) return Qt5CorePackageBase.fetch(self) def configure(self, configureDefines=""): with utils.ScopedEnv({"SQLITE3SRCDIR" : CraftPackageObject.get("win32libs/sqlite").instance.sourceDir()}): if not len(self.subinfo.buildTarget) == 3: # 5.9 with open(os.path.join(self.sourceDir(), ".qmake.conf"), "rt+") as conf: text = conf.read() text = re.sub(re.compile(r"MODULE_VERSION = \d\.\d+\.\d+"), f"MODULE_VERSION = {self.subinfo.buildTarget}", text) with open(os.path.join(self.sourceDir(), ".qmake.conf"), "wt+") as conf: conf.write(text) return Qt5CorePackageBase.configure(self) class Package(Qt5CoreSdkPackageBase): def __init__(self): Qt5CoreSdkPackageBase.__init__(self, classA=QtPackage) diff --git a/libs/qt5/version.ini b/libs/qt5/version-5.9.ini similarity index 91% copy from libs/qt5/version.ini copy to libs/qt5/version-5.9.ini index e1197223..19fdba28 100644 --- a/libs/qt5/version.ini +++ b/libs/qt5/version-5.9.ini @@ -1,11 +1,10 @@ [General] name = Qt5 tags = v5.6.1;v5.6.1-1;v5.6.2 -branches = dev;5.6;5.6.1;5.6;5.7;5.8;5.9;5.10 +branches = dev;5.6;5.6.1;5.6;5.7;5.8;5.9; # note: 5.6.1-1 tarball won't build using craft (version number inside tarball differs) -- let's just use the branch for now -tarballs = 5.6.0;5.6.2;5.7.0;5.7.1;5.9.0;5.9.1;5.9.2;5.9.3;5.9.4 -defaulttarget = 5.9.3 +tarballs = 5.6.0;5.6.2;5.7.0;5.7.1;5.9.0;5.9.1;5.9.2;5.9.3;5.9.4; tarballUrl = https://download.qt-project.org/official_releases/qt/${VERSION_MAJOR}.${VERSION_MINOR}/${VERSION}/submodules/${PACKAGE_NAME}-opensource-src-${VERSION}.tar.xz tarballDigestUrl = https://download.qt-project.org/official_releases/qt/${VERSION_MAJOR}.${VERSION_MINOR}/${VERSION}/submodules/${PACKAGE_NAME}-opensource-src-${VERSION}.tar.xz.sha256 tarballInstallSrc = ${PACKAGE_NAME}-opensource-src-${VERSION} gitUrl = https://code.qt.io/qt/${PACKAGE_NAME}.git diff --git a/libs/qt5/version.ini b/libs/qt5/version.ini index e1197223..fd93d871 100644 --- a/libs/qt5/version.ini +++ b/libs/qt5/version.ini @@ -1,11 +1,12 @@ [General] name = Qt5 -tags = v5.6.1;v5.6.1-1;v5.6.2 -branches = dev;5.6;5.6.1;5.6;5.7;5.8;5.9;5.10 +include = version-5.9.ini +tags = +branches = 5.10 # note: 5.6.1-1 tarball won't build using craft (version number inside tarball differs) -- let's just use the branch for now -tarballs = 5.6.0;5.6.2;5.7.0;5.7.1;5.9.0;5.9.1;5.9.2;5.9.3;5.9.4 +tarballs = 5.10.0 defaulttarget = 5.9.3 -tarballUrl = https://download.qt-project.org/official_releases/qt/${VERSION_MAJOR}.${VERSION_MINOR}/${VERSION}/submodules/${PACKAGE_NAME}-opensource-src-${VERSION}.tar.xz -tarballDigestUrl = https://download.qt-project.org/official_releases/qt/${VERSION_MAJOR}.${VERSION_MINOR}/${VERSION}/submodules/${PACKAGE_NAME}-opensource-src-${VERSION}.tar.xz.sha256 -tarballInstallSrc = ${PACKAGE_NAME}-opensource-src-${VERSION} +tarballUrl = https://download.qt-project.org/official_releases/qt/${VERSION_MAJOR}.${VERSION_MINOR}/${VERSION}/submodules/${PACKAGE_NAME}-everywhere-src-${VERSION}.tar.xz +tarballDigestUrl = https://download.qt-project.org/official_releases/qt/${VERSION_MAJOR}.${VERSION_MINOR}/${VERSION}/submodules/${PACKAGE_NAME}-everywhere-src-${VERSION}.tar.xz.sha256 +tarballInstallSrc = ${PACKAGE_NAME}-everywhere-src-${VERSION} gitUrl = https://code.qt.io/qt/${PACKAGE_NAME}.git