diff --git a/extragear/kdeconnect-kde/kdeconnect-kde.py b/extragear/kdeconnect-kde/kdeconnect-kde.py index de5729bc..58d45324 100644 --- a/extragear/kdeconnect-kde/kdeconnect-kde.py +++ b/extragear/kdeconnect-kde/kdeconnect-kde.py @@ -1,91 +1,92 @@ import info from Package.CMakePackageBase import * class subinfo(info.infoclass): def setTargets(self): self.svnTargets['master'] = 'https://invent.kde.org/kde/kdeconnect-kde.git' self.defaultTarget = 'master' self.description = "KDE Connect adds communication between KDE and your smartphone" self.displayName = "KDE Connect" def setDependencies(self): self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["kdesupport/qca"] = None self.runtimeDependencies["kde/frameworks/tier1/ki18n"] = None self.runtimeDependencies["kde/frameworks/tier3/kconfigwidgets"] = None self.runtimeDependencies["kde/frameworks/tier1/kdbusaddons"] = None self.runtimeDependencies["kde/frameworks/tier3/kiconthemes"] = None self.runtimeDependencies["kde/frameworks/tier3/knotifications"] = None self.runtimeDependencies["kde/frameworks/tier3/kcmutils"] = None self.runtimeDependencies["kde/frameworks/tier1/breeze-icons"] = None self.runtimeDependencies["kde/frameworks/tier1/kirigami"] = None self.runtimeDependencies["kde/frameworks/tier3/kpeople"] = None + self.runtimeDependencies["kde/unreleased/kpeoplevcard"] = None self.runtimeDependencies["libs/qt5/qtmultimedia"] = None 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["caption"] = self.binaryArchiveName(fileType=None).capitalize() self.defines["icon"] = os.path.join(os.path.dirname(__file__), "icon.ico") self.defines["appname"] = "kdeconnect-indicator" self.defines["nsis_include"] = f"!include {self.packageDir()}\\SnoreNotify.nsh" self.defines["sections"] = r""" !define MyApp_AppUserModelId org.kde.kdeconnect.daemon !define SnoreToastExe "$INSTDIR\bin\SnoreToast.exe" Section "@{productname}" SectionIn 1 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application !insertmacro SnoreShortcut "$SMPROGRAMS\@{productname}.lnk" "$INSTDIR\bin\@{appname}.exe" "${MyApp_AppUserModelId}" CreateShortCut "$SMPROGRAMS\Startup\@{productname}.lnk" "$INSTDIR\bin\@{appname}.exe" CreateShortCut "$DESKTOP\@{productname}.lnk" "$INSTDIR\bin\@{appname}.exe" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd """ self.defines["un_sections"]=r""" Section "Un.Remove Shortcuts" Delete "$SMPROGRAMS\@{productname}.lnk" Delete "$SMPROGRAMS\Startup\@{productname}.lnk" Delete "$DESKTOP\@{productname}.lnk" SectionEnd """ self.ignoredPackages.append("binary/mysql") return TypePackager.createPackage(self) def preArchive(self): archiveDir = self.archiveDir() # move everything to the location where Qt expects it pluginPath = os.path.join(archiveDir, "plugins") binPath = os.path.join(archiveDir, "bin") if CraftCore.compiler.isMacOS: # Move kdeconnect, kdeconnect-cli, kdeconnect-sms and dbus-daemon to the package defines = self.setDefaults(self.defines) appPath = self.getMacAppPath(defines) if not utils.copyFile(os.path.join(binPath, "dbus-daemon"), os.path.join(appPath, "Contents", "MacOS"), linkOnly=False): return False if not utils.copyFile(os.path.join(binPath, "kdeconnect-cli"), os.path.join(appPath, "Contents", "MacOS"), linkOnly=False): return False if not utils.copyFile(os.path.join(archiveDir, "Applications", "KDE", "kdeconnect.app", "Contents", "MacOS", "kdeconnect"), os.path.join(appPath, "Contents", "MacOS"), linkOnly=False): return False if not utils.copyFile(os.path.join(archiveDir, "Applications", "KDE", "kdeconnect-sms.app", "Contents", "MacOS", "kdeconnect-sms"), os.path.join(appPath, "Contents", "MacOS"), linkOnly=False): return False return utils.mergeTree(os.path.join(archiveDir, "lib/qca-qt5"), pluginPath if CraftCore.compiler.isMacOS else binPath) diff --git a/extragear/kdevelop/version.ini b/extragear/kdevelop/version.ini index db49eea8..ff4e06ec 100644 --- a/extragear/kdevelop/version.ini +++ b/extragear/kdevelop/version.ini @@ -1,11 +1,11 @@ -[General] -name = KDevelop -tags = v5.2.1 -branches = master;5.2;5.3 -# skip 5.3.3, packaged with tar --format=posix, which 7-zip, as used on Windows, does not support -tarballs = 5.2.80;5.3.0;5.3.1;5.3.2 -defaulttarget = 5.3.2 -tarballUrl = http://download.kde.org/stable/kdevelop/${VERSION}/src/${PACKAGE_NAME}-${VERSION}.tar.xz -tarballDigestUrl = http://download.kde.org/stable/kdevelop/${VERSION}/src/${PACKAGE_NAME}-${VERSION}.tar.xz.sha256 -tarballInstallSrc = ${PACKAGE_NAME}-${VERSION} -gitUrl = git://anongit.kde.org/${PACKAGE_NAME} +[General] +name = KDevelop +tags = v5.2.1 +branches = master;5.2;5.3 +# skip 5.3.3, packaged with tar --format=posix, which 7-zip, as used on Windows, does not support +tarballs = 5.2.80;5.3.0;5.3.1;5.3.2 +defaulttarget = 5.3.2 +tarballUrl = http://download.kde.org/stable/kdevelop/${VERSION}/src/${PACKAGE_NAME}-${VERSION}.tar.xz +tarballDigestUrl = http://download.kde.org/stable/kdevelop/${VERSION}/src/${PACKAGE_NAME}-${VERSION}.tar.xz.sha256 +tarballInstallSrc = ${PACKAGE_NAME}-${VERSION} +gitUrl = git://anongit.kde.org/${PACKAGE_NAME}