[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [craft-blueprints-kde] libs/qt5/qtbase: Try it without a qt.conf
From: Hannah von Reth <null () kde ! org>
Date: 2018-09-28 9:02:39
Message-ID: E1g5ofX-0003td-B9 () code ! kde ! org
[Download RAW message or body]
Git commit 3dc461f4f23ca3688629f555fdff8f529d4a12ed by Hannah von Reth.
Committed on 28/09/2018 at 09:02.
Pushed by vonreth into branch 'master'.
Try it without a qt.conf
M +2 -14 libs/qt5/qtbase/qtbase.py
https://commits.kde.org/craft-blueprints-kde/3dc461f4f23ca3688629f555fdff8f529d4a12ed
diff --git a/libs/qt5/qtbase/qtbase.py b/libs/qt5/qtbase/qtbase.py
index e02d949..ea1c15f 100644
--- a/libs/qt5/qtbase/qtbase.py
+++ b/libs/qt5/qtbase/qtbase.py
@@ -204,11 +204,6 @@ class QtPackage(Qt5CorePackageBase):
with self.getQtBaseEnv():
if not Qt5CorePackageBase.install(self):
return False
- parser = configparser.ConfigParser()
- parser.read(os.path.join(self.buildDir(), "bin", "qt.conf"))
- parser.remove_section("EffectiveSourcePaths")
- with open(os.path.join(self.imageDir(), "bin", "qt.conf"), "wt") as out:
- parser.write(out)
# install msvc debug files if available
if CraftCore.compiler.isMSVC():
@@ -227,20 +222,13 @@ class QtPackage(Qt5CorePackageBase):
# TODO: remove after the next cache rebuild (now 5.11.2)
conf = os.path.join(self.imageDir(), "bin", "qt.conf")
if os.path.exists(conf):
- parser = configparser.ConfigParser()
- parser.read(conf)
- parser.remove_section("EffectiveSourcePaths")
- with open(conf, "wt") as out:
- parser.write(out)
+ utils.deleteFile(conf)
if CraftCore.compiler.isWindows and CraftCore.settings.getboolean("Packager", "UseCache"):
return utils.system(["qtbinpatcher", "--nobackup",
f"--qt-dir={self.installDir()}",
f"--new-dir={CraftStandardDirs.craftRoot()}"])
- else:
- return self.patchInstallPrefix([os.path.join(self.installDir(), "bin", "qt.conf")],
- self.subinfo.buildPrefix,
- CraftCore.standardDirs.craftRoot())
+ return True
def getQtBaseEnv(self):
envs = {}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic