diff --git a/libs/exiv2/exiv2.py b/libs/exiv2/exiv2.py index 5a91eb4f..a4011993 100644 --- a/libs/exiv2/exiv2.py +++ b/libs/exiv2/exiv2.py @@ -1,51 +1,56 @@ import info class subinfo(info.infoclass): def setTargets(self): for ver in ['0.24', '0.25']: self.targets[ver] = 'http://www.exiv2.org/releases/exiv2-%s.tar.gz' % ver self.targetInstSrc[ver] = 'exiv2-%s' % ver for ver in ["0.27.0a"]: self.targets[ver] = f"http://www.exiv2.org/releases/exiv2-{ver}-Source.tar.gz" self.targetInstSrc[ver] = f"exiv2-{ver[0:-1]}-Source" + for ver in ["0.27.1"]: + self.targets[ver] = f"https://github.com/Exiv2/exiv2/archive/{ver}.tar.gz" + self.archiveNames[ver] = f"exiv2-{ver}.tar.gz" + self.targetInstSrc[ver] = f"exiv2-{ver}" self.targetDigests['0.24'] = '2f19538e54f8c21c180fa96d17677b7cff7dc1bb' self.patchToApply['0.24'] = ('exiv2-0.22-20120117.diff', 1) self.patchToApply['0.25'] = ('exiv2-0.25-20150826.diff', 1) self.targetDigests['0.25'] = 'adb8ffe63916e7c27bda9792e690d1330ec7273d' self.patchToApply["0.27.0a"] = [('exiv2-0.27.0a-20190105.diff', 1), ("exiv2-0.27.0a-20190201.diff", 1)] self.targetDigests["0.27.0a"] = (['a4adfa7aaf295b0383adead476f8e0493b9d6c6c7570d5884d2ebf8a2871902f'], CraftHash.HashAlgorithm.SHA256) + self.targetDigests["0.27.1"] = (['1b3766b2c203ce213a4195de14d61694017ec1a69d15d4575bccecef130990fe'], CraftHash.HashAlgorithm.SHA256) self.patchLevel["0.27.0a"] = 1 - self.svnTargets['svnHEAD'] = 'svn://dev.exiv2.org/svn/trunk' + self.svnTargets['master'] = 'https://github.com/Exiv2/exiv2.git' self.description = "an image metadata library" - self.defaultTarget = '0.27.0a' + self.defaultTarget = '0.27.1' def setDependencies(self): self.runtimeDependencies["libs/iconv"] = None self.runtimeDependencies["libs/gettext"] = None self.runtimeDependencies["libs/expat"] = None self.runtimeDependencies["libs/zlib"] = None self.runtimeDependencies["libs/libcurl"] = None self.runtimeDependencies["virtual/base"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self, **args): CMakePackageBase.__init__(self) self.subinfo.options.configure.args += " -DEXIV2_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_NLS=OFF -DIconv_IS_BUILT_IN=OFF" if CraftCore.compiler.isWindows: - self.subinfo.options.configure.args += " -DICONV_ACCEPTS_CONST_INPUT=ON -DEXIV2_ENABLE_WIN_UNICODE=ON" - if CraftCore.compiler.isMinGW(): + self.subinfo.options.configure.args += " -DICONV_ACCEPTS_CONST_INPUT=ON -DEXIV2_ENABLE_WIN_UNICODE=OFF" + if CraftCore.compiler.isMinGW() and self.buildTarget == "0.27.0a": # https://github.com/Exiv2/exiv2/issues/421 self.subinfo.options.configure.args += " -DBUILD_SHARED_LIBS=OFF" else: self.subinfo.options.configure.args += " -DBUILD_SHARED_LIBS=ON" diff --git a/libs/qt5/qtwebengine/c6fb532d81f405b2456c382aa0b29eef8866f993.patch b/libs/qt5/qtwebengine/c6fb532d81f405b2456c382aa0b29eef8866f993.patch new file mode 100644 index 00000000..09a31df5 --- /dev/null +++ b/libs/qt5/qtwebengine/c6fb532d81f405b2456c382aa0b29eef8866f993.patch @@ -0,0 +1,28 @@ +From c6fb532d81f405b2456c382aa0b29eef8866f993 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Wed, 17 Apr 2019 16:29:37 +0200 +Subject: [PATCH] Allow VS 2019 to try to build QtWebEngine +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Task-number: QTBUG-75212 +Change-Id: I1d1a99d9a5b6684d23e51cf55d384e7dfee6ef2a +Reviewed-by: Jüri Valdmann +--- + src/core/config/windows.pri | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/core/config/windows.pri b/src/core/config/windows.pri +index 9eb15830d..730b38a35 100644 +--- a/src/core/config/windows.pri ++++ b/src/core/config/windows.pri +@@ -56,6 +56,8 @@ msvc:contains(QT_ARCH, "i386"):!usingMSVC32BitCrossCompiler() { + msvc { + equals(MSVC_VER, 15.0) { + MSVS_VERSION = 2017 ++ } else: equals(MSVC_VER, 16.0) { ++ MSVS_VERSION = 2019 + } else { + error("Visual Studio compiler version \"$$MSVC_VER\" is not supported by Qt WebEngine") + } diff --git a/libs/qt5/qtwebengine/qtwebengine.py b/libs/qt5/qtwebengine/qtwebengine.py index 85ddd5df..1b6da3cf 100644 --- a/libs/qt5/qtwebengine/qtwebengine.py +++ b/libs/qt5/qtwebengine/qtwebengine.py @@ -1,84 +1,85 @@ # -*- coding: utf-8 -*- import info class subinfo(info.infoclass): def registerOptions(self): # only supports msvc17+ if CraftCore.compiler.isMSVC() and CraftCore.compiler.getInternalVersion() < 15: self.parent.package.categoryInfo.compiler = CraftCore.compiler.Compiler.NoCompiler def setTargets(self): self.versionInfo.setDefaultValues() self.patchLevel["5.12.1"] = 2 - self.patchToApply["5.12.3"] = [("0001-Fix-building-GN-with-VS-2019.patch", 1)] + self.patchToApply["5.12.3"] = [("0001-Fix-building-GN-with-VS-2019.patch", 1), + ("c6fb532d81f405b2456c382aa0b29eef8866f993.patch", 1)] for ver in self.versionInfo.tarballs() + self.versionInfo.branches() + self.versionInfo.tags(): qtVer = CraftVersion(ver) if qtVer <= CraftVersion("5.9"): self.patchToApply[ver] = [("0001-Fix-the-detection-of-python2.exe.patch", 1)]#https://codereview.qt-project.org/#/c/203000/ def setDependencies(self): self.buildDependencies["dev-utils/gperf"] = None self.buildDependencies["dev-utils/flexbison"] = None self.buildDependencies["dev-utils/python2"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["libs/qt5/qtlocation"] = None self.runtimeDependencies["libs/qt5/qtdeclarative"] = None self.runtimeDependencies["libs/qt5/qtwebchannel"] = None if not CraftCore.compiler.isWindows: self.runtimeDependencies["libs/lcms2"] = None self.runtimeDependencies["libs/freetype"] = None self.runtimeDependencies["libs/libopus"] = None self.runtimeDependencies["libs/zlib"] = None self.runtimeDependencies["libs/libxml2"] = None self.runtimeDependencies["libs/libxslt"] = None self.runtimeDependencies["libs/freetype"] = None self.runtimeDependencies["libs/fontconfig"] = None self.runtimeDependencies["libs/libjpeg-turbo"] = None self.runtimeDependencies["qt-libs/poppler"] = None self.runtimeDependencies["libs/webp"] = None self.runtimeDependencies["libs/ffmpeg"] = None from Package.Qt5CorePackageBase import * class QtPackage(Qt5CorePackageBase): def __init__(self, **args): Qt5CorePackageBase.__init__(self) self.subinfo.options.fetch.checkoutSubmodules = True if CraftCore.compiler.isLinux: self.subinfo.options.configure.args += " -- --webengine-pulseaudio=no --webengine-ffmpeg=system" def fetch(self): if isinstance(self, GitSource): utils.system(["git", "clean", "-xdf"], cwd=self.sourceDir()) return Qt5CorePackageBase.fetch(self) def compile(self): env = {} if CraftCore.compiler.isMacOS: # we need mac's version of libtool here env["PATH"] = f"/usr/bin/:{os.environ['PATH']}" if self.qtVer < CraftVersion("5.9") and CraftCore.compiler.isWindows: env["PATH"] = CraftCore.settings.get("Paths", "PYTHON27") + ";" + os.environ["PATH"] with utils.ScopedEnv(env): return Qt5CorePackageBase.compile(self) def install(self): if not Qt5CorePackageBase.install(self): return False if CraftCore.compiler.isWindows and os.path.isdir(os.path.join(self.imageDir(), "resources")): # apply solution for wrong install location of some important files # see: https://stackoverflow.com/a/35448081 utils.mergeTree(os.path.join(self.imageDir(), "resources"), os.path.join(self.imageDir(), "bin")) return True class Package(Qt5CoreSdkPackageBase): def __init__(self): Qt5CoreSdkPackageBase.__init__(self, classA=QtPackage, condition=not CraftCore.compiler.isMinGW())