diff --git a/kde/kdemultimedia/kdenlive/kdenlive.py b/kde/kdemultimedia/kdenlive/kdenlive.py index ce38eb30..2ed3c519 100644 --- a/kde/kdemultimedia/kdenlive/kdenlive.py +++ b/kde/kdemultimedia/kdenlive/kdenlive.py @@ -1,82 +1,82 @@ import info class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() self.description = "Libre Video Editor, by KDE community" def setDependencies(self): self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None self.runtimeDependencies["virtual/base"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["libs/qt5/qtmultimedia"] = None self.runtimeDependencies["libs/qt5/qtdeclarative"] = None self.runtimeDependencies["libs/qt5/qtquickcontrols"] = None self.runtimeDependencies["libs/qt5/qtquickcontrols2"] = None self.runtimeDependencies["kde/frameworks/tier1/breeze-icons"] = None self.runtimeDependencies["kde/frameworks/tier1/karchive"] = None self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = None self.runtimeDependencies["kde/frameworks/tier1/kcoreaddons"] = None self.runtimeDependencies["kde/frameworks/tier1/kdbusaddons"] = None self.runtimeDependencies["kde/frameworks/tier1/kguiaddons"] = None self.runtimeDependencies["kde/frameworks/tier1/ki18n"] = None self.runtimeDependencies["kde/frameworks/tier1/kitemviews"] = None self.runtimeDependencies["kde/frameworks/tier1/kplotting"] = None self.runtimeDependencies["kde/frameworks/tier1/kwidgetsaddons"] = None self.runtimeDependencies["kde/frameworks/tier2/kcompletion"] = None self.runtimeDependencies["kde/frameworks/tier2/kcrash"] = None self.runtimeDependencies["kde/frameworks/tier2/kjobwidgets"] = None self.runtimeDependencies["kde/frameworks/tier3/kdeclarative"] = None self.runtimeDependencies["kde/frameworks/tier3/kbookmarks"] = None self.runtimeDependencies["kde/frameworks/tier3/kconfigwidgets"] = None self.runtimeDependencies["kde/frameworks/tier3/kiconthemes"] = None self.runtimeDependencies["kde/frameworks/tier3/kio"] = None self.runtimeDependencies["kde/frameworks/tier3/knewstuff"] = None self.runtimeDependencies["kde/frameworks/tier3/knotifications"] = None self.runtimeDependencies["kde/frameworks/tier3/knotifyconfig"] = None self.runtimeDependencies["kde/frameworks/tier3/kservice"] = None self.runtimeDependencies["kde/frameworks/tier3/ktextwidgets"] = None self.runtimeDependencies["kde/frameworks/tier3/kxmlgui"] = None self.runtimeDependencies["kde/frameworks/tier3/kinit"] = None self.runtimeDependencies["kde/frameworks/tier3/purpose"] = None self.runtimeDependencies["libs/ffmpeg"] = None self.runtimeDependencies["libs/mlt"] = None + self.runtimeDependencies["libs/rttr"] = None self.runtimeDependencies["kde/plasma/breeze"] = None # if CraftCore.compiler.isWindows: # self.runtimeDependencies["libs/drmingw"] = None from Package.CMakePackageBase import * from Utils import GetFiles class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) - #self.subinfo.options.configure.args += " -DBUILD_TESTS=OFF " def createPackage(self): self.blacklist_file.append(os.path.join(self.packageDir(), 'blacklist.txt')) self.ignoredPackages.append("libs/llvm-meta") self.ignoredPackages.append("data/hunspell-dictionaries") self.ignoredPackages.append("binary/mysql") self.defines["icon"] = os.path.join(self.buildDir(), "src", "kdenlive.ico") self.defines["icon_png"] = os.path.join(self.sourceDir(), "kdenlive", "icons", "128-apps-kdenlive.png") self.defines["shortcuts"] = [{"name" : "Kdenlive", "target":"bin/kdenlive.exe", "description" : self.subinfo.description}] self.defines["mimetypes"] = ["application/x-kdenlive"] self.defines["file_types"] = [".kdenlive"] return TypePackager.createPackage(self) def postInstall(self): if CraftCore.compiler.isWindows: self.schemeDir = os.path.join(self.installDir(), 'bin', 'data', 'color-schemes') else: self.schemeDir = os.path.join(self.installDir(), 'share', 'color-schemes') for scheme in ['Breeze', 'BreezeDark', 'BreezeHighContrast', 'BreezeLight']: GetFiles.getFile('https://cgit.kde.org/breeze.git/plain/colors/'+scheme+'.colors', self.schemeDir) for scheme in ['Honeycomb', 'Norway', 'ObsidianCoast', 'Oxygen', 'OxygenCold', 'Steel', 'WontonSoup', 'Zion', 'ZionReversed']: GetFiles.getFile('https://cgit.kde.org/plasma-desktop.git/plain/kcms/colors/schemes/'+scheme+'.colors', self.schemeDir) return True diff --git a/libs/rttr/FixGcc8Build.patch b/libs/rttr/FixGcc8Build.patch new file mode 100644 index 00000000..a4ef6dd6 --- /dev/null +++ b/libs/rttr/FixGcc8Build.patch @@ -0,0 +1,25 @@ +From 7cc2a4587a28ff75f4df8fc389bfebcc80fa97b6 Mon Sep 17 00:00:00 2001 +From: Vincent Pinon +Date: Wed, 17 Apr 2019 00:39:30 +0200 +Subject: [PATCH] Fix build failing with GCC8 + +--- + CMake/utility.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMake/utility.cmake b/CMake/utility.cmake +index 8dda62e..c307ada 100644 +--- a/CMake/utility.cmake ++++ b/CMake/utility.cmake +@@ -392,7 +392,7 @@ endfunction() + #################################################################################### + function( set_compiler_warnings target) + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- set(WARNINGS "-Werror" ++ set(WARNINGS # "-Werror" + "-Wall") + elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(WARNINGS "-Werror" +-- +2.20.1 + diff --git a/libs/rttr/rttr.py b/libs/rttr/rttr.py new file mode 100644 index 00000000..2461237f --- /dev/null +++ b/libs/rttr/rttr.py @@ -0,0 +1,27 @@ +import info + + +class subinfo(info.infoclass): + def setTargets(self): + self.svnTargets["master"] = "https://github.com/rttrorg/rttr.git" + + for ver in ['0.9.6']: + self.targets[ver] = f"https://github.com/rttrorg/rttr/archive/v{ver}.tar.gz" + self.archiveNames[ver] = f"rttr-{ver}.tar.gz" + self.targetInstSrc[ver] = f"rttr-{ver}" + self.targetDigests['0.9.6'] = (['058554f8644450185fd881a6598f9dee7ef85785cbc2bb5a5526a43225aa313f'], CraftHash.HashAlgorithm.SHA256) + self.patchToApply["0.9.6"] = [("FixGcc8Build.patch", 1)] + + self.description = "Run Time Type Reflection library written in C++" + self.webpage = "https://www.rttr.org/" + self.defaultTarget = "0.9.6" + + def setDependencies(self): + self.runtimeDependencies["virtual/base"] = None + +from Package.CMakePackageBase import * + + +class Package(CMakePackageBase): + def __init__(self, **args): + CMakePackageBase.__init__(self)