WIP

2019-12-03 19:31:42 +01:00
parent ffc27ed072
commit ca6fe6a109
7 changed files with 144 additions and 11 deletions
--- a/recipes-kde/apps/kalzium/kalzium.bb
+++ b/recipes-kde/apps/kalzium/kalzium.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
    file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
 "

-inherit kde-apps pythonnative gettext pkgconfig gtk-icon-cache
+inherit kde-apps gettext pkgconfig gtk-icon-cache

 DEPENDS += " \
    qtsvg \
--- a/recipes-kde/packagegroups/kde-apps.bb
+++ b/recipes-kde/packagegroups/kde-apps.bb
@@ -14,6 +14,7 @@ RDEPENDS_${PN} = " \
    filelight \
    gwenview \
    kalgebra \
+    kalzium \
    kate \
    kcachegrind \
    kcalc \
--- a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs-native/0001-native-build-encodefile-only.patch
+++ b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs-native/0001-native-build-encodefile-only.patch
@@ -1,6 +1,6 @@
 From d242b39515dbd268ecd4eaec63d3424497827488 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@mail.com>
-Date: Sun, 18 Dec 2016 23:02:14 +0100
+Date: Tue, 3 Dec 2019 18:11:35 +0100
 Subject: [PATCH] native: build encodefile only
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -19,7 +19,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 52226cd..ff8863e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -54,6 +54,7 @@ option(USE_MOLEQUEUE "Enable the MoleQueue dependent functionality" ON)
+@@ -55,6 +55,7 @@ option(USE_MOLEQUEUE "Enable the MoleQueue dependent functionality" ON)
 option(USE_PYTHON "Use Python to wrap some of our API" OFF)
 
 add_subdirectory(utilities)
@@ -27,11 +27,10 @@ index 52226cd..ff8863e 100644
 add_subdirectory(thirdparty)
 add_subdirectory(avogadro)
 
-@@ -107,3 +108,5 @@ install(FILES
-   DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/avogadrolibs")
- install(EXPORT "AvogadroLibsTargets"
-   DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/avogadrolibs")
-+
+@@ -114,3 +115,4 @@ if (NOT SKBUILD)
+   install(EXPORT "AvogadroLibsTargets"
+     DESTINATION "${INSTALL_LIBRARY_DIR}/cmake/avogadrolibs")
+ endif()
 +endif()
 diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
 index e459934..6a76c75 100644
--- a/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.inc
+++ b/recipes-misc/recipes-chemistry/avogadro/avogadrolibs.inc
@@ -4,9 +4,9 @@ HOMEPAGE = "http://openchemistry.org/avogadro2"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=95b8695b33e17e83db253ab07da4455a"

-inherit cmake_qt5 pythonnative
+inherit cmake_qt5 python3native

-PV = "1.92.0"
+PV = "1.92.1+git${SRCPV}"
 SRC_URI = "git://github.com/OpenChemistry/avogadrolibs.git"
-SRCREV = "c22000b59a810529ce306089d1c78e0d1ebbd6c3"
+SRCREV = "8dc172ec88956515c21eec69d5172d995741bb6c"
 S = "${WORKDIR}/git"
--- a/recipes-misc/recipes-qt-automotive/qtapplicationmanager/qtapplicationmanager.bb
+++ b/recipes-misc/recipes-qt-automotive/qtapplicationmanager/qtapplicationmanager.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Qt component for application lifecycle management "
+HOMEPAGE = "https://doc.qt.io/QtApplicationManager/index.html"
+
+# Taken from qtbase / based upon [1]
+# [1] https://github.com/qt/qtapplicationmanager/commit/ad92263c32fd5fc1f79134607e99160d459b64e0#diff-24ae8db1bf70b4900036589a2f522803
+LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+"
+
+inherit qmake5
+
+DEPENDS = " \
+    qtbase \
+    qtdeclarative \
+    qtwayland \
+    libyaml \
+    libarchive \
+"
+
+BASE_PV = "5.12"
+
+SRC_URI = "git://github.com/qt/qtapplicationmanager.git;branch=${BASE_PV}"
+SRCREV = "9f07efec1cf09c629e7fc04417e6a5ccca2687bc"
+S = "${WORKDIR}/git"
+PV = "${BASE_PV}+git${SRCPV}"
+
--- a/recipes-support/carbone/carbone/npm-shrinkwrap.json
+++ b/recipes-support/carbone/carbone/npm-shrinkwrap.json
@@ -0,0 +1,62 @@
+{
+  "name": "carbone",
+  "version": "1.2.1",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "debug": {
+      "version": "2.6.9",
+      "requires": {
+        "ms": "2.0.0"
+      },
+      "dependencies": {
+        "ms": {
+          "version": "2.0.0"
+        }
+      }
+    },
+    "moment": {
+      "version": "2.19.3"
+    },
+    "moxie-zip": {
+      "version": "0.0.3"
+    },
+    "timsort": {
+      "version": "0.3.0"
+    },
+    "which": {
+      "version": "1.3.1",
+      "requires": {
+        "isexe": "^2.0.0"
+      },
+      "dependencies": {
+        "isexe": {
+          "version": "2.0.0"
+        }
+      }
+    },
+    "yauzl": {
+      "version": "2.8.0",
+      "requires": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.0.1"
+      },
+      "dependencies": {
+        "buffer-crc32": {
+          "version": "0.2.13"
+        },
+        "fd-slicer": {
+          "version": "1.0.1",
+          "requires": {
+            "pend": "~1.2.0"
+          },
+          "dependencies": {
+            "pend": {
+              "version": "1.2.0"
+            }
+          }
+        }
+      }
+    }
+  }
+}
--- a/recipes-support/carbone/carbone_git.bb
+++ b/recipes-support/carbone/carbone_git.bb
@@ -0,0 +1,40 @@
+SUMMARY = "Fast, Simple and Powerful report generator"
+DESCRIPTION = "Fast, Simple and Powerful report generator. Injects JSON and produces PDF, DOCX, XLSX, ODT, PPTX, ODS, ...!"
+HOMEPAGE = "https://carbone.io"
+LICENSE = "MIT & ISC & Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e \
+                    file://node_modules/which/LICENSE;md5=82703a69f6d7411dde679954c2fd9dca \
+                    file://node_modules/which/node_modules/isexe/LICENSE;md5=82703a69f6d7411dde679954c2fd9dca \
+                    file://node_modules/timsort/LICENSE.md;md5=1a4424c73be0822c92e2c175d58f1d23 \
+                    file://node_modules/debug/LICENSE;md5=ddd815a475e7338b0be7a14d8ee35a99 \
+                    file://node_modules/debug/node_modules/ms/license.md;md5=fd56fd5f1860961dfa92d313167c37a6 \
+                    file://node_modules/yauzl/LICENSE;md5=e62df7ee79458f947161db54ea09ad4d \
+                    file://node_modules/yauzl/node_modules/fd-slicer/LICENSE;md5=5bbc2685b76c055f7adef651da1241ca \
+                    file://node_modules/yauzl/node_modules/fd-slicer/node_modules/pend/LICENSE;md5=e8a22696b017d8f536112ef54c81f3fa \
+                    file://node_modules/yauzl/node_modules/buffer-crc32/LICENSE;md5=b27a845c0955487ec9ca7b4ff7295b2b \
+                    file://node_modules/moment/LICENSE;md5=397bb5fedab22612d8d69f1458a9321e"
+
+SRC_URI = "git://github.com/Ideolys/carbone.git"
+PV = "1.2.1+git${SRCPV}"
+SRCREV = "945d64f54e1ede8420c41dc9ac11ac8b56cef7fa"
+
+NPM_SHRINKWRAP := "${THISDIR}/${PN}/npm-shrinkwrap.json"
+
+inherit npm
+
+# Must be set after inherit npm since that itself sets S
+S = "${WORKDIR}/git"
+LICENSE_${PN}-debug-ms = "MIT"
+LICENSE_${PN}-debug = "MIT"
+LICENSE_${PN}-moment = "MIT"
+LICENSE_${PN}-moxie-zip = "MIT"
+LICENSE_${PN}-timsort = "MIT"
+LICENSE_${PN}-which-isexe = "ISC"
+LICENSE_${PN}-which = "ISC"
+LICENSE_${PN}-yauzl-buffer-crc32 = "MIT"
+LICENSE_${PN}-yauzl-fd-slicer-pend = "MIT"
+LICENSE_${PN}-yauzl-fd-slicer = "MIT"
+LICENSE_${PN}-yauzl = "MIT"
+LICENSE_${PN} = "Apache-2.0"
+
+