diff --git a/extragear/atcore/atcore.ico b/extragear/atcore/atcore.ico index 51cbbf29..b52d6df0 100644 Binary files a/extragear/atcore/atcore.ico and b/extragear/atcore/atcore.ico differ diff --git a/extragear/atcore/atcore.py b/extragear/atcore/atcore.py index dcf490d3..2c7f2931 100644 --- a/extragear/atcore/atcore.py +++ b/extragear/atcore/atcore.py @@ -1,34 +1,37 @@ import info +from CraftOS.osutils import OsUtils class subinfo(info.infoclass): def setTargets(self): self.svnTargets['master'] = 'git://anongit.kde.org/atcore|master' self.svnTargets['1.0'] = 'git://anongit.kde.org/atcore|1.0' self.defaultTarget = '1.0' self.displayName = "AtCoreTest" self.webpage = "https://atelier.kde.org" self.description = "The KDE core of Atelier Printer Host" def setDependencies(self): self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["libs/qt5/qtserialport"] = None self.runtimeDependencies["libs/qt5/qtcharts"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) if self.buildTarget != "1.0": - self.subinfo.options.configure.args = "-DBUILD_GUI=ON " + self.subinfo.options.configure.args = "-DBUILD_GUI=ON" + if OsUtils.isMac(): + self.subinfo.options.configure.args += "-DDEPLOY_PLUGINS_WITH_BINARY=ON" def createPackage(self): self.blacklist_file.append(os.path.join(self.packageDir(), 'blacklist.txt')) self.defines["executable"] = "bin\\atcore-gui.exe" self.defines["appname"] = "atcore-gui" self.defines["icon"] = os.path.join(self.packageDir(), "atcore.ico") return super().createPackage() diff --git a/extragear/atelier/atelier.ico b/extragear/atelier/atelier.ico index e93e38e5..c8e88583 100644 Binary files a/extragear/atelier/atelier.ico and b/extragear/atelier/atelier.ico differ diff --git a/extragear/atelier/atelier.py b/extragear/atelier/atelier.py index ac158036..e672bf9b 100644 --- a/extragear/atelier/atelier.py +++ b/extragear/atelier/atelier.py @@ -1,39 +1,38 @@ import info from CraftConfig import * from CraftOS.osutils import OsUtils class subinfo( info.infoclass ): def setTargets( self ): self.svnTargets[ 'master' ] = 'git://anongit.kde.org/atelier|master' self.defaultTarget = 'master' self.description = 'Atelier Printer Host' self.webpage = "https://atelier.kde.org" self.displayName = "Atelier" def setDependencies( self ): self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None self.runtimeDependencies["kde/frameworks/tier1/ki18n"] = None self.runtimeDependencies["kde/frameworks/tier3/kconfigwidgets"] = None self.runtimeDependencies["kde/frameworks/tier3/kxmlgui"] = None self.runtimeDependencies["kde/frameworks/tier3/ktexteditor"] = None self.runtimeDependencies["extragear/atcore"] = "master" self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["libs/qt5/qtserialport"] = None self.runtimeDependencies["libs/qt5/qtcharts"] = None self.runtimeDependencies["libs/qt5/qt3d"] = None self.runtimeDependencies["libs/qt5/qtmultimedia"] = None - self.runtimeDependencies["kdesupport/qwt"] = None from Package.CMakePackageBase import * class Package( CMakePackageBase ): def __init__(self): CMakePackageBase.__init__(self) def createPackage(self): self.blacklist_file.append(os.path.join(self.packageDir(), 'blacklist.txt')) self.defines[ "executable" ] = "bin\\atelier.exe" self.defines[ "icon" ] = os.path.join(self.packageDir(), "atelier.ico") return super().createPackage()