6 Commits

Author SHA1 Message Date
Andreas Müller
6f6e1eccbd sddm-autologin.pam: remove pam_permit.so
Not the best idea to just trust what people send...

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-03-05 22:34:57 +01:00
Andreas Müller
aecc2a940d qtiohelper: upgrade 0.3.994+ -> 0.4.0+
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-10-24 11:46:09 +02:00
Andreas Müller
b5277d6441 exiv2: add all CVE patches found ad fedora
see [1]

[1] https://src.fedoraproject.org/cgit/rpms/exiv2.git/

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-01-04 21:04:53 +01:00
Andreas Müller
a8753216e9 exiv2: remove bogus do_install prepend
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-01-04 21:04:43 +01:00
Andreas Müller
78e6ebc828 exiv2: update SRC_URI
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-01-04 21:04:32 +01:00
Andreas Müller
3f0741da9f kdeclarative: Fix build if QML-debugger was not enabled
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2019-01-01 20:53:57 +01:00
672 changed files with 18846 additions and 4243 deletions

17
README Normal file
View 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>

View File

@@ -1,27 +0,0 @@
OE layer to desktop environments based on Qt5
---------------------------------------------
Layer dependencies:
----------------------
see [layer.conf](conf/layer.conf) for dependencies and 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 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 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.
Maintainers
-----------
Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>

View File

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

View File

@@ -3,3 +3,5 @@ inherit cmake_qt5 cmake_extra_sanity
EXTRA_OECMAKE += " \
-DCMAKE_QT5_EX_PATH_HOST_HEADERS=${STAGING_INCDIR} \
"
FILES_${PN}-dev += "${datadir}/cmake ${libdir}/cmake"

View File

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

View File

@@ -1,6 +1,6 @@
inherit kde-base
KDE_APP_VERSION = "19.08.0"
KDE_APP_VERSION = "18.08.0"
SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"

View File

@@ -19,18 +19,13 @@ 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 pythonnative
DEPENDS += "libxml2-native"
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"
FILES_${PN}-dev += "${libdir}/cmake"
FILES_${PN}-dbg += "${libdir}/plugins/kf5/.debug ${libexecdir}/kf5/.debug"
EXTRA_OECMAKE += " \
-DECM_MKSPECS_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \

View File

@@ -1,3 +1,3 @@
inherit kde-kf5
SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.61/portingAids/${BPN}-${PV}.tar.xz"
SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.49/portingAids/${BPN}-${PV}.tar.xz"

View File

@@ -1,5 +1,5 @@
inherit kde-base
KF5_VERSION = "5.61.0"
KF5_VERSION = "5.49.0"
SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.61/${BPN}-${PV}.tar.xz"
SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.49/${BPN}-${PV}.tar.xz"

View File

@@ -1,8 +1,8 @@
inherit kde-base
PLASMA_VERSION = "5.16.5"
PLASMA_VERSION = "5.13.5"
SRC_URI = "${KDE_MIRROR}/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz"
SRC_URI = "${KDE_MIRROR}/stable/plasma/${PV}/${BPN}-${PV}.tar.xz"
DEPENDS += " \
kwayland \

View File

@@ -2,21 +2,13 @@ LIRI_GIT_BRANCH ?= "develop"
SRC_URI = "git://github.com/lirios/${@'${BPN}'.replace('liri-', '')}.git;protocol=git;branch=${LIRI_GIT_BRANCH}"
DEPENDS += " \
qtwayland-native \
qttools-native \
liri-cmake-shared \
extra-cmake-modules \
qtbase \
qttools \
qtdeclarative \
qtwayland \
"
DEPENDS += "qtbase qtdeclarative extra-cmake-modules-native"
inherit cmake_qt5_extra pkgconfig qt5-translation
inherit cmake_qt5_extra pkgconfig
EXTRA_OECMAKE += " \
-DINSTALL_LIBDIR:PATH=${baselib} \
-DINSTALL_QMLDIR:PATH=${OE_QMAKE_PATH_QML} \
-DINSTALL_PLUGINSDIR:PATH=${OE_QMAKE_PATH_PLUGINS} \
-DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \
-DECM_MKSPECS_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \
-DPLUGIN_INSTALL_DIR=${OE_QMAKE_PATH_PLUGINS} \
-DQT_PLUGIN_INSTALL_DIR=${OE_QMAKE_PATH_PLUGINS} \
"

View 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}() {
oldpath=`pwd`
for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
cd `dirname "$sofile"`
lv2-ttl-generator "$sofile"
done
cd $oldpath
}
pkg_prerm_${PN}() {
for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
path=`dirname "$sofile"`
for turtle in `find $path -name '*.ttl'`; do
rm $turtle
done
done
}
RDEPENDS_${PN} += "lv2-ttl-generator"

View File

@@ -1,8 +1,15 @@
inherit cmake_qt5_extra qt5-translation
inherit cmake_qt5_extra
HOMEPAGE = "http://lxqt.org/"
DEPENDS += "lxqt-build-tools qtbase qttools-native"
SRC_URI = "git://github.com/lxqt/${BPN}.git;protocol=git;branch=master"
SRC_URI = "git://github.com/lxde/${BPN}.git;protocol=git;branch=master"
S = "${WORKDIR}/git"
EXTRA_OECMAKE += " \
-DPULL_TRANSLATIONS=Off \
-DCLEAN_TRANSLATIONS=Off \
"
FILES_${PN}-dev += "${datadir}/cmake ${libdir}/cmake"

View File

@@ -13,9 +13,9 @@ DEPENDS += "qemu-native"
# 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")
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:

View File

@@ -13,26 +13,26 @@ FILES_${PN}_remove = "${datadir}/${BPN}"
python qt_do_split_locales() {
import glob
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 = (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):
@@ -44,16 +44,16 @@ python qt_do_split_locales() {
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.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))

View File

@@ -10,18 +10,13 @@ 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 = "thud warrior"
LAYERDEPENDS_meta-qt5-extra = "core qt5-layer openembedded-layer networking-layer multimedia-layer"
LAYERSERIES_COMPAT_meta-qt5-extra = "sumo"
LICENSE_PATH += "${LAYERDIR}/files/licenses"
# required for fluxbox - supplied by e.g fedora glibc-common
HOSTTOOLS_NONFATAL += "gencat"
PREFERRED_PROVIDER_zyn = "${@bb.utils.contains("DISTRO_FEATURES", "opengl", "zyn-fusion", "zynaddsubfx",d)}"

View File

@@ -1 +0,0 @@
PACKAGECONFIG += "cxx"

View File

@@ -1 +0,0 @@
BBCLASSEXTEND = "native"

View File

@@ -1 +0,0 @@
BBCLASSEXTEND = "native"

View File

@@ -1 +0,0 @@
BBCLASSEXTEND = "native"

View File

@@ -1 +0,0 @@
BBCLASSEXTEND = "native"

View File

@@ -1,525 +0,0 @@
QSkinny License
Version 1.0, November 1, 2016
QSkinny is Copyright (C) 2016 Uwe Rathmann
You may use, distribute and copy QSkinny under the terms of
GNU Lesser General Public License version 2.1, which is displayed below
with the following exceptions:
1. The object code form of a "work that uses the Library" may incorporate
material from a header file that is part of the Library. You may
distribute such object code under terms of your choice, provided that:
(i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data
structure layouts, accessors, macros, inline functions and
templates; and
(iii) you comply with the terms of Section 6 of the GNU Lesser General
Public License version 2.1.
-------------------------------------------------------------------------
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.
To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights. These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that
there is no warranty for the free library. Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder. Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.
Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License. This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License. We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.
When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library. The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom. The Lesser General
Public License permits more lax criteria for linking other code with
the library.
We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License. It also provides other free software developers Less
of an advantage over competing non-free programs. These disadvantages
are the reason we use the ordinary General Public License for many
libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software. For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.
Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (1) uses at run time a
copy of the library already present on the user's computer system,
rather than copying library functions into the executable, and (2)
will operate properly with a modified version of the library, if
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).
To apply these terms, attach the following notices to the library. It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
<one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
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, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!

View File

@@ -1,24 +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] = "db3ad80358b31df292d69b067c5657c6"
SRC_URI[sha256sum] = "04dbe12f52e68a0fececad1bbab08e279d7fd2f438e126bfc6d047daf1a55b75"
PV = "1.2.10"
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 \
"

View File

@@ -1,29 +0,0 @@
SUMMARY = "FocusWriter is a simple, distraction-free writing environment"
HOMEPAGE = "http://gottcode.org/gottet/"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
inherit qmake5 qt5-translation gtk-icon-cache
DEPENDS = " \
qttools-native \
qtbase \
qtmultimedia \
hicolor-icon-theme \
hunspell \
"
SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2"
SRC_URI[md5sum] = "a9a33873fc7c0f919fe575b78278fdbf"
SRC_URI[sha256sum] = "5886054427da20ef0542dc97c8d2b4308b0a169b49f0409633dd8b17fe71bc94"
PV = "1.7.3"
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
FILES_${PN} += " \
${datadir}/metainfo \
${datadir}/${BPN}/icons \
${datadir}/${BPN}/symbols1000.dat \
${datadir}/${BPN}/themes \
${datadir}/${BPN}/sounds \
"

View File

@@ -1,19 +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] = "4f0fee606eff49d5a5cf9cdc9baae622"
SRC_URI[sha256sum] = "f18ccc4e42d6ddb763983d0bfdc1da4ff91faa83289796e1b238f5fa5404e51e"
PV = "1.5.9"
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
FILES_${PN} += " \
${datadir}/metainfo \
"

View File

@@ -1,16 +0,0 @@
SUMMARY = "All gottcode recipes - just for build test"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
inherit packagegroup
RDEPENDS_${PN} = " \
connectagram \
focuswriter \
gottet \
hexalate \
kapow \
peg-e \
simsu \
tetzle \
"

View File

@@ -1,19 +0,0 @@
SUMMARY = "Tetzle is a jigsaw puzzle game that uses tetrominoes for the pieces"
HOMEPAGE = "https://gottcode.org/tetzle/"
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] = "85685c336812e6e46133ab5e82be4a4d"
SRC_URI[sha256sum] = "982bac58aa37be4ac27a723b84d122af62b8cdce63d9aad180efa48427ce10b0"
PV = "2.1.5"
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
FILES_${PN} += " \
${datadir}/metainfo \
"

View File

@@ -1,69 +0,0 @@
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

@@ -1,31 +0,0 @@
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

@@ -1,59 +0,0 @@
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,28 +0,0 @@
From 45038115cf962f0b5923a74ae362e3a430ec5a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 8 Nov 2018 10:37:24 +0100
Subject: [PATCH] fix qml install dir
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
components/CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 33920a6..22d75c9 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -1,5 +1,5 @@
configure_file("2.0/LayoutBox.qml" "2.0/LayoutBox.qml")
-install(DIRECTORY "2.0/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
-install(DIRECTORY "common/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/2.0/" DESTINATION "${QT_IMPORTS_DIR}/SddmComponents")
+install(DIRECTORY "2.0/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
+install(DIRECTORY "common/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/2.0/" DESTINATION "${QML_INSTALL_DIR}/SddmComponents")
--
2.14.5

View File

@@ -1,57 +0,0 @@
From 68dbaac218216d001706c1a72d2db4819e3ca8cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 25 Nov 2018 00:29:17 +0100
Subject: [PATCH] Workaround missing sessions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The current approach is wrong in many ways:
* In case a session file does not set TryExec it is kept enabled accidentlty
* Session files with TryExec without full path are ignored. Problem here: sddm
tries to find executables based on PATH environment. Problem at least for my
environment: There is no PATH variable set by systemd. So for session files
without path: Do not perform further checks / just trust for now.
Upstream-Sttaus: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/greeter/SessionModel.cpp | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp
index 2a3c091..927bce2 100644
--- a/src/greeter/SessionModel.cpp
+++ b/src/greeter/SessionModel.cpp
@@ -124,22 +124,11 @@ namespace SDDM {
Session *si = new Session(type, session);
bool execAllowed = true;
- QFileInfo fi(si->tryExec());
- if (fi.isAbsolute()) {
- if (!fi.exists() || !fi.isExecutable())
+ if(!si->tryExec().isEmpty()) {
+ QFileInfo fi(si->tryExec());
+ if (fi.isAbsolute()) {
+ if (!fi.exists() || !fi.isExecutable())
execAllowed = false;
- } else {
- execAllowed = false;
- QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
- QString envPath = env.value(QStringLiteral("PATH"));
- QStringList pathList = envPath.split(QLatin1Char(':'));
- foreach(const QString &path, pathList) {
- QDir pathDir(path);
- fi.setFile(pathDir, si->tryExec());
- if (fi.exists() && fi.isExecutable()) {
- execAllowed = true;
- break;
- }
}
}
// add to sessions list
--
2.14.5

View File

@@ -1,27 +0,0 @@
###############################################################################
# We ship a minimalistic default configuration. To get a full configuration
# with all defaults run 'sddm --example-config > default.config'
###############################################################################
[Autologin]
# Name of session file for autologin session (if empty try last logged in)
Session=
# Username for autologin session
User=
[General]
# Comma-separated list of Linux namespaces for user session to enter.
# Touchscreen users with Qt Virtual Keyboard installed can set this to
# "qtvirtualkeyboard" for the on-screen keyboard.
InputMethod=
[Users]
# Do not touch PATH
DefaultPath=

View File

@@ -1,24 +0,0 @@
SUMMARY = "Add mathematical features to your program"
LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
"
inherit kde-apps
DEPENDS += " \
libeigen \
qtsvg \
qtdeclarative \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "5df2b3229bd8487cf54c094496f9b823"
SRC_URI[sha256sum] = "516f29f089be92fecf5e17dcf466a9daf8525ec9e594f52f04338603914c2003"
FILES_${PN} += " \
${datadir}/libanalitza \
${OE_QMAKE_PATH_QML} \
"

View File

@@ -28,11 +28,9 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "1a4bc737591957d2461328c43d7976eb"
SRC_URI[sha256sum] = "0685285486ca933e3467f35c3d5d4e8633ae80f1e5529f8a4d8257d0b53d9512"
SRC_URI += " \
file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch \
"
SRC_URI[md5sum] = "ca6926e80afc64f8ab1b3a0adb5286e1"
SRC_URI[sha256sum] = "e544c3433350fb837570b62e14faeb1033ef31458084a819d49c630b58a6e736"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \
${datadir}/config.kcfg \
@@ -41,3 +39,9 @@ FILES_${PN} += " \
${datadir}/k*5 \
${OE_QMAKE_PATH_PLUGINS} \
"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/.debug \
${OE_QMAKE_PATH_PLUGINS}/*/.debug \
${OE_QMAKE_PATH_PLUGINS}/kf5/kio_dnd/.debug \
"

View File

@@ -19,8 +19,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "09e74bf5950455b6c236153af3bc5426"
SRC_URI[sha256sum] = "3ef81f74ce6fccd6eaf60e0dfd18fe660ac357e75c4715801da9bb3a203a6008"
SRC_URI[md5sum] = "5d27fce69637836b315c9d6baf30da14"
SRC_URI[sha256sum] = "4903d58bf747e5d2898c750f179bb5539eaabcd77fbbc7a70a18dd752aaad408"
FILES_${PN} += " \
${datadir}/kservices5 \

View File

@@ -19,8 +19,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "6ee18909082965333cf6938c2850f28f"
SRC_URI[sha256sum] = "829ecfe3a46bc1c009fea14c5860aa17ea18f36ed33fdc9296c499992aeed466"
SRC_URI[md5sum] = "780378835e74c5924c5a59a30680b5d7"
SRC_URI[sha256sum] = "6a1f4b97dc623ff8d25561dd75ab688d9d1aac56ab45f0d1dc2c078018a8732d"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -16,7 +16,7 @@ DEPENDS += " \
"
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "78f66c9b8f9d1e61d421eea7ce5241c7"
SRC_URI[sha256sum] = "8f8983bc8d143832dc14bc2003ba6af1af27688e477c0c791fd61445464f2069"
SRC_URI[md5sum] = "25651209050396a76d660856f109cf04"
SRC_URI[sha256sum] = "175645a149ae4d758ff2746900f6eabe4734b2bdac4d8c95893c650be4f929f2"
FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"

View File

@@ -1,7 +1,7 @@
From 8ed7b093ea4d7ed8e435cb7704e5a30418356796 Mon Sep 17 00:00:00 2001
From 11f1c4adc5141a66552f6862d943c7af3c8972b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 29 Oct 2018 22:40:32 +0100
Subject: [PATCH] remove try_run by try_compile in breeze-icon-check
Date: Mon, 18 Jun 2018 23:31:15 +0200
Subject: [PATCH] replace try_run by try_compile in breeze-icon-check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -12,29 +12,31 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
cmake/modules/CheckGlobalBreezeIcons.cmake | 18 ------------------
1 file changed, 18 deletions(-)
cmake/modules/CheckGlobalBreezeIcons.cmake | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/cmake/modules/CheckGlobalBreezeIcons.cmake b/cmake/modules/CheckGlobalBreezeIcons.cmake
index 9763213..dfff662 100644
index 9763213..46a218a 100644
--- a/cmake/modules/CheckGlobalBreezeIcons.cmake
+++ b/cmake/modules/CheckGlobalBreezeIcons.cmake
@@ -24,21 +24,3 @@ else()
@@ -24,21 +24,14 @@ else()
set(CheckGlobalBreezeIcons_libs Qt5::Xml)
endif()
-try_run(RUN_RESULT COMPILE_OK
- ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp
- ${CMAKE_SOURCE_DIR}/cmake/modules/CheckGlobalBreezeIcons.cpp
- COMPILE_DEFINITIONS ${CheckGlobalBreezeIcons_defs}
- LINK_LIBRARIES ${CheckGlobalBreezeIcons_libs}
- CMAKE_FLAGS ${CheckGlobalBreezeIcons_flags}
+try_compile(COMPILE_OK
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp
${CMAKE_SOURCE_DIR}/cmake/modules/CheckGlobalBreezeIcons.cpp
COMPILE_DEFINITIONS ${CheckGlobalBreezeIcons_defs}
LINK_LIBRARIES ${CheckGlobalBreezeIcons_libs}
CMAKE_FLAGS ${CheckGlobalBreezeIcons_flags}
- COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT
- RUN_OUTPUT_VARIABLE RUN_OUTPUT)
-
-if(NOT COMPILE_OK)
- message(FATAL_ERROR "${COMPILE_OUTPUT}")
-endif()
+ OUTPUT_VARIABLE COMPILE_OUTPUT)
if(NOT COMPILE_OK)
message(FATAL_ERROR "${COMPILE_OUTPUT}")
endif()
-
-if(NOT ${RUN_RESULT} EQUAL 0)
- message(FATAL_ERROR "No valid breeze-icons.rcc resource file found. \
@@ -42,5 +44,5 @@ index 9763213..dfff662 100644
-Result: ${RUN_OUTPUT}")
-endif()
--
2.14.4
2.14.3

View File

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

View File

@@ -38,12 +38,11 @@ DEPENDS += " \
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://0001-replace-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[md5sum] = "90ac376276be2f5a8f6eca537ca5fd0c"
SRC_URI[sha256sum] = "7a813f9ea815a09c1e733d0e7dc879c64eee85f075389e87e6aab99cf0c1c1ff"
SRC_URI[md5sum] = "22d6c4739109441f5274da584f67f1c8"
SRC_URI[sha256sum] = "6d55cd4af177bcb060673a0977d52bc91cc2dd1b1420d008a78f9783312152fb"
do_install_append() {
install -d "${D}/${datadir}/pixmaps"

View File

@@ -18,10 +18,12 @@ DEPENDS += " \
"
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "4964e28440f3a808297efb0cb786bd14"
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} \
"

View File

@@ -24,8 +24,8 @@ DEPENDS += " \
"
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "f11fa519d7f5519c8e48906fa96cab2f"
SRC_URI[sha256sum] = "22716d719654e8f887fe4d33654e252ddf3d3d818c44e15a8af0e6f2e7d6ccd7"
SRC_URI[md5sum] = "48216d8f83a48c93bed9acd0081daa92"
SRC_URI[sha256sum] = "3b6485629b5e4343b7ddf42efb1927310d60b143a22afe79925147d0ddcdf36c"
FILES_${PN} += " \
${datadir}/kservicetypes5 \

View File

@@ -19,11 +19,15 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "032a73a5293f47e2e743fc71b34a6d89"
SRC_URI[sha256sum] = "f074aa7151f4b4d9202d90257952638652a1bf09d02699762f346d85b61c5f54"
SRC_URI[md5sum] = "898477ec482c80eeda7784fd57bf1fe4"
SRC_URI[sha256sum] = "3bea72ffe16aac221e2ffa2f91c910b78912dca557aba4866204aa3ed85c26c9"
FILES_${PN} += " \
${datadir}/config.kcfg \
${datadir}/kservices5 \
${OE_QMAKE_PATH_PLUGINS} \
"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/.debug \
"

View File

@@ -36,21 +36,15 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "2c9aebc32016b521f62cb73e34c92635"
SRC_URI[sha256sum] = "fd44714541ae7082d4615e441242afdba2d7810a373bfc8c3e64ff5c7db0a0f0"
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"
SRC_URI[md5sum] = "645ecbd2896ef47ac5ce7a7f1fd3b738"
SRC_URI[sha256sum] = "5efb4c5dc304a6d179915b6553ad0f5232dc4e6b38a9d4dbd80a72a5351e6fe4"
SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"
FILES_SOLIBSDEV = "${libdir}/libdolphin*${SOLIBSDEV}"
FILES_${PN} += " \
${datadir}/config.kcfg \
${datadir}/k*5 \
${datadir}/kglobalaccel \
${datadir}/dbus-1 \
${libdir}/libkdeinit5_dolphin.so \
${OE_QMAKE_PATH_PLUGINS} \

View File

@@ -1,7 +1,7 @@
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
Subject: [PATCH 2/2] fix build for qtbase without session management
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -16,7 +16,7 @@ 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)
@@ -346,9 +346,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;
@@ -32,7 +32,7 @@ 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)
@@ -134,6 +134,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
mainWindow->show();
@@ -40,7 +40,7 @@ index b4ca2c6..5c058a9 100644
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)
@@ -142,6 +143,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
}
}

View File

@@ -1,24 +0,0 @@
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

@@ -29,8 +29,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "0b8ac2d21caac785824241d25df3c48f"
SRC_URI[sha256sum] = "3d792f6dfd4a5d8ad7726fa942840ebed2b2bb6f25ec6f68883b83859c21cacc"
SRC_URI[md5sum] = "06baf39ea96ece188be9157e12ce9e6c"
SRC_URI[sha256sum] = "a6f7ae038b3f7f753bec5e99e9b257225f48000cc4b1d5d0ce3bb3d3beb51b08"
CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
@@ -40,3 +40,7 @@ FILES_${PN} += " \
${datadir}/icons \
${OE_QMAKE_PATH_PLUGINS} \
"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/.debug \
"

View File

@@ -21,8 +21,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "317af4cb4e1ba176db4b6a8f049b3c88"
SRC_URI[sha256sum] = "bdd3d32f6666b3d2fa4c614f5f058571c8849484e1ba17a97996680503f8e8e6"
SRC_URI[md5sum] = "5973b0176f48e80a52ea1eca33ec4bc7"
SRC_URI[sha256sum] = "69de0bafa3e407cc6c9b52cb942cbb414db526fee7e99154498f7e821fc0a6f3"
SRC_URI += " \
file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
"
@@ -32,3 +32,7 @@ FILES_${PN} += " \
${datadir}/icons \
${OE_QMAKE_PATH_PLUGINS} \
"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/.debug \
"

View File

@@ -24,8 +24,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "b90a37729f3650157e0f32759248d72d"
SRC_URI[sha256sum] = "b61bf45df63dc3fb324e1a74ec84ae4f2d58371af88ccd28593b0716673dc00a"
SRC_URI[md5sum] = "fa563c48468f03dcc6be6605402ccc7c"
SRC_URI[sha256sum] = "5898f962dfde9f124c9967c75581c2e2d8015fecac765f1c3470edb7f97ddf1a"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -0,0 +1,30 @@
From 06f07a9b331bec4ff51c2a5174e758b1bffba10c Mon Sep 17 00:00:00 2001
From: "Luis Gustavo S. Barreto" <gustavo@ossystems.com.br>
Date: Wed, 6 Apr 2016 19:23:55 +0000
Subject: [PATCH 2/3] Set Kipi package properties
This change make Kipi optional.
Upstream-Status: Pending
Signed-off-by: Luis Gustavo S. Barreto <gustavo@ossystems.com.br>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a18ca16..d855192 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ find_package(KF5Kipi)
if (KF5Kipi_FOUND)
set(KIPI_FOUND true)
endif()
-# set_package_properties(Kipi PROPERTIES URL"http://www.kipi-plugins.org" DESCRIPTION "Provides various image manipulation and export features" TYPE OPTIONAL)
+set_package_properties(KF5Kipi PROPERTIES URL "http://www.kipi-plugins.org" DESCRIPTION "Provides various image manipulation and export features" TYPE OPTIONAL)
find_package(LCMS2)
set_package_properties(LCMS2 PROPERTIES URL "http://www.littlecms.com" DESCRIPTION "Color management engine" TYPE REQUIRED)
--
2.1.4

View File

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

View File

@@ -25,11 +25,12 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "5ff7266c47db9e5ddbb3aa0e6e34c980"
SRC_URI[sha256sum] = "1d1d4713bcebdd8c7c458c075b7101055c81cf94a802ac8b9b3528a3c3c961a3"
SRC_URI[md5sum] = "702ea798307dbb07f7216df928c1be78"
SRC_URI[sha256sum] = "d4b22bd4a3935c84e9aaa7eb8437ee43df12efe07200ff3b1f554020ef5169db"
SRC_URI += " \
file://0001-Avoid-try_run.patch \
file://0001-Set-Kipi-package-properties.patch \
file://0002-Avoid-try_run.patch \
"
CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"
@@ -41,3 +42,7 @@ FILES_${PN} += " \
${datadir}/kconf_update \
${OE_QMAKE_PATH_PLUGINS} \
"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/.debug \
"

View File

@@ -1,31 +0,0 @@
SUMMARY = "2D and 3D Graph Calculator"
LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
"
inherit kde-apps gettext gtk-icon-cache
DEPENDS += "\
ncurses \
readline \
analitza \
kauth-native \
kconfig-native \
kcoreaddons-native \
kdoctools-native \
ki18n \
kconfigwidgets \
kwidgetsaddons \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "9cebf309ed192c91149bd5195de611a3"
SRC_URI[sha256sum] = "b875b2bfe985e5c595f60fbb146fb4545c34321bb86f7fc04164a23f0bb3e9eb"
FILES_${PN} += " \
${datadir}/icons \
${datadir}/kalgebramobile \
"

View File

@@ -14,11 +14,6 @@ DEPENDS += " \
openbabel \
avogadrolibs \
\
kcoreaddons-native \
kconfig-native \
kdoctools-native \
kauth-native \
kdesignerplugin-native \
karchive \
kconfig \
kcoreaddons \
@@ -35,8 +30,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "7d9eea9cb7b2111c1e0808cf68bfb0f2"
SRC_URI[sha256sum] = "4b3b91fb86b2d97efc7ca8c3037f33101d402df7dd2fe311b12a87468e8a6b5c"
SRC_URI[md5sum] = "72bde526067b7f54ba7d13a69cac5fc7"
SRC_URI[sha256sum] = "50050c85fb1760a99b7bbd0ed0f1047b4456139eb8d3f012005f6106e16a880e"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -26,8 +26,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "3c9728c22c737d9cd69ccf2c6ba8d0e8"
SRC_URI[sha256sum] = "e0e53e60e7af1f0002343969b2ce0ce47e0cd3d7318b44d2827478291c2a9cd4"
SRC_URI[md5sum] = "d14c511fd51e6dee50d6cc110bdf2e51"
SRC_URI[sha256sum] = "7004a0ab08e017fc02425c0c1ac72c4c8506a2e2ef3b53969a2d4ef691edd00d"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

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

View File

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

View File

@@ -34,8 +34,13 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "b1fc6858905a84f3c4818b57c67af861"
SRC_URI[sha256sum] = "6acc3172429191ab47722d788f324292ea5ee2f1e419d48c72200579b9b30878"
SRC_URI[md5sum] = "4a825ea7da1e8102031d82f99576399e"
SRC_URI[sha256sum] = "c7fc7ebab1c9ce8933bcf6bf6fc265e20b3a858a21d379ae7259b34f5dbe2cd2"
SRC_URI += " \
file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
file://0002-fix-build-for-sessionless-kconfig.patch \
"
FILES_SOLIBSDEV = ""
@@ -49,3 +54,8 @@ FILES_${PN} += " \
${libdir}/libkdeinit5*.so \
${OE_QMAKE_PATH_PLUGINS} \
"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/*/.debug \
${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \
"

View File

@@ -27,8 +27,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "70795d40845ce31ccc6cbbedc159b1f5"
SRC_URI[sha256sum] = "12b2a0e703312159a8a217ddb5e19c9a9bea1825d668dd4377fe8e52101f3c90"
SRC_URI[md5sum] = "afebac9c1ac7e77aa281ef72ef44919b"
SRC_URI[sha256sum] = "9ad461b3470eab3c5d8c59af41ecbccf042265ae628de850a094ab8c5f8ea91d"
SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
FILES_${PN} += " \
@@ -36,5 +36,3 @@ FILES_${PN} += " \
${datadir}/kconf_update \
${datadir}/icons \
"
RDEPENDS_${PN} += "perl"

View File

@@ -22,8 +22,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "59ac93b9848beadbc3d593bd14e78c84"
SRC_URI[sha256sum] = "3337c6fb57fdb8439e6e6edc0186fec76641196714daa955465e009923573b84"
SRC_URI[md5sum] = "0a9e9609035e68add688d47e3d4e66ed"
SRC_URI[sha256sum] = "41451d1e296b83cd82591e84b0a81917187e258f20eab6e44a08b435aefbddde"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -28,8 +28,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "0329877af7eb4fec1daff1a5c66c0890"
SRC_URI[sha256sum] = "3df779542c1d74d63e66a4db86210d75e37939f8f29947851b9c76c347856025"
SRC_URI[md5sum] = "93c0a879432f8fa4f35685b2d09e628d"
SRC_URI[sha256sum] = "d5febbc2d1410e8cc7155410e1429bb5aa13a01fc0aadb6a9a82a61b71a70774"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \

View File

@@ -1,32 +0,0 @@
SUMMARY = "KBreakout: Destroy as many bricks as possible without losing the ball"
DESCRIPTION = "KBreakout is a Breakout-like game. Its objective is to destroy as many bricks as possible without losing the ball"
LICENSE = "GPLv2 & GFDL-1.2"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
"
inherit kde-apps gettext
DEPENDS += "\
kcoreaddons-native \
kconfig-native \
kauth-native \
kdoctools-native \
kcrash \
kwidgetsaddons \
kdbusaddons \
ki18n \
kconfigwidgets \
kxmlgui \
libkdegames \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "89dc5c5bbdfe10d56fea9964bf36c861"
SRC_URI[sha256sum] = "87748c5bda9b7563531e0b0701ec4a745cd95121b9bd426448e5ed476292fdd4"
FILES_${PN} += " \
${datadir}/kxmlgui5 \
${datadir}/icons \
"

View File

@@ -1,33 +0,0 @@
SUMMARY = "GUI to profilers such as Valgrind"
HOMEPAGE = "https://kcachegrind.github.io/html/Home.html"
LICENSE = "GPLv2 & GFDL-1.2"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
"
inherit kde-apps gettext gtk-icon-cache
DEPENDS += "\
kcoreaddons-native \
kdoctools-native \
ki18n-native \
kauth-native \
kconfig-native \
karchive \
kwidgetsaddons \
kxmlgui \
kio \
kdbusaddons \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "447466379d5a9d30edab30e048532c61"
SRC_URI[sha256sum] = "676dd522eb9976789da17eea1dc103c9c67b6df7bfa70d998e29c0e7dde0608b"
FILES_${PN} += " \
${datadir}/kxmlgui5 \
"
RRECOMMENDS_${PN} += "graphviz"
RDEPENDS_${PN} += "perl"

View File

@@ -9,7 +9,6 @@ inherit kde-apps gettext
DEPENDS += "\
gmp \
mpfr \
kauth-native \
kconfig-native \
kcoreaddons-native \
@@ -23,8 +22,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "42b066d7920a5041928ab4da6a76bd70"
SRC_URI[sha256sum] = "58c26a9698bfc9e0d3a5614ab26c53878e87fc601688ad6c5848fbdbc21c4103"
SRC_URI[md5sum] = "d2aca9d304748cb5c1434f146446db1d"
SRC_URI[sha256sum] = "66494c778cad6a422136cca755f04f79bf31854bdcd4d940347ed2c47c5b6d11"
FILES_SOLIBSDEV = ""

View File

@@ -1,23 +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[md5sum] = "504833fb10fb5f8cac86fe8c6a61fded"
SRC_URI[sha256sum] = "31caf29e82327d7e31badff141dd7d5f179b87e9547c322b074f58bc07063020"

View File

@@ -16,8 +16,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "00101a3953d752e1f59e168c42918edd"
SRC_URI[sha256sum] = "bd9fa8940218f686b0a2d8c6fbe38b996646508a1908dd53925c2513f6fd39eb"
SRC_URI[md5sum] = "7876e108b9fb2ff0deea2a18f33bd1f2"
SRC_URI[sha256sum] = "741cf9f7a6e59bcf2118f9eb69db7f35384d8153f886b9f2721ed46b99e9b4eb"
FILES_${PN} += " \
${datadir}/icons \

View File

@@ -1,6 +1,6 @@
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
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 4 Sep 2015 14:01:36 +0200
Subject: [PATCH] CMakeLists.txt: make MLT_PREFIX configurable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -8,24 +8,24 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee77dae..29c4efd 100644
index d33b65e..2c1c376 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,7 @@ if(WIN32)
find_package(DrMinGW)
set(MLT_PREFIX "..")
else()
- set(MLT_PREFIX ${MLT_ROOT_DIR})
+ set(MLT_PREFIX ${MLT_ROOT_DIR} CACHE STRING "mlt prefix")
find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
endif()
@@ -108,7 +108,7 @@ set_package_properties(MLT PROPERTIES
TYPE RUNTIME
PURPOSE "Required to do video processing")
-set(MLT_PREFIX ${MLT_ROOT_DIR})
+set(MLT_PREFIX ${MLT_ROOT_DIR} CACHE STRING "mlt prefix")
add_subdirectory(data)
if(KF5DocTools_FOUND)
--
2.21.0
2.14.3

View File

@@ -7,17 +7,14 @@ LIC_FILES_CHKSUM = " \
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,14 +29,15 @@ DEPENDS += "\
kguiaddons \
ktextwidgets \
kiconthemes \
kdoctools-native \
xapian-core \
purpose \
kdeclarative \
shared-mime-info-native \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "84fa3c806680c8ef72f89fd51ee2df64"
SRC_URI[sha256sum] = "01b60bf58f6818a5ca9aa6e7a79111965700e6948da0bc0edd1184c26fd872e4"
SRC_URI[md5sum] = "4cda25856cd790a5e9c1face9f2be7c5"
SRC_URI[sha256sum] = "43247d070e6898c26271235b915b45422ee8668e512f38f6df711e5571dca019"
SRC_URI += " \
file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \
@@ -56,4 +54,8 @@ FILES_${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \
"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/.debug \
"
RRECOMMENDS_${PN} += "ffmpeg"

View File

@@ -22,8 +22,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "821e1086f5283e8d5bbc423aa177609d"
SRC_URI[sha256sum] = "e6effd6aaf08c9bfa649b194313e7719b65a9d53f00570e14d2752ce68d13bfe"
SRC_URI[md5sum] = "9f4d7830df288b41f61d26438c4a891e"
SRC_URI[sha256sum] = "0fe329bde6014d4d536e91c211933c57f8e4b1111eeacc8a64ce8cb424369bba"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -26,8 +26,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "bab3f3220243e01923db745d6167ee85"
SRC_URI[sha256sum] = "f37d526610fa0579d5be9de19325ed82e14763c997d9ea026dfcf1068bf2428a"
SRC_URI[md5sum] = "d04bdd512bc79fed8ca308e3d3f68d51"
SRC_URI[sha256sum] = "f873786448548bf7ffd084b977a03fcfed4424ceb4a4ef1c9e9be9249d888591"
SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \

View File

@@ -1,29 +0,0 @@
SUMMARY = "KDE file find utility"
LICENSE = "GPLv2 & GFDL-1.3"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.DOC;md5=10b9de612d532fdeeb7fe8fcd1435cc6 \
"
inherit kde-apps gettext gtk-icon-cache
DEPENDS += " \
kauth-native \
kconfig-native \
kcoreaddons-native \
kdoctools-native \
karchive \
kfilemetadata \
ki18n \
kio \
ktextwidgets \
kwidgetsaddons \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "65a0a93eb67fa7d413f0f61d1db6aff9"
SRC_URI[sha256sum] = "25b7b442600c4e109b0a6f7f09962a4d95d419673f6b64eebf226dcdae8cc6ff"
FILES_${PN} += " \
${datadir}/icons \
"

View File

@@ -28,8 +28,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "0a10db2a3c8e5b3fcf21c467f7c2b9f4"
SRC_URI[sha256sum] = "36810c12ae5d163738101b0f5f13c03cda03ee4c157f641df0f73105a894644f"
SRC_URI[md5sum] = "7a9b73167ce946a011673f8f60c6ec20"
SRC_URI[sha256sum] = "5e251e62c52260424c023989eb51eb4f2e805722b5536f881925151e74487cfa"
SRC_URI += " \
file://0001-fix-build-for-qtbase-without-session-management.patch \
@@ -45,5 +45,3 @@ FILES_${PN} += " \
${datadir}/kde4 \
${libdir}/libkdeinit5_khelpcenter.so \
"
RDEPENDS_${PN} += "perl"

View File

@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
inherit kde-apps gettext
DEPENDS += " \
libssh \
qtsvg \
qtwebengine \
\
@@ -35,12 +36,10 @@ DEPENDS += " \
solid \
kbookmarks \
kguiaddons \
syntax-highlighting \
shared-mime-info-native \
"
# REVISIT optionals
# libssh \
# openslp
# openssh <-> dropbear
DEPENDS += " \
@@ -50,8 +49,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "d749392cbfc3e1c28bfc5465f7b209cc"
SRC_URI[sha256sum] = "792a6a6d1ea2457dda10aedc6cefd3518064c8f47c62f9c3c4a508442b83d3cd"
SRC_URI[md5sum] = "39eb2427a4af8b12457a8214590406f0"
SRC_URI[sha256sum] = "764cb0e970da6df0e775d8eb793930005e893e8a2093fdb4a54ef36fc4ffaacc"
# gperf creates hard #line links
do_install_prepend() {
@@ -75,4 +74,7 @@ FILES_${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \
"
RDEPENDS_${PN} += "perl"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/.debug \
${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \
"

View File

@@ -19,8 +19,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "4856362e01ae16ae71aab9dd8255c1fc"
SRC_URI[sha256sum] = "7d42c254e62750899e429482c2b6ed3b4b1e8c5a66fbc371eec656421817d0a4"
SRC_URI[md5sum] = "dd41241a1b421f967b1314c383a1a012"
SRC_URI[sha256sum] = "ee4c754245f8c8e9c429a3551f65c715cbb234bdaf5ae5c53299f1772933d102"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -23,8 +23,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "91bc39b1ded22abcf1584b1d19ef42ad"
SRC_URI[sha256sum] = "f601963d0670639a11c4100ed1f53a0e308f79ddf98e1b4fc6a0a4674e117f22"
SRC_URI[md5sum] = "bd68f0c992a83443d2e8a7553a13b4b7"
SRC_URI[sha256sum] = "2bf392334c9c9a2fd07326a562b65fd03f526899ab72eef53adb8bd925ead451"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -23,8 +23,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "fdfa8ba98152383adebc5cb6d523a48f"
SRC_URI[sha256sum] = "290efbc208d2fa6ad5552fe8c0679fd0669f4abf6dc31fafd267bd9444add981"
SRC_URI[md5sum] = "5ea8467d386e1137405cbebdd984d74e"
SRC_URI[sha256sum] = "d6a312be8e3d0c13bc5b14d33f2177b54c9f22cfdfbbd7ea4e6e82cb688b0e7c"
FILES_${PN} += " \
${datadir}/icons \

View File

@@ -0,0 +1,44 @@
From 9757ed6c44884eb7890f31e015f5788de88891ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 21 Dec 2017 00:22:43 +0100
Subject: [PATCH] Fix build with QT_NO_SESSIONMANAGER set
---
apps/KMixApp.cpp | 4 ++++
apps/kmix.cpp | 2 ++
2 files changed, 6 insertions(+)
diff --git a/apps/KMixApp.cpp b/apps/KMixApp.cpp
index d00309b..b00f27a 100644
--- a/apps/KMixApp.cpp
+++ b/apps/KMixApp.cpp
@@ -87,7 +87,11 @@ bool KMixApp::restoreSessionIfApplicable(bool hasArgKeepvisibility, bool reset)
*/
creationLock.lock();
+#ifndef QT_NO_SESSIONMANAGER
bool restore = qApp->isSessionRestored(); // && KMainWindow::canBeRestored(0);
+#else
+ bool restore = false;
+#endif
qCDebug(KMIX_LOG) << "Starting KMix using keepvisibility=" << hasArgKeepvisibility << ", failsafe=" << reset << ", sessionRestore=" << restore;
int createCount = 0;
if (restore)
diff --git a/apps/kmix.cpp b/apps/kmix.cpp
index b97852c..cd74d03 100644
--- a/apps/kmix.cpp
+++ b/apps/kmix.cpp
@@ -99,8 +99,10 @@ KMixWindow::KMixWindow(bool invisible, bool reset) :
recreateGUI(false, QString(), true, reset);
}
+#ifndef QT_NO_SESSIONMANAGER
if (!qApp->isSessionRestored() ) // done by the session manager otherwise
setInitialSize();
+#endif
fixConfigAfterRead();
theKMixDeviceManager->initHotplug();
--
2.9.5

View File

@@ -20,20 +20,23 @@ DEPENDS += " \
kdesignerplugin-native \
sonnet-native \
kdbusaddons \
kdelibs4support \
kdelibs4support-native \
kglobalaccel \
ki18n \
kiconthemes \
kxmlgui \
plasma-framework \
kinit \
"
PACKAGECONFIG = "pulseaudio"
PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "5cb21b19501c46b1195c2a8e02773b43"
SRC_URI[sha256sum] = "3d9cf6dcb35ded0091d16f5e9f4cb384ae21ea4065547b52d5f13f199d3d7b08"
SRC_URI[md5sum] = "cc77bb8af8cfdec36a3666296ec1c9b7"
SRC_URI[sha256sum] = "f075a162cc8b0d7f06cea2727159a75f76480ac8d8769250e3d2085d6f2b9420"
SRC_URI += "file://0001-Fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
EXTRA_OECMAKE += "-DKMIX_KF5_BUILD=1"
@@ -48,3 +51,8 @@ FILES_${PN} += " \
${libdir}/libkdeinit5*.so \
${OE_QMAKE_PATH_PLUGINS} \
"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/.debug \
${OE_QMAKE_PATH_PLUGINS}/plasma/*/.debug \
"

View File

@@ -1,35 +0,0 @@
SUMMARY = "Mathematical Function Plotter"
LICENSE = "GPLv2 & GFDL-1.2"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
"
inherit kde-apps gtk-icon-cache
DEPENDS += " \
qtsvg \
\
kauth-native \
kconfig-native \
kcoreaddons-native \
kdoctools-native \
kcrash \
kguiaddons \
ki18n \
kparts \
kwidgetsaddons \
kdbusaddons \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "51f060f9c71bdcea90fa678c50d1b400"
SRC_URI[sha256sum] = "66384c96ba1e82b32427a873f944d5efa915bb2bf7d9ee886c94f368bd1f5e94"
FILES_${PN} += " \
${datadir}/config.kcfg \
${datadir}/kxmlgui5 \
${datadir}/dbus-1 \
${datadir}/kservices5 \
${OE_QMAKE_PATH_PLUGINS} \
"

View File

@@ -2,7 +2,7 @@ SUMMARY = "KolourPaint - Paint Program"
LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2 & MIT"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=7549f6da638b0246572ed9cf4275b860 \
file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
file://COPYING.LIB;md5=3214f080875748938ba060314b4f727d \
"
@@ -29,8 +29,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "cf5d22f371c34fbf2a779cc495635406"
SRC_URI[sha256sum] = "00596d813eff27e45de7f51ae411b144ee21a7ae2baf576e248046dbd97e097d"
SRC_URI[md5sum] = "288c52f48ed3ae35d9e245d1b43a7aa3"
SRC_URI[sha256sum] = "f1e2e5d0bb1086037517c691c6bfb1159c7dd9ef86eccadba29485a810eb085c"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -1,9 +1,10 @@
SUMMARY = "KDE's terminal emulator"
LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2"
LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2 & MIT"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \
file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
file://COPYING.Unicode;md5=ca09fbc4ba99ecc01ce41d513908dcd3 \
"
inherit kde-apps gettext
@@ -40,8 +41,8 @@ DEPENDS += " \
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "8cb4b9121c05df8150a132ef8b8752c4"
SRC_URI[sha256sum] = "4d495bf42fad1f457282a57f19fe2aece1ddbc88239352f0ebadfbcebf52ad6e"
SRC_URI[md5sum] = "5273faf4b6fb3ecce8df30620cf84b2c"
SRC_URI[sha256sum] = "e778feebc01850e3965f5b2e173011c1b0205ea6d3d98e0045b17f74fc4c21dc"
# do not move so-libs to -dev package
FILES_SOLIBSDEV = ""
@@ -49,7 +50,6 @@ FILES_SOLIBSDEV = ""
FILES_${PN} += " \
${datadir}/k*5 \
${datadir}/khotkeys \
${datadir}/knsrcfiles \
${OE_QMAKE_PATH_PLUGINS} \
${libdir}/libkdeinit5_konsole.so \
"

View File

@@ -27,8 +27,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "10c36ae664d29165afd73dc490445f58"
SRC_URI[sha256sum] = "1d68ac9094ad8f9bf0487daced786508f96ce2a63fd8d9884c2d03960fda9328"
SRC_URI[md5sum] = "89d1f7917d73e21363ad05c12a22919a"
SRC_URI[sha256sum] = "b4ba00d0d90ccb60a8b9328d22f0ce31413abe8a4ead775d712b8a5b2355a936"
FILES_SOLIBSDEV = ""

View File

@@ -30,8 +30,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "ccdc91c6337c72cb0797fa80f39aae88"
SRC_URI[sha256sum] = "1dbfcce80813c238d5a9084ffcde828b0abeb7b370cfb1e82b55de75a5f02ba9"
SRC_URI[md5sum] = "80cc1a875d5b2aadf53a4c493353e311"
SRC_URI[sha256sum] = "153fb85f036496e1e17f48e5230bda3be43a21f802a6df98f96091b1ba7218a3"
SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \

View File

@@ -1,6 +1,5 @@
SUMMARY = "Krita is a free digital painting application"
LICENSE = "GPLv3 & BSD"
HOMEPAGE = "https://krita.org/"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
@@ -33,14 +32,11 @@ DEPENDS += " \
kcrash \
"
PV = "4.1.8"
PVEXT = ""
SRC_URI = " \
${KDE_MIRROR}/stable/${BPN}/${PV}/${BPN}-${PV}${PVEXT}.tar.gz \
${KDE_MIRROR}/stable/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
"
SRC_URI[md5sum] = "995192161d98489d7ced1fd493fe150e"
SRC_URI[sha256sum] = "0476c9e2279f0ae690c2ed02e1aa9c3d491943643f9859355a02657318bd5940"
S = "${WORKDIR}/${BPN}-${PV}${PVEXT}"
SRC_URI[md5sum] = "ec8933f055944598fd05a331929d8776"
SRC_URI[sha256sum] = "78792df8165b986b806dcf9960a2679f683f2263e06f3ad5a24b0f78d8f27ed5"
OECMAKE_GENERATOR="Unix Makefiles"

View File

@@ -29,8 +29,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "7541923b1e7e1bc2083baf5d627279f9"
SRC_URI[sha256sum] = "0f773ce70fbc05f30285b7123c5e28fe241ff56677c5b80c1201238bdbc375f8"
SRC_URI[md5sum] = "ab108dd971638e8ec848c56dd2a55b37"
SRC_URI[sha256sum] = "2da6dd1cca5e647762e0929faa68373075473d2c76917ebd0d452da097698739"
FILES_${PN} += " \
${datadir}/icons \

View File

@@ -22,7 +22,7 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "44acdc44e7258858a14a5781a0712336"
SRC_URI[sha256sum] = "1231a9dd9a697fe2379a93a3a4d5c026aedf70a8f7e14d8a626ef6b782fb4259"
SRC_URI[md5sum] = "719e43ff75f842155895b9a82cb5bb04"
SRC_URI[sha256sum] = "5001b0f54d253d1142f8794eb18a020331785abbb61cdeaedd0344c85546bed4"
FILES_${PN} += "${datadir}/kxmlgui5"

View File

@@ -24,8 +24,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "7ef7eaa7a6d2303936cab9d940582fa3"
SRC_URI[sha256sum] = "aaf6c646cc8e7387dc034636fb94029fc0fda3c7fc89b6b633dc42349fd0a471"
SRC_URI[md5sum] = "e1ba8dfe67e19dd9b6587cfa1b6f7190"
SRC_URI[sha256sum] = "c958c4b43257f6874de35f998c25cf93a4c13f7e1c1ddb0883c622d30889d983"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \
@@ -33,5 +33,11 @@ FILES_${PN} += " \
${datadir}/polkit-1 \
${datadir}/icons \
${datadir}/k*5 \
${libdir}/kauth \
${OE_QMAKE_PATH_PLUGINS} \
"
FILES_${PN}-dbg += " \
${libdir}/kauth/.debug \
${OE_QMAKE_PATH_PLUGINS}/.debug \
"

View File

@@ -12,7 +12,6 @@ DEPENDS += "\
fftw \
libopus \
libsamplerate0 \
librsvg-native \
\
kcompletion \
kconfig-native \
@@ -33,8 +32,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "6aca4382b837d80724190b69b65f33f6"
SRC_URI[sha256sum] = "60f5408e9a67e934c67332b9a9643513f35946796d1ccf70369e411f804b1043"
SRC_URI[md5sum] = "f2a8fd28722ab63d3bc6cbb9ec58af91"
SRC_URI[sha256sum] = "b726904c8f3bc009a646cc8fa0f3a954af021f8e3e4221c186dcca079185352a"
SRC_URI += "file://0001-FIND_REQUIRED_PROGRAM-is-broken-use-the-tools-direct.patch"
# Aagh: To select a soundcard we need to select another type - so keep oss in as dummy

View File

@@ -13,5 +13,5 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "897c8a580f6909638242a3b4f410dc18"
SRC_URI[sha256sum] = "5c00a6f28445ba5a45284c3cee0ee3f158ad9e184fea5ee8adc83ac3000b26b1"
SRC_URI[md5sum] = "81813d4cff8cdd7dead94db7d67127ae"
SRC_URI[sha256sum] = "dd146eebd1e0eea7e6a20ebd66b7d9ac2c79cc573de39faf6d34efaafb9bf376"

View File

@@ -32,6 +32,7 @@ DEPENDS += "\
kbookmarks \
kio \
knewstuff \
kdelibs4support \
kparts \
solid \
sonnet-native \
@@ -43,11 +44,15 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "b18e1dc39fa8daadd9f33e634dc1df88"
SRC_URI[sha256sum] = "cb1135a86b373543410f3eb0677aed033bad2b8ef60130753c699338e0c22d1b"
SRC_URI[md5sum] = "201e19f3006c86a65f01e593c8960c58"
SRC_URI[sha256sum] = "e0bca02674c5e961db17e8225affc689c437ab78eabcd620a1e38ee7b1d583ca"
FILES_${PN} += " \
${datadir}/carddecks \
${datadir}/kconf_update \
${OE_QMAKE_PATH_QML} \
"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_QML}/*/*/*/*/.debug \
"

View File

@@ -13,5 +13,5 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "f26ba6f5c79a5d3dfd9e3a25fc0c74e5"
SRC_URI[sha256sum] = "42bb1a8b69efbb4ab8b1d939279d3eb02b2d8030bcb917739f4f61fb5a10db15"
SRC_URI[md5sum] = "2d33323dad9db0484a4ca9c7f43e2910"
SRC_URI[sha256sum] = "4d4171c3da949c7a0c6109f32f156237ccaff52cdb8bef2da9a96e2a1a2fb031"

View File

@@ -19,8 +19,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "2e47bfa260ba644ee1f79595a344f2ad"
SRC_URI[sha256sum] = "b51aea6773b609cc1c3a297e72e15b7b504c2877938030e1afac86319e855694"
SRC_URI[md5sum] = "1954b6613fc2f7f9f0dacb8fdc9874c1"
SRC_URI[sha256sum] = "037978ed877bea9d20a00a8da1870df3fe528bd7d9d50441a80f60ced53efb77"
FILES_${PN} += " \
${datadir}/kmahjongglib \

View File

@@ -26,8 +26,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "d889cf9793a384f18d294dcee03bf37a"
SRC_URI[sha256sum] = "bb51159c803890af82a38e5a4bd4df0895cc34ed68fa8ed3a4c66adafc9ea6b6"
SRC_URI[md5sum] = "f1d5a5656d401aee61155d20ba90cee0"
SRC_URI[sha256sum] = "e577c1f0029b016a8ea3560ceb83a17682ef9fe9ad6381429fe3fdbe1419069e"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -0,0 +1,31 @@
From 51a1a623dbdeac52b0afd383189e509f6b61df9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 16 Sep 2015 15:20:30 +0200
Subject: [PATCH] align path of designer plugins
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@googlemail.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68b3d78..57c4792 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -199,7 +199,7 @@ add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget suppo
set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory for executables and libraries" FORCE)
if (NOT QT_PLUGINS_DIR)
- set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins)
+ set(QT_PLUGINS_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/qt5/plugins)
endif()
####################################################
--
2.1.0

View File

@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL-3;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
file://LICENSE.txt;md5=e9b5891877660f283be4bc396de0570f \
file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \
file://COPYING.DOC;md5=28d73eafa40ebd0ccdc6b37df8de10a3 \
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
"
inherit kde-apps cmake_lib gettext
@@ -31,17 +31,15 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "4be2ebbfb45fbc1aa7acd9df4441e2d9"
SRC_URI[sha256sum] = "c1c951a1357c94a61b38f0ae8a1235d194150cd351dbf25d2db3508b22b44cc1"
SRC_URI[md5sum] = "aff6a8dedc3ac27e56c3a572be2d72e3"
SRC_URI[sha256sum] = "6e73764dd87fff112699b03653a93c92e4c87aba0305cf64280af00c9c6d8cfa"
SRC_URI += "file://0001-align-path-of-designer-plugins.patch"
EXTRA_OECMAKE += " \
-DMARBLE_PRI_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \
-DQT_PLUGINS_DIR=${OE_QMAKE_PATH_PLUGINS} \
"
EXTRA_OECMAKE += "-DMARBLE_PRI_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules"
PACKAGES =+ " \
${PN}-qt \
${PN}-designer-plugin \
${PN}-designer-plugin-dbg ${PN}-designer-plugin \
"
CMAKE_ALIGN_SYSROOT[1] = "Marble, -S${includedir}, -s${_IMPORT_PREFIX}/include"
@@ -63,6 +61,16 @@ FILES_${PN} += " \
${OE_QMAKE_PATH_QML} \
"
FILES_${PN}-dbg += " \
${libdir}/marble/plugins/.debug \
${libdir}/marble/plugins/org/kde/edu/marble/.debug \
${OE_QMAKE_PATH_PLUGINS}/.debug \
"
FILES_${PN}-designer-plugin += " \
${OE_QMAKE_PATH_PLUGINS}/designer \
"
FILES_${PN}-designer-plugin-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/designer/.debug \
"

View File

@@ -2,7 +2,7 @@ SUMMARY = "A KDE Software for Music Education"
LICENSE = "GPLv2 & GFDL-1.3"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://COPYING.DOC;md5=10ce6fc3438e5c4c933bfb5db3b097ec \
file://COPYING.DOC;md5=10b9de612d532fdeeb7fe8fcd1435cc6 \
"
inherit kde-apps gtk-icon-cache
@@ -21,8 +21,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "abca361f3cc370dea139bc2bbb265a81"
SRC_URI[sha256sum] = "3827a7e8dd3c48e12521fd0aa76eccbeaf9f2627935f19647f2147e87db63554"
SRC_URI[md5sum] = "b76d3bb56c3af835e7768de0205ebd62"
SRC_URI[sha256sum] = "e6f97a131ca13118064da667568842202fefa1d8b8b6bdcdcb5c84f46252743f"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
"
inherit kde-apps gtk-icon-cache mime
inherit kde-apps gtk-icon-cache
DEPENDS += " \
qca \
@@ -32,13 +32,9 @@ DEPENDS += " \
shared-mime-info-native \
"
# After 17.2.3 okteta left KDE application release cycle and continued
# with 0.25.0. To avoid package version going backwards set epoch;
PE = "1"
SRC_URI = "https://download.kde.org/stable/okteta/${PV}/src/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "7b8a9bf185652dc6579e05f009ae220f"
SRC_URI[sha256sum] = "ae2a72d0162184278d1c0e0a73b52751a0181deede0231a4c9d568bb7ac82a52"
PV = "17.12.3"
SRC_URI[md5sum] = "780530d53715ef8d579d7262b7eb823c"
SRC_URI[sha256sum] = "64b2d5264ac3b2e8010cbcf58fe03c567d4e44684a4fcd6e135eb14007da9a0f"
FILES_${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \
@@ -46,3 +42,8 @@ FILES_${PN} += " \
${datadir}/kxmlgui5 \
${datadir}/mime \
"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/.debug \
${OE_QMAKE_PATH_PLUGINS}/*/.debug \
"

View File

@@ -3,20 +3,12 @@ LICENSE = "GPLv2 & GFDL-1.2 & LGPL-2.1"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=5a3169a2d39a757efd8b7aa66a69d97b \
file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
file://COPYING.DOC;md5=d8855fca80aa0b428deafa405d0ea17a \
file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \
"
inherit kde-apps gtk-icon-cache
SRC_URI += "file://0001-Do-not-build-docs.patch"
DEPENDS += " \
ki18n-native \
kconfig-native \
kauth-native \
kcoreaddons-native \
kdoctools-native \
sonnet-native \
libkexiv2 \
qca \
tiff \
@@ -26,14 +18,16 @@ DEPENDS += " \
karchive \
kbookmarks \
kcompletion \
kconfig-native \
kconfigwidgets \
kauth-native \
kcoreaddons-native \
kdbusaddons \
kdoctools-native \
sonnet-native \
kiconthemes \
kirigami2 \
purpose \
kjs \
kio \
ki18n \
kparts \
threadweaver \
kwallet \
@@ -42,10 +36,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "0ff6de9c7dba4580c7f34d47a13b7302"
SRC_URI[sha256sum] = "721a0d02d5ff9277c4a9a13dbde0ede3528eff848622e83abc36d57d9759b3ec"
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
SRC_URI[md5sum] = "12b5b11d7e96d4679168e1e8d6d00b77"
SRC_URI[sha256sum] = "f6a27b9b2707358dfed713458ed52cb1ac7dbc48ce3c06bfe04dd0b036809c87"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -1,33 +0,0 @@
From eec3c9a96c7302867e68bfdad7f50f5c08d4c047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 21 Aug 2019 22:14:58 +0200
Subject: [PATCH] Do not build docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We cannot remove kdoctools from dependencies due to other cmake files looking
for it.
Upstream-Status: Pendind
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
CMakeLists.txt | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a2cad7..b8aeae4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -483,6 +483,4 @@ install(EXPORT Okular5Targets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE Okul
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
ki18n_install(po)
-if (KF5DocTools_FOUND)
- kdoctools_install(po)
-endif()
+
--
2.21.0

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