Compare commits
32 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e72f9e14ce | ||
|
|
d48aa6c934 | ||
|
|
6f5a2513a9 | ||
|
|
48ab2dad10 | ||
|
|
641aabf595 | ||
|
|
c3e6b0c2eb | ||
|
|
9346cf05fa | ||
|
|
cfe91e5789 | ||
|
|
2535943408 | ||
|
|
81bafc6045 | ||
|
|
d67918a112 | ||
|
|
2b7e58e352 | ||
|
|
7f9f0f98a4 | ||
|
|
746ed64373 | ||
|
|
530170adb5 | ||
|
|
f9e77021de | ||
|
|
6c670a475d | ||
|
|
99859ac8f2 | ||
|
|
93345ef5d0 | ||
|
|
5092528e63 | ||
|
|
eedf8d776d | ||
|
|
cfdd7cef66 | ||
|
|
c0975ababa | ||
|
|
93bf5449fa | ||
|
|
23d1d614ca | ||
|
|
0c85f97c44 | ||
|
|
f808a07052 | ||
|
|
08e507efbb | ||
|
|
8dde8f5444 | ||
|
|
5f6e8f07fb | ||
|
|
610819dace | ||
|
|
50fb943746 |
17
README
Normal file
17
README
Normal file
@@ -0,0 +1,17 @@
|
||||
OE layer to desktop environments based on qt5
|
||||
|
||||
This layer depends on:
|
||||
|
||||
URI: git://git.openembedded.org/openembedded-core
|
||||
branch: master
|
||||
revision: HEAD
|
||||
|
||||
URI: git://github.com/meta-qt5/meta-qt5.git
|
||||
branch: master
|
||||
revision: HEAD
|
||||
|
||||
URI: git://git.openembedded.org/meta-openembedded
|
||||
branch: master
|
||||
revision: HEAD
|
||||
|
||||
Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
|
||||
30
README.md
30
README.md
@@ -1,30 +0,0 @@
|
||||
OE layer to desktop environments based on Qt5
|
||||
---------------------------------------------
|
||||
|
||||
|
||||
Layer dependencies:
|
||||
----------------------
|
||||
see [layer.conf](conf/layer.conf) for dependencies and [Layer-index](https://layers.openembedded.org/layerindex/branch/master/layers/) where to find layers
|
||||
|
||||
|
||||
Contributing
|
||||
------------
|
||||
* Submit any patches against the `meta-qt5-extra` layer by using the GitHub pull-request feature.
|
||||
|
||||
|
||||
Policies
|
||||
--------
|
||||
* **Please do not send private emails to maintainer - they will not be answered anymore**. For bug-reports/questions/suggestions.. use [issues](https://github.com/schnitzeltony/meta-qt5-extra/issues).
|
||||
* Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
|
||||
* Use 4 spaces for indentation always (shell and python code)
|
||||
* For splitting of long list values use four-space indentation on sucessive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
|
||||
* Pull-requests with patches fixing issues for musl, clang or gold-linker are accepeted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.
|
||||
* Be aware that **this layer changes other layer's defaults by bbappends**. Maintainer disagrees with common 'configure to death practice' and won't waste time explaining dozens of knobs that are mandatory to get working/useful builds. See
|
||||
[extends-meta-oe](extends-meta-oe) / [extends-meta-qt5](extends-meta-qt5) / [extends-oe-core](extends-oe-core).
|
||||
Pull requests removing appends for sake of magic 'compliant' scripts are not accepted.
|
||||
|
||||
|
||||
Maintainers
|
||||
-----------
|
||||
|
||||
Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
|
||||
14
classes/cmake_auto_align_paths.bbclass
Normal file
14
classes/cmake_auto_align_paths.bbclass
Normal file
@@ -0,0 +1,14 @@
|
||||
CMAKE_ALIGN_FILES_FIND ??= "*Targets.cmake"
|
||||
|
||||
do_configure_append() {
|
||||
# remove absolute paths from exported cmake files
|
||||
for f in `find ${B} -name '${CMAKE_ALIGN_FILES_FIND}'` ${CMAKE_ADD_ALIGN_FILES} ; do
|
||||
sed -i 's:${STAGING_INCDIR_NATIVE}:${includedir}:g' "$f"
|
||||
sed -i 's:${STAGING_INCDIR}:${includedir}:g' "$f"
|
||||
sed -i 's:${STAGING_LIBDIR_NATIVE}:${libdir}:g' "$f"
|
||||
sed -i 's:${STAGING_LIBDIR}:${libdir}:g' "$f"
|
||||
sed -i 's:${STAGING_BASELIBDIR_NATIVE}:${base_libdir}:g' "$f"
|
||||
sed -i 's:${STAGING_BASELIBDIR}:${base_libdir}:g' "$f"
|
||||
done
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@ python () {
|
||||
if get_flags_ignore(cmakehideflags):
|
||||
return
|
||||
|
||||
pn = d.getVar('PN')
|
||||
pn = d.getVar('PN', True)
|
||||
if cmakehideflags:
|
||||
for flag, flagval in sorted(cmakehideflags.items()):
|
||||
items = flagval.split(",")
|
||||
@@ -96,7 +96,7 @@ python () {
|
||||
|
||||
# 4. Handle CMAKE_ALIGN_SYSROOT
|
||||
python do_populate_sysroot_append() {
|
||||
pn = d.getVar('PN')
|
||||
pn = d.getVar('PN', True)
|
||||
|
||||
# parse single parameter in CMAKE_ALIGN_SYSROOT[..] and return array of line strings extracted
|
||||
def parseparam(param, flag):
|
||||
@@ -107,7 +107,7 @@ python do_populate_sysroot_append() {
|
||||
|
||||
# handle file in WORKDIR
|
||||
if cmd == '-f' or cmd == '-F':
|
||||
filename = "%s/%s" % (d.getVar('WORKDIR'), cmdparam)
|
||||
filename = "%s/%s" % (d.getVar('WORKDIR', True), cmdparam)
|
||||
if os.path.isfile(filename):
|
||||
fd = open(filename, 'r')
|
||||
str = fd.read()
|
||||
@@ -144,7 +144,7 @@ python do_populate_sysroot_append() {
|
||||
return
|
||||
|
||||
# check if cmake files were installed to sysroot
|
||||
tmpfile = d.getVar('CMAKEINSTALLED')
|
||||
tmpfile = d.getVar('CMAKEINSTALLED', True)
|
||||
if (not os.path.isfile(tmpfile)) or os.path.getsize(tmpfile) == 0:
|
||||
bb.warn("There were no cmake files installed by %s" % pn)
|
||||
else:
|
||||
@@ -157,7 +157,7 @@ python do_populate_sysroot_append() {
|
||||
if len(cmakedir) == 0:
|
||||
bb.fatal('Directory in CMAKE_ALIGN_SYSROOT[%s] must not be empty in %s' % (flag, pn))
|
||||
# check if this directory is created by us
|
||||
pipe = os.popen('grep %s %s' % (cmakedir, d.getVar('CMAKEINSTALLED')))
|
||||
pipe = os.popen('grep %s %s' % (cmakedir, d.getVar('CMAKEINSTALLED', True)))
|
||||
matching_files = pipe.readlines()
|
||||
pipe.close()
|
||||
if len(matching_files) == 0:
|
||||
|
||||
@@ -5,7 +5,7 @@ CMAKEINSTALLED = "${WORKDIR}/staged_cmake_files"
|
||||
|
||||
# 1. remove tmp file from last build
|
||||
python do_populate_sysroot_prepend() {
|
||||
tmpfile = d.getVar('CMAKEINSTALLED')
|
||||
tmpfile = d.getVar('CMAKEINSTALLED', True)
|
||||
if os.path.isfile(tmpfile):
|
||||
os.remove(tmpfile)
|
||||
}
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
inherit kde-base
|
||||
|
||||
KDE_APP_VERSION = "20.08.3"
|
||||
KDE_APP_VERSION = "18.12.3"
|
||||
|
||||
#SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI = "${KDE_MIRROR}/stable/release-service/${PV}/src/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"
|
||||
|
||||
RRECOMMENDS_${PN} += "qtbase-plugins"
|
||||
|
||||
@@ -17,20 +17,13 @@ ${KDE_MIRROR} http://kde.c3sl.ufpr.br \n \
|
||||
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
|
||||
|
||||
# extra-cmake-modules cause dependent to check for python
|
||||
inherit cmake_qt5_extra python3native
|
||||
|
||||
DEPENDS += "libxml2-native"
|
||||
inherit cmake_qt5_extra pythonnative
|
||||
|
||||
do_compile_prepend() {
|
||||
export XDG_DATA_HOME=${STAGING_DATADIR}
|
||||
}
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kf5 \
|
||||
${datadir}/qlogging-categories5 \
|
||||
${libdir}/plugins/kf5 \
|
||||
${libexecdir}/kf5 \
|
||||
"
|
||||
FILES_${PN} += "${libdir}/plugins/kf5 ${datadir}/kf5 ${libexecdir}/kf5"
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
-DECM_MKSPECS_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
inherit kde-kf5
|
||||
|
||||
SRC_URI = "${KDE_MIRROR}/stable/frameworks/${KF5_VERSION_DIR}/portingAids/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.56/portingAids/${BPN}-${PV}.tar.xz"
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
inherit kde-base
|
||||
|
||||
KF5_VERSION = "5.73.0"
|
||||
KF5_VERSION = "5.56.0"
|
||||
|
||||
def kde_verdir(v):
|
||||
return oe.utils.trim_version(v, 2)
|
||||
|
||||
KF5_VERSION_DIR = "${@kde_verdir("${KF5_VERSION}")}"
|
||||
|
||||
SRC_URI = "${KDE_MIRROR}/stable/frameworks/${KF5_VERSION_DIR}/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.56/${BPN}-${PV}.tar.xz"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
inherit kde-base
|
||||
|
||||
PLASMA_VERSION = "5.19.5"
|
||||
PLASMA_VERSION = "5.15.3"
|
||||
PLASMA_FIXUP_VERSION = "5.15.3.2"
|
||||
|
||||
SRC_URI = "${KDE_MIRROR}/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ DEPENDS += " \
|
||||
qtwayland \
|
||||
"
|
||||
|
||||
inherit cmake_qt5_extra pkgconfig
|
||||
inherit cmake_qt5_extra pkgconfig qt5-translation
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
-DINSTALL_LIBDIR:PATH=${baselib} \
|
||||
|
||||
53
classes/lv2-postinst-helper.bbclass
Normal file
53
classes/lv2-postinst-helper.bbclass
Normal file
@@ -0,0 +1,53 @@
|
||||
# Helper class to handle ontarget-postinst creation of lv2 turtle files
|
||||
|
||||
# File created during compile usually. To create this file makefiles have to be
|
||||
# aligned - see do_configure_prepend at zynaddsubfx or distrho-ports. The file
|
||||
# is expected with the following format
|
||||
# lv2-ttl-generator <path>/plugin.so
|
||||
LV2-TURTLE-BUILD-DATA = "${WORKDIR}/lv2-ttl-generator-data"
|
||||
|
||||
# E.g zynaddsubfx needs to create dummy lv2 turtle files to keep install sane.
|
||||
# To delete them automatically (see below) the contain a dummy string:
|
||||
LV2-DUMMY-TURTLE-STR = "lv2-dummy-turtle-string"
|
||||
|
||||
# To make ontarget postinst/prerm happen, the names of all plugins with their
|
||||
# paths as installed on target a stored in a file called lv2-postinst-manifest
|
||||
LV2-POSTINST-MANIFEST = "${datadir}/${BPN}/lv2-postinst-manifest"
|
||||
|
||||
do_install_append() {
|
||||
# remove dummy lv2-turtles again
|
||||
cd ${D}/${libdir}/lv2
|
||||
for tfile in `grep -rl ${LV2-DUMMY-TURTLE-STR}`; do
|
||||
rm $tfile
|
||||
done
|
||||
|
||||
# create postinst manifest
|
||||
install -d ${D}`dirname ${LV2-POSTINST-MANIFEST}`
|
||||
for sofile in `cat ${LV2-TURTLE-BUILD-DATA} | awk '{ print $2 }'`; do
|
||||
sofile=`basename $sofile`
|
||||
installed=`find ${D}${libdir}/lv2 -name $sofile | sed 's|${D}||g'`
|
||||
echo $installed >> ${D}${LV2-POSTINST-MANIFEST}
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst_ontarget_${PN}-lv2() {
|
||||
oldpath=`pwd`
|
||||
for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
|
||||
cd `dirname "$sofile"`
|
||||
lv2-ttl-generator "$sofile"
|
||||
done
|
||||
cd $oldpath
|
||||
}
|
||||
|
||||
pkg_prerm_${PN}-lv2() {
|
||||
for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
|
||||
path=`dirname "$sofile"`
|
||||
for turtle in `find $path -name '*.ttl'`; do
|
||||
rm $turtle
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
FILES_${PN}-lv2 += "${LV2-POSTINST-MANIFEST}"
|
||||
RDEPENDS_${PN}-lv2 += "lv2-ttl-generator"
|
||||
@@ -1,4 +1,4 @@
|
||||
inherit cmake_qt5_extra
|
||||
inherit cmake_qt5_extra qt5-translation
|
||||
|
||||
HOMEPAGE = "http://lxqt.org/"
|
||||
|
||||
|
||||
8
classes/pack_audio_plugins.bbclass
Normal file
8
classes/pack_audio_plugins.bbclass
Normal file
@@ -0,0 +1,8 @@
|
||||
# Auto package audio plugins
|
||||
|
||||
PACKAGES =+ "${PN}-dssi ${PN}-ladspa ${PN}-lv2 ${PN}-vst"
|
||||
|
||||
FILES_${PN}-dssi += "${libdir}/dssi"
|
||||
FILES_${PN}-ladspa += "${libdir}/ladspa"
|
||||
FILES_${PN}-lv2 += "${libdir}/lv2"
|
||||
FILES_${PN}-vst += "${libdir}/vst"
|
||||
22
classes/qemu-ext.bbclass
Normal file
22
classes/qemu-ext.bbclass
Normal file
@@ -0,0 +1,22 @@
|
||||
inherit qemu
|
||||
|
||||
DEPENDS += "qemu-native"
|
||||
|
||||
# This is an extended/modified qemu.bbclass tailored four our needs:
|
||||
#
|
||||
# * add qemu-native to DEPENDS: we can do that because there is no
|
||||
# introspection/interception delayed qemu usage here
|
||||
# * The executable binary is set by absolute path: oe-core's qemu.bbclass
|
||||
# expects it in sysroot. Here we usually run binaries in builddir which are
|
||||
# not yet installed.
|
||||
# * A recipe can set an extra library path in 'QEMU_EXTRA_LIBDIR'. This path is
|
||||
# an absolute path.
|
||||
|
||||
def qemu_run_binary_local(data, rootfs_path, binary):
|
||||
libdir = rootfs_path + data.getVar("libdir", False)
|
||||
base_libdir = rootfs_path + data.getVar("base_libdir", False)
|
||||
extra_libdir = data.getVar("QEMU_EXTRA_LIBDIR", False)
|
||||
if extra_libdir:
|
||||
return qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir, extra_libdir]) + binary
|
||||
else:
|
||||
return qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir]) + binary
|
||||
@@ -7,30 +7,32 @@ QT_TRANSLATION_FILES ??= "${datadir}/*/translations/*.qm ${datadir}/*/translatio
|
||||
|
||||
FILES_${PN}-locale = "${datadir}/*/translations"
|
||||
|
||||
# remove ${datadir}/${BPN} set by bitbake.conf
|
||||
FILES_${PN}_remove = "${datadir}/${BPN}"
|
||||
|
||||
python qt_do_split_locales() {
|
||||
import glob
|
||||
import collections
|
||||
|
||||
if (d.getVar('PACKAGE_NO_LOCALE') == '1'):
|
||||
if (d.getVar('PACKAGE_NO_LOCALE', True) == '1'):
|
||||
bb.debug(1, "package requested not splitting locales")
|
||||
return
|
||||
|
||||
packages = collections.deque((d.getVar('PACKAGES') or "").split())
|
||||
packages = (d.getVar('PACKAGES', True) or "").split()
|
||||
|
||||
datadir = d.getVar('datadir')
|
||||
datadir = d.getVar('datadir', True)
|
||||
if not datadir:
|
||||
bb.note("datadir not defined")
|
||||
return
|
||||
|
||||
dvar = d.getVar('PKGD')
|
||||
pn = d.getVar('LOCALEBASEPN')
|
||||
dvar = d.getVar('PKGD', True)
|
||||
pn = d.getVar('LOCALEBASEPN', True)
|
||||
|
||||
if pn + '-locale' in packages:
|
||||
packages.remove(pn + '-locale')
|
||||
|
||||
# extract locales from *.qm files into list in locales
|
||||
locales = []
|
||||
for transvar in d.getVar('QT_TRANSLATION_FILES').split():
|
||||
for transvar in d.getVar('QT_TRANSLATION_FILES', True).split():
|
||||
translocation = '%s%s' % (dvar, transvar)
|
||||
transfiles = glob.glob(translocation)
|
||||
for l in sorted(transfiles):
|
||||
@@ -39,19 +41,19 @@ python qt_do_split_locales() {
|
||||
locales.append(locale)
|
||||
|
||||
if not locales:
|
||||
bb.warn("No locale files for recipe %s. Remove qt5-translation from inherit?" % d.getVar('PN'))
|
||||
bb.debug(1, "No locale files in this package")
|
||||
return
|
||||
|
||||
summary = d.getVar('SUMMARY') or pn
|
||||
description = d.getVar('DESCRIPTION') or ""
|
||||
locale_section = d.getVar('LOCALE_SECTION')
|
||||
mlprefix = d.getVar('MLPREFIX') or ""
|
||||
summary = d.getVar('SUMMARY', True) or pn
|
||||
description = d.getVar('DESCRIPTION', True) or ""
|
||||
locale_section = d.getVar('LOCALE_SECTION', True)
|
||||
mlprefix = d.getVar('MLPREFIX', True) or ""
|
||||
for l in sorted(locales):
|
||||
ln = legitimize_package_name(l)
|
||||
pkg = pn + '-locale-' + ln
|
||||
packages.appendleft(pkg)
|
||||
packages.append(pkg)
|
||||
files = ''
|
||||
for transvar in d.getVar('QT_TRANSLATION_FILES').split():
|
||||
for transvar in d.getVar('QT_TRANSLATION_FILES', True).split():
|
||||
files = '%s %s' % (files, transvar.replace('*.qm', '*_%s.qm' % l))
|
||||
d.setVar('FILES_' + pkg, files )
|
||||
d.setVar('RRECOMMENDS_' + pkg, '%svirtual-locale-%s' % (mlprefix, ln))
|
||||
@@ -61,7 +63,7 @@ python qt_do_split_locales() {
|
||||
if locale_section:
|
||||
d.setVar('SECTION_' + pkg, locale_section)
|
||||
|
||||
d.setVar('PACKAGES', ' '.join(list(packages)))
|
||||
d.setVar('PACKAGES', ' '.join(packages))
|
||||
}
|
||||
|
||||
PACKAGESPLITFUNCS_prepend = "qt_do_split_locales "
|
||||
|
||||
37
classes/wafold.bbclass
Normal file
37
classes/wafold.bbclass
Normal file
@@ -0,0 +1,37 @@
|
||||
# avoids build breaks when using no-static-libs.inc
|
||||
DISABLE_STATIC = ""
|
||||
|
||||
EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
python waf_preconfigure() {
|
||||
import subprocess
|
||||
from distutils.version import StrictVersion
|
||||
subsrcdir = d.getVar('S')
|
||||
wafbin = os.path.join(subsrcdir, 'waf')
|
||||
try:
|
||||
result = subprocess.check_output([wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT)
|
||||
version = result.decode('utf-8').split()[1]
|
||||
if StrictVersion(version) >= StrictVersion("1.8.7"):
|
||||
d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}")
|
||||
except subprocess.CalledProcessError as e:
|
||||
bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode)
|
||||
except FileNotFoundError:
|
||||
bb.fatal("waf does not exist in %s" % subsrcdir)
|
||||
}
|
||||
|
||||
do_configure[prefuncs] += "waf_preconfigure"
|
||||
|
||||
wafold_do_configure() {
|
||||
${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF}
|
||||
}
|
||||
|
||||
do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+"
|
||||
wafold_do_compile() {
|
||||
${S}/waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}
|
||||
}
|
||||
|
||||
wafold_do_install() {
|
||||
${S}/waf install --destdir=${D}
|
||||
}
|
||||
|
||||
EXPORT_FUNCTIONS do_configure do_compile do_install
|
||||
@@ -2,7 +2,7 @@
|
||||
BBPATH .= ":${LAYERDIR}"
|
||||
|
||||
# recipes
|
||||
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*/*.bb"
|
||||
BBFILES += "${LAYERDIR}/recipes-*/*.bb ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*/*.bb"
|
||||
# appends
|
||||
BBFILES += "${LAYERDIR}/extends-*/*.bb ${LAYERDIR}/extends-*/*.bbappend"
|
||||
|
||||
@@ -10,16 +10,8 @@ BBFILE_COLLECTIONS += "meta-qt5-extra"
|
||||
BBFILE_PATTERN_meta-qt5-extra := "^${LAYERDIR}/"
|
||||
BBFILE_PRIORITY_meta-qt5-extra = "20"
|
||||
|
||||
LAYERDEPENDS_meta-qt5-extra = " \
|
||||
core \
|
||||
qt5-layer \
|
||||
openembedded-layer \
|
||||
networking-layer \
|
||||
multimedia-layer \
|
||||
gnome-layer \
|
||||
meta-python \
|
||||
"
|
||||
LAYERSERIES_COMPAT_meta-qt5-extra = "dunfell gatesgarth"
|
||||
LAYERDEPENDS_meta-qt5-extra = "core qt5-layer openembedded-layer networking-layer multimedia-layer"
|
||||
LAYERSERIES_COMPAT_meta-qt5-extra = "sumo thud"
|
||||
|
||||
LICENSE_PATH += "${LAYERDIR}/files/licenses"
|
||||
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
PACKAGECONFIG += "cxx"
|
||||
@@ -1,3 +0,0 @@
|
||||
PACKAGECONFIG_append = " qt5"
|
||||
|
||||
inherit cmake_qt5
|
||||
@@ -1,5 +0,0 @@
|
||||
inherit cmake_extra_sanity
|
||||
|
||||
# yeah I know yocto does not want us to change this
|
||||
PACKAGECONFIG_append = " ${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', ' clang', '', d)}"
|
||||
|
||||
@@ -8,32 +8,29 @@ Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Date: Sat, 18 Jan 2020 16:35:24 +0100
|
||||
Adjusted to Qt 5.14
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
|
||||
index ce4232f3e8..d9003f4508 100644
|
||||
index 76401da..3a712d2 100644
|
||||
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
|
||||
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
|
||||
@@ -161,9 +161,12 @@ static QString moc(const QString &name)
|
||||
@@ -289,9 +289,12 @@ static QString moc(const QString &name)
|
||||
|
||||
static QTextStream &writeHeader(QTextStream &ts, bool changesWillBeLost)
|
||||
{
|
||||
+ QString strCmdLine = commandLine;
|
||||
+ strCmdLine.replace(QStringLiteral("STRING_FULL_PATH"), QStringLiteral("STRING_PATH"));
|
||||
+ strCmdLine.replace(QStringLiteral("recipe-sysroot"), QStringLiteral("recipe--sysroot"));
|
||||
ts << "/*" << Qt::endl
|
||||
<< " * This file was generated by " PROGRAMNAME " version " PROGRAMVERSION << Qt::endl
|
||||
- << " * Command line was: " << commandLine << Qt::endl
|
||||
+ << " * Command line was: " << strCmdLine << Qt::endl
|
||||
<< " *" << Qt::endl
|
||||
<< " * " PROGRAMNAME " is " PROGRAMCOPYRIGHT << Qt::endl
|
||||
<< " *" << Qt::endl
|
||||
+ QString strCmdLine = commandLine;
|
||||
+ strCmdLine.replace(QStringLiteral("STRING_FULL_PATH"), QStringLiteral("STRING_PATH"));
|
||||
+ strCmdLine.replace(QStringLiteral("recipe-sysroot"), QStringLiteral("recipe--sysroot"));
|
||||
ts << "/*" << endl
|
||||
<< " * This file was generated by " PROGRAMNAME " version " PROGRAMVERSION << endl
|
||||
- << " * Command line was: " << commandLine << endl
|
||||
+ << " * Command line was: " << strCmdLine << endl
|
||||
<< " *" << endl
|
||||
<< " * " PROGRAMNAME " is " PROGRAMCOPYRIGHT << endl
|
||||
<< " *" << endl
|
||||
--
|
||||
2.21.0
|
||||
2.1.0
|
||||
|
||||
|
||||
@@ -2,18 +2,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
|
||||
|
||||
PACKAGECONFIG_FONTS = "fontconfig"
|
||||
|
||||
# Full (desktop) GL is default in meta-qt5 and qtbase. Some of our recipes
|
||||
# (AFAICR krita/mixxx) will fail with qt build for GLES.
|
||||
# Will never understand why a BSP layer changes defaults to make people happy
|
||||
# not using defaults. Yes it looks like an error but that should have been
|
||||
# fixed at meta-qt5.
|
||||
# see https://github.com/Freescale/meta-freescale/pull/379
|
||||
PACKAGECONFIG_GL_use-mainline-bsp = "${QT5_EXTRA_QTBASE_IMX_MAINLINE_GL} gbm kms"
|
||||
|
||||
# If one does not need failing recipes mentioned above and wants gles:
|
||||
# override QT5_EXTRA_QTBASE_IMX_MAINLINE_GL with 'gles2'
|
||||
QT5_EXTRA_QTBASE_IMX_MAINLINE_GL ??= ""
|
||||
|
||||
# session management only for x11 environment
|
||||
PACKAGECONFIG_DISTRO += " \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "sm", "", d)} \
|
||||
|
||||
@@ -15,6 +15,3 @@ CMAKE_ALIGN_SYSROOT_class-nativesdk[1] = "ignore"
|
||||
# cross -> native binaries
|
||||
CMAKE_ALIGN_SYSROOT[1] = "Qt5Help, -S${bindir}${QT_DIR_NAME}, -s${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}"
|
||||
CMAKE_ALIGN_SYSROOT[2] = "Qt5LinguistTools, -S${bindir}${QT_DIR_NAME}, -s${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}"
|
||||
|
||||
# yeah I know yocto does not want us to change this
|
||||
PACKAGECONFIG_append = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', ' clang', '', d)}"
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
# Since Qt5.15 qtwaylandscanner creates a comment as:
|
||||
|
||||
# // source file is /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/kwayland/5.70.0-r0/recipe-sysroot/usr/share/wayland-protocols/unstable/tablet/tablet-unstable-v2.xml
|
||||
|
||||
# which triggers our make_extra_sanity.bbclass.
|
||||
# To be compatible with Qt5.14 (dunfell) and >= Qt5.15 (current master) we do
|
||||
# some sed instead of patching.
|
||||
do_patch_append_class-native() {
|
||||
bb.build.exec_func('do_fix_qtwaylandscanner_cpp', d)
|
||||
}
|
||||
|
||||
do_fix_qtwaylandscanner_cpp () {
|
||||
if [ -f ${S}/src/qtwaylandscanner/qtwaylandscanner.cpp ]; then
|
||||
sed -i 's:printf("// source file is://printf("// source file is:' ${S}/src/qtwaylandscanner/qtwaylandscanner.cpp
|
||||
fi
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
SUMMARY = "Qt/C++ wrapper for ZIP/UNZIP package"
|
||||
HOMEPAGE = "https://github.com/stachenov/quazip"
|
||||
LICENSE = "LGPL-2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4c01c380a79ed7138aa9049e29df9c6a"
|
||||
|
||||
DEPENDS = "qtbase zlib"
|
||||
|
||||
SRC_URI = "git://github.com/stachenov/quazip.git"
|
||||
SRCREV = "100578f686b7da029a19c0bc9ad3c93f80adb2bb"
|
||||
PV = "1.1"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit cmake_qt5
|
||||
|
||||
EXTRA_CMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
|
||||
@@ -1 +0,0 @@
|
||||
PACKAGECONFIG_append = " qt5"
|
||||
396
files/licenses/CC-BY-SA-4.0
Normal file
396
files/licenses/CC-BY-SA-4.0
Normal file
@@ -0,0 +1,396 @@
|
||||
Attribution 4.0 International
|
||||
|
||||
=======================================================================
|
||||
|
||||
Creative Commons Corporation ("Creative Commons") is not a law firm and
|
||||
does not provide legal services or legal advice. Distribution of
|
||||
Creative Commons public licenses does not create a lawyer-client or
|
||||
other relationship. Creative Commons makes its licenses and related
|
||||
information available on an "as-is" basis. Creative Commons gives no
|
||||
warranties regarding its licenses, any material licensed under their
|
||||
terms and conditions, or any related information. Creative Commons
|
||||
disclaims all liability for damages resulting from their use to the
|
||||
fullest extent possible.
|
||||
|
||||
Using Creative Commons Public Licenses
|
||||
|
||||
Creative Commons public licenses provide a standard set of terms and
|
||||
conditions that creators and other rights holders may use to share
|
||||
original works of authorship and other material subject to copyright
|
||||
and certain other rights specified in the public license below. The
|
||||
following considerations are for informational purposes only, are not
|
||||
exhaustive, and do not form part of our licenses.
|
||||
|
||||
Considerations for licensors: Our public licenses are
|
||||
intended for use by those authorized to give the public
|
||||
permission to use material in ways otherwise restricted by
|
||||
copyright and certain other rights. Our licenses are
|
||||
irrevocable. Licensors should read and understand the terms
|
||||
and conditions of the license they choose before applying it.
|
||||
Licensors should also secure all rights necessary before
|
||||
applying our licenses so that the public can reuse the
|
||||
material as expected. Licensors should clearly mark any
|
||||
material not subject to the license. This includes other CC-
|
||||
licensed material, or material used under an exception or
|
||||
limitation to copyright. More considerations for licensors:
|
||||
wiki.creativecommons.org/Considerations_for_licensors
|
||||
|
||||
Considerations for the public: By using one of our public
|
||||
licenses, a licensor grants the public permission to use the
|
||||
licensed material under specified terms and conditions. If
|
||||
the licensor's permission is not necessary for any reason--for
|
||||
example, because of any applicable exception or limitation to
|
||||
copyright--then that use is not regulated by the license. Our
|
||||
licenses grant only permissions under copyright and certain
|
||||
other rights that a licensor has authority to grant. Use of
|
||||
the licensed material may still be restricted for other
|
||||
reasons, including because others have copyright or other
|
||||
rights in the material. A licensor may make special requests,
|
||||
such as asking that all changes be marked or described.
|
||||
Although not required by our licenses, you are encouraged to
|
||||
respect those requests where reasonable. More_considerations
|
||||
for the public:
|
||||
wiki.creativecommons.org/Considerations_for_licensees
|
||||
|
||||
=======================================================================
|
||||
|
||||
Creative Commons Attribution 4.0 International Public License
|
||||
|
||||
By exercising the Licensed Rights (defined below), You accept and agree
|
||||
to be bound by the terms and conditions of this Creative Commons
|
||||
Attribution 4.0 International Public License ("Public License"). To the
|
||||
extent this Public License may be interpreted as a contract, You are
|
||||
granted the Licensed Rights in consideration of Your acceptance of
|
||||
these terms and conditions, and the Licensor grants You such rights in
|
||||
consideration of benefits the Licensor receives from making the
|
||||
Licensed Material available under these terms and conditions.
|
||||
|
||||
|
||||
Section 1 -- Definitions.
|
||||
|
||||
a. Adapted Material means material subject to Copyright and Similar
|
||||
Rights that is derived from or based upon the Licensed Material
|
||||
and in which the Licensed Material is translated, altered,
|
||||
arranged, transformed, or otherwise modified in a manner requiring
|
||||
permission under the Copyright and Similar Rights held by the
|
||||
Licensor. For purposes of this Public License, where the Licensed
|
||||
Material is a musical work, performance, or sound recording,
|
||||
Adapted Material is always produced where the Licensed Material is
|
||||
synched in timed relation with a moving image.
|
||||
|
||||
b. Adapter's License means the license You apply to Your Copyright
|
||||
and Similar Rights in Your contributions to Adapted Material in
|
||||
accordance with the terms and conditions of this Public License.
|
||||
|
||||
c. Copyright and Similar Rights means copyright and/or similar rights
|
||||
closely related to copyright including, without limitation,
|
||||
performance, broadcast, sound recording, and Sui Generis Database
|
||||
Rights, without regard to how the rights are labeled or
|
||||
categorized. For purposes of this Public License, the rights
|
||||
specified in Section 2(b)(1)-(2) are not Copyright and Similar
|
||||
Rights.
|
||||
|
||||
d. Effective Technological Measures means those measures that, in the
|
||||
absence of proper authority, may not be circumvented under laws
|
||||
fulfilling obligations under Article 11 of the WIPO Copyright
|
||||
Treaty adopted on December 20, 1996, and/or similar international
|
||||
agreements.
|
||||
|
||||
e. Exceptions and Limitations means fair use, fair dealing, and/or
|
||||
any other exception or limitation to Copyright and Similar Rights
|
||||
that applies to Your use of the Licensed Material.
|
||||
|
||||
f. Licensed Material means the artistic or literary work, database,
|
||||
or other material to which the Licensor applied this Public
|
||||
License.
|
||||
|
||||
g. Licensed Rights means the rights granted to You subject to the
|
||||
terms and conditions of this Public License, which are limited to
|
||||
all Copyright and Similar Rights that apply to Your use of the
|
||||
Licensed Material and that the Licensor has authority to license.
|
||||
|
||||
h. Licensor means the individual(s) or entity(ies) granting rights
|
||||
under this Public License.
|
||||
|
||||
i. Share means to provide material to the public by any means or
|
||||
process that requires permission under the Licensed Rights, such
|
||||
as reproduction, public display, public performance, distribution,
|
||||
dissemination, communication, or importation, and to make material
|
||||
available to the public including in ways that members of the
|
||||
public may access the material from a place and at a time
|
||||
individually chosen by them.
|
||||
|
||||
j. Sui Generis Database Rights means rights other than copyright
|
||||
resulting from Directive 96/9/EC of the European Parliament and of
|
||||
the Council of 11 March 1996 on the legal protection of databases,
|
||||
as amended and/or succeeded, as well as other essentially
|
||||
equivalent rights anywhere in the world.
|
||||
|
||||
k. You means the individual or entity exercising the Licensed Rights
|
||||
under this Public License. Your has a corresponding meaning.
|
||||
|
||||
|
||||
Section 2 -- Scope.
|
||||
|
||||
a. License grant.
|
||||
|
||||
1. Subject to the terms and conditions of this Public License,
|
||||
the Licensor hereby grants You a worldwide, royalty-free,
|
||||
non-sublicensable, non-exclusive, irrevocable license to
|
||||
exercise the Licensed Rights in the Licensed Material to:
|
||||
|
||||
a. reproduce and Share the Licensed Material, in whole or
|
||||
in part; and
|
||||
|
||||
b. produce, reproduce, and Share Adapted Material.
|
||||
|
||||
2. Exceptions and Limitations. For the avoidance of doubt, where
|
||||
Exceptions and Limitations apply to Your use, this Public
|
||||
License does not apply, and You do not need to comply with
|
||||
its terms and conditions.
|
||||
|
||||
3. Term. The term of this Public License is specified in Section
|
||||
6(a).
|
||||
|
||||
4. Media and formats; technical modifications allowed. The
|
||||
Licensor authorizes You to exercise the Licensed Rights in
|
||||
all media and formats whether now known or hereafter created,
|
||||
and to make technical modifications necessary to do so. The
|
||||
Licensor waives and/or agrees not to assert any right or
|
||||
authority to forbid You from making technical modifications
|
||||
necessary to exercise the Licensed Rights, including
|
||||
technical modifications necessary to circumvent Effective
|
||||
Technological Measures. For purposes of this Public License,
|
||||
simply making modifications authorized by this Section 2(a)
|
||||
(4) never produces Adapted Material.
|
||||
|
||||
5. Downstream recipients.
|
||||
|
||||
a. Offer from the Licensor -- Licensed Material. Every
|
||||
recipient of the Licensed Material automatically
|
||||
receives an offer from the Licensor to exercise the
|
||||
Licensed Rights under the terms and conditions of this
|
||||
Public License.
|
||||
|
||||
b. No downstream restrictions. You may not offer or impose
|
||||
any additional or different terms or conditions on, or
|
||||
apply any Effective Technological Measures to, the
|
||||
Licensed Material if doing so restricts exercise of the
|
||||
Licensed Rights by any recipient of the Licensed
|
||||
Material.
|
||||
|
||||
6. No endorsement. Nothing in this Public License constitutes or
|
||||
may be construed as permission to assert or imply that You
|
||||
are, or that Your use of the Licensed Material is, connected
|
||||
with, or sponsored, endorsed, or granted official status by,
|
||||
the Licensor or others designated to receive attribution as
|
||||
provided in Section 3(a)(1)(A)(i).
|
||||
|
||||
b. Other rights.
|
||||
|
||||
1. Moral rights, such as the right of integrity, are not
|
||||
licensed under this Public License, nor are publicity,
|
||||
privacy, and/or other similar personality rights; however, to
|
||||
the extent possible, the Licensor waives and/or agrees not to
|
||||
assert any such rights held by the Licensor to the limited
|
||||
extent necessary to allow You to exercise the Licensed
|
||||
Rights, but not otherwise.
|
||||
|
||||
2. Patent and trademark rights are not licensed under this
|
||||
Public License.
|
||||
|
||||
3. To the extent possible, the Licensor waives any right to
|
||||
collect royalties from You for the exercise of the Licensed
|
||||
Rights, whether directly or through a collecting society
|
||||
under any voluntary or waivable statutory or compulsory
|
||||
licensing scheme. In all other cases the Licensor expressly
|
||||
reserves any right to collect such royalties.
|
||||
|
||||
|
||||
Section 3 -- License Conditions.
|
||||
|
||||
Your exercise of the Licensed Rights is expressly made subject to the
|
||||
following conditions.
|
||||
|
||||
a. Attribution.
|
||||
|
||||
1. If You Share the Licensed Material (including in modified
|
||||
form), You must:
|
||||
|
||||
a. retain the following if it is supplied by the Licensor
|
||||
with the Licensed Material:
|
||||
|
||||
i. identification of the creator(s) of the Licensed
|
||||
Material and any others designated to receive
|
||||
attribution, in any reasonable manner requested by
|
||||
the Licensor (including by pseudonym if
|
||||
designated);
|
||||
|
||||
ii. a copyright notice;
|
||||
|
||||
iii. a notice that refers to this Public License;
|
||||
|
||||
iv. a notice that refers to the disclaimer of
|
||||
warranties;
|
||||
|
||||
v. a URI or hyperlink to the Licensed Material to the
|
||||
extent reasonably practicable;
|
||||
|
||||
b. indicate if You modified the Licensed Material and
|
||||
retain an indication of any previous modifications; and
|
||||
|
||||
c. indicate the Licensed Material is licensed under this
|
||||
Public License, and include the text of, or the URI or
|
||||
hyperlink to, this Public License.
|
||||
|
||||
2. You may satisfy the conditions in Section 3(a)(1) in any
|
||||
reasonable manner based on the medium, means, and context in
|
||||
which You Share the Licensed Material. For example, it may be
|
||||
reasonable to satisfy the conditions by providing a URI or
|
||||
hyperlink to a resource that includes the required
|
||||
information.
|
||||
|
||||
3. If requested by the Licensor, You must remove any of the
|
||||
information required by Section 3(a)(1)(A) to the extent
|
||||
reasonably practicable.
|
||||
|
||||
4. If You Share Adapted Material You produce, the Adapter's
|
||||
License You apply must not prevent recipients of the Adapted
|
||||
Material from complying with this Public License.
|
||||
|
||||
|
||||
Section 4 -- Sui Generis Database Rights.
|
||||
|
||||
Where the Licensed Rights include Sui Generis Database Rights that
|
||||
apply to Your use of the Licensed Material:
|
||||
|
||||
a. for the avoidance of doubt, Section 2(a)(1) grants You the right
|
||||
to extract, reuse, reproduce, and Share all or a substantial
|
||||
portion of the contents of the database;
|
||||
|
||||
b. if You include all or a substantial portion of the database
|
||||
contents in a database in which You have Sui Generis Database
|
||||
Rights, then the database in which You have Sui Generis Database
|
||||
Rights (but not its individual contents) is Adapted Material; and
|
||||
|
||||
c. You must comply with the conditions in Section 3(a) if You Share
|
||||
all or a substantial portion of the contents of the database.
|
||||
|
||||
For the avoidance of doubt, this Section 4 supplements and does not
|
||||
replace Your obligations under this Public License where the Licensed
|
||||
Rights include other Copyright and Similar Rights.
|
||||
|
||||
|
||||
Section 5 -- Disclaimer of Warranties and Limitation of Liability.
|
||||
|
||||
a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
|
||||
EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
|
||||
AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
|
||||
ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
|
||||
IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
|
||||
WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
|
||||
PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
|
||||
ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
|
||||
KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
|
||||
ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
|
||||
|
||||
b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
|
||||
TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
|
||||
NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
|
||||
INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
|
||||
COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
|
||||
USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
|
||||
ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
|
||||
DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
|
||||
IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
|
||||
|
||||
c. The disclaimer of warranties and limitation of liability provided
|
||||
above shall be interpreted in a manner that, to the extent
|
||||
possible, most closely approximates an absolute disclaimer and
|
||||
waiver of all liability.
|
||||
|
||||
|
||||
Section 6 -- Term and Termination.
|
||||
|
||||
a. This Public License applies for the term of the Copyright and
|
||||
Similar Rights licensed here. However, if You fail to comply with
|
||||
this Public License, then Your rights under this Public License
|
||||
terminate automatically.
|
||||
|
||||
b. Where Your right to use the Licensed Material has terminated under
|
||||
Section 6(a), it reinstates:
|
||||
|
||||
1. automatically as of the date the violation is cured, provided
|
||||
it is cured within 30 days of Your discovery of the
|
||||
violation; or
|
||||
|
||||
2. upon express reinstatement by the Licensor.
|
||||
|
||||
For the avoidance of doubt, this Section 6(b) does not affect any
|
||||
right the Licensor may have to seek remedies for Your violations
|
||||
of this Public License.
|
||||
|
||||
c. For the avoidance of doubt, the Licensor may also offer the
|
||||
Licensed Material under separate terms or conditions or stop
|
||||
distributing the Licensed Material at any time; however, doing so
|
||||
will not terminate this Public License.
|
||||
|
||||
d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
|
||||
License.
|
||||
|
||||
|
||||
Section 7 -- Other Terms and Conditions.
|
||||
|
||||
a. The Licensor shall not be bound by any additional or different
|
||||
terms or conditions communicated by You unless expressly agreed.
|
||||
|
||||
b. Any arrangements, understandings, or agreements regarding the
|
||||
Licensed Material not stated herein are separate from and
|
||||
independent of the terms and conditions of this Public License.
|
||||
|
||||
|
||||
Section 8 -- Interpretation.
|
||||
|
||||
a. For the avoidance of doubt, this Public License does not, and
|
||||
shall not be interpreted to, reduce, limit, restrict, or impose
|
||||
conditions on any use of the Licensed Material that could lawfully
|
||||
be made without permission under this Public License.
|
||||
|
||||
b. To the extent possible, if any provision of this Public License is
|
||||
deemed unenforceable, it shall be automatically reformed to the
|
||||
minimum extent necessary to make it enforceable. If the provision
|
||||
cannot be reformed, it shall be severed from this Public License
|
||||
without affecting the enforceability of the remaining terms and
|
||||
conditions.
|
||||
|
||||
c. No term or condition of this Public License will be waived and no
|
||||
failure to comply consented to unless expressly agreed to by the
|
||||
Licensor.
|
||||
|
||||
d. Nothing in this Public License constitutes or may be interpreted
|
||||
as a limitation upon, or waiver of, any privileges and immunities
|
||||
that apply to the Licensor or You, including from the legal
|
||||
processes of any jurisdiction or authority.
|
||||
|
||||
|
||||
=======================================================================
|
||||
|
||||
Creative Commons is not a party to its public
|
||||
licenses. Notwithstanding, Creative Commons may elect to apply one of
|
||||
its public licenses to material it publishes and in those instances
|
||||
will be considered the “Licensor.” The text of the Creative Commons
|
||||
public licenses is dedicated to the public domain under the CC0 Public
|
||||
Domain Dedication. Except for the limited purpose of indicating that
|
||||
material is shared under a Creative Commons public license or as
|
||||
otherwise permitted by the Creative Commons policies published at
|
||||
creativecommons.org/policies, Creative Commons does not authorize the
|
||||
use of the trademark "Creative Commons" or any other trademark or logo
|
||||
of Creative Commons without its prior written consent including,
|
||||
without limitation, in connection with any unauthorized modifications
|
||||
to any of its public licenses or any other arrangements,
|
||||
understandings, or agreements concerning use of licensed material. For
|
||||
the avoidance of doubt, this paragraph does not form part of the
|
||||
public licenses.
|
||||
|
||||
Creative Commons may be contacted at creativecommons.org.
|
||||
|
||||
@@ -1,103 +0,0 @@
|
||||
COMMERCIAL LICENSE AGREEMENT
|
||||
FOR COMMERCIAL VERSIONS
|
||||
Version 1.0
|
||||
|
||||
Copyright of this license text (C) 2001 Trolltech AS and (C) 2002-2016
|
||||
Klarälvdalens Datakonsult AB. All rights reserved. License text used
|
||||
with kind permission of Trolltech AS. The software and accompanying
|
||||
material is Copyright (C) 2010-2019 Klarälvdalens Datakonsult AB.
|
||||
|
||||
This non-exclusive non-transferable License Agreement ("Agreement") is
|
||||
between you ("Licensee") and Klarälvdalens Datakonsult AB (KDAB), and
|
||||
pertains to the Klarälvdalens Datakonsult AB software product(s)
|
||||
accompanying this Agreement, which include(s) computer software and
|
||||
may include "online" or electronic documentation, associated media,
|
||||
and printed materials, including the source code, example programs and
|
||||
the documentation ("Software").
|
||||
|
||||
|
||||
COPYRIGHT AND RESTRICTIONS
|
||||
|
||||
1. All intellectual property rights in the Software are owned by KDAB
|
||||
and are protected by Swedish copyright laws, other applicable
|
||||
copyright laws, and international treaty provisions. KDAB retains all
|
||||
rights not expressly granted. No title, property rights or copyright
|
||||
in the Software or in any modifications to the Software shall pass to
|
||||
the Licensee under any circumstances. The Software is licensed, not
|
||||
sold.
|
||||
|
||||
2. By installing, copying, or otherwise using the Software, you agree
|
||||
to be bound by the terms of this agreement. If you do not agree to the
|
||||
terms of this Agreement, do not install, copy, or otherwise use the
|
||||
Software.
|
||||
|
||||
3. Upon your acceptance of the terms and conditions of this Agreement,
|
||||
KDAB grants you the right to use the Software in the manner provided
|
||||
below.
|
||||
|
||||
4. KDAB grants to you as an individual a personal, nonexclusive,
|
||||
non-transferable license to make and use copies of the Software for
|
||||
the sole purposes of designing, developing, testing and distributing
|
||||
your software product(s) ("Applications"). You may install copies of
|
||||
the Software on an unlimited number of computers provided that you are
|
||||
the only individual using the Software. If you are an entity, KDAB
|
||||
grants you the right to designate one, and only one, individual within
|
||||
your organization who shall have the sole right to use the Software in
|
||||
the manner provided above.
|
||||
|
||||
5. The license granted in this Agreement for you to create and
|
||||
distribute your own Applications is subject to all of the following
|
||||
conditions: (i) all copies of the Applications you create must bear a
|
||||
valid copyright notice, either your own or the copyright notice that
|
||||
appears on the Software; (ii) you may not remove or alter any
|
||||
copyright, trademark or other proprietary rights notice contained in
|
||||
any portion of the Software; (iii) you will indemnify and hold KDAB, its
|
||||
related companies and its suppliers, harmless from and against any
|
||||
claims or liabilities arising out of the use and/or reproduction of
|
||||
your Applications; (iv) your Applications must be written using a
|
||||
licensed, registered copy of the Software; (v) your Applications must
|
||||
add primary and substantial functionality to the Software; (vi) your
|
||||
Applications may not pass on functionality which in any way makes it
|
||||
possible for others to create Applications with the Software; (vii)
|
||||
your Applications may not compete with the Software; (viii) you may
|
||||
not use KDAB's or any of its suppliers' names, logos, or trademarks to
|
||||
market your programs, except to state that your program was written
|
||||
using the Software.
|
||||
|
||||
6. LICENSEE'S BREACH OF CONTRACT
|
||||
In addition to penalties, other sanctions and the like as stated in
|
||||
the Swedish Copyright Act (1960:729), or successive legislation as it
|
||||
may appear, the Licensee agrees to pay a Contractual Fine in case of
|
||||
his/her/their breach of any of the above mentioned obligations,
|
||||
including but not limited to, the Licensee's obligation to let only
|
||||
one person per license use the Software as stated under above. The
|
||||
Contractual Fine is EUR 5000 and is payable by the Licensee to the
|
||||
Licenser immediately upon the Licenser having reasonably demonstrated
|
||||
that the Licensee is in breach of his obligations in this Agreement.
|
||||
|
||||
7. WARRANTY DISCLAIMER
|
||||
THE SOFTWARE IS LICENSED TO YOU "AS IS". TO THE MAXIMUM EXTENT
|
||||
PERMITTED BY APPLICABLE LAW, KDAB ON BEHALF OF ITSELF AND ITS SUPPLIERS,
|
||||
DISCLAIMS ALL WARRANTIES AND CONDITIONS, EITHER EXPRESS OR IMPLIED,
|
||||
INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT WITH
|
||||
REGARD TO THE SOFTWARE.
|
||||
|
||||
8. LIMITATION OF LIABILITY
|
||||
IF, KDAB'S WARRANTY DISCLAIMER NOTWITHSTANDING, KDAB IS HELD LIABLE TO
|
||||
YOU BASED ON THE SOFTWARE, KDAB'S ENTIRE LIABILITY TO YOU AND YOUR
|
||||
EXCLUSIVE REMEDY SHALL BE, AT REPAIR OR REPLACEMENT OF THE SOFTWARE,
|
||||
PROVIDED YOU RETURN TO KDAB ALL COPIES OF THE SOFTWARE AS ORIGINALLY
|
||||
DELIVERED TO YOU. KDAB SHALL NOT UNDER ANY CIRCUMSTANCES BE LIABLE TO
|
||||
YOU BASED ON FAILURE OF THE SOFTWARE IF THE FAILURE RESULTED FROM
|
||||
ACCIDENT, ABUSE OR MISAPPLICATION, NOR SHALL KDAB UNDER ANY
|
||||
CIRCUMSTANCES BE LIABLE FOR SPECIAL DAMAGES, PUNITIVE OR EXEMPLARY
|
||||
DAMAGES, DAMAGES FOR LOSS OF PROFITS OR INTERRUPTION OF BUSINESS OR
|
||||
FOR LOSS OR CORRUPTION OF DATA.
|
||||
|
||||
9. This Agreement may only be modified in writing signed by you and an
|
||||
authorized officer of KDAB. All terms of any purchase order or other
|
||||
ordering document shall be superseded by this Agreement.
|
||||
|
||||
10. This Agreement shall be construed, interpreted and governed by the
|
||||
laws of Sweden, the venue to be Sunne Tingsratt.
|
||||
@@ -1,147 +0,0 @@
|
||||
COMMERCIAL LICENSE AGREEMENT
|
||||
FOR COMMERCIAL VERSIONS
|
||||
December 20, 2016
|
||||
|
||||
|
||||
IMPORTANT-READ CAREFULLY: This Klarälvdalens Datakonsult AB End-User
|
||||
License Agreement ("EULA") is a legal agreement between you (either an
|
||||
individual or a legal entity) and Klarälvdalens Datakonsult AB
|
||||
("KDAB") for the Klarälvdalens Datakonsult AB software product(s)
|
||||
accompanying this EULA, which include(s) computer software and may
|
||||
include "online" or electronic documentation, associated media, and
|
||||
printed materials ("Licensed Product").
|
||||
|
||||
The Licensed Product is protected by copyright laws and international
|
||||
copyright treaties, as well as other intellectual property laws and
|
||||
treaties. The Licensed Product is licensed, not sold.
|
||||
|
||||
By installing, copying, or otherwise using the Licensed Product, you
|
||||
agree to be bound by the terms of this EULA. If you do not agree to
|
||||
the terms of this EULA, do not install, copy, or otherwise use the
|
||||
Licensed Product; you may, however, return it to your place of
|
||||
purchase for a full refund. In addition, by installing, copying, or
|
||||
otherwise using any updates or other components of the Licensed
|
||||
Product that you receive separately as part of the Licensed Product
|
||||
("Updates"), you agree to be bound by any additional license terms
|
||||
that accompany such Updates. If you do not agree to the additional
|
||||
license terms that accompany such Updates, you may not install, copy,
|
||||
or otherwise use such Updates.
|
||||
|
||||
Upon your acceptance of the terms and conditions of this EULA, KDAB
|
||||
grants you the right to use the Licensed Product in the manner
|
||||
provided below.
|
||||
|
||||
KDAB grants to you as an individual a personal, nonexclusive,
|
||||
nontransferable license to make and use copies of the Licensed Product
|
||||
for the sole purposes of designing, developing, and testing your
|
||||
software product(s) ("Applications"). You may install copies of the
|
||||
Licensed Product on an unlimited number of computers provided that you
|
||||
are the only individual using the Licensed Product. If you are an
|
||||
entity, KDAB grants you the right to designate one, and only one,
|
||||
individual within your organization who shall have the sole right to
|
||||
use the Licensed Product in the manner provided above. You may at any
|
||||
time, but not more frequently that once every six (6) months,
|
||||
designate another individual to replace the current designated user by
|
||||
notifying KDAB, so long as there is no more than one designated user
|
||||
at any given time.
|
||||
|
||||
|
||||
GENERAL TERMS THAT APPLY TO APPLICATIONS AND REDISTRIBUTABLES
|
||||
KDAB grants you a nonexclusive, royalty-free right to reproduce and
|
||||
distribute the object code form of any portion of the Licensed Product
|
||||
("Redistributables") for execution on any operating system of a type
|
||||
listed in the License Certificate ("Platforms"). Copies of
|
||||
Redistributables may only be distributed with and for the sole purpose
|
||||
of executing Applications permitted under this License Agreement that
|
||||
you have created using the Licensed Product. Under no circumstances
|
||||
may any copies of Redistributables be distributed separately.
|
||||
|
||||
The license granted in this EULA for you to create your own
|
||||
Applications and distribute them and the Redistributables (if any) to
|
||||
your customers is subject to all of the following conditions: (i) all
|
||||
copies of the Applications you create must bear a valid copyright
|
||||
notice, either your own or the copyright notice that appears on the
|
||||
Licensed Product; (ii) you may not remove or alter any copyright,
|
||||
trademark or other proprietary rights notice contained in any portion
|
||||
of the Licensed Product; (iii) Redistributables, if any, shall be
|
||||
licensed to your customer "as is" (KDAB MAKES NO WARRANTIES OR
|
||||
REPRESENTATIONS VIS-A-VIS YOUR CUSTOMER WITH RESPECT TO
|
||||
REDISTRIBUTABLES, AND KDAB EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES
|
||||
VIS-A-VIS YOUR CUSTOMER, WHETHER EXPRESS OR IMPLIED, ORAL OR WRITTEN,
|
||||
INCLUDING, BUT NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY
|
||||
OR FITNESS FOR ANY PARTICULAR PURPOSE, WHETHER OR NOT KDAB KNOWS, HAS
|
||||
REASON TO KNOW, HAS BEEN ADVISED OR IS OTHERWISE AWARE OF SUCH
|
||||
PURPOSE); (iv) you will indemnify and hold KDAB, its related companies
|
||||
and its suppliers, harmless from and against any claims or liabilities
|
||||
arising out of the use, reproduction or distribution of your
|
||||
Applications; (v) your Applications must be written using a licensed,
|
||||
registered copy of the Licensed Product; (vi) your Applications must
|
||||
add primary and substantial functionality to the Licensed Product;
|
||||
(vii) your Applications may not pass on functionality which in any way
|
||||
makes it possible for others to create Applications with the Software;
|
||||
(viii) your Applications may not compete with the Licensed Product;
|
||||
(ix)) you may not use KDAB's or any of its suppliers' names, logos, or
|
||||
trademarks to market your programs, except to state that your program
|
||||
was written using the Licensed Product.
|
||||
|
||||
LICENSEE'S BREACH OF CONTRACT
|
||||
In addition to penalties, other sanctions and the like as stated in
|
||||
the Swedish Copyright Act (1960:729), or successive legislation as it
|
||||
may appear, the Licensee agrees to pay a Contractual Fine in case of
|
||||
his/her/their breach of any of the above mentioned obligations,
|
||||
including but not limited to, the Licensee's obligation to let only
|
||||
one person per license use the Software as stated under above. The
|
||||
Contractual Fine is EUR 5000 and is payable by the Licensee to the
|
||||
Licenser immediately upon the Licenser having reasonably demonstrated
|
||||
that the Licensee is in breach of his obligations in this Agreement.
|
||||
|
||||
WARRANTY DISCLAIMER
|
||||
THE LICENSED PRODUCT IS LICENSED TO YOU "AS IS". TO THE MAXIMUM
|
||||
EXTENT PERMITTED BY APPLICABLE LAW, KDAB ON BEHALF OF ITSELF AND ITS
|
||||
SUPPLIERS, DISCLAIMS ALL WARRANTIES AND CONDITIONS, EITHER EXPRESS OR
|
||||
IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
|
||||
NON-INFRINGEMENT WITH REGARD TO THE LICENSED PRODUCT. THIS WARRANTY
|
||||
DISCLAIMER NOTWITHSTANDING, YOU MAY HAVE SPECIFIC LEGAL RIGHTS WHICH
|
||||
MAY VARY FROM STATE/JURISDICTION TO STATE/JURISDICTION.
|
||||
|
||||
|
||||
LIMITATION OF LIABILITY
|
||||
IF, KDAB'S WARRANTY DISCLAIMER NOTWITHSTANDING, KDAB IS HELD LIABLE TO
|
||||
YOU, WHETHER IN CONTRACT, TORT OR ANY OTHER LEGAL THEORY, BASED ON THE
|
||||
LICENSED PRODUCT, KDAB'S ENTIRE LIABILITY TO YOU AND YOUR EXCLUSIVE
|
||||
REMEDY SHALL BE, AT KDAB'S OPTION, EITHER (A) RETURN OF THE PRICE YOU
|
||||
PAID FOR THE LICENSED PRODUCT, OR (B) REPAIR OR REPLACEMENT OF THE
|
||||
LICENSED PRODUCT, PROVIDED YOU RETURN TO KDAB ALL COPIES OF THE
|
||||
LICENSED PRODUCT AS ORIGINALLY DELIVERED TO YOU. KDAB SHALL NOT UNDER
|
||||
ANY CIRCUMSTANCES BE LIABLE TO YOU BASED ON FAILURE OF THE LICENSED
|
||||
PRODUCT IF THE FAILURE RESULTED FROM ACCIDENT, ABUSE OR
|
||||
MISAPPLICATION, NOR SHALL KDAB UNDER ANY CIRCUMSTANCES BE LIABLE FOR
|
||||
SPECIAL DAMAGES, PUNITIVE OR EXEMPLARY DAMAGES, DAMAGES FOR LOSS OF
|
||||
PROFITS OR INTERRUPTION OF BUSINESS OR FOR LOSS OR CORRUPTION OF DATA.
|
||||
ANY AWARD OF DAMAGES FROM KDAB TO YOU SHALL NOT EXCEED THE TOTAL AMOUNT
|
||||
YOU HAVE PAID TO KDAB IN CONNECTION WITH THIS EULA.
|
||||
|
||||
|
||||
SUPPORT AND UPDATES
|
||||
You will receive email based, software developer support and access to
|
||||
Updates to the Licensed Product for one year from the date of initial
|
||||
delivery, in accordance with KDAB support policies and procedures.
|
||||
Such policies and procedures may be changed from time to time.
|
||||
|
||||
|
||||
GENERAL PROVISIONS
|
||||
This EULA may only be modified in writing signed by you and an
|
||||
authorized officer of KDAB. All terms of any purchase order or other
|
||||
ordering document shall be superseded by this EULA. If any provision
|
||||
of the EULA is found void or unenforceable, the remainder will remain
|
||||
valid and enforceable according to its terms. If any remedy provided
|
||||
is determined to have failed for its essential purpose, all
|
||||
limitations of liability and exclusions of damages set forth in this
|
||||
EULA shall remain in effect.
|
||||
|
||||
This EULA shall be construed, interpreted and governed by the laws of
|
||||
Sweden, the venue to be Sunne Tingsratt. The EULA gives you specific
|
||||
legal rights; you may have others, which vary from state to state and
|
||||
from country to country. KDAB reserves all rights not specifically
|
||||
granted in this EULA.
|
||||
@@ -1,12 +0,0 @@
|
||||
Permission to use, copy, modify, and distribute this software for any
|
||||
purpose with or without fee is hereby granted, provided that the above
|
||||
copyright notice and this permission notice appear in all copies.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From f583921012ed1f4e853f41d4fd3d95d1a819ac03 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 4 Aug 2018 02:48:14 +0200
|
||||
Subject: [PATCH] Make sure to find python3 sip code generator
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
configure.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.py b/configure.py
|
||||
index a263efb..daefc0e 100644
|
||||
--- a/configure.py
|
||||
+++ b/configure.py
|
||||
@@ -522,7 +522,7 @@ class TargetConfiguration:
|
||||
self.qtconf_prefix = ''
|
||||
self.qt_shared = False
|
||||
self.qt_version = 0
|
||||
- self.sip = self._find_exe('sip5', 'sip')
|
||||
+ self.sip = self._find_exe('sip3')
|
||||
self.sip_h_version = None
|
||||
self.sip_inc_dir = self.py_venv_inc_dir
|
||||
self.static = False
|
||||
--
|
||||
2.14.4
|
||||
|
||||
76
recipes-bindings/python3-pyqt5_5.9.2.bb
Normal file
76
recipes-bindings/python3-pyqt5_5.9.2.bb
Normal file
@@ -0,0 +1,76 @@
|
||||
SUMMARY = "Python Qt5 Bindings"
|
||||
AUTHOR = "Phil Thomson @ riverbank.co.uk"
|
||||
HOMEPAGE = "http://riverbankcomputing.co.uk"
|
||||
SECTION = "devel/python"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
SRC_URI = "\
|
||||
https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-${PV}/PyQt5_gpl-${PV}.tar.gz \
|
||||
file://0001-Make-sure-to-find-python3-sip-code-generator.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "33d6d2ab8183da17ac18b8132a4b278e"
|
||||
SRC_URI[sha256sum] = "c190dac598c97b0113ca5e7a37c71c623f02d1d713088addfacac4acfa4b8394"
|
||||
|
||||
PE = "1"
|
||||
|
||||
inherit qmake5 python3native
|
||||
|
||||
DEPENDS += "sip3-native sip3 qtbase python3"
|
||||
DEPENDS_append_class-target = "qtsvg"
|
||||
|
||||
S = "${WORKDIR}/PyQt5_gpl-${PV}"
|
||||
B = "${S}"
|
||||
|
||||
DISABLED_FEATURES = "PyQt_Desktop_OpenGL"
|
||||
|
||||
DISABLED_FEATURES_append_arm = " PyQt_qreal_double"
|
||||
|
||||
PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets QtSvg"
|
||||
PYQT_MODULES_class-native = "QtCore"
|
||||
PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets QtSvg"
|
||||
|
||||
# full paths
|
||||
SYSROOTDIR = "${STAGING_DIR_HOST}"
|
||||
SYSROOTDIR_class-native = "${STAGING_DIR_NATIVE}"
|
||||
INCLUDEDIR = "${STAGING_INCDIR}"
|
||||
INCLUDEDIR_class-native = "${STAGING_INCDIR_NATIVE}"
|
||||
LIBDIR = "${STAGING_LIBDIR}"
|
||||
LIBDIR_class-native = "${STAGING_LIBDIR_NATIVE}"
|
||||
PYTHONEXEC="${bindir}/${PYTHON_PN}"
|
||||
PYTHONEXEC_class-native="${PYTHON}"
|
||||
|
||||
do_configure() {
|
||||
echo "py_platform = linux" > pyqt.cfg
|
||||
echo "py_inc_dir = ${INCLUDEDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg
|
||||
echo "py_pylib_dir = ${LIBDIR}/python${PYTHON_BASEVERSION}" >> pyqt.cfg
|
||||
echo "py_pylib_lib = python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg
|
||||
echo "pyqt_module_dir = ${D}/${PYTHON_SITEPACKAGES_DIR}" >> pyqt.cfg
|
||||
echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg
|
||||
echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg
|
||||
echo "pyuic_interpreter = ${PYTHONEXEC}" >> pyqt.cfg
|
||||
echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg
|
||||
echo "qt_shared = True" >> pyqt.cfg
|
||||
QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION`
|
||||
echo "[Qt $QT_VERSION]" >> pyqt.cfg
|
||||
echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg
|
||||
echo yes | python3 configure.py --verbose --qmake ${OE_QMAKE_QMAKE} --configuration pyqt.cfg --sysroot ${SYSROOTDIR}
|
||||
}
|
||||
|
||||
do_install() {
|
||||
oe_runmake install
|
||||
}
|
||||
|
||||
do_install_class-native() {
|
||||
oe_runmake install
|
||||
}
|
||||
|
||||
RDEPENDS_${PN}_append_class-target = " python3-core python3-sip"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${libdir}/${PYTHON_DIR}/site-packages \
|
||||
${datadir}/sip/PyQt5 \
|
||||
"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
44
recipes-bindings/sip3_4.19.8.bb
Normal file
44
recipes-bindings/sip3_4.19.8.bb
Normal file
@@ -0,0 +1,44 @@
|
||||
SUMMARY = "SIP is a C++/Python Wrapper Generator"
|
||||
HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
|
||||
SECTION = "devel"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"
|
||||
|
||||
inherit python3-dir
|
||||
|
||||
DEPENDS = "python3"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz"
|
||||
SRC_URI[md5sum] = "0625fb20347d4ff1b5da551539be0727"
|
||||
SRC_URI[sha256sum] = "7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc"
|
||||
BPN = "sip"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
PACKAGES += "python3-sip"
|
||||
|
||||
do_configure_prepend_class-target() {
|
||||
echo "py_platform = linux" > sip.cfg
|
||||
echo "py_inc_dir = %(sysroot)/${includedir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> sip.cfg
|
||||
echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg
|
||||
echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
|
||||
echo "sip_module_dir = ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages" >> sip.cfg
|
||||
echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
|
||||
python3 configure.py --configuration sip.cfg --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}"
|
||||
}
|
||||
do_configure_prepend_class-native() {
|
||||
echo "py_platform = linux" > sip.cfg
|
||||
echo "py_inc_dir = ${includedir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> sip.cfg
|
||||
echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg
|
||||
echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
|
||||
echo "sip_module_dir = ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages" >> sip.cfg
|
||||
echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
|
||||
python3 configure.py --configuration sip.cfg --sysroot ${STAGING_DIR_NATIVE}
|
||||
}
|
||||
do_install() {
|
||||
oe_runmake install
|
||||
# avoid conflicts with sip for python2
|
||||
mv ${D}/${bindir}/sip ${D}/${bindir}/sip3
|
||||
}
|
||||
|
||||
FILES_python3-sip = "${libdir}/${PYTHON_DIR}/site-packages/"
|
||||
@@ -1,25 +0,0 @@
|
||||
SUMMARY = "Connectagram is a word unscrambling game"
|
||||
HOMEPAGE = "https://gottcode.org/connectagram/"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
inherit qmake5 qt5-translation gtk-icon-cache
|
||||
|
||||
DEPENDS = "qttools-native qtbase hicolor-icon-theme"
|
||||
|
||||
SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
|
||||
SRC_URI[md5sum] = "6ec03e98a79b8404a414353a3538aec7"
|
||||
SRC_URI[sha256sum] = "a711da70bd08383dd06b5f7ccbd92dcd201165426dfd20343c64f584a23f9de1"
|
||||
PV = "1.2.11"
|
||||
UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/metainfo \
|
||||
"
|
||||
|
||||
# WIP: qt5-translation expects *.qm to work properly so pack word data in PN for now
|
||||
FILES_${PN} += " \
|
||||
${datadir}/connectagram/data \
|
||||
"
|
||||
@@ -3,9 +3,9 @@ HOMEPAGE = "http://gottcode.org/gottet/"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
inherit qmake5 qt5-translation gtk-icon-cache mime-xdg
|
||||
inherit qmake5 qt5-translation gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
DEPENDS = " \
|
||||
qttools-native \
|
||||
qtbase \
|
||||
qtmultimedia \
|
||||
@@ -14,10 +14,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
|
||||
SRC_URI[md5sum] = "ba9e316b4bc0c4568d71f7dc3cd64fff"
|
||||
SRC_URI[sha256sum] = "34f576a49c9fe64aedad66e02efafc29c840b6c3ddc98a42d87dfda499710541"
|
||||
PV = "1.7.6"
|
||||
UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
|
||||
SRC_URI[md5sum] = "b3bcf028c519b6a6daabfc71055d4ca8"
|
||||
SRC_URI[sha256sum] = "0190fff4930213b2e32d5d76750af784f45f89046d239da466dc5c9f625ec05b"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
|
||||
|
||||
@@ -25,6 +23,7 @@ FILES_${PN} += " \
|
||||
${datadir}/metainfo \
|
||||
${datadir}/${BPN}/icons \
|
||||
${datadir}/${BPN}/symbols1000.dat \
|
||||
${datadir}/${BPN}/icons \
|
||||
${datadir}/${BPN}/themes \
|
||||
${datadir}/${BPN}/sounds \
|
||||
"
|
||||
@@ -8,10 +8,8 @@ inherit qmake5 qt5-translation gtk-icon-cache
|
||||
DEPENDS = "qttools-native qtbase hicolor-icon-theme"
|
||||
|
||||
SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
|
||||
SRC_URI[md5sum] = "9e0c5cf63233376228dc7888515e6556"
|
||||
SRC_URI[sha256sum] = "6c979caa5b3fa6854ca8367ca0595814fcc101f0bdfad02d64219dd9049abb2b"
|
||||
PV = "1.1.9"
|
||||
UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
|
||||
SRC_URI[md5sum] = "f5a0a46d4d1c40c98f20be531aacf488"
|
||||
SRC_URI[sha256sum] = "7cc6c49cb191a264dccf18659b885ead921f01ad496dac9774c7ec49428c8a7d"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
|
||||
|
||||
@@ -8,10 +8,8 @@ inherit qmake5 qt5-translation gtk-icon-cache
|
||||
DEPENDS = "qttools-native qtbase hicolor-icon-theme"
|
||||
|
||||
SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
|
||||
SRC_URI[md5sum] = "4c318906a2782aed37a1e7244f73f97c"
|
||||
SRC_URI[sha256sum] = "5d3198523960d4df394d2092cd7e7b9003878a70a2934dbada60947651b1c88d"
|
||||
PV = "1.1.6"
|
||||
UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
|
||||
SRC_URI[md5sum] = "0b8d536e87c634471543cfae97b7b1c0"
|
||||
SRC_URI[sha256sum] = "9dfdaaf802f792dbd539b7e87674f942a773970aa50c298cd395b5d21a9acca3"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
SUMMARY = "Kapow is a punch clock program to easily keep track of your hours"
|
||||
HOMEPAGE = "https://gottcode.org/kapow/"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
inherit qmake5 qt5-translation gtk-icon-cache
|
||||
|
||||
DEPENDS = "qttools-native qtbase hicolor-icon-theme"
|
||||
|
||||
SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
|
||||
SRC_URI[md5sum] = "51900b071ef71da4c86ee38bda161e72"
|
||||
SRC_URI[sha256sum] = "6ba62239f5717422d899573ff50f8a967aea8fbbd79ac57406d6b86a333d027c"
|
||||
PV = "1.5.10"
|
||||
UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/metainfo \
|
||||
"
|
||||
@@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
|
||||
inherit packagegroup
|
||||
|
||||
RDEPENDS_${PN} = " \
|
||||
connectagram \
|
||||
focuswriter \
|
||||
gottet \
|
||||
hexalate \
|
||||
kapow \
|
||||
peg-e \
|
||||
simsu \
|
||||
tetzle \
|
||||
|
||||
@@ -8,10 +8,8 @@ inherit qmake5 qt5-translation gtk-icon-cache
|
||||
DEPENDS = "qttools-native qtbase hicolor-icon-theme"
|
||||
|
||||
SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
|
||||
SRC_URI[md5sum] = "ea2659e5cf6e0d981189cbe2751588df"
|
||||
SRC_URI[sha256sum] = "06d6a07c056b82372cdd6ac258dbfedab397ad4f13b70117f548b8218201ff17"
|
||||
PV = "1.2.8"
|
||||
UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
|
||||
SRC_URI[md5sum] = "001a9d449c47e7dca9c9c93defbaa946"
|
||||
SRC_URI[sha256sum] = "b7a644397a6e8fd24c5df72a8c5950af8de035c9fafc712fea5eae87eea15d81"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
|
||||
|
||||
@@ -8,10 +8,8 @@ inherit qmake5 qt5-translation gtk-icon-cache
|
||||
DEPENDS = "qttools-native qtbase hicolor-icon-theme"
|
||||
|
||||
SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
|
||||
SRC_URI[md5sum] = "dc33b6c8c0cc5c60e47e1c094f99c467"
|
||||
SRC_URI[sha256sum] = "b5df8994ff7bc35e775c466c8214e4362d1f720757383c9cd412693fcb6f143b"
|
||||
PV = "1.3.9"
|
||||
UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
|
||||
SRC_URI[md5sum] = "f7567be498c365b6a2e301346d08659a"
|
||||
SRC_URI[sha256sum] = "a3c56b6339fd314b198b7ec89d27f1919d4b480e7e0eae03980dda5fec31cd6a"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
|
||||
|
||||
@@ -3,15 +3,13 @@ HOMEPAGE = "https://gottcode.org/tetzle/"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
inherit qmake5 qt5-translation gtk-icon-cache mime-xdg
|
||||
inherit qmake5 qt5-translation gtk-icon-cache
|
||||
|
||||
DEPENDS += "qttools-native qtbase hicolor-icon-theme"
|
||||
DEPENDS = "qttools-native qtbase hicolor-icon-theme"
|
||||
|
||||
SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
|
||||
SRC_URI[md5sum] = "dc3e1545aaba5d7571c84a1a30c04210"
|
||||
SRC_URI[sha256sum] = "fbc3c86b5bf64187f89379176bd0085c636605d9594c7af8d0c056760d6cf80a"
|
||||
PV = "2.1.6"
|
||||
UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\-src\.tar"
|
||||
SRC_URI[md5sum] = "df7a1a9174a3802b8738ddb3f423d0da"
|
||||
SRC_URI[sha256sum] = "ef67083018dc5e22a61d52e3041d6d725753e6ed5bc70b770159d867451c8cb1"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
SUMMARY = "A lightweight compositor for X11"
|
||||
HOMEPAGE = "https://github.com/yshui/picom"
|
||||
LICENSE = "MPL-2.0 & MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a9a621b5a1b8f702c605093d657b550c"
|
||||
|
||||
SRC_URI = "git://github.com/yshui/picom.git;branch=stable/8"
|
||||
SRCREV = "dac85eac10082dfc3df463aaa74b811144e22122"
|
||||
PV = "8.2"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
DEPENDS = " \
|
||||
libxext \
|
||||
libxdamage \
|
||||
libxfixes \
|
||||
xcb-util-renderutil \
|
||||
libxrender \
|
||||
libxrandr \
|
||||
libxcomposite \
|
||||
xcb-util-image \
|
||||
libxpresent \
|
||||
libxinerama \
|
||||
libdrm \
|
||||
libev \
|
||||
pixman \
|
||||
dbus \
|
||||
libconfig \
|
||||
libpcre \
|
||||
uthash \
|
||||
"
|
||||
|
||||
inherit meson features_check gtk-icon-cache
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
|
||||
PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false,virtual/libgl"
|
||||
@@ -1,33 +0,0 @@
|
||||
From 04d58fcb669c9d6ee79cdd630f04791b61f417cc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 8 Jun 2020 17:10:03 +0200
|
||||
Subject: [PATCH] Fix build with Qt >= 5.15
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fixes:
|
||||
| ../qpdfview-0.4.18/sources/model.h:46:22: error: field 'boundary' has incomplete type 'QPainterPath'
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
sources/model.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/sources/model.h b/sources/model.h
|
||||
index 6363c32..dc10a8c 100644
|
||||
--- a/sources/model.h
|
||||
+++ b/sources/model.h
|
||||
@@ -27,6 +27,7 @@ along with qpdfview. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include <QtPlugin>
|
||||
#include <QWidget>
|
||||
#include <QVector>
|
||||
+#include <QPainterPath>
|
||||
|
||||
class QAbstractItemModel;
|
||||
class QColor;
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
SUMMARY = "The Linux perf GUI for performance analysis"
|
||||
LICENSE = "GPLv2+ | KDAB-Commercial | KDAB-Commercial-US"
|
||||
LICENSE = "GPLv2+ | KDAB-Commercial"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.txt;md5=50a9af6464b390664488e7af1cc5c148 \
|
||||
file://LICENSE.GPL.txt;md5=8b7a65584aeb92995bcb6066ed0f58f7 \
|
||||
file://LICENSE.txt;md5=a6b8a64054f1549420f27724acd2337a \
|
||||
file://LICENSE.GPL.txt;md5=eed541e1ee57f0373b3cb5824dfe6b93 \
|
||||
file://LICENSE.US.txt;md5=1cf6e30372544be558f7146a7e229cdd \
|
||||
"
|
||||
|
||||
@@ -22,9 +22,9 @@ DEPENDS += " \
|
||||
solid \
|
||||
"
|
||||
SRC_URI = "gitsm://github.com/KDAB/hotspot.git"
|
||||
SRCREV = "35d1865babf40b9df454810ca8cc09e77b0c349a"
|
||||
SRCREV = "a41a0a5ba1fead202bfdcb2198f192114d030484"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "1.2.0+git${SRCPV}"
|
||||
PV = "1.1.0+git${SRCPV}"
|
||||
|
||||
FILES_${PN} += "${datadir}/icons"
|
||||
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
SUMMARY = "A Qt tool for creating business and scientific charts"
|
||||
LICENSE = "GPLv2+ | KDAB-Commercial"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.txt;md5=d5e1956ab398a4ae39e2470a9abd4889 \
|
||||
file://LICENSE.GPL.txt;md5=6af452a21ffa624c438c2cde4423a893 \
|
||||
"
|
||||
|
||||
inherit cmake_qt5_extra
|
||||
|
||||
DEPENDS += " \
|
||||
qtbase \
|
||||
qtsvg \
|
||||
"
|
||||
|
||||
do_install_append() {
|
||||
# these have gone wild / qmake was always pain
|
||||
rm -r ${D}/usr/mkspecs
|
||||
}
|
||||
|
||||
SRC_URI = "git://github.com/KDAB/KDChart.git"
|
||||
SRCREV = "95547e8a2f6c362db1dd071a2df00b0e75e05da0"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "2.7.2"
|
||||
|
||||
FILES_${PN}-dev += "${datadir}/mkspecs"
|
||||
@@ -1,24 +0,0 @@
|
||||
SUMMARY = "Qt library for generating printable and exportable reports"
|
||||
DESCRIPTION = "Qt library for generating printable and exportable reports from code and from XML descriptions"
|
||||
LICENSE = "(LGPL-2.1 | LGPL-3.0) & (GPL-2.0 | GPL-3.0 ) | KDAB-Commercial"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.txt;md5=d988404a6396edf41e7f8cbb2db3c185 \
|
||||
"
|
||||
|
||||
inherit cmake_qt5_extra
|
||||
|
||||
DEPENDS += " \
|
||||
qtbase \
|
||||
kdcharts \
|
||||
"
|
||||
|
||||
SRC_URI = "git://github.com/KDAB/KDReports.git"
|
||||
SRCREV = "47728293e7842140d36a7861cf4316f2c1cbd795"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "1.9.0"
|
||||
|
||||
do_install_append() {
|
||||
# these have gone wild / qmake was always pain
|
||||
rm -r ${D}/usr/mkspecs
|
||||
}
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
inherit native
|
||||
|
||||
SRC_URI += "file://0001-Just-build-bare-kdwsdl2cpp-for-native.patch"
|
||||
@@ -1,10 +0,0 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
DEPENDS += " \
|
||||
${BPN}-native \
|
||||
qtbase \
|
||||
"
|
||||
|
||||
SRC_URI += "file://0002-Do-not-export-kdwsdl2cpp-as-target-it-will-fin-it-s-.patch"
|
||||
|
||||
FILES_${PN}-dev += "${datadir}/mkspecs"
|
||||
@@ -1,15 +0,0 @@
|
||||
SUMMARY = "A Qt-based client-side and server-side SOAP component"
|
||||
LICENSE = "(GPLv2 & LGPLv2.1 & AGPL-3.0) | KDAB-Commercial"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSE.GPL.txt;md5=63e3028b49eac8f84ab29661f079f159 \
|
||||
file://LICENSE.LGPL.txt;md5=ce198ec102c2f0b1d13f26967a934670 \
|
||||
file://LICENSE.AGPL3-modified.txt;md5=6b6dcd83ea786a77851d959c2797f78c \
|
||||
file://LICENSE.txt;md5=a0def7eadd11e7a9916a16e5d8bc1a82 \
|
||||
"
|
||||
|
||||
inherit cmake_qt5
|
||||
|
||||
SRC_URI = "git://github.com/KDAB/KDSoap.git;protocol=https"
|
||||
SRCREV = "fb0e905e242c2044fd25683a406eb6d369db052f"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "1.9.0"
|
||||
@@ -1,117 +0,0 @@
|
||||
From 4c0ea920ab34615d3cf83ef018c8485e3c07fa4f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 22 May 2020 09:56:41 +0200
|
||||
Subject: [PATCH] Just build bare kdwsdl2cpp for native
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
kdwsdl2cpp/common/fileprovider.cpp | 2 +-
|
||||
kdwsdl2cpp/src/main.cpp | 6 +++---
|
||||
kdwsdl2cpp/src/settings.cpp | 2 +-
|
||||
kdwsdl2cpp/src/settings.h | 4 ++--
|
||||
5 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index addbafe2..596425e4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -190,9 +190,9 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
|
||||
)
|
||||
endif()
|
||||
|
||||
-add_subdirectory(src)
|
||||
+#add_subdirectory(src)
|
||||
add_subdirectory(kdwsdl2cpp)
|
||||
-if(${PROJECT_NAME}_IS_ROOT_PROJECT)
|
||||
+if(false)
|
||||
|
||||
export(TARGETS kdsoap kdsoap-server kdwsdl2cpp NAMESPACE KDSoap::
|
||||
FILE "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapTargets.cmake"
|
||||
diff --git a/kdwsdl2cpp/common/fileprovider.cpp b/kdwsdl2cpp/common/fileprovider.cpp
|
||||
index 1f23554d..45124850 100644
|
||||
--- a/kdwsdl2cpp/common/fileprovider.cpp
|
||||
+++ b/kdwsdl2cpp/common/fileprovider.cpp
|
||||
@@ -106,7 +106,7 @@ bool FileProvider::get( const QUrl &url, QString &target )
|
||||
|
||||
QNetworkAccessManager manager;
|
||||
QNetworkRequest request(url);
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
|
||||
+#if FALSE
|
||||
if (Settings::self()->certificateLoaded()) {
|
||||
QSslConfiguration sslConfig = request.sslConfiguration();
|
||||
sslConfig.setPrivateKey(Settings::self()->sslKey());
|
||||
diff --git a/kdwsdl2cpp/src/main.cpp b/kdwsdl2cpp/src/main.cpp
|
||||
index 8905b6dc..8ac65f9e 100644
|
||||
--- a/kdwsdl2cpp/src/main.cpp
|
||||
+++ b/kdwsdl2cpp/src/main.cpp
|
||||
@@ -67,7 +67,7 @@ static void showHelp(const char *appName)
|
||||
" use of the import-path option\n"
|
||||
" -help-on-missing When groups or basic types could not be found, display\n"
|
||||
" available types (helps with wrong namespaces)\n"
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
|
||||
+#if FALSE
|
||||
" -pkcs12file Load a certificate from a PKCS12 file. You can use this option\n"
|
||||
" if the WSDL file (or files refering to it) is served from a \n"
|
||||
" location which require certificate based authentication\n"
|
||||
@@ -217,7 +217,7 @@ int main(int argc, char **argv)
|
||||
useLocalFilesOnly = true;
|
||||
} else if (opt == QLatin1String("-help-on-missing")) {
|
||||
helpOnMissing = true;
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
|
||||
+#if FALSE
|
||||
} else if (opt == QLatin1String("-pkcs12file")) {
|
||||
++arg;
|
||||
if (!argv[arg]) {
|
||||
@@ -288,7 +288,7 @@ int main(int argc, char **argv)
|
||||
Settings::self()->setHelpOnMissing(helpOnMissing);
|
||||
|
||||
KWSDL::Compiler compiler;
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
|
||||
+#if FALSE
|
||||
if (!pkcs12File.isEmpty()) {
|
||||
if (!Settings::self()->loadCertificate(pkcs12File, pkcs12Password))
|
||||
return -1;
|
||||
diff --git a/kdwsdl2cpp/src/settings.cpp b/kdwsdl2cpp/src/settings.cpp
|
||||
index 2e25e01a..db7b8aab 100644
|
||||
--- a/kdwsdl2cpp/src/settings.cpp
|
||||
+++ b/kdwsdl2cpp/src/settings.cpp
|
||||
@@ -252,7 +252,7 @@ bool Settings::helpOnMissing() const
|
||||
return mHelpOnMissing;
|
||||
}
|
||||
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
|
||||
+#if FALSE
|
||||
bool Settings::loadCertificate(const QString &certPath, const QString & password)
|
||||
{
|
||||
QFile certFile(certPath);
|
||||
diff --git a/kdwsdl2cpp/src/settings.h b/kdwsdl2cpp/src/settings.h
|
||||
index c5ca846f..f177ea77 100644
|
||||
--- a/kdwsdl2cpp/src/settings.h
|
||||
+++ b/kdwsdl2cpp/src/settings.h
|
||||
@@ -87,7 +87,7 @@ public:
|
||||
bool helpOnMissing() const;
|
||||
void setHelpOnMissing(bool b);
|
||||
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
|
||||
+#if FALSE
|
||||
bool loadCertificate(const QString & certPath, const QString &password = QString());
|
||||
bool certificateLoaded() const;
|
||||
QSslKey sslKey() const;
|
||||
@@ -115,7 +115,7 @@ private:
|
||||
bool mKeepUnusedTypes;
|
||||
bool mUseLocalFilesOnly;
|
||||
bool mHelpOnMissing;
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
|
||||
+#if FALSE
|
||||
QSslKey mSslKey;
|
||||
QSslCertificate mCertificate;
|
||||
QList<QSslCertificate> mCaCertificates;
|
||||
--
|
||||
2.21.1
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
From 1d666d5c6ea5e3b1633c6692572f480e86531a37 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 24 May 2020 00:27:46 +0200
|
||||
Subject: [PATCH] Do not export kdwsdl2cpp as target - it will fin it's way
|
||||
into cross sysroot
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
kdwsdl2cpp/CMakeLists.txt | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index addbafe2..3558dd48 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -194,7 +194,7 @@ add_subdirectory(src)
|
||||
add_subdirectory(kdwsdl2cpp)
|
||||
if(${PROJECT_NAME}_IS_ROOT_PROJECT)
|
||||
|
||||
- export(TARGETS kdsoap kdsoap-server kdwsdl2cpp NAMESPACE KDSoap::
|
||||
+ export(TARGETS kdsoap kdsoap-server NAMESPACE KDSoap::
|
||||
FILE "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapTargets.cmake"
|
||||
)
|
||||
|
||||
diff --git a/kdwsdl2cpp/CMakeLists.txt b/kdwsdl2cpp/CMakeLists.txt
|
||||
index 82418be3..61c46688 100644
|
||||
--- a/kdwsdl2cpp/CMakeLists.txt
|
||||
+++ b/kdwsdl2cpp/CMakeLists.txt
|
||||
@@ -72,7 +72,7 @@ target_link_libraries(kdwsdl2cpp_lib ${QT_LIBRARIES})
|
||||
add_executable(kdwsdl2cpp ${SOURCES_EXE})
|
||||
target_link_libraries(kdwsdl2cpp kdwsdl2cpp_lib ${QT_LIBRARIES})
|
||||
|
||||
-install(TARGETS kdwsdl2cpp EXPORT "KDSoapTargets"
|
||||
+install(TARGETS kdwsdl2cpp
|
||||
RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
|
||||
BUNDLE DESTINATION .
|
||||
)
|
||||
--
|
||||
2.21.1
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
SUMMARY = "Add mathematical features to your program"
|
||||
LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2"
|
||||
LICENSE = "GPLv2 & GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
|
||||
file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-apps
|
||||
@@ -15,7 +15,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "2045657dd16e3f73e3e5e67a7db6cd36c072a85e7957f411a6e348cabc9c469b"
|
||||
SRC_URI[md5sum] = "f8186958405a7ee235ba0bff76c0f126"
|
||||
SRC_URI[sha256sum] = "c241b6a3d849534ccd50601c0aebd5cd785220bb7957ed7f6b1d3db35ba0f925"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/libanalitza \
|
||||
|
||||
@@ -2,10 +2,10 @@ SUMMARY = "Ark is KDE's file archiver"
|
||||
LICENSE = "GPLv2 & LGPLv3"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
|
||||
file://COPYING.icons;md5=78d89b1a70de936b57b7231c94b75ca6 \
|
||||
file://COPYING.icons;md5=6e01bfa20e899e8ad569d5488923cbd2 \
|
||||
"
|
||||
|
||||
inherit kde-apps gtk-icon-cache mime mime-xdg
|
||||
inherit kde-apps gtk-icon-cache
|
||||
|
||||
DEPENDS += "\
|
||||
libarchive \
|
||||
@@ -28,7 +28,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "fedfb2fb9b9d5d7741e7166d2e13049d48a90501f22d046f9ae01469c5957c0e"
|
||||
SRC_URI[md5sum] = "72d72ddaa13a10cd8ed6319fe00e51be"
|
||||
SRC_URI[sha256sum] = "ecf781b5d3691bb967c9170938c1133e2972ee97d71aab2de65487a952700722"
|
||||
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -19,7 +19,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "2fcfb885a5b25e9144fd7e6b9964dc7a394ab009a1f0c361bf7730be756e3132"
|
||||
SRC_URI[md5sum] = "d131f6dec4f4e50d52657087403e4c05"
|
||||
SRC_URI[sha256sum] = "b8475ba1a74f8ebc6a36029b60ac803ab0d2c81c253b8c16bd05b6249454c3e3"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kservices5 \
|
||||
|
||||
@@ -19,7 +19,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "2f646d82ae825a2631394a4c515c265eeef4b2e58eefa6e6375d3eb7fd8eeb1a"
|
||||
SRC_URI[md5sum] = "340d557424fc1ae1defff10a660f39b2"
|
||||
SRC_URI[sha256sum] = "7fc7ff304cf5b5bf2049fdd53fbb4a819bddefc77fde94702c5118240403d972"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From ac4229126c5e11c21db757565597b5c4ccde062a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Thu, 5 Dec 2019 17:23:36 +0100
|
||||
Subject: [PATCH] Do not rely on python2
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
cmake/modules/KDbCreateSharedDataClasses.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/modules/KDbCreateSharedDataClasses.cmake b/cmake/modules/KDbCreateSharedDataClasses.cmake
|
||||
index dc5101d..b764cb3 100644
|
||||
--- a/cmake/modules/KDbCreateSharedDataClasses.cmake
|
||||
+++ b/cmake/modules/KDbCreateSharedDataClasses.cmake
|
||||
@@ -23,7 +23,7 @@ macro(KDB_CREATE_SHARED_DATA_CLASSES)
|
||||
list(GET _args 1 PREFIX)
|
||||
list(REMOVE_AT _args 0 1)
|
||||
# message(STATUS "OUTPUT_VAR: ${OUTPUT_VAR} ${_args}")
|
||||
- find_package(PythonInterp 2.6)
|
||||
+ find_package(PythonInterp)
|
||||
set_package_properties(PythonInterp PROPERTIES DESCRIPTION "Python language interpreter"
|
||||
URL "https://www.python.org" TYPE REQUIRED
|
||||
PURPOSE "Required by the Shared Data Classes (SDC) tool")
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -15,10 +15,8 @@ DEPENDS += " \
|
||||
kcoreaddons \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
|
||||
file://0001-Do-not-rely-on-python2.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "8f8983bc8d143832dc14bc2003ba6af1af27688e477c0c791fd61445464f2069"
|
||||
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[md5sum] = "25651209050396a76d660856f109cf04"
|
||||
SRC_URI[sha256sum] = "175645a149ae4d758ff2746900f6eabe4734b2bdac4d8c95893c650be4f929f2"
|
||||
|
||||
FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
|
||||
@@ -1,30 +0,0 @@
|
||||
From b4e62f10ad907cc3db7adac75e0171e88bb9172d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 18 Aug 2019 15:10:02 +0200
|
||||
Subject: [PATCH] Fix build with Qt 5.13
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
src/plugins/forms/widgets/kexidbdatepicker.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/plugins/forms/widgets/kexidbdatepicker.cpp b/src/plugins/forms/widgets/kexidbdatepicker.cpp
|
||||
index 1e0692d..c719964 100644
|
||||
--- a/src/plugins/forms/widgets/kexidbdatepicker.cpp
|
||||
+++ b/src/plugins/forms/widgets/kexidbdatepicker.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include <QLineEdit>
|
||||
#include <QInputMethodEvent>
|
||||
+#include <QDate>
|
||||
|
||||
KexiDBDatePicker::KexiDBDatePicker(QWidget *parent)
|
||||
: KDatePicker(parent)
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
|
||||
"
|
||||
|
||||
inherit kde-apps gtk-icon-cache mime-xdg
|
||||
inherit kde-apps gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
qtwebkit \
|
||||
@@ -40,9 +40,9 @@ SRC_URI = " \
|
||||
${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
|
||||
file://0001-remove-try_run-by-try_compile-in-breeze-icon-check.patch \
|
||||
file://0002-Add-missing-include-to-fix-build-with-Qt-5.11.patch \
|
||||
file://0003-Fix-build-with-Qt-5.13.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "7a813f9ea815a09c1e733d0e7dc879c64eee85f075389e87e6aab99cf0c1c1ff"
|
||||
SRC_URI[md5sum] = "22d6c4739109441f5274da584f67f1c8"
|
||||
SRC_URI[sha256sum] = "6d55cd4af177bcb060673a0977d52bc91cc2dd1b1420d008a78f9783312152fb"
|
||||
|
||||
do_install_append() {
|
||||
install -d "${D}/${datadir}/pixmaps"
|
||||
@@ -18,9 +18,12 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[sha256sum] = "67af0c2d74715957bd5373a6a30589ff0a996cb1d267dfd0538dccaa9a768dfa"
|
||||
SRC_URI[md5sum] = "ee888d41a677ddc6b8c63f0f71e82026"
|
||||
SRC_URI[sha256sum] = "7ede8ee868ba480e4666a32b4b26d279b1e45177f83b0ada32a15fa9cee514a3"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kproperty3 \
|
||||
${datadir}/kpropertywidgets3 \
|
||||
${datadir}/kservicetypes5 \
|
||||
${datadir}/kreport3 \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
@@ -1,122 +0,0 @@
|
||||
From 5d3053ea78b349b81b7a562974ad78f93d169791 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslaw Staniek <staniek@kde.org>
|
||||
Date: Tue, 16 Jun 2020 21:59:12 +0200
|
||||
Subject: [PATCH] Fix build with GCC 10 (make KReportGroupTracker use C++ file)
|
||||
|
||||
BUG:422886
|
||||
CCMAIL:adam@piggz.co.uk
|
||||
|
||||
FIXED-IN:3.2.1
|
||||
|
||||
Upstream-Status: Applied[https://github.com/KDE/kreport/commit/5d3053ea78b349b81b7a562974ad78f93d169791]
|
||||
---
|
||||
src/CMakeLists.txt | 5 +---
|
||||
.../scripting/KReportGroupTracker.cpp | 26 +++++++++++++++++++
|
||||
src/renderer/scripting/KReportGroupTracker.h | 25 +++++++++++++++---
|
||||
3 files changed, 48 insertions(+), 8 deletions(-)
|
||||
create mode 100644 src/renderer/scripting/KReportGroupTracker.cpp
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 1cf0b389..65bcf6e5 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -106,6 +106,7 @@ set(kreport_TARGET_INCLUDE_DIRS
|
||||
|
||||
if(KREPORT_SCRIPTING)
|
||||
list(APPEND kreport_LIB_SRCS
|
||||
+ renderer/scripting/KReportGroupTracker.cpp
|
||||
renderer/scripting/KReportScriptHandler.cpp
|
||||
renderer/scripting/KReportScriptConstants.cpp
|
||||
renderer/scripting/KReportScriptDebug.cpp
|
||||
@@ -133,10 +134,6 @@ if(KREPORT_SCRIPTING)
|
||||
items/text/KReportScriptText.cpp
|
||||
)
|
||||
|
||||
- qt_wrap_cpp(KReport kreport_LIB_SRCS
|
||||
- renderer/scripting/KReportGroupTracker.h
|
||||
- )
|
||||
-
|
||||
list(APPEND kreport_INCLUDE_DIRS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/renderer/scripting
|
||||
)
|
||||
diff --git a/src/renderer/scripting/KReportGroupTracker.cpp b/src/renderer/scripting/KReportGroupTracker.cpp
|
||||
new file mode 100644
|
||||
index 00000000..9274d4a5
|
||||
--- /dev/null
|
||||
+++ b/src/renderer/scripting/KReportGroupTracker.cpp
|
||||
@@ -0,0 +1,26 @@
|
||||
+/* This file is part of the KDE project
|
||||
+ * Copyright (C) 2015 by Adam Pigg (adam@piggz.co.uk)
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
+ */
|
||||
+
|
||||
+#include "KReportGroupTracker.h"
|
||||
+
|
||||
+KReportGroupTracker::KReportGroupTracker()
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+KReportGroupTracker::~KReportGroupTracker()
|
||||
+{
|
||||
+}
|
||||
diff --git a/src/renderer/scripting/KReportGroupTracker.h b/src/renderer/scripting/KReportGroupTracker.h
|
||||
index e434e05a..4c0852ea 100644
|
||||
--- a/src/renderer/scripting/KReportGroupTracker.h
|
||||
+++ b/src/renderer/scripting/KReportGroupTracker.h
|
||||
@@ -1,3 +1,20 @@
|
||||
+/* This file is part of the KDE project
|
||||
+ * Copyright (C) 2015 by Adam Pigg (adam@piggz.co.uk)
|
||||
+ *
|
||||
+ * This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU Lesser General Public
|
||||
+ * License as published by the Free Software Foundation; either
|
||||
+ * version 2.1 of the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ * Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
+ */
|
||||
+
|
||||
#ifndef KREPORTGROUPTRACKER_H
|
||||
#define KREPORTGROUPTRACKER_H
|
||||
|
||||
@@ -7,16 +24,16 @@
|
||||
/*!
|
||||
* @brief Keeps track of groups as the data for the group changes
|
||||
*/
|
||||
-class KREPORT_EXPORT KReportGroupTracker : public QObject {
|
||||
+class KREPORT_EXPORT KReportGroupTracker : public QObject
|
||||
+{
|
||||
Q_OBJECT
|
||||
|
||||
protected:
|
||||
- KReportGroupTracker() {}
|
||||
- ~KReportGroupTracker() override{}
|
||||
+ KReportGroupTracker();
|
||||
+ ~KReportGroupTracker() override;
|
||||
|
||||
public:
|
||||
Q_SLOT virtual void setGroupData(const QMap<QString, QVariant> &groupData) = 0;
|
||||
};
|
||||
|
||||
#endif // KREPORTGROUPTRACKER_H
|
||||
-
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -23,12 +23,9 @@ DEPENDS += " \
|
||||
qtwebkit \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
|
||||
file://0001-Do-not-rely-on-python2.patch \
|
||||
file://0001-Fix-build-with-GCC-10-make-KReportGroupTracker-use-C.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "22716d719654e8f887fe4d33654e252ddf3d3d818c44e15a8af0e6f2e7d6ccd7"
|
||||
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[md5sum] = "48216d8f83a48c93bed9acd0081daa92"
|
||||
SRC_URI[sha256sum] = "3b6485629b5e4343b7ddf42efb1927310d60b143a22afe79925147d0ddcdf36c"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kservicetypes5 \
|
||||
@@ -8,6 +8,7 @@ DEPENDS += "\
|
||||
kauth-native \
|
||||
kconfig-native \
|
||||
kcoreaddons-native \
|
||||
kdesignerplugin-native \
|
||||
kdelibs4support-native \
|
||||
kdelibs4support \
|
||||
sonnet-native \
|
||||
@@ -18,7 +19,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "0cb1b232c9b86811107ef9270ba2be42d242157b8daeeeffd1493ae635f0aa3a"
|
||||
SRC_URI[md5sum] = "f4be0f56a4935ef177375ab7f22ce25b"
|
||||
SRC_URI[sha256sum] = "1bff5f828f11e9b9a527b59f12ec16745fa19fb09392ca1872d6b0c909212427"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
|
||||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-apps gettext mime-xdg
|
||||
inherit kde-apps gettext
|
||||
|
||||
DEPENDS += " \
|
||||
kauth-native \
|
||||
@@ -36,17 +36,18 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "9d29577e0ef2d364a54718f1a8e0a74cf4246f6bd020ff605825f5888739f680"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
|
||||
SRC_URI[md5sum] = "08f6009c452da25828e26608b1191d19"
|
||||
SRC_URI[sha256sum] = "c4921759bdfec9a96201a5d76a67869f867ec7e3caf92f8e46fa5d853a0741b1"
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-without-session-management.patch \
|
||||
file://0002-Revert-Make-target_link_libraries-for-kdeinit_dolphi.patch \
|
||||
"
|
||||
|
||||
FILES_SOLIBSDEV = "${libdir}/libdolphin*${SOLIBSDEV}"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/kglobalaccel \
|
||||
${datadir}/knsrcfiles \
|
||||
${datadir}/dbus-1 \
|
||||
${libdir}/libkdeinit5_dolphin.so \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
From b9abe385e2563d7178fbf982ec6977b9f3e625bf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 28 Aug 2015 23:22:18 +0200
|
||||
Subject: [PATCH] fix build for qtbase without session management
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/dolphinmainwindow.cpp | 2 ++
|
||||
src/main.cpp | 2 ++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
|
||||
index f7a7613..127cd85 100644
|
||||
--- a/src/dolphinmainwindow.cpp
|
||||
+++ b/src/dolphinmainwindow.cpp
|
||||
@@ -386,9 +386,11 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
|
||||
// Find out if Dolphin is closed directly by the user or
|
||||
// by the session manager because the session is closed
|
||||
bool closedByUser = true;
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
if (qApp->isSavingSession()) {
|
||||
closedByUser = false;
|
||||
}
|
||||
+#endif
|
||||
|
||||
if (m_tabWidget->count() > 1 && GeneralSettings::confirmClosingMultipleTabs() && closedByUser) {
|
||||
// Ask the user if he really wants to quit and close all tabs.
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index b4ca2c6..5c058a9 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -156,6 +156,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
||||
|
||||
mainWindow->show();
|
||||
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
if (app.isSessionRestored()) {
|
||||
const QString className = KXmlGuiWindow::classNameOfToplevel(1);
|
||||
if (className == QLatin1String("DolphinMainWindow")) {
|
||||
@@ -164,6 +165,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
||||
qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
|
||||
return app.exec(); // krazy:exclude=crash;
|
||||
}
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
From d6c810a4e95af9f4d8c4176eaa622e1507ab5613 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 29 Oct 2018 22:19:12 +0100
|
||||
Subject: [PATCH] Revert "Make target_link_libraries for kdeinit_dolphin
|
||||
PRIVATE"
|
||||
|
||||
This reverts commit 8e6f4eecd318041d2e4e6386d1660742dd4ddd89.
|
||||
---
|
||||
src/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 5aff4b0fa..9dc77c3da 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -297,7 +297,7 @@ ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS})
|
||||
kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
|
||||
|
||||
|
||||
-target_link_libraries(kdeinit_dolphin PRIVATE
|
||||
+target_link_libraries(kdeinit_dolphin
|
||||
dolphinstatic
|
||||
dolphinprivate
|
||||
KF5::Crash
|
||||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-apps gettext mime-xdg
|
||||
inherit kde-apps gettext
|
||||
|
||||
DEPENDS += " \
|
||||
phonon \
|
||||
@@ -29,7 +29,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "36a755be402d7b811483a17887ebf0c73fc92f92ecbe00b54c11158ee0591a93"
|
||||
SRC_URI[md5sum] = "fcf5e0ec51b65619fcfe8c7bc59bd162"
|
||||
SRC_URI[sha256sum] = "115d60bfdef498ea75bc077a7091fb738615b399b03ec2a76a4bf34f19b407f3"
|
||||
|
||||
CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING-DOCS;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-apps gettext mime-xdg
|
||||
inherit kde-apps gettext
|
||||
|
||||
DEPENDS += "\
|
||||
kauth-native \
|
||||
@@ -21,7 +21,11 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "b838cf9aa2b77839860c50c514428a03739d4584465a350384175bd8a4d592ca"
|
||||
SRC_URI[md5sum] = "af910a156f817368d2bab2520636f320"
|
||||
SRC_URI[sha256sum] = "9090bc7c7ac2586e857cdc246a94621c1453e7f65c6d491f2f374f43d3e4af1a"
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
|
||||
"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From d83637a54457d77687088f45a9036b9a2a7bcf11 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 24 Apr 2015 11:35:45 +0200
|
||||
Subject: [PATCH] fix build for qtbase build without session support
|
||||
QT_NO_SESSIONMANAGER
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/main.cpp | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index 2463a29..1709717 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -78,6 +78,7 @@ int main(int argc, char *argv[])
|
||||
options.process(app);
|
||||
about.processCommandLine(&options);
|
||||
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
if (!app.isSessionRestored()) {
|
||||
MainWindow *mw = new MainWindow();
|
||||
|
||||
@@ -89,7 +90,9 @@ int main(int argc, char *argv[])
|
||||
|
||||
mw->show();
|
||||
}
|
||||
- else RESTORE(MainWindow);
|
||||
+ else
|
||||
+#endif
|
||||
+ RESTORE(MainWindow);
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -24,7 +24,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "9a65508930c969f07fe6a228b0f4b1b24797cfaa49710698393b84cfb260aba4"
|
||||
SRC_URI[md5sum] = "e18910bb5e1605ed4c8eafe07ab2a0ad"
|
||||
SRC_URI[sha256sum] = "ad065e488f9a751423d571f51449e766c625e88ca7d3c30d21ff3b9027fc04af"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
|
||||
@@ -2,9 +2,6 @@ From e5170c60d0443d8f50b5bf6a85bea64bea29fbc0 Mon Sep 17 00:00:00 2001
|
||||
From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
|
||||
Date: Wed, 6 Apr 2016 19:42:07 +0000
|
||||
Subject: [PATCH 3/3] Avoid try_run
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
When cross compiling, the executable compiled in the first step usually
|
||||
cannot be run on the build host. For this reason, we use try_compile()
|
||||
@@ -13,19 +10,15 @@ to determine what version of libjpeg is available.
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Luis Gustavo S. Barreto <gustavo@ossystems.com.br>
|
||||
|
||||
Adjusted to 19.04
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
|
||||
---
|
||||
lib/CMakeLists.txt | 75 ++++++++++++++++++++++++++--------------------
|
||||
1 file changed, 42 insertions(+), 33 deletions(-)
|
||||
lib/CMakeLists.txt | 71 ++++++++++++++++++++++++++++++++----------------------
|
||||
1 file changed, 42 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
|
||||
index 2a6a08d..c8696ba 100644
|
||||
index d51b80d..db3ac7b 100644
|
||||
--- a/lib/CMakeLists.txt
|
||||
+++ b/lib/CMakeLists.txt
|
||||
@@ -12,42 +12,51 @@ message(STATUS "Looking for libjpeg version in ${JPEG_INCLUDE_DIR}/jpeglib.h")
|
||||
@@ -10,42 +10,55 @@ message(STATUS "Looking for libjpeg version in ${JPEG_INCLUDE_DIR}/jpeglib.h")
|
||||
# found in (between libjpeg, libjpeg-turbo and various multilib header
|
||||
# forwarding schemes seen in distros), have a simple program print out the
|
||||
# right version.
|
||||
@@ -34,16 +27,6 @@ index 2a6a08d..c8696ba 100644
|
||||
-#include <stdio.h>
|
||||
-#include <stdlib.h>
|
||||
-#include <jpeglib.h>
|
||||
-
|
||||
-int main(void) { printf(\"%d\\\n\", JPEG_LIB_VERSION); return 0; }
|
||||
-")
|
||||
-
|
||||
-try_run(JPEGLIB_RUN_RESULT JPEGLIB_COMPILE_RESULT
|
||||
- ${CMAKE_CURRENT_BINARY_DIR} ${JPEGLIB_VERSION_CHECK_PATH}
|
||||
- CMAKE_FLAGS -DINCLUDE_DIRECTORIES:PATH=${JPEG_INCLUDE_DIR}
|
||||
- RUN_OUTPUT_VARIABLE jpeglib_version)
|
||||
-
|
||||
-if ((${JPEGLIB_COMPILE_RESULT} EQUAL FALSE) OR ("${JPEGLIB_RUN_RESULT}" EQUAL FAILED_TO_RUN) OR "${jpeglib_version}" STREQUAL "")
|
||||
+function(JPEGVersionCheck Ret Op Version)
|
||||
+ set(JPEGLIB_VERSION_CHECK_PATH "${CMAKE_CURRENT_BINARY_DIR}/jpeglib-version-check.c")
|
||||
+ file(WRITE ${JPEGLIB_VERSION_CHECK_PATH} "
|
||||
@@ -58,58 +41,68 @@ index 2a6a08d..c8696ba 100644
|
||||
+ return 0;
|
||||
+ }
|
||||
+ ")
|
||||
+ try_compile(COMPILE_RESULT_VAR
|
||||
|
||||
-int main(void) { printf(\"%d\\\n\", JPEG_LIB_VERSION); }
|
||||
-")
|
||||
+try_compile(COMPILE_RESULT_VAR
|
||||
+ "${CMAKE_BINARY_DIR}" "${JPEGLIB_VERSION_CHECK_PATH}"
|
||||
+ COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS}"
|
||||
+ OUTPUT_VARIABLE COMPILE_OUT)
|
||||
|
||||
-try_run(JPEGLIB_RUN_RESULT JPEGLIB_COMPILE_RESULT
|
||||
- ${CMAKE_CURRENT_BINARY_DIR} ${JPEGLIB_VERSION_CHECK_PATH}
|
||||
- CMAKE_FLAGS -DINCLUDE_DIRECTORIES:PATH=${JPEG_INCLUDE_DIR}
|
||||
- RUN_OUTPUT_VARIABLE jpeglib_version)
|
||||
+ set(${Ret} ${COMPILE_OUT} PARENT_SCOPE)
|
||||
+endfunction()
|
||||
+
|
||||
|
||||
-if ((${JPEGLIB_COMPILE_RESULT} EQUAL FALSE) OR ("${JPEGLIB_RUN_RESULT}" EQUAL FAILED_TO_RUN) OR "${jpeglib_version}" STREQUAL "")
|
||||
- message(FATAL_ERROR "Could not find jpeglib.h. This file comes with libjpeg.")
|
||||
-endif()
|
||||
+find_package(JPEG REQUIRED)
|
||||
+if(JPEG_FOUND)
|
||||
+ JPEGVersionCheck(JPEG_LIB_VERSION < 80)
|
||||
+ if (${JPEG_LIB_VERSION} MATCHES "#error")
|
||||
+ set(GV_JPEG_DIR libjpeg-62)
|
||||
+ endif()
|
||||
+ JPEGVersionCheck(JPEG_LIB_VERSION == 80)
|
||||
+ if (${JPEG_LIB_VERSION} MATCHES "#error")
|
||||
+ set(GV_JPEG_DIR libjpeg-80)
|
||||
+ endif()
|
||||
+ JPEGVersionCheck(JPEG_LIB_VERSION == 90)
|
||||
+ if (${JPEG_LIB_VERSION} MATCHES "#error")
|
||||
+ set(GV_JPEG_DIR libjpeg-90)
|
||||
+ endif()
|
||||
+
|
||||
+ if ("${GV_JPEG_DIR}" STREQUAL "")
|
||||
+ message(FATAL_ERROR "Unknown libjpeg version")
|
||||
+ else()
|
||||
+ message(STATUS "using ${GV_JPEG_DIR}")
|
||||
+ endif()
|
||||
+else(JPEG_FOUND)
|
||||
message(FATAL_ERROR "Could not find jpeglib.h. This file comes with libjpeg.")
|
||||
endif()
|
||||
|
||||
-if ("${jpeglib_version}" LESS 80)
|
||||
- set(GV_JPEG_DIR libjpeg-62)
|
||||
-endif()
|
||||
-
|
||||
+ JPEGVersionCheck(JPEG_LIB_VERSION == 80)
|
||||
+ if (${JPEG_LIB_VERSION} MATCHES "#error")
|
||||
+ set(GV_JPEG_DIR libjpeg-80)
|
||||
+ endif()
|
||||
|
||||
-if ("${jpeglib_version}" EQUAL 80)
|
||||
- set(GV_JPEG_DIR libjpeg-80)
|
||||
-endif()
|
||||
-
|
||||
+ JPEGVersionCheck(JPEG_LIB_VERSION == 90)
|
||||
+ if (${JPEG_LIB_VERSION} MATCHES "#error")
|
||||
+ set(GV_JPEG_DIR libjpeg-90)
|
||||
+ endif()
|
||||
|
||||
-if ("${jpeglib_version}" EQUAL 90)
|
||||
- set(GV_JPEG_DIR libjpeg-90)
|
||||
-endif()
|
||||
-
|
||||
-if ("${GV_JPEG_DIR}" STREQUAL "")
|
||||
- message(FATAL_ERROR "Unknown libjpeg version: ${jpeglib_version}")
|
||||
-endif()
|
||||
+ if ("${GV_JPEG_DIR}" STREQUAL "")
|
||||
+ message(FATAL_ERROR "Unknown libjpeg version")
|
||||
+ else()
|
||||
+ message(STATUS "using ${GV_JPEG_DIR}")
|
||||
+ endif()
|
||||
+else(JPEG_FOUND)
|
||||
+ message(FATAL_ERROR "Could not find jpeglib.h. This file comes with libjpeg.")
|
||||
endif()
|
||||
-
|
||||
-message(STATUS "libjpeg version: ${jpeglib_version}")
|
||||
-
|
||||
+
|
||||
add_definitions(-Dlibjpeg_EXPORTS)
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/${GV_JPEG_DIR}
|
||||
--
|
||||
2.20.1
|
||||
2.5.5
|
||||
|
||||
|
||||
@@ -2,21 +2,21 @@ SUMMARY = "A fast and easy to use image viewer for KDE"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b"
|
||||
|
||||
inherit kde-apps gettext mime-xdg
|
||||
inherit kde-apps gettext
|
||||
|
||||
DEPENDS += " \
|
||||
kdelibs4support-native \
|
||||
kdoctools-native \
|
||||
jpeg \
|
||||
exiv2 \
|
||||
lcms \
|
||||
phonon \
|
||||
kdelibs4support \
|
||||
kdelibs4support-native \
|
||||
kded \
|
||||
kactivities \
|
||||
kcoreaddons-native \
|
||||
kconfig-native \
|
||||
kauth-native \
|
||||
kdesignerplugin-native \
|
||||
sonnet-native \
|
||||
kxmlgui \
|
||||
kfilemetadata \
|
||||
@@ -25,9 +25,12 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "acc76c7b80f71ce47fb747c81cd062b1581ccc441f025e023bedc193feb8bc26"
|
||||
SRC_URI[md5sum] = "93019f12a8b494b22d00d9489832246b"
|
||||
SRC_URI[sha256sum] = "0b4ff869fc09140e258e894f5169fc6c96f1126891b8ed1a391d4624d6ab0c35"
|
||||
|
||||
SRC_URI += "file://0001-Avoid-try_run.patch"
|
||||
SRC_URI += " \
|
||||
file://0001-Avoid-try_run.patch \
|
||||
"
|
||||
|
||||
CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
|
||||
|
||||
|
||||
@@ -3,10 +3,10 @@ LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
|
||||
file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-apps gettext gtk-icon-cache mime-xdg
|
||||
inherit kde-apps gettext gtk-icon-cache
|
||||
|
||||
DEPENDS += "\
|
||||
ncurses \
|
||||
@@ -22,7 +22,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "0c9490bb15dd22226469dc3d00457987bb3f1c332fd16e24323cd358688cf54c"
|
||||
SRC_URI[md5sum] = "6357ca100f9f85ffd9fab69fa4bb9d79"
|
||||
SRC_URI[sha256sum] = "a93b319c6a3fab3d3a12923f8153a6f38281887e176fffaa37ca6cc677a280b5"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
|
||||
@@ -3,10 +3,10 @@ LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
|
||||
file://COPYING.DOC;md5=d8855fca80aa0b428deafa405d0ea17a \
|
||||
file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
|
||||
"
|
||||
|
||||
inherit kde-apps gettext pkgconfig gtk-icon-cache mime-xdg
|
||||
inherit kde-apps pythonnative gettext pkgconfig gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
qtsvg \
|
||||
@@ -18,6 +18,7 @@ DEPENDS += " \
|
||||
kconfig-native \
|
||||
kdoctools-native \
|
||||
kauth-native \
|
||||
kdesignerplugin-native \
|
||||
karchive \
|
||||
kconfig \
|
||||
kcoreaddons \
|
||||
@@ -34,7 +35,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "b6dc3db2a3d14653ef132402fdd2a120ed26c663475eba186f7af9dcae5d00e5"
|
||||
SRC_URI[md5sum] = "7d9eea9cb7b2111c1e0808cf68bfb0f2"
|
||||
SRC_URI[sha256sum] = "4b3b91fb86b2d97efc7ca8c3037f33101d402df7dd2fe311b12a87468e8a6b5c"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
|
||||
@@ -26,7 +26,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "fee768b772a45eb78b213aae70707b79299f92deb006095559311b013670015a"
|
||||
SRC_URI[md5sum] = "6fbc7241c27a158e3983e2cfb64237f5"
|
||||
SRC_URI[sha256sum] = "ad4a6377d260df76d000631ab4c95e5cb82ce47d031edc9801b6ed92d856305c"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
From ac7548b52a701ad846dd0cb534440f8de7864711 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Tue, 10 Feb 2015 11:43:46 +0100
|
||||
Subject: [PATCH 1/2] fix build for qtbase build without session support
|
||||
QT_NO_SESSIONMANAGER
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
kate/kateapp.cpp | 5 ++++-
|
||||
kate/katemainwindow.cpp | 2 ++
|
||||
kwrite/main.cpp | 5 ++++-
|
||||
3 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/kate/src/kateapp.cpp b/kate/src/kateapp.cpp
|
||||
index 4c26f33..03fd159 100644
|
||||
--- a/kate/kateapp.cpp
|
||||
+++ b/kate/kateapp.cpp
|
||||
@@ -99,10 +99,13 @@ bool KateApp::init()
|
||||
// set KATE_PID for use in child processes
|
||||
qputenv("KATE_PID", QString::fromLatin1("%1").arg(QCoreApplication::applicationPid()).toLatin1().constData());
|
||||
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
// handle restore different
|
||||
if (qApp->isSessionRestored()) {
|
||||
restoreKate();
|
||||
- } else {
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
// let us handle our command line args and co ;)
|
||||
// we can exit here if session chooser decides
|
||||
if (!startupKate()) {
|
||||
diff --git a/kate/src/katemainwindow.cpp b/kate/src/katemainwindow.cpp
|
||||
index 464e20c..8efc401 100644
|
||||
--- a/kate/katemainwindow.cpp
|
||||
+++ b/kate/katemainwindow.cpp
|
||||
@@ -467,9 +467,11 @@ bool KateMainWindow::queryClose()
|
||||
{
|
||||
// session saving, can we close all views ?
|
||||
// just test, not close them actually
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
if (qApp->isSavingSession()) {
|
||||
return queryClose_internal();
|
||||
}
|
||||
+#endif
|
||||
|
||||
// normal closing of window
|
||||
// allow to close all windows until the last without restrictions
|
||||
diff --git a/kwrite/main.cpp b/kwrite/main.cpp
|
||||
index a361527..d5738e9 100644
|
||||
--- a/kwrite/main.cpp
|
||||
+++ b/kwrite/main.cpp
|
||||
@@ -159,9 +159,12 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
||||
*/
|
||||
aboutData.processCommandLine(&parser);
|
||||
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
if (app.isSessionRestored()) {
|
||||
KWrite::restore();
|
||||
- } else {
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
bool nav = false;
|
||||
int line = 0, column = 0;
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
From d3c4d12f9168d2d1267b9732e75658866ef8bb9b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Tue, 10 Feb 2015 11:52:14 +0100
|
||||
Subject: [PATCH 2/2] fix build for sessionless kconfig
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
kate/kateapp.cpp | 2 ++
|
||||
kwrite/kwrite.cpp | 2 ++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/kate/kateapp.cpp b/kate/kateapp.cpp
|
||||
index 03fd159..ae2c793 100644
|
||||
--- a/kate/kateapp.cpp
|
||||
+++ b/kate/kateapp.cpp
|
||||
@@ -121,6 +121,7 @@ bool KateApp::init()
|
||||
|
||||
void KateApp::restoreKate()
|
||||
{
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
KConfig *sessionConfig = KConfigGui::sessionConfig();
|
||||
|
||||
// activate again correct session!!!
|
||||
@@ -142,6 +143,7 @@ void KateApp::restoreKate()
|
||||
if (mainWindowsCount() == 0) {
|
||||
newMainWindow();
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
bool KateApp::startupKate()
|
||||
diff --git a/kwrite/kwrite.cpp b/kwrite/kwrite.cpp
|
||||
index dc54855..5693db0 100644
|
||||
--- a/kwrite/kwrite.cpp
|
||||
+++ b/kwrite/kwrite.cpp
|
||||
@@ -454,6 +454,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents
|
||||
//restore session
|
||||
void KWrite::restore()
|
||||
{
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
KConfig *config = KConfigGui::sessionConfig();
|
||||
|
||||
if (!config) {
|
||||
@@ -483,6 +484,7 @@ void KWrite::restore()
|
||||
t = new KWrite(docList.at(cg.readEntry("DocumentNumber", 0) - 1));
|
||||
t->restore(config, z);
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
void KWrite::aboutEditor()
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING-LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
"
|
||||
|
||||
inherit kde-apps gettext mime-xdg
|
||||
inherit kde-apps gettext
|
||||
|
||||
DEPENDS += " \
|
||||
qtscript \
|
||||
@@ -34,7 +34,13 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "e9b7a9b11ae54a387b5a6d6f4253f9da7f63972fe2928d7fa280d969638dfdd4"
|
||||
SRC_URI[md5sum] = "17e8021c1c1bf1d77cd467ca3fab3caf"
|
||||
SRC_URI[sha256sum] = "f7f2cba41a4c88b65885532db6b6161c66055a6697d20ee88adb70f302d387e1"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
|
||||
file://0002-fix-build-for-sessionless-kconfig.patch \
|
||||
"
|
||||
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From b54684b9e48bbe6783dd3c690524ed2d21dc30ee Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Tue, 5 May 2015 14:29:15 +0200
|
||||
Subject: [PATCH] fix build for qtbase build without session support
|
||||
QT_NO_SESSIONMANAGER
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
main.cpp | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index ec62c67..fd0c921 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -89,9 +89,12 @@ int main(int argc, char **argv)
|
||||
}
|
||||
else
|
||||
{
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
if ( app.isSessionRestored() )
|
||||
RESTORE(AtomTopLevel)
|
||||
- else {
|
||||
+ else
|
||||
+#endif
|
||||
+ {
|
||||
AtomTopLevel *top = new AtomTopLevel;
|
||||
if ( parser.isSet( QStringLiteral("hackmode") ) )
|
||||
top->enableHackMode();
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -27,12 +27,12 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "d336fdaa10d5d1deb66d6764e07a1288dc79692b789b63d8662ce57086e961ec"
|
||||
SRC_URI[md5sum] = "83a27f535669d9a5d4782b9355db757b"
|
||||
SRC_URI[sha256sum] = "0e18087d0de067282023a98b800807632dd6a91bab51cf0d43d53bffba9b33f1"
|
||||
SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
${datadir}/kconf_update \
|
||||
${datadir}/icons \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN} += "perl"
|
||||
|
||||
@@ -22,7 +22,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "ee9586d3e68ced73e796bd8b407233605be0ff8f60cf445cf3f03663fb3080c9"
|
||||
SRC_URI[md5sum] = "640b68db31f22b138ef0df5968e648a9"
|
||||
SRC_URI[sha256sum] = "e981107096893a8078ab978c429f367432a74de1bdeffe8fb628ccc397701332"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
From 616528cad6a98b2604eb8365f55538a738e7db2e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sun, 11 Oct 2015 21:34:06 +0200
|
||||
Subject: [PATCH] fix build with QT_NO_SESSIONMANAGER set
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
main.cpp | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/main.cpp b/main.cpp
|
||||
index 311268d..e0257f1 100644
|
||||
--- a/main.cpp
|
||||
+++ b/main.cpp
|
||||
@@ -84,9 +84,12 @@ int main(int argc, char **argv)
|
||||
|
||||
KDBusService service;
|
||||
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
if (app.isSessionRestored())
|
||||
RESTORE(KBounceMainWindow)
|
||||
- else {
|
||||
+ else
|
||||
+#endif
|
||||
+ {
|
||||
KBounceMainWindow *w = new KBounceMainWindow;
|
||||
w->show();
|
||||
}
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -28,7 +28,9 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "9e1bdf041f1cb3dc371f8dda3c2323baab24f3edd2ec5603086e4b9a23ddc320"
|
||||
SRC_URI[md5sum] = "f190c2913ba0dbcdf15c6f02be532ce8"
|
||||
SRC_URI[sha256sum] = "c62cb68b4246c1aef73efb04ea883599384afbd977e8da93893346cbd835f343"
|
||||
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
|
||||
@@ -23,7 +23,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "1f4d45954794d3474831731db9211a54bd0e9b878dc6887c2abbfbb66c0bcd92"
|
||||
SRC_URI[md5sum] = "26c31da7a5dae51ef1a362ca3458517f"
|
||||
SRC_URI[sha256sum] = "23e1cc935eab6a2520e683185cb223243c71553b1ef6059a21f09d72e8fe00af"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
|
||||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
|
||||
"
|
||||
|
||||
inherit kde-apps gettext gtk-icon-cache mime-xdg
|
||||
inherit kde-apps gettext gtk-icon-cache
|
||||
|
||||
DEPENDS += "\
|
||||
kcoreaddons-native \
|
||||
@@ -22,11 +22,9 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "3aaf99c11dcb45a27d5e89a514859b4c92082b26fcf5709783b8c8cbd237409e"
|
||||
SRC_URI[md5sum] = "3193c9233a545e55528f68b6fb5eb6fb"
|
||||
SRC_URI[sha256sum] = "48011190a0ef28998e6c96b9d644e3d06b68606b7d1467c84a8d176eeebb9adf"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
"
|
||||
|
||||
RRECOMMENDS_${PN} += "graphviz"
|
||||
RDEPENDS_${PN} += "perl"
|
||||
|
||||
@@ -9,7 +9,6 @@ inherit kde-apps gettext
|
||||
|
||||
DEPENDS += "\
|
||||
gmp \
|
||||
mpfr \
|
||||
kauth-native \
|
||||
kconfig-native \
|
||||
kcoreaddons-native \
|
||||
@@ -23,7 +22,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "5ed62f8336bba82d27a617de398d80285d5da40ff5fd7929768387b2a70363d6"
|
||||
SRC_URI[md5sum] = "ddd1ca9dcdb7db22f8a011e525e99963"
|
||||
SRC_URI[sha256sum] = "10b3ebb5efab3731e9f12a8632546685281179881b03aae98f96a2cdbd21f02f"
|
||||
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
SUMMARY = "Tool to copy and paste characters from all installed fonts"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
|
||||
"
|
||||
|
||||
inherit kde-apps
|
||||
|
||||
DEPENDS += " \
|
||||
kdoctools-native \
|
||||
kconfig-native \
|
||||
kcoreaddons-native \
|
||||
kauth-native \
|
||||
kbookmarks \
|
||||
kcrash \
|
||||
ki18n \
|
||||
kwidgetsaddons \
|
||||
kxmlgui \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "ea090dde3fce15a2a5779c010ef72cda0b87cb3556ee08f226530ae5a48cd9dc"
|
||||
@@ -16,7 +16,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "87c483e790c47cfc05a99e3815d42ba140d6830396b9debcdf31424e80c2e4a0"
|
||||
SRC_URI[md5sum] = "edc6d65d8ed5c0a7c02e2eda2b78ab4c"
|
||||
SRC_URI[sha256sum] = "8defdb9450922b675dc80561a0f4bb119e621a85dd73661fc4caacef8db91228"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
From d7cf023376cb834f9becb63f2648c63c5ec3fd12 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 17 Aug 2019 23:17:45 +0200
|
||||
Date: Thu, 15 Nov 2018 18:46:38 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: make MLT_PREFIX configurable
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
@@ -14,18 +11,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ee77dae..29c4efd 100644
|
||||
index ec69e0c..0792bc3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -76,7 +76,7 @@ if(WIN32)
|
||||
find_package(DrMinGW)
|
||||
set(MLT_PREFIX "..")
|
||||
else()
|
||||
@@ -119,7 +119,7 @@ set_package_properties(MLT PROPERTIES
|
||||
PURPOSE "Required to do video processing")
|
||||
|
||||
if(NOT WIN32)
|
||||
- set(MLT_PREFIX ${MLT_ROOT_DIR})
|
||||
+ set(MLT_PREFIX ${MLT_ROOT_DIR} CACHE STRING "mlt prefix")
|
||||
find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
|
||||
else()
|
||||
set(MLT_PREFIX "..")
|
||||
endif()
|
||||
|
||||
--
|
||||
2.21.0
|
||||
2.14.5
|
||||
|
||||
|
||||
@@ -4,20 +4,17 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=38adfe5a9f2953129da1774430b28adf \
|
||||
"
|
||||
|
||||
inherit kde-apps gtk-icon-cache mime mime-xdg
|
||||
inherit kde-apps gtk-icon-cache
|
||||
|
||||
DEPENDS += "\
|
||||
shared-mime-info-native \
|
||||
kpackage-native \
|
||||
kcoreaddons-native \
|
||||
kdoctools-native \
|
||||
kauth-native \
|
||||
mlt \
|
||||
qtsvg \
|
||||
qtwebkit \
|
||||
karchive \
|
||||
kauth-native \
|
||||
sonnet-native \
|
||||
kbookmarks \
|
||||
kcoreaddons-native \
|
||||
kconfig-native \
|
||||
kconfigwidgets \
|
||||
kdbusaddons \
|
||||
@@ -32,13 +29,15 @@ DEPENDS += "\
|
||||
kguiaddons \
|
||||
ktextwidgets \
|
||||
kiconthemes \
|
||||
kdoctools-native \
|
||||
xapian-core \
|
||||
purpose \
|
||||
kdeclarative \
|
||||
shared-mime-info-native \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "9f8f3636f65f42a73fd1a97e29f8493fbcb8297ca755852eae93258ce12ceda0"
|
||||
SRC_URI[md5sum] = "57e49c3995117945938669e24aff9352"
|
||||
SRC_URI[sha256sum] = "fcfe2474bc271e730ed95edb21ae46e93c1ce773ed036f63c9fb2db02cbc7e64"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \
|
||||
@@ -48,11 +47,10 @@ EXTRA_OECMAKE += "-DMLT_PREFIX=${prefix}"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
${datadir}/icons \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/knsrcfiles \
|
||||
${datadir}/mime \
|
||||
${datadir}/menu \
|
||||
${datadir}/icons \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
SUMMARY = "KDevelop-PG-Qt is a parser generator"
|
||||
LICENSE = "LGPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=15ce55ef03e0531acfa5ca508b9f85b2"
|
||||
|
||||
inherit kde-base
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
PV = "2.2.1"
|
||||
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[sha256sum] = "c13931788ac9dc02188cdd9c6e71e164ae81b4568b048748652bbf6fa4a9c62b"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
@@ -1,105 +0,0 @@
|
||||
SUMMARY = "Cross-platform IDE for C, C++, Python, QML/JavaScript and PHP"
|
||||
LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
|
||||
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-base gettext pkgconfig gtk-icon-cache mime mime-xdg bash-completion
|
||||
|
||||
python() {
|
||||
if 'clang-layer' not in d.getVar('BBFILE_COLLECTIONS').split():
|
||||
raise bb.parse.SkipRecipe('Requires meta-clang to be present due to qttools-native - see extends-meta-qt5/qttools_git.bbappend.')
|
||||
}
|
||||
|
||||
DEPENDS += " \
|
||||
kauth-native \
|
||||
kconfig-native \
|
||||
kcoreaddons-native \
|
||||
kdevelop-pg-qt-native \
|
||||
kdoctools-native \
|
||||
ki18n-native \
|
||||
kpackage-native \
|
||||
shared-mime-info-native \
|
||||
\
|
||||
qtbase \
|
||||
qtdeclarative \
|
||||
qtwebengine \
|
||||
grantlee \
|
||||
libkomparediff2 \
|
||||
libksysguard \
|
||||
karchive \
|
||||
kcmutils \
|
||||
kconfig \
|
||||
kcrash \
|
||||
kdeclarative \
|
||||
kdevelop-pg-qt \
|
||||
kguiaddons \
|
||||
kiconthemes \
|
||||
kitemmodels \
|
||||
kitemviews \
|
||||
kjobwidgets \
|
||||
kio \
|
||||
knewstuff \
|
||||
knotifications \
|
||||
knotifyconfig \
|
||||
kparts \
|
||||
krunner \
|
||||
kservice \
|
||||
ktexteditor \
|
||||
kxmlgui \
|
||||
kwindowsystem \
|
||||
okteta \
|
||||
purpose \
|
||||
threadweaver \
|
||||
"
|
||||
|
||||
PV = "5.6.0"
|
||||
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[sha256sum] = "38adc7d4c4cf2f0fb4191650001e979b5e1b5a3476db28737020baf2fb56f532"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
|
||||
|
||||
do_configure_append() {
|
||||
# although the name is missleading I still love cmake_extra_sanity.bbclass...
|
||||
sed -i 's:${STAGING_DIR_NATIVE}::g' ${B}/plugins/clang/libclang_include_path.h
|
||||
}
|
||||
|
||||
# Yeah nasty but...
|
||||
FILES_SOLIBSDEV = "${libdir}/libKDevC*so ${libdir}/libKDevPlatform*so"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kdev* \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/knsrcfiles \
|
||||
${datadir}/knotifications5 \
|
||||
${datadir}/mime \
|
||||
${datadir}/plasma \
|
||||
${libdir}/libKDevelopSessionsWatch.so \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
${OE_QMAKE_PATH_QML} \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN} += " \
|
||||
bash \
|
||||
zsh \
|
||||
"
|
||||
|
||||
# To give best user experience out of the box..
|
||||
RRECOMMENDS_${PN} += " \
|
||||
packagegroup-qt5-toolchain-target \
|
||||
binutils \
|
||||
ccache \
|
||||
make \
|
||||
gcc-symlinks g++-symlinks cpp-symlinks \
|
||||
gdb \
|
||||
cmake \
|
||||
ninja \
|
||||
python3-core \
|
||||
qtwebengine-dev \
|
||||
qtwebengine-mkspecs \
|
||||
qtwebengine-plugins \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebengine-qmlplugins', '', d)} \
|
||||
"
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
SUMMARY = "Library to compare files and strings, used in Kompare and KDevelop"
|
||||
LICENSE = "GPLv2 & LGPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=8d8cc811a0870dd8391a69e61a77967a"
|
||||
|
||||
inherit kde-apps gettext
|
||||
|
||||
DEPENDS += " \
|
||||
kauth-native \
|
||||
kconfig-native \
|
||||
kcoreaddons-native \
|
||||
ki18n-native \
|
||||
kcodecs \
|
||||
kio \
|
||||
kxmlgui \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "68714068d3c8051e0c477cb349d913843fe9bb6184dcffb10f5f7109dc94605a"
|
||||
@@ -22,7 +22,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "d7f71de3b1d1a8795fd5636947a1dcd57d212f0045e44159eaf3ffe034b4650a"
|
||||
SRC_URI[md5sum] = "daa73fb65eb5b48928b3b4e4511d6e06"
|
||||
SRC_URI[sha256sum] = "a8a9e8a4c2bdc1855078383f10720b4b3a388c678dee148494dc18ba5019a6ae"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From cb9bb7f24cd21fb0fa1742a4316ad489f6c8cf6d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sun, 11 Oct 2015 21:24:16 +0200
|
||||
Subject: [PATCH] fix build with QT_NO_SESSIONMANAGER set
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/main.cpp | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index b27de6f..556fb16 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -70,10 +70,14 @@ int main(int argc, char **argv)
|
||||
KgDifficultyLevel::VeryHard
|
||||
);
|
||||
KDBusService service;
|
||||
+#ifndef QT_NO_SESSIONMANAGER
|
||||
// see if we are starting with session management
|
||||
if (app.isSessionRestored()) {
|
||||
RESTORE(MainWindow);
|
||||
- } else {
|
||||
+ }
|
||||
+ else
|
||||
+#endif
|
||||
+ {
|
||||
MainWindow *window = new MainWindow;
|
||||
window->show();
|
||||
}
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -26,7 +26,9 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "fd168af82bfec1cca87beb1f9b89520fdd4aa31401db690855615ac5c79b4153"
|
||||
SRC_URI[md5sum] = "fe3970879eec195f387c772e6fd6fba5"
|
||||
SRC_URI[sha256sum] = "b3d959cc195b924ca877df2762c3e8ef115ac41c2355f34efbbcaabe9b02b500"
|
||||
SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -21,7 +21,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "b94d9bcc6c72a93d77cae70a1d39449cb6edde2c25c57b78c1595d810daf2582"
|
||||
SRC_URI[md5sum] = "fa127f073bbb0075741c12d0017b2f44"
|
||||
SRC_URI[sha256sum] = "ad123b24f88e1ade5a845c16a84a483835cce31b92741107d8dbd02f462d4cd9"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
|
||||
@@ -28,8 +28,12 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[sha256sum] = "b9b86fce869a1f084bf1af4917228acb34dc99cb0079a7e79908e8c7b92256f5"
|
||||
SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"
|
||||
SRC_URI[md5sum] = "7af7f7f466600d08ca11aa1f24e9c977"
|
||||
SRC_URI[sha256sum] = "5b4a9ed17d0898c74cf7fd1612e2d055086d5e04148b3b17df5977255fc240b8"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-without-session-management.patch \
|
||||
"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
@@ -41,5 +45,3 @@ FILES_${PN} += " \
|
||||
${datadir}/kde4 \
|
||||
${libdir}/libkdeinit5_khelpcenter.so \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN} += "perl"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user