1 Commits

Author SHA1 Message Date
Andreas Müller
ca6fe6a109 WIP 2019-12-05 10:42:12 +01:00
392 changed files with 7359 additions and 2105 deletions

View File

@@ -4,7 +4,7 @@ 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
see [layer.conf](conf/layer.conf) for dependencies and https://layers.openembedded.org/layerindex/branch/master/layers/ where to find layers
Contributing
@@ -14,14 +14,11 @@ Contributing
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).
* Please do not send private emails to maintainers. For questions/suggestions.. use GitHub 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)
* Use 4 spaces for indention always
* 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

View 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
}

View File

@@ -1,8 +1,7 @@
inherit kde-base
KDE_APP_VERSION = "20.08.3"
KDE_APP_VERSION = "19.08.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"

View File

@@ -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.64/portingAids/${BPN}-${PV}.tar.xz"

View File

@@ -1,10 +1,5 @@
inherit kde-base
KF5_VERSION = "5.73.0"
KF5_VERSION = "5.64.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.64/${BPN}-${PV}.tar.xz"

View File

@@ -1,6 +1,6 @@
inherit kde-base
PLASMA_VERSION = "5.19.5"
PLASMA_VERSION = "5.17.3"
SRC_URI = "${KDE_MIRROR}/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"

View File

@@ -13,7 +13,7 @@ DEPENDS += " \
qtwayland \
"
inherit cmake_qt5_extra pkgconfig
inherit cmake_qt5_extra pkgconfig qt5-translation
EXTRA_OECMAKE += " \
-DINSTALL_LIBDIR:PATH=${baselib} \

View File

@@ -1,4 +1,4 @@
inherit cmake_qt5_extra
inherit cmake_qt5_extra qt5-translation
HOMEPAGE = "http://lxqt.org/"

22
classes/qemu-ext.bbclass Normal file
View 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")
base_libdir = rootfs_path + data.getVar("base_libdir")
extra_libdir = data.getVar("QEMU_EXTRA_LIBDIR")
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

View File

@@ -7,15 +7,17 @@ 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'):
bb.debug(1, "package requested not splitting locales")
return
packages = collections.deque((d.getVar('PACKAGES') or "").split())
packages = (d.getVar('PACKAGES') or "").split()
datadir = d.getVar('datadir')
if not datadir:
@@ -39,7 +41,7 @@ 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
@@ -49,7 +51,7 @@ python qt_do_split_locales() {
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():
files = '%s %s' % (files, transvar.replace('*.qm', '*_%s.qm' % l))
@@ -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 "

View File

@@ -19,7 +19,7 @@ LAYERDEPENDS_meta-qt5-extra = " \
gnome-layer \
meta-python \
"
LAYERSERIES_COMPAT_meta-qt5-extra = "dunfell gatesgarth"
LAYERSERIES_COMPAT_meta-qt5-extra = "zeus"
LICENSE_PATH += "${LAYERDIR}/files/licenses"

View File

@@ -1,3 +0,0 @@
PACKAGECONFIG_append = " qt5"
inherit cmake_qt5

View File

@@ -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)}"

View File

@@ -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

View File

@@ -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)} \

View File

@@ -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)}"

View File

@@ -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
}

View File

@@ -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', '')}"

View File

@@ -1 +0,0 @@
PACKAGECONFIG_append = " qt5"

396
files/licenses/CC-BY-SA-4.0 Normal file
View 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.

View File

@@ -8,10 +8,9 @@ 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"
SRC_URI[md5sum] = "db3ad80358b31df292d69b067c5657c6"
SRC_URI[sha256sum] = "04dbe12f52e68a0fececad1bbab08e279d7fd2f438e126bfc6d047daf1a55b75"
PV = "1.2.10"
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"

View File

@@ -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,9 @@ 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] = "a9a33873fc7c0f919fe575b78278fdbf"
SRC_URI[sha256sum] = "5886054427da20ef0542dc97c8d2b4308b0a169b49f0409633dd8b17fe71bc94"
PV = "1.7.3"
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"

View File

@@ -8,10 +8,9 @@ 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] = "85272ffa824695e76e726dcce798dbe3"
SRC_URI[sha256sum] = "440e9570e2909e3029cced304774a15d83b4019925ac9a4cfb44c1f8a77592d8"
PV = "1.1.8"
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"

View File

@@ -8,10 +8,9 @@ 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] = "465bdcaa8793dd74e1f1a13dddb78631"
SRC_URI[sha256sum] = "422f5fed8adc7e2bc43e22a5c0573385143f8b15e8b3495b7b766e0409fa9782"
PV = "1.1.5"
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"

View File

@@ -8,10 +8,9 @@ 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"
SRC_URI[md5sum] = "4f0fee606eff49d5a5cf9cdc9baae622"
SRC_URI[sha256sum] = "f18ccc4e42d6ddb763983d0bfdc1da4ff91faa83289796e1b238f5fa5404e51e"
PV = "1.5.9"
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"

View File

@@ -8,10 +8,9 @@ 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] = "9730d413dc6df67de93cd6f506680db6"
SRC_URI[sha256sum] = "07025165f903a2e0e57c5ff537a7abb6e849a8d0f0c531b48db4a452edf6a0fc"
PV = "1.2.7"
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"

View File

@@ -8,10 +8,9 @@ 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] = "d3e8887703dddc59999021bb364da860"
SRC_URI[sha256sum] = "79b35bef30b6629574cb563d60291b4dc2cd41f52dc48acde53dcb874656b6a6"
PV = "1.3.8"
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"

View File

@@ -3,15 +3,14 @@ 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] = "85685c336812e6e46133ab5e82be4a4d"
SRC_URI[sha256sum] = "982bac58aa37be4ac27a723b84d122af62b8cdce63d9aad180efa48427ce10b0"
PV = "2.1.5"
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"

View File

@@ -0,0 +1,35 @@
SUMMARY = "Compton is a compositor for X"
LICENSE = "NTP & MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=51f8a6ef7a22968bea284609c6093146"
inherit autotools-brokensep pkgconfig features_check
REQUIRED_DISTRO_FEATURES = "x11"
DEPENDS = " \
virtual/libx11 \
libxcomposite \
libxdamage \
libxfixes \
libxext \
libxrender \
libxrandr \
libpcre \
libconfig \
libxinerama \
libdrm \
dbus \
"
SRC_URI = " \
git://github.com/chjj/compton.git \
file://0001-Makefile-use-pkgconfig-to-find-libpcre.patch \
file://0002-Makefile-don-t-build-manpages.patch \
"
SRCREV = "86266e00e2bdac46d0a8dabfc1db3e29af91640e"
PV = "v0.1-beta2+git${SRCPV}"
S = "${WORKDIR}/git"
# there are not many machines around supporting gl
EXTRA_OEMAKE = "NO_VSYNC_OPENGL=1"

View File

@@ -0,0 +1,33 @@
From 40fff6e760920d6b31dc98dbcbde081845ac26b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 26 Aug 2015 22:31:35 +0200
Subject: [PATCH 1/2] Makefile: use pkgconfig to find libpcre
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@googlemail.com>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index e66f322..d9737f7 100644
--- a/Makefile
+++ b/Makefile
@@ -39,8 +39,8 @@ endif
# Enables support for PCRE regular expression pattern in window conditions
ifeq "$(NO_REGEX_PCRE)" ""
CFG += -DCONFIG_REGEX_PCRE
- LIBS += $(shell pcre-config --libs)
- INCS += $(shell pcre-config --cflags)
+ LIBS += $(shell pkg-config --libs libpcre)
+ INCS += $(shell pkg-config --cflags libpcre)
# Enables JIT support in libpcre
ifeq "$(NO_REGEX_PCRE_JIT)" ""
CFG += -DCONFIG_REGEX_PCRE_JIT
--
2.1.0

View File

@@ -0,0 +1,33 @@
From c5fbed297f765b222d92c4eca15743c8f8b4741d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 26 Aug 2015 23:04:41 +0200
Subject: [PATCH 2/2] Makefile: don't build manpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
we don't have all these tools neccessary in oe
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
Makefile | 2 --
1 file changed, 2 deletions(-)
diff --git a/Makefile b/Makefile
index e66f322..94d595c 100644
--- a/Makefile
+++ b/Makefile
@@ -126,8 +126,6 @@ INCS += $(shell pkg-config --cflags $(PACKAGES))
CFLAGS += -Wall
BINS = compton bin/compton-trans
-MANPAGES = man/compton.1 man/compton-trans.1
-MANPAGES_HTML = $(addsuffix .html,$(MANPAGES))
# === Recipes ===
.DEFAULT_GOAL := compton
--
2.1.0

View File

@@ -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"

View File

@@ -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

View File

@@ -4,14 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS += "cups poppler qtsvg"
SRC_URI = " \
https://launchpad.net/qpdfview/trunk/${PV}/+download/${BPN}-${PV}.tar.gz \
file://0001-Fix-build-with-Qt-5.15.patch \
"
SRC_URI[md5sum] = "4d63ee0095e939602f9bf4759ae57953"
SRC_URI[sha256sum] = "cc642e7fa74029373ca9b9fbc29adc4883f8b455130a78ad54746d6844a0396c"
SRC_URI = "https://launchpad.net/qpdfview/trunk/${PV}/+download/${BPN}-${PV}.tar.gz"
SRC_URI[md5sum] = "4b317c4536332a7fe437abe50eca1716"
SRC_URI[sha256sum] = "fad416e8fefc3057fa1b8d12d964c7eccd16dffe0307a0d6e9d55a543294da7f"
inherit qmake5 mime-xdg
inherit qmake5
QMAKE_PROFILES = "${S}/qpdfview.pro"
EXTRA_QMAKEVARS_PRE += " \

View File

@@ -0,0 +1,69 @@
From f6f8d9fee3a776f742977545dc62a418ccf82b89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 2 Nov 2018 12:56:57 +0100
Subject: [PATCH] Fix linking for all examples
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>
---
examples/automotive/automotive.pro | 4 ----
examples/example.pri | 4 +++-
playground/playground.pri | 4 +++-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/examples/automotive/automotive.pro b/examples/automotive/automotive.pro
index cb0954e..72e1159 100644
--- a/examples/automotive/automotive.pro
+++ b/examples/automotive/automotive.pro
@@ -8,10 +8,6 @@ QSK_SKIN_DIR=$${QSK_ROOT}/skins
INCLUDEPATH *= $${QSK_SKIN_DIR}
DEPENDPATH *= $${QSK_SKIN_DIR}
-QSK_PLUGIN_DIR = $${QSK_OUT_ROOT}/plugins
-QMAKE_RPATHDIR *= $${QSK_PLUGIN_DIR}/skins
-LIBS *= -L$${QSK_PLUGIN_DIR}/skins -lsquiekskin -lmaterialskin
-
HEADERS += \
ButtonBar.h \
SoundControl.h \
diff --git a/examples/example.pri b/examples/example.pri
index 221f995..c8d59c2 100644
--- a/examples/example.pri
+++ b/examples/example.pri
@@ -24,9 +24,11 @@ DEPENDPATH *= $${QSK_DIRS}
DESTDIR = $${QSK_OUT_ROOT}/examples/bin
-QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib
+QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib $${QSK_OUT_ROOT}/plugins/skins
qskAddLibrary($${QSK_OUT_ROOT}/lib, qsktestsupport)
qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny)
+qskAddLibrary($${QSK_OUT_ROOT}/plugins/skins, squiekskin)
+qskAddLibrary($${QSK_OUT_ROOT}/plugins/skins, materialskin)
win32 {
contains(QSK_CONFIG, QskDll) {
diff --git a/playground/playground.pri b/playground/playground.pri
index 8e61547..11362f9 100644
--- a/playground/playground.pri
+++ b/playground/playground.pri
@@ -26,9 +26,11 @@ DEPENDPATH += $${QSK_DIRS}
DESTDIR = $${QSK_OUT_ROOT}/playground/bin
-QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib
+QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib $${QSK_OUT_ROOT}/plugins/skins
qskAddLibrary($${QSK_OUT_ROOT}/lib, qsktestsupport)
qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny)
+qskAddLibrary($${QSK_OUT_ROOT}/plugins/skins, squiekskin)
+qskAddLibrary($${QSK_OUT_ROOT}/plugins/skins, materialskin)
win32 {
contains(QSK_CONFIG, QskDll) {
--
2.14.4

View File

@@ -0,0 +1,31 @@
From 8a09ea3ea3be54e200480dc03e375aaae2bba4ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 2 Nov 2018 13:51:51 +0100
Subject: [PATCH] Do not install to /usr/local
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
qskconfig.pri | 4 ----
1 file changed, 4 deletions(-)
diff --git a/qskconfig.pri b/qskconfig.pri
index f78c0c4..1926b5e 100644
--- a/qskconfig.pri
+++ b/qskconfig.pri
@@ -10,10 +10,6 @@ QSK_VERSION = $${QSK_VER_MAJ}.$${QSK_VER_MIN}.$${QSK_VER_PAT}
QSK_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
-unix {
- QSK_INSTALL_PREFIX = /usr/local/qskinny-$${QSK_VERSION}
-}
-
win32 {
QSK_INSTALL_PREFIX = C:/Qskinny-$${QSK_VERSION}
}
--
2.14.4

View File

@@ -0,0 +1,59 @@
SUMMARY = "A lightweight framework on top of the Qt scene graph"
DESCRIPTION = "A lightweight framework on top of the Qt scene graph and only few classes from Qt/Quick. It is usable from C++ and/or QML"
LICENSE = "LGPLv2.1-qskinny-exception"
LIC_FILES_CHKSUM = "file://COPYING;md5=ef112951de2dd97ead272458f5b86bdc"
inherit qmake5 qemu-ext
SRC_URI = " \
git://github.com/uwerat/qskinny.git \
file://0001-Fix-linking-for-all-examples.patch \
file://0002-Do-not-install-to-usr-local.patch \
"
SRCREV = "84e19c43f800f1d05f23dcb855807e0159b8fa04"
S = "${WORKDIR}/git"
PV = "0.0.1+git${SRCPV}"
DEPENDS += " \
qtbase \
qtdeclarative \
qtsvg \
"
PACKAGECONFIG ?= ""
PACKAGECONFIG[qtwebengine] = ",,qtwebengine"
SVG2QVG_CALL_IN_SOURCE = "$${SVG2QVG}"
QEMUCALL = "${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '')}"
do_configure_prepend() {
for pro_file in `find ${S} -name *.pro`; do
# wrap cross svg2qvg by qemu
sed -i 's|${SVG2QVG_CALL_IN_SOURCE}|${QEMUCALL} ${SVG2QVG_CALL_IN_SOURCE}|g' "$pro_file"
done
}
do_install_append() {
# Don't not pollute /usr/include
install -d ${D}${includedir}/qskinny
for header in `find ${D}/${includedir} -name '*.h*'`; do
mv $header ${D}${includedir}/qskinny/
done
# plugins are not yet used as such -> libdir
for lib in `find ${D}/usr/plugins -name '*.so*'`; do
mv $lib ${D}${libdir}/
done
rm -r ${D}/usr/plugins
}
PACKAGES =+ "${PN}-examples"
FILES_${PN} += " \
${libdir}/lib*skin.so \
${OE_QMAKE_PATH_PLUGINS} \
"
FILES_${PN}-examples += "${bindir}"
FILES_SOLIBSDEV = "${libdir}/libqsk*${SOLIBSDEV}"

View File

@@ -1,9 +1,10 @@
#%PAM-1.0
auth required pam_env.so
auth required pam_tally.so file=/var/log/faillog onerr=succeed
auth required pam_shells.so
auth required pam_nologin.so
auth required pam_permit.so
-auth optional pam_gnome_keyring.so
-auth optional pam_kwallet5.so
account include common-account
@@ -11,6 +12,4 @@ password include common-password
session include common-session
session required pam_limits.so
-session optional pam_kwallet5.so auto_start
-session optional pam_gnome_keyring.so auto_start

View File

@@ -2,8 +2,8 @@
auth requisite pam_nologin.so
auth required pam_env.so
-auth optional pam_kwallet5.so
-auth optional pam_gnome_keyring.so
auth optional pam_kwallet5.so
auth optional pam_gnome_keyring.so
#auth required pam_unix.so
# To deny passwordless login comment next line and uncomment previous line
auth required pam_unix.so nullok
@@ -13,8 +13,8 @@ account required pam_unix.so
session required pam_limits.so
session required pam_unix.so
-session optional pam_systemd.so
-session optional pam_kwallet5.so auto_start
-session optional pam_gnome_keyring.so auto_start
session optional pam_kwallet5.so auto_start
session optional pam_gnome_keyring.so auto_start
password required pam_unix.so

View File

@@ -74,6 +74,7 @@ RDEPENDS_${PN} += " \
qtbase-plugins \
qtdeclarative-plugins \
qtdeclarative-qmlplugins \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-tally', '', d)} \
"
RRECOMMENDS_${PN += " \

View File

@@ -0,0 +1,9 @@
require recipes-graphics/xorg-lib/xcb-util.inc
DEPENDS += "xcb-util xcb-util-renderutil xcb-util-image"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=ce469b61c70ff8d7cce0547476891974"
SRC_URI[md5sum] = "88e70d92ff5616d406ce5b1b62e0c58b"
SRC_URI[sha256sum] = "ed65367b810d47ab637011585135f4a84dd12e235dddcd3b26e0cfb3be21fb3a"

View File

@@ -1,8 +1,8 @@
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 \
file://LICENSE.txt;md5=ec5e1ab8584968655cce6fd650160b26 \
file://LICENSE.GPL.txt;md5=9bea831e8733013a5761386750f57271 \
"
inherit cmake_qt5_extra
@@ -12,14 +12,9 @@ DEPENDS += " \
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"
SRCREV = "488ae47b2be78b07d196ead7614ab35866c63157"
S = "${WORKDIR}/git"
PV = "2.7.2"
PV = "2.6.50+git${SRCPV}"
FILES_${PN}-dev += "${datadir}/mkspecs"

View File

@@ -1,8 +1,11 @@
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"
LICENSE = "(GPLv2 & LGPLv2.1 ) | KDAB-Commercial | KDAB-Commercial-US"
LIC_FILES_CHKSUM = " \
file://LICENSE.txt;md5=d988404a6396edf41e7f8cbb2db3c185 \
file://LICENSE.GPL.txt;md5=fa70ea33eec42152e9d40dfb8310b70c \
file://LICENSE.LGPL.txt;md5=cce5e510cd6a04c95c4b4910d22559fe \
file://LICENSE.US.txt;md5=affebebb336655a41db530c5594f7dff \
file://LICENSE.txt;md5=129d14735385614fe7b1d5eee63674a5 \
"
inherit cmake_qt5_extra
@@ -13,12 +16,6 @@ DEPENDS += " \
"
SRC_URI = "git://github.com/KDAB/KDReports.git"
SRCREV = "47728293e7842140d36a7861cf4316f2c1cbd795"
SRCREV = "2a7defbef34399838739f87f42c7d36c198b1611"
S = "${WORKDIR}/git"
PV = "1.9.0"
do_install_append() {
# these have gone wild / qmake was always pain
rm -r ${D}/usr/mkspecs
}
PV = "1.8.50+git${SRCPV}"

View File

@@ -1,5 +0,0 @@
require ${BPN}.inc
inherit native
SRC_URI += "file://0001-Just-build-bare-kdwsdl2cpp-for-native.patch"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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

View File

@@ -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

View File

@@ -15,7 +15,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "2045657dd16e3f73e3e5e67a7db6cd36c072a85e7957f411a6e348cabc9c469b"
SRC_URI[md5sum] = "71b431cf4d65c14e413d3e0bf9ee657e"
SRC_URI[sha256sum] = "9247172f3ffbc0fd3308b4b40f5d76eaa2a5012dc49525c3087caf5cdfc1513e"
FILES_${PN} += " \
${datadir}/libanalitza \

View File

@@ -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,8 +28,11 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "fedfb2fb9b9d5d7741e7166d2e13049d48a90501f22d046f9ae01469c5957c0e"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
SRC_URI[md5sum] = "7229b67491b61dcec2fc210444099653"
SRC_URI[sha256sum] = "bc1fcd84632c628a10e8536d56b65a7acbd4235ed0e034fec864b78bdc36f8f1"
SRC_URI += " \
file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch \
"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -19,7 +19,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "2fcfb885a5b25e9144fd7e6b9964dc7a394ab009a1f0c361bf7730be756e3132"
SRC_URI[md5sum] = "2efa693e1c94fa03d0d391ffb489636b"
SRC_URI[sha256sum] = "edb9284b1a7d73b0c824390aa875593650880eb77c2680a2942c9fd65f436a2d"
FILES_${PN} += " \
${datadir}/kservices5 \

View File

@@ -19,7 +19,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "2f646d82ae825a2631394a4c515c265eeef4b2e58eefa6e6375d3eb7fd8eeb1a"
SRC_URI[md5sum] = "0834d12a9478b0335f1ac17448339084"
SRC_URI[sha256sum] = "2f950820ebdb52f1c81476b36b5ea07808fe8da154e7757a85ca8ac2c1b37735"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -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

View File

@@ -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 = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "78f66c9b8f9d1e61d421eea7ce5241c7"
SRC_URI[sha256sum] = "8f8983bc8d143832dc14bc2003ba6af1af27688e477c0c791fd61445464f2069"
FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"

View File

@@ -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 \
@@ -42,6 +42,7 @@ SRC_URI = " \
file://0002-Add-missing-include-to-fix-build-with-Qt-5.11.patch \
file://0003-Fix-build-with-Qt-5.13.patch \
"
SRC_URI[md5sum] = "90ac376276be2f5a8f6eca537ca5fd0c"
SRC_URI[sha256sum] = "7a813f9ea815a09c1e733d0e7dc879c64eee85f075389e87e6aab99cf0c1c1ff"
do_install_append() {

View File

@@ -18,6 +18,7 @@ DEPENDS += " \
"
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "4964e28440f3a808297efb0cb786bd14"
SRC_URI[sha256sum] = "67af0c2d74715957bd5373a6a30589ff0a996cb1d267dfd0538dccaa9a768dfa"
FILES_${PN} += " \

View File

@@ -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

View File

@@ -23,11 +23,8 @@ 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 = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "f11fa519d7f5519c8e48906fa96cab2f"
SRC_URI[sha256sum] = "22716d719654e8f887fe4d33654e252ddf3d3d818c44e15a8af0e6f2e7d6ccd7"
FILES_${PN} += " \

View File

@@ -18,7 +18,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "0cb1b232c9b86811107ef9270ba2be42d242157b8daeeeffd1493ae635f0aa3a"
SRC_URI[md5sum] = "3fc039691fae9e401d6e66d1c78b831f"
SRC_URI[sha256sum] = "82860ef615954e94f3f382ad60fb144fcfcf7777b8a890f281c0cce55da13a55"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -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,7 +36,12 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "9d29577e0ef2d364a54718f1a8e0a74cf4246f6bd020ff605825f5888739f680"
SRC_URI[md5sum] = "41fa8934aa3f10bb422d79d952db0e6e"
SRC_URI[sha256sum] = "de71f52324c15d692448ac4c79c1e0fcf35df5c03349a8bcbebfae20d9f69d4e"
SRC_URI += " \
file://0001-fix-build-for-qtbase-without-session-management.patch \
file://0002-Revert-Make-target_link_libraries-for-kdeinit_dolphi.patch \
"
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
@@ -46,7 +51,6 @@ FILES_${PN} += " \
${datadir}/config.kcfg \
${datadir}/k*5 \
${datadir}/kglobalaccel \
${datadir}/knsrcfiles \
${datadir}/dbus-1 \
${libdir}/libkdeinit5_dolphin.so \
${OE_QMAKE_PATH_PLUGINS} \

View File

@@ -0,0 +1,50 @@
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
@@ -434,9 +434,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
@@ -168,6 +168,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")) {
@@ -176,6 +177,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
}
}
+#endif
KDBusService dolphinDBusService;
DBusInterface interface;

View File

@@ -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

View File

@@ -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] = "3852d3814d21ed1c8f1e98d188cb82f2"
SRC_URI[sha256sum] = "f9172f6ddf75cf8e4be19d50f80994d59545fdea966674fb67abe7a7c934810a"
CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"

View File

@@ -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] = "6fa0d265e40841fca313aa631de1931b"
SRC_URI[sha256sum] = "95fa38574292a2aa8d3d90749fbbb61c5005889ef1df1aaa04d2d789bbf4fb00"
SRC_URI += " \
file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -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

View File

@@ -24,7 +24,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "9a65508930c969f07fe6a228b0f4b1b24797cfaa49710698393b84cfb260aba4"
SRC_URI[md5sum] = "1429dd72178fbefc8b5d704a01047c71"
SRC_URI[sha256sum] = "eac24bb0b0bcf7e12e4059187e0fd542503bae620637a4f35a339e6f63ab3890"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -2,7 +2,7 @@ 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 \
@@ -25,9 +25,12 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "acc76c7b80f71ce47fb747c81cd062b1581ccc441f025e023bedc193feb8bc26"
SRC_URI[md5sum] = "925dd075bdec3aaa61dfac125b7dd077"
SRC_URI[sha256sum] = "7e7ad69eaa7a6b2d0549e94d1dab0d012107c822d66483d54aa8268900820255"
SRC_URI += "file://0001-Avoid-try_run.patch"
SRC_URI += " \
file://0001-Avoid-try_run.patch \
"
CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"

View File

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
"
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] = "1fb55c17da09c60fdb36c4b629e95174"
SRC_URI[sha256sum] = "7832584a161c2f611ce980ad98932533c998d37e6e4e2b7afbd0b4e98ce88a65"
FILES_${PN} += " \
${datadir}/icons \

View File

@@ -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 gettext pkgconfig gtk-icon-cache
DEPENDS += " \
qtsvg \
@@ -34,7 +34,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "b6dc3db2a3d14653ef132402fdd2a120ed26c663475eba186f7af9dcae5d00e5"
SRC_URI[md5sum] = "7d9eea9cb7b2111c1e0808cf68bfb0f2"
SRC_URI[sha256sum] = "4b3b91fb86b2d97efc7ca8c3037f33101d402df7dd2fe311b12a87468e8a6b5c"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -26,7 +26,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "fee768b772a45eb78b213aae70707b79299f92deb006095559311b013670015a"
SRC_URI[md5sum] = "594487a991b9cc7b36802393ab218856"
SRC_URI[sha256sum] = "0edc811df5d4e729851e4af980fb414d70af66218091c017c16054a5181af80e"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -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,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "e9b7a9b11ae54a387b5a6d6f4253f9da7f63972fe2928d7fa280d969638dfdd4"
SRC_URI[md5sum] = "a8a14bf2a8590b1d8f38b565881d71ba"
SRC_URI[sha256sum] = "ab9f076e7e825fca64252b366e637e34157f1f875aa573bdae333fc240e0ec71"
FILES_SOLIBSDEV = ""

View File

@@ -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

View File

@@ -27,7 +27,9 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "d336fdaa10d5d1deb66d6764e07a1288dc79692b789b63d8662ce57086e961ec"
SRC_URI[md5sum] = "4c3cd816f6a7553e94ef7c3870b3bede"
SRC_URI[sha256sum] = "a02df5d0d03fdd478ead1ba705089514b6debfae553be8d814edfb6952149eac"
SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -22,7 +22,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "ee9586d3e68ced73e796bd8b407233605be0ff8f60cf445cf3f03663fb3080c9"
SRC_URI[md5sum] = "579d0fdc50c7da848eda46d6c6bb753b"
SRC_URI[sha256sum] = "9d2553472a3f61e1be584bed2d9295a60b8074fdcd264213d67dc20f63033563"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -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

View File

@@ -28,7 +28,9 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "9e1bdf041f1cb3dc371f8dda3c2323baab24f3edd2ec5603086e4b9a23ddc320"
SRC_URI[md5sum] = "ca06728d8d10b442435b1852769aee24"
SRC_URI[sha256sum] = "21e4bc2e2f3c23d4b954c8b336aab9faa5ba6021ca1487baf39595ff31d82e0b"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -23,7 +23,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "1f4d45954794d3474831731db9211a54bd0e9b878dc6887c2abbfbb66c0bcd92"
SRC_URI[md5sum] = "7d34763a6f37cc904008d84f3cdb1542"
SRC_URI[sha256sum] = "1c49d80dcbaa7745932c6b64c520072099e66767e8d1f725a332f79a7ee89f3f"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -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,7 +22,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "3aaf99c11dcb45a27d5e89a514859b4c92082b26fcf5709783b8c8cbd237409e"
SRC_URI[md5sum] = "d408ad818809a0211c742c2bb285a668"
SRC_URI[sha256sum] = "8fc5e0643bb826b07cb5d283b8bd6fd5da4979f6125b43b1db3a9db60b02a36a"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -23,7 +23,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "5ed62f8336bba82d27a617de398d80285d5da40ff5fd7929768387b2a70363d6"
SRC_URI[md5sum] = "1c3d23529035c135fe28924c9541e099"
SRC_URI[sha256sum] = "7c61d96bcd45621d021ae8a56224dcf81999cb14ab7b1d7976a47eee2be25d2e"
FILES_SOLIBSDEV = ""

View File

@@ -19,4 +19,5 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "ea090dde3fce15a2a5779c010ef72cda0b87cb3556ee08f226530ae5a48cd9dc"
SRC_URI[md5sum] = "ab2110da74583da086e638da467bc2b2"
SRC_URI[sha256sum] = "f294965fc7cf8b1063b611233a98fab13a00263f1d4fd254fb8b53b3f125bc52"

View File

@@ -16,7 +16,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "87c483e790c47cfc05a99e3815d42ba140d6830396b9debcdf31424e80c2e4a0"
SRC_URI[md5sum] = "8c14dfc8c4f2895a27b854a71d5bd992"
SRC_URI[sha256sum] = "0c3d45ceb9029f0d316e61b3f403838b4c7de82a3211a231b539e6755386c657"
FILES_${PN} += " \
${datadir}/icons \

View File

@@ -4,7 +4,7 @@ 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 \
@@ -38,7 +38,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "9f8f3636f65f42a73fd1a97e29f8493fbcb8297ca755852eae93258ce12ceda0"
SRC_URI[md5sum] = "1d24264b2a20d8a14fa601c626f72a6d"
SRC_URI[sha256sum] = "64ab3cf06222b95f021941d8c430c70918c04c3ea988f7ccf5ef87c6b69b4465"
SRC_URI += " \
file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \
@@ -48,11 +49,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} \
"

View File

@@ -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"

View File

@@ -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)} \
"

View File

@@ -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"

View File

@@ -22,7 +22,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "d7f71de3b1d1a8795fd5636947a1dcd57d212f0045e44159eaf3ffe034b4650a"
SRC_URI[md5sum] = "75be2e3b15fc4e00fd8c5dd4e206f745"
SRC_URI[sha256sum] = "eef733c2089ce8fc40405653fa5e3aaafe67a1cc5d074f744e49b185291c0617"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -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

View File

@@ -26,7 +26,9 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "fd168af82bfec1cca87beb1f9b89520fdd4aa31401db690855615ac5c79b4153"
SRC_URI[md5sum] = "fefd5cf52e4bdb07765f8067abca1eb6"
SRC_URI[sha256sum] = "6a433c8b628f105d210efd5b5532763e09a4e7190d71f8cf11931ab1605abeec"
SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -21,7 +21,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "b94d9bcc6c72a93d77cae70a1d39449cb6edde2c25c57b78c1595d810daf2582"
SRC_URI[md5sum] = "69b66e2a46e453c98bf0251a5c78a0d2"
SRC_URI[sha256sum] = "6ebb7d361a8456e3a3bc7bac995a0224cd76eefd724ff62ba0d6348f7eb1f4f2"
FILES_${PN} += " \
${datadir}/icons \

View File

@@ -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] = "3d7a240b68d630baa244495c7720ebb8"
SRC_URI[sha256sum] = "a03817fb16739b1b235dc54ddeda2c2ebc6605a0c7678e02af24c05271c0b77a"
SRC_URI += " \
file://0001-fix-build-for-qtbase-without-session-management.patch \
"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

View File

@@ -9,13 +9,12 @@ LIC_FILES_CHKSUM = " \
file://man/LICENSE;md5=d975629b732b61cb58f9595c6baa9379 \
"
inherit kde-apps gettext mime
inherit kde-apps gettext
DEPENDS += " \
qtsvg \
qtwebengine \
\
kdsoap-native kdsoap \
exiv2 \
taglib \
kactivities \
@@ -51,11 +50,16 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "2c0001a2e864173988c5b0916de4511ff4c5ea711e96e928f9299fc4b44af344"
SRC_URI += "file://0001-Do-not-find-use-taglib-config.patch"
SRC_URI[md5sum] = "3da78e506ba30497ac303f8fe80628f7"
SRC_URI[sha256sum] = "e38e872f78ff24fe512ec7ff9ed4f6b6a8e1fef6111fdb0222c133bed0a8861f"
SRC_URI += " \
file://0001-Do-not-find-use-taglib-config.patch \
file://0002-Disable-nfs-for-now.patch \
"
do_configure_append() {
sed -i 's:${S}/smb/kdsoap-ws-discovery-client/src/kdwsdl2cpp:${STAGING_BINDIR_NATIVE}/kdwsdl2cpp:g' ${B}/build.ninja
# gperf creates hard #line links
do_install_prepend() {
no_staging_check=true
}
FILES_${PN} += " \

View File

@@ -0,0 +1,35 @@
From 56be2d68e5a8213c199006bbb8b3461764764e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 17 Nov 2019 21:16:59 +0100
Subject: [PATCH] Disable nfs for now
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It seems there was a change in oe-core's glibc/libtirpc causing missing symbols
for libtirpc.
Upstream-Status: Inappropriate
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
CMakeLists.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55236d4..0f31e67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,9 +177,6 @@ if(NOT WIN32)
endif()
check_include_files(rpc/rpc.h HAVE_RPC_RPC_H)
add_feature_info("NFS kioslave" HAVE_RPC_RPC_H "The RPC library is needed to build the NFS kioslave")
- if(HAVE_RPC_RPC_H)
- add_subdirectory( nfs )
- endif()
endif()
# KDNSSD before 5.54 suffers from a race condition in avahi's dbus API and
--
2.21.0

View File

@@ -2,7 +2,7 @@ SUMMARY = "KMag is a screen magnifier"
LICENSE = "GPLv2 & GFDL-1.2"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=38adfe5a9f2953129da1774430b28adf \
file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
"
inherit kde-apps gtk-icon-cache
@@ -19,7 +19,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "932017734a5a34eaf7d66f768ccb1448cac266a145fc0e08a23b248bc77f8478"
SRC_URI[md5sum] = "d22f41a42bd3065be69d21cf847d15cb"
SRC_URI[sha256sum] = "216e5db763f72ff1f4ada339912dc686fa7a6cea0dafc8b9eab35601edabc950"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -23,7 +23,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "70e0c7c228136240ed7cc2703fb1757f5f2fc925cf7a9b73d5beb8df4f4df771"
SRC_URI[md5sum] = "de39196ffa941da79873706fbfa210ef"
SRC_URI[sha256sum] = "d74446083f6ead6d7571e0ca4ff37af3f8167cc16ed7f67576155a000b41ca22"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -23,7 +23,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "971ad5017f8ec5227e2d0d6c6f4abdc59d4bafa68f040fc39cf5db3d6e84c5d6"
SRC_URI[md5sum] = "ee0c16f73fbc0ac0ddf0f004136a966b"
SRC_URI[sha256sum] = "4ebb5d932ab43f11f81d0fa64aef871ffecaab4a2c3a5c4dbf10416a86fa8329"
FILES_${PN} += " \
${datadir}/icons \

View File

@@ -32,7 +32,8 @@ PACKAGECONFIG = "pulseaudio"
PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "93b86accbbd37e5ecf7c780b619c9802616dec1573c43e21041d57acdc48f501"
SRC_URI[md5sum] = "f5cb90fe0db16ef5be1028ce03cde0b9"
SRC_URI[sha256sum] = "cf71abee1ab35423b0daeaf1fbddbcdcb2f40fd946dfabf0cb19b8762b8582bc"
EXTRA_OECMAKE += "-DKMIX_KF5_BUILD=1"

View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
"
inherit kde-apps gtk-icon-cache mime-xdg
inherit kde-apps gtk-icon-cache
DEPENDS += " \
qtsvg \
@@ -23,7 +23,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "9e4928511348d560ccbdf0f5b104c024ff4263c0445ba3899b6eac5579c06733"
SRC_URI[md5sum] = "6a473954c71262f705137ed3e2e2b261"
SRC_URI[sha256sum] = "777408873baa5d6ce236d71bc2935a89fa414fb9f59049ba6e1ae88d581f580e"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=3214f080875748938ba060314b4f727d \
"
inherit kde-apps gtk-icon-cache mime-xdg
inherit kde-apps gtk-icon-cache
DEPENDS += "\
kauth-native \
@@ -30,7 +30,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "3047607a89e9f840e6013dae2c0f6a5d46d45781201c9499ee7994b2ac7dc434"
SRC_URI[md5sum] = "ae04fd585380915bfafbb11251bc0422"
SRC_URI[sha256sum] = "aac61cfc561b4d4759b086508c53c525db6899ae11a2400c4ca701fcb5649c8d"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -2,7 +2,7 @@ SUMMARY = "KDE's terminal emulator"
LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
file://COPYING.DOC;md5=d8855fca80aa0b428deafa405d0ea17a \
file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
"
@@ -40,7 +40,8 @@ DEPENDS += " \
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "5d7a03e745d324210a94099188e64c42203a8e3a27d5854d211675538e6f514a"
SRC_URI[md5sum] = "81c12c16135df39bdf42c895c77f27d0"
SRC_URI[sha256sum] = "2cc610109ff8ddc6efa6ea83f0153f4b1d72e4be65d8dbde9cfd526c257e7025"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""

View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
"
inherit kde-apps gtk-icon-cache mime mime-xdg
inherit kde-apps gtk-icon-cache mime
DEPENDS += " \
kauth-native \
@@ -27,7 +27,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[sha256sum] = "493b20d53806cbb1bd656817ef139de80197ec585bb097c4bd28c23b655aa4c5"
SRC_URI[md5sum] = "b2dbb97f4ba3837de38df312bff40567"
SRC_URI[sha256sum] = "b1414eb0c04396468f40ea84fe71077b98476b4b76c0d3abb95ae4afd49e27a7"
FILES_SOLIBSDEV = ""

Some files were not shown because too many files have changed in this diff Show More