Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c16ba209a9 | ||
|
|
79e2668652 | ||
|
|
c1830c1411 | ||
|
|
d296e689ee | ||
|
|
c6789fc33b | ||
|
|
26f541be0d | ||
|
|
de5207d1e3 |
2
README
2
README
@@ -14,4 +14,4 @@ URI: git://git.openembedded.org/meta-openembedded
|
||||
branch: master
|
||||
revision: HEAD
|
||||
|
||||
Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
|
||||
Layer maintainer: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
inherit kde-base
|
||||
|
||||
KDE_APP_VERSION = "18.12.3"
|
||||
KDE_APP_VERSION = "17.12.3"
|
||||
|
||||
SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz"
|
||||
|
||||
|
||||
@@ -24,6 +24,8 @@ do_compile_prepend() {
|
||||
}
|
||||
|
||||
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 \
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
inherit kde-kf5
|
||||
|
||||
SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.56/portingAids/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.44/portingAids/${BPN}-${PV}.tar.xz"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
inherit kde-base
|
||||
|
||||
KF5_VERSION = "5.56.0"
|
||||
KF5_VERSION = "5.44.0"
|
||||
|
||||
SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.56/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.44/${BPN}-${PV}.tar.xz"
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
inherit kde-base
|
||||
|
||||
PLASMA_VERSION = "5.15.3"
|
||||
PLASMA_FIXUP_VERSION = "5.15.3.2"
|
||||
PLASMA_VERSION = "5.12.4"
|
||||
|
||||
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 \
|
||||
|
||||
@@ -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} \
|
||||
"
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
# Helper class to handle ontarget-postinst creation of lv2 turtle files
|
||||
|
||||
# File created during compile usually. To create this file makefiles have to be
|
||||
# aligned - see do_configure_prepend at zynaddsubfx or distrho-ports. The file
|
||||
# is expected with the following format
|
||||
# lv2-ttl-generator <path>/plugin.so
|
||||
LV2-TURTLE-BUILD-DATA = "${WORKDIR}/lv2-ttl-generator-data"
|
||||
|
||||
# E.g zynaddsubfx needs to create dummy lv2 turtle files to keep install sane.
|
||||
# To delete them automatically (see below) the contain a dummy string:
|
||||
LV2-DUMMY-TURTLE-STR = "lv2-dummy-turtle-string"
|
||||
|
||||
# To make ontarget postinst/prerm happen, the names of all plugins with their
|
||||
# paths as installed on target a stored in a file called lv2-postinst-manifest
|
||||
LV2-POSTINST-MANIFEST = "${datadir}/${BPN}/lv2-postinst-manifest"
|
||||
|
||||
do_install_append() {
|
||||
# remove dummy lv2-turtles again
|
||||
cd ${D}/${libdir}/lv2
|
||||
for tfile in `grep -rl ${LV2-DUMMY-TURTLE-STR}`; do
|
||||
rm $tfile
|
||||
done
|
||||
|
||||
# create postinst manifest
|
||||
install -d ${D}`dirname ${LV2-POSTINST-MANIFEST}`
|
||||
for sofile in `cat ${LV2-TURTLE-BUILD-DATA} | awk '{ print $2 }'`; do
|
||||
sofile=`basename $sofile`
|
||||
installed=`find ${D}${libdir}/lv2 -name $sofile | sed 's|${D}||g'`
|
||||
echo $installed >> ${D}${LV2-POSTINST-MANIFEST}
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
pkg_postinst_ontarget_${PN}-lv2() {
|
||||
oldpath=`pwd`
|
||||
for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
|
||||
cd `dirname "$sofile"`
|
||||
lv2-ttl-generator "$sofile"
|
||||
done
|
||||
cd $oldpath
|
||||
}
|
||||
|
||||
pkg_prerm_${PN}-lv2() {
|
||||
for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do
|
||||
path=`dirname "$sofile"`
|
||||
for turtle in `find $path -name '*.ttl'`; do
|
||||
rm $turtle
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
FILES_${PN}-lv2 += "${LV2-POSTINST-MANIFEST}"
|
||||
RDEPENDS_${PN}-lv2 += "lv2-ttl-generator"
|
||||
@@ -1,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"
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
# Auto package audio plugins
|
||||
|
||||
PACKAGES =+ "${PN}-dssi ${PN}-ladspa ${PN}-lv2 ${PN}-vst"
|
||||
|
||||
FILES_${PN}-dssi += "${libdir}/dssi"
|
||||
FILES_${PN}-ladspa += "${libdir}/ladspa"
|
||||
FILES_${PN}-lv2 += "${libdir}/lv2"
|
||||
FILES_${PN}-vst += "${libdir}/vst"
|
||||
@@ -2,21 +2,26 @@ inherit qemu
|
||||
|
||||
DEPENDS += "qemu-native"
|
||||
|
||||
# This is an extended/modified qemu.bbclass tailored four our needs:
|
||||
# slightly reworked qemu_run_binary: qemu.bbclass expects binary in sysroot but
|
||||
# our binary is not (yet) installed
|
||||
# ${@qemu_run_binary_local(d, '$D', '/usr/bin/test_app')} [test_app arguments]
|
||||
#
|
||||
# * add qemu-native to DEPENDS: we can do that because there is no
|
||||
# introspection/interception delayed qemu usage here
|
||||
# * The executable binary is set by absolute path: oe-core's qemu.bbclass
|
||||
# expects it in sysroot. Here we usually run binaries in builddir which are
|
||||
# not yet installed.
|
||||
# * A recipe can set an extra library path in 'QEMU_EXTRA_LIBDIR'. This path is
|
||||
# an absolute path.
|
||||
|
||||
def qemu_run_binary_local(data, rootfs_path, binary):
|
||||
qemu_binary = qemu_target_binary(data)
|
||||
if qemu_binary == "qemu-allarch":
|
||||
qemu_binary = "qemuwrapper"
|
||||
|
||||
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
|
||||
extra_libdir = ":" + extra_libdir
|
||||
else:
|
||||
return qemu_wrapper_cmdline(data, rootfs_path, [libdir, base_libdir]) + binary
|
||||
extra_libdir = ""
|
||||
qemu_options = data.getVar("QEMU_OPTIONS", True)
|
||||
|
||||
return "PSEUDO_UNLOAD=1 " + qemu_binary + " " + qemu_options + " -L " + rootfs_path\
|
||||
+ " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + extra_libdir + " "\
|
||||
+ binary
|
||||
|
||||
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
# avoids build breaks when using no-static-libs.inc
|
||||
DISABLE_STATIC = ""
|
||||
|
||||
EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
python waf_preconfigure() {
|
||||
import subprocess
|
||||
from distutils.version import StrictVersion
|
||||
subsrcdir = d.getVar('S')
|
||||
wafbin = os.path.join(subsrcdir, 'waf')
|
||||
try:
|
||||
result = subprocess.check_output([wafbin, '--version'], cwd=subsrcdir, stderr=subprocess.STDOUT)
|
||||
version = result.decode('utf-8').split()[1]
|
||||
if StrictVersion(version) >= StrictVersion("1.8.7"):
|
||||
d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}")
|
||||
except subprocess.CalledProcessError as e:
|
||||
bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode)
|
||||
except FileNotFoundError:
|
||||
bb.fatal("waf does not exist in %s" % subsrcdir)
|
||||
}
|
||||
|
||||
do_configure[prefuncs] += "waf_preconfigure"
|
||||
|
||||
wafold_do_configure() {
|
||||
${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF}
|
||||
}
|
||||
|
||||
do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+"
|
||||
wafold_do_compile() {
|
||||
${S}/waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}
|
||||
}
|
||||
|
||||
wafold_do_install() {
|
||||
${S}/waf install --destdir=${D}
|
||||
}
|
||||
|
||||
EXPORT_FUNCTIONS do_configure do_compile do_install
|
||||
@@ -2,7 +2,7 @@
|
||||
BBPATH .= ":${LAYERDIR}"
|
||||
|
||||
# recipes
|
||||
BBFILES += "${LAYERDIR}/recipes-*/*.bb ${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*/*.bb"
|
||||
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*.bb ${LAYERDIR}/recipes-*/*/*/*/*.bb"
|
||||
# appends
|
||||
BBFILES += "${LAYERDIR}/extends-*/*.bb ${LAYERDIR}/extends-*/*.bbappend"
|
||||
|
||||
@@ -11,7 +11,7 @@ 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"
|
||||
LAYERSERIES_COMPAT_meta-qt5-extra = "sumo thud"
|
||||
LAYERSERIES_COMPAT_meta-qt5-extra = "rocko"
|
||||
|
||||
LICENSE_PATH += "${LAYERDIR}/files/licenses"
|
||||
|
||||
|
||||
6
extends-meta-oe/networkmanager_%.bbappend
Normal file
6
extends-meta-oe/networkmanager_%.bbappend
Normal file
@@ -0,0 +1,6 @@
|
||||
PACKAGECONFIG ?= "nss ifupdown netconfig dhclient dnsmasq \
|
||||
${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
|
||||
wifi \
|
||||
bluez5 \
|
||||
modemmanager \
|
||||
"
|
||||
@@ -1,12 +1,4 @@
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
|
||||
|
||||
PACKAGECONFIG_FONTS = "fontconfig"
|
||||
|
||||
# session management only for x11 environment
|
||||
PACKAGECONFIG_DISTRO += " \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "sm", "", d)} \
|
||||
accessibility \
|
||||
sql-sqlite \
|
||||
cups \
|
||||
libinput \
|
||||
"
|
||||
PACKAGECONFIG_DISTRO += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "sm", "", d)} qml-debug accessibility"
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
BBCLASSEXTEND = "native"
|
||||
@@ -1 +0,0 @@
|
||||
BBCLASSEXTEND = "native"
|
||||
@@ -1 +0,0 @@
|
||||
BBCLASSEXTEND = "native"
|
||||
@@ -1 +0,0 @@
|
||||
BBCLASSEXTEND = "native"
|
||||
@@ -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!
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From f583921012ed1f4e853f41d4fd3d95d1a819ac03 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 4 Aug 2018 02:48:14 +0200
|
||||
Subject: [PATCH] Make sure to find python3 sip code generator
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
configure.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.py b/configure.py
|
||||
index a263efb..daefc0e 100644
|
||||
--- a/configure.py
|
||||
+++ b/configure.py
|
||||
@@ -522,7 +522,7 @@ class TargetConfiguration:
|
||||
self.qtconf_prefix = ''
|
||||
self.qt_shared = False
|
||||
self.qt_version = 0
|
||||
- self.sip = self._find_exe('sip5', 'sip')
|
||||
+ self.sip = self._find_exe('sip3')
|
||||
self.sip_h_version = None
|
||||
self.sip_inc_dir = self.py_venv_inc_dir
|
||||
self.static = False
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -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] = "b3bcf028c519b6a6daabfc71055d4ca8"
|
||||
SRC_URI[sha256sum] = "0190fff4930213b2e32d5d76750af784f45f89046d239da466dc5c9f625ec05b"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/metainfo \
|
||||
${datadir}/${BPN}/icons \
|
||||
${datadir}/${BPN}/symbols1000.dat \
|
||||
${datadir}/${BPN}/icons \
|
||||
${datadir}/${BPN}/themes \
|
||||
${datadir}/${BPN}/sounds \
|
||||
"
|
||||
@@ -1,14 +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} = " \
|
||||
focuswriter \
|
||||
gottet \
|
||||
hexalate \
|
||||
peg-e \
|
||||
simsu \
|
||||
tetzle \
|
||||
"
|
||||
@@ -1,18 +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] = "df7a1a9174a3802b8738ddb3f423d0da"
|
||||
SRC_URI[sha256sum] = "ef67083018dc5e22a61d52e3041d6d725753e6ed5bc70b770159d867451c8cb1"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/metainfo \
|
||||
"
|
||||
@@ -1,24 +0,0 @@
|
||||
SUMMARY = "Add mathematical features to your program"
|
||||
LICENSE = "GPLv2 & GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-apps
|
||||
|
||||
DEPENDS += " \
|
||||
libeigen \
|
||||
qtsvg \
|
||||
qtdeclarative \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "f8186958405a7ee235ba0bff76c0f126"
|
||||
SRC_URI[sha256sum] = "c241b6a3d849534ccd50601c0aebd5cd785220bb7957ed7f6b1d3db35ba0f925"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/libanalitza \
|
||||
${OE_QMAKE_PATH_QML} \
|
||||
"
|
||||
@@ -28,8 +28,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "72d72ddaa13a10cd8ed6319fe00e51be"
|
||||
SRC_URI[sha256sum] = "ecf781b5d3691bb967c9170938c1133e2972ee97d71aab2de65487a952700722"
|
||||
SRC_URI[md5sum] = "e9ab1b82b80b3901de35cdaf3b32267a"
|
||||
SRC_URI[sha256sum] = "b13d102e06eeaf080270a710a6b82d11d444fde78f0c701ac5efca682cfb5642"
|
||||
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
@@ -39,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 \
|
||||
"
|
||||
|
||||
@@ -19,10 +19,5 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "d131f6dec4f4e50d52657087403e4c05"
|
||||
SRC_URI[sha256sum] = "b8475ba1a74f8ebc6a36029b60ac803ab0d2c81c253b8c16bd05b6249454c3e3"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kservices5 \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
SRC_URI[md5sum] = "959165128d97a132b2b18d886af6c4f1"
|
||||
SRC_URI[sha256sum] = "10956500e389cce6b043fbda7bdc16916cda75548f285268025d72dc5546c1be"
|
||||
|
||||
@@ -19,8 +19,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "340d557424fc1ae1defff10a660f39b2"
|
||||
SRC_URI[sha256sum] = "7fc7ff304cf5b5bf2049fdd53fbb4a819bddefc77fde94702c5118240403d972"
|
||||
SRC_URI[md5sum] = "6076cadd753fe67dac2967bb81d2a66f"
|
||||
SRC_URI[sha256sum] = "498fcca291345cd5bba61f1163916ad059b7691083d10a3e910eff130072ea97"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
SUMMARY = "Database Connectivity and Creation Framework"
|
||||
HOMEPAGE = "https://community.kde.org/KDb"
|
||||
LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.LIB;md5=a9cc0417b6424a8311f616fa527d0755 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
|
||||
"
|
||||
|
||||
inherit kde-apps
|
||||
|
||||
DEPENDS += " \
|
||||
icu \
|
||||
kcoreaddons-native \
|
||||
kcoreaddons \
|
||||
"
|
||||
|
||||
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[md5sum] = "25651209050396a76d660856f109cf04"
|
||||
SRC_URI[sha256sum] = "175645a149ae4d758ff2746900f6eabe4734b2bdac4d8c95893c650be4f929f2"
|
||||
|
||||
FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"
|
||||
@@ -1,46 +0,0 @@
|
||||
From 8ed7b093ea4d7ed8e435cb7704e5a30418356796 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
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
try_run does not work in cross environments
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
cmake/modules/CheckGlobalBreezeIcons.cmake | 18 ------------------
|
||||
1 file changed, 18 deletions(-)
|
||||
|
||||
diff --git a/cmake/modules/CheckGlobalBreezeIcons.cmake b/cmake/modules/CheckGlobalBreezeIcons.cmake
|
||||
index 9763213..dfff662 100644
|
||||
--- a/cmake/modules/CheckGlobalBreezeIcons.cmake
|
||||
+++ b/cmake/modules/CheckGlobalBreezeIcons.cmake
|
||||
@@ -24,21 +24,3 @@ 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}
|
||||
- COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT
|
||||
- RUN_OUTPUT_VARIABLE RUN_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. \
|
||||
-The CheckGlobalBreezeIcons.cmake script returned ${RUN_RESULT}.\n \
|
||||
-Result: ${RUN_OUTPUT}")
|
||||
-endif()
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
From e915c66f94921aaf07232a454404e157b65bbb5f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 22 Jun 2018 22:49:17 +0200
|
||||
Subject: [PATCH] Add missing include to fix build with Qt 5.11
|
||||
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/main/startup/KexiNewProjectAssistant.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/main/startup/KexiNewProjectAssistant.cpp b/src/main/startup/KexiNewProjectAssistant.cpp
|
||||
index 59e819a..afacc17 100644
|
||||
--- a/src/main/startup/KexiNewProjectAssistant.cpp
|
||||
+++ b/src/main/startup/KexiNewProjectAssistant.cpp
|
||||
@@ -54,6 +54,7 @@
|
||||
#include <QProgressBar>
|
||||
#include <QFileInfo>
|
||||
#include <QFileDialog>
|
||||
+#include <QAction>
|
||||
|
||||
class KexiServerDBNamePage : public QWidget, public Ui::KexiServerDBNamePage
|
||||
{
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
SUMMARY = "Kexi is a visual database applications creator"
|
||||
HOMEPAGE = "https://www.calligra.org/kexi/"
|
||||
LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2 & BSD"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=8608b1f74c58ebcb11718f46e8619749 \
|
||||
file://COPYING.LIB;md5=7537f2f34ef162007ae9f34b9f256dcb \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
|
||||
"
|
||||
|
||||
inherit kde-apps gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
qtwebkit \
|
||||
\
|
||||
kdb \
|
||||
kreport \
|
||||
\
|
||||
kauth-native \
|
||||
kconfig-native \
|
||||
kcoreaddons-native \
|
||||
kdoctools-native \
|
||||
karchive \
|
||||
kcodecs \
|
||||
kconfigwidgets \
|
||||
kguiaddons \
|
||||
ki18n \
|
||||
kiconthemes \
|
||||
kitemviews \
|
||||
kwidgetsaddons \
|
||||
ktextwidgets \
|
||||
kxmlgui \
|
||||
kcompletion \
|
||||
kio \
|
||||
ktexteditor \
|
||||
marble \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz \
|
||||
file://0001-remove-try_run-by-try_compile-in-breeze-icon-check.patch \
|
||||
file://0002-Add-missing-include-to-fix-build-with-Qt-5.11.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "22d6c4739109441f5274da584f67f1c8"
|
||||
SRC_URI[sha256sum] = "6d55cd4af177bcb060673a0977d52bc91cc2dd1b1420d008a78f9783312152fb"
|
||||
|
||||
do_install_append() {
|
||||
install -d "${D}/${datadir}/pixmaps"
|
||||
install ${S}/src/pics/icons/breeze/apps/48/kexi.svg ${D}/${datadir}/pixmaps/
|
||||
}
|
||||
|
||||
FILES_${PN} += " \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
RDEPENDS_${PN} += "breeze-icons-binres"
|
||||
|
||||
# REVISIT
|
||||
#-- The following RECOMMENDED packages have not been found:
|
||||
#
|
||||
# * KexiMarble (required version >= 0.19.2), KDE World Globe Widget library, <https://marble.kde.org>
|
||||
# Required by Kexi form map widget
|
||||
# * MySQL, MySQL Client Library (libmysqlclient), <http://www.mysql.com>
|
||||
# Required by Kexi MySQL migration driver
|
||||
# * PostgreSQL, C API to PostgreSQL (libpq), <http://www.postgresql.org>
|
||||
# Required by Kexi PostgreSQL migration driver
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
SUMMARY = "Property editing framework with editor widget"
|
||||
HOMEPAGE = "https://community.kde.org/KProperty"
|
||||
LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.LIB;md5=3dcc9b0b0118292a0c5d1c18927ef176 \
|
||||
file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
|
||||
"
|
||||
|
||||
inherit kde-apps
|
||||
|
||||
DEPENDS += " \
|
||||
kcoreaddons-native \
|
||||
kcoreaddons \
|
||||
kconfig-native \
|
||||
kconfig \
|
||||
kwidgetsaddons \
|
||||
kguiaddons \
|
||||
"
|
||||
|
||||
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[md5sum] = "ee888d41a677ddc6b8c63f0f71e82026"
|
||||
SRC_URI[sha256sum] = "7ede8ee868ba480e4666a32b4b26d279b1e45177f83b0ada32a15fa9cee514a3"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kpropertywidgets3 \
|
||||
${datadir}/kservicetypes5 \
|
||||
${datadir}/kreport3 \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
@@ -1,34 +0,0 @@
|
||||
SUMMARY = "Framework for creation and generation of reports"
|
||||
HOMEPAGE = "https://community.kde.org/KReport"
|
||||
LICENSE = "LGPLv2 & GFDL-1.2 & BSD"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.LIB;md5=1634220ce20ef95161c3b8401908638c \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
|
||||
"
|
||||
|
||||
inherit kde-apps
|
||||
|
||||
DEPENDS += " \
|
||||
kproperty \
|
||||
\
|
||||
kcoreaddons-native \
|
||||
kcoreaddons \
|
||||
kconfig-native \
|
||||
kconfig \
|
||||
kwidgetsaddons \
|
||||
kguiaddons \
|
||||
\
|
||||
marble \
|
||||
qtwebkit \
|
||||
"
|
||||
|
||||
SRC_URI = "${KDE_MIRROR}/stable/${BPN}/src/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[md5sum] = "48216d8f83a48c93bed9acd0081daa92"
|
||||
SRC_URI[sha256sum] = "3b6485629b5e4343b7ddf42efb1927310d60b143a22afe79925147d0ddcdf36c"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kservicetypes5 \
|
||||
${datadir}/kreport3 \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
@@ -19,11 +19,15 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "f4be0f56a4935ef177375ab7f22ce25b"
|
||||
SRC_URI[sha256sum] = "1bff5f828f11e9b9a527b59f12ec16745fa19fb09392ca1872d6b0c909212427"
|
||||
SRC_URI[md5sum] = "6dc086cfb23a47f46c99946f71406004"
|
||||
SRC_URI[sha256sum] = "8e31695ea1ddfd58b35059d5389e5b9b401fd10294d50765a834ae81a8e6bb2d"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
${datadir}/kservices5 \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${OE_QMAKE_PATH_PLUGINS}/.debug \
|
||||
"
|
||||
|
||||
@@ -36,11 +36,11 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "08f6009c452da25828e26608b1191d19"
|
||||
SRC_URI[sha256sum] = "c4921759bdfec9a96201a5d76a67869f867ec7e3caf92f8e46fa5d853a0741b1"
|
||||
SRC_URI[md5sum] = "c79b7db37e9c5cd84eab7673eeb563d3"
|
||||
SRC_URI[sha256sum] = "40dc96fa05cf6a09c49329cd69c9f1079b4ddb57592c9ff0e957eec6e761a439"
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-without-session-management.patch \
|
||||
file://0002-Revert-Make-target_link_libraries-for-kdeinit_dolphi.patch \
|
||||
file://0001-align-paths-to-phonon.patch \
|
||||
file://0002-fix-build-for-qtbase-without-session-management.patch \
|
||||
"
|
||||
|
||||
FILES_SOLIBSDEV = "${libdir}/libdolphin*${SOLIBSDEV}"
|
||||
@@ -52,3 +52,7 @@ FILES_${PN} += " \
|
||||
${libdir}/libkdeinit5_dolphin.so \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${OE_QMAKE_PATH_PLUGINS}/.debug \
|
||||
"
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
From ed293f192c85976efdff4d8253a63a9d1a801d11 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sun, 23 Aug 2015 22:59:27 +0200
|
||||
Subject: [PATCH 1/2] align paths to phonon
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/panels/information/informationpanelcontent.cpp | 6 +++---
|
||||
src/panels/information/phononwidget.cpp | 10 +++++-----
|
||||
src/panels/information/phononwidget.h | 2 +-
|
||||
3 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
|
||||
index c18d473..97962de 100644
|
||||
--- a/src/panels/information/informationpanelcontent.cpp
|
||||
+++ b/src/panels/information/informationpanelcontent.cpp
|
||||
@@ -41,9 +41,9 @@
|
||||
#include <panels/places/placesitem.h>
|
||||
#include <panels/places/placesitemmodel.h>
|
||||
|
||||
-#include <Phonon/BackendCapabilities>
|
||||
-#include <Phonon/MediaObject>
|
||||
-#include <Phonon/SeekSlider>
|
||||
+#include <phonon/BackendCapabilities>
|
||||
+#include <phonon/MediaObject>
|
||||
+#include <phonon/SeekSlider>
|
||||
|
||||
#include <QEvent>
|
||||
#include <QLabel>
|
||||
diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
|
||||
index 1d6361f..24f3ffc 100644
|
||||
--- a/src/panels/information/phononwidget.cpp
|
||||
+++ b/src/panels/information/phononwidget.cpp
|
||||
@@ -20,11 +20,11 @@
|
||||
|
||||
#include "phononwidget.h"
|
||||
|
||||
-#include <Phonon/AudioOutput>
|
||||
-#include <Phonon/Global>
|
||||
-#include <Phonon/MediaObject>
|
||||
-#include <Phonon/SeekSlider>
|
||||
-#include <Phonon/VideoWidget>
|
||||
+#include <phonon/AudioOutput>
|
||||
+#include <phonon/Global>
|
||||
+#include <phonon/MediaObject>
|
||||
+#include <phonon/SeekSlider>
|
||||
+#include <phonon/VideoWidget>
|
||||
|
||||
#include <QVBoxLayout>
|
||||
#include <QHBoxLayout>
|
||||
diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h
|
||||
index 837a668..1fb9543 100644
|
||||
--- a/src/panels/information/phononwidget.h
|
||||
+++ b/src/panels/information/phononwidget.h
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <QSize>
|
||||
#include <QWidget>
|
||||
|
||||
-#include <Phonon/Global>
|
||||
+#include <phonon/Global>
|
||||
|
||||
namespace Phonon
|
||||
{
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -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
|
||||
@@ -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!";
|
||||
}
|
||||
}
|
||||
@@ -29,8 +29,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "fcf5e0ec51b65619fcfe8c7bc59bd162"
|
||||
SRC_URI[sha256sum] = "115d60bfdef498ea75bc077a7091fb738615b399b03ec2a76a4bf34f19b407f3"
|
||||
SRC_URI[md5sum] = "6352cbdc575a4b0da1eabce763d24602"
|
||||
SRC_URI[sha256sum] = "448725522965fd06779034fad9342526d9a1ac88c3ac5ea7b73e7cefc089b4c8"
|
||||
|
||||
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 \
|
||||
"
|
||||
|
||||
@@ -21,8 +21,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "af910a156f817368d2bab2520636f320"
|
||||
SRC_URI[sha256sum] = "9090bc7c7ac2586e857cdc246a94621c1453e7f65c6d491f2f374f43d3e4af1a"
|
||||
SRC_URI[md5sum] = "3d00b1ca499e4bc55d71aa7ee21f6c7c"
|
||||
SRC_URI[sha256sum] = "ceaa8441d94651e665790af6cb419bf39b34b7246f4848b070a8a2dde78a1bcd"
|
||||
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 \
|
||||
"
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
SUMMARY = "Granatier is a clone of the classic Bomberman game"
|
||||
DESCRIPTION = "Granatier is a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"
|
||||
LICENSE = "GPLv2 & GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-apps gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
kauth-native \
|
||||
kcoreaddons-native \
|
||||
kconfig-native \
|
||||
kdoctools-native \
|
||||
kcrash \
|
||||
kdbusaddons \
|
||||
kwidgetsaddons \
|
||||
ki18n \
|
||||
kconfigwidgets \
|
||||
kxmlgui \
|
||||
knewstuff \
|
||||
libkdegames \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "e18910bb5e1605ed4c8eafe07ab2a0ad"
|
||||
SRC_URI[sha256sum] = "ad065e488f9a751423d571f51449e766c625e88ca7d3c30d21ff3b9027fc04af"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
${datadir}/icons \
|
||||
${datadir}/kxmlgui5 \
|
||||
"
|
||||
@@ -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
|
||||
|
||||
@@ -25,11 +25,12 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "93019f12a8b494b22d00d9489832246b"
|
||||
SRC_URI[sha256sum] = "0b4ff869fc09140e258e894f5169fc6c96f1126891b8ed1a391d4624d6ab0c35"
|
||||
SRC_URI[md5sum] = "c0e224d49d0e80e5f1e24f43de81920d"
|
||||
SRC_URI[sha256sum] = "3987dcfbfaea60130d98d7708f7c0f468eec3efff6f45241aeb08751882aff0d"
|
||||
|
||||
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"
|
||||
@@ -38,6 +39,9 @@ FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/icons \
|
||||
${datadir}/solid \
|
||||
${datadir}/kconf_update \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${OE_QMAKE_PATH_PLUGINS}/.debug \
|
||||
"
|
||||
|
||||
@@ -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=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
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] = "6357ca100f9f85ffd9fab69fa4bb9d79"
|
||||
SRC_URI[sha256sum] = "a93b319c6a3fab3d3a12923f8153a6f38281887e176fffaa37ca6cc677a280b5"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
${datadir}/kalgebramobile \
|
||||
"
|
||||
@@ -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 \
|
||||
|
||||
@@ -26,8 +26,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "6fbc7241c27a158e3983e2cfb64237f5"
|
||||
SRC_URI[sha256sum] = "ad4a6377d260df76d000631ab4c95e5cb82ce47d031edc9801b6ed92d856305c"
|
||||
SRC_URI[md5sum] = "afc4665114cb52ff957d73542ad265b1"
|
||||
SRC_URI[sha256sum] = "9f5ccb8e1ab5ca50bae12992e567f7df419555d062fc4260faa46b58d052cf12"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
|
||||
@@ -34,8 +34,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "17e8021c1c1bf1d77cd467ca3fab3caf"
|
||||
SRC_URI[sha256sum] = "f7f2cba41a4c88b65885532db6b6161c66055a6697d20ee88adb70f302d387e1"
|
||||
SRC_URI[md5sum] = "4c6c8a35d1293f04c00bea822367837b"
|
||||
SRC_URI[sha256sum] = "e5b6a3ccb688ee358dadbcca86c0060a481ff60a81a472865429beba6bea2a10"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
|
||||
@@ -54,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 \
|
||||
"
|
||||
|
||||
@@ -27,8 +27,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "83a27f535669d9a5d4782b9355db757b"
|
||||
SRC_URI[sha256sum] = "0e18087d0de067282023a98b800807632dd6a91bab51cf0d43d53bffba9b33f1"
|
||||
SRC_URI[md5sum] = "a60927adb222fbd1c1c1482a3c03cd5d"
|
||||
SRC_URI[sha256sum] = "54b689973be0690bec5412f6198750bcfa63e71c5435543e6683e96705444cd2"
|
||||
SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
SUMMARY = "KBlocks - Falling Blocks Game"
|
||||
LICENSE = "GPLv2 & GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-apps gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
kauth-native \
|
||||
kconfig-native \
|
||||
kcoreaddons-native \
|
||||
kdoctools-native \
|
||||
kcrash \
|
||||
kdbusaddons \
|
||||
kwidgetsaddons \
|
||||
ki18n \
|
||||
kconfigwidgets \
|
||||
kxmlgui \
|
||||
libkdegames \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "640b68db31f22b138ef0df5968e648a9"
|
||||
SRC_URI[sha256sum] = "e981107096893a8078ab978c429f367432a74de1bdeffe8fb628ccc397701332"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
${datadir}/icons \
|
||||
${datadir}/kxmlgui5 \
|
||||
"
|
||||
@@ -28,8 +28,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "f190c2913ba0dbcdf15c6f02be532ce8"
|
||||
SRC_URI[sha256sum] = "c62cb68b4246c1aef73efb04ea883599384afbd977e8da93893346cbd835f343"
|
||||
SRC_URI[md5sum] = "4f80daf1b4c1f8c8ade43da1af1b224e"
|
||||
SRC_URI[sha256sum] = "7cd37fe9d5415e1dabcbf6cdb7f3c5aaa76bf9dc1144c400d2e58bddd0da1054"
|
||||
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -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] = "26c31da7a5dae51ef1a362ca3458517f"
|
||||
SRC_URI[sha256sum] = "23e1cc935eab6a2520e683185cb223243c71553b1ef6059a21f09d72e8fe00af"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
${datadir}/icons \
|
||||
"
|
||||
@@ -1,30 +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] = "3193c9233a545e55528f68b6fb5eb6fb"
|
||||
SRC_URI[sha256sum] = "48011190a0ef28998e6c96b9d644e3d06b68606b7d1467c84a8d176eeebb9adf"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
"
|
||||
@@ -22,8 +22,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "ddd1ca9dcdb7db22f8a011e525e99963"
|
||||
SRC_URI[sha256sum] = "10b3ebb5efab3731e9f12a8632546685281179881b03aae98f96a2cdbd21f02f"
|
||||
SRC_URI[md5sum] = "6bd85ec27c474fd9c67e775e3fb6d5e3"
|
||||
SRC_URI[sha256sum] = "124d2cb3cad885fa948d17d485ceb406c782d2d456e18917128508aae5c49970"
|
||||
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
|
||||
@@ -16,8 +16,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "edc6d65d8ed5c0a7c02e2eda2b78ab4c"
|
||||
SRC_URI[sha256sum] = "8defdb9450922b675dc80561a0f4bb119e621a85dd73661fc4caacef8db91228"
|
||||
SRC_URI[md5sum] = "b7c26d70a8bd83e5b70f75535af46989"
|
||||
SRC_URI[sha256sum] = "d4a3df598ab18fa393c383d72528a399dcc2e33d3494a8fe4db098d67f5cc8f9"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
|
||||
@@ -1,28 +1,31 @@
|
||||
From d7cf023376cb834f9becb63f2648c63c5ec3fd12 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Thu, 15 Nov 2018 18:46:38 +0100
|
||||
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
|
||||
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 ec69e0c..0792bc3 100644
|
||||
index d33b65e..2c1c376 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -119,7 +119,7 @@ set_package_properties(MLT PROPERTIES
|
||||
@@ -108,7 +108,7 @@ set_package_properties(MLT PROPERTIES
|
||||
TYPE RUNTIME
|
||||
PURPOSE "Required to do video processing")
|
||||
|
||||
if(NOT WIN32)
|
||||
- set(MLT_PREFIX ${MLT_ROOT_DIR})
|
||||
+ set(MLT_PREFIX ${MLT_ROOT_DIR} CACHE STRING "mlt prefix")
|
||||
else()
|
||||
set(MLT_PREFIX "..")
|
||||
endif()
|
||||
-set(MLT_PREFIX ${MLT_ROOT_DIR})
|
||||
+set(MLT_PREFIX ${MLT_ROOT_DIR} CACHE STRING "mlt prefix")
|
||||
|
||||
add_subdirectory(data)
|
||||
if(KF5DocTools_FOUND)
|
||||
--
|
||||
2.14.5
|
||||
2.14.3
|
||||
|
||||
|
||||
@@ -31,13 +31,12 @@ DEPENDS += "\
|
||||
kiconthemes \
|
||||
kdoctools-native \
|
||||
xapian-core \
|
||||
purpose \
|
||||
shared-mime-info-native \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "57e49c3995117945938669e24aff9352"
|
||||
SRC_URI[sha256sum] = "fcfe2474bc271e730ed95edb21ae46e93c1ce773ed036f63c9fb2db02cbc7e64"
|
||||
SRC_URI[md5sum] = "b2d2571e20547d54fe7b7108882e7e8d"
|
||||
SRC_URI[sha256sum] = "371f860365d01c4c0aebe931354cc99a646d44f17e6846c93ee2c002258f503e"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \
|
||||
@@ -54,4 +53,8 @@ FILES_${PN} += " \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${OE_QMAKE_PATH_PLUGINS}/.debug \
|
||||
"
|
||||
|
||||
RRECOMMENDS_${PN} += "ffmpeg"
|
||||
|
||||
@@ -22,8 +22,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "daa73fb65eb5b48928b3b4e4511d6e06"
|
||||
SRC_URI[sha256sum] = "a8a9e8a4c2bdc1855078383f10720b4b3a388c678dee148494dc18ba5019a6ae"
|
||||
SRC_URI[md5sum] = "9583927463f8afd583c112151c38bd41"
|
||||
SRC_URI[sha256sum] = "9776c270e2a8b43b8ad8b500015542f7249b5fcf2ce0b698e0866125032a00a3"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -26,8 +26,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "fe3970879eec195f387c772e6fd6fba5"
|
||||
SRC_URI[sha256sum] = "b3d959cc195b924ca877df2762c3e8ef115ac41c2355f34efbbcaabe9b02b500"
|
||||
SRC_URI[md5sum] = "d3547836e884387da322086ebccacac8"
|
||||
SRC_URI[sha256sum] = "ac5f73ead36f30609d2ef1b8888b940e47e3bbbee54fda8c27765ddea5a295cc"
|
||||
SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -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] = "fa127f073bbb0075741c12d0017b2f44"
|
||||
SRC_URI[sha256sum] = "ad123b24f88e1ade5a845c16a84a483835cce31b92741107d8dbd02f462d4cd9"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
"
|
||||
@@ -28,8 +28,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "7af7f7f466600d08ca11aa1f24e9c977"
|
||||
SRC_URI[sha256sum] = "5b4a9ed17d0898c74cf7fd1612e2d055086d5e04148b3b17df5977255fc240b8"
|
||||
SRC_URI[md5sum] = "533d441f6c4bc76b581eb4ffc5f17d1d"
|
||||
SRC_URI[sha256sum] = "f6c41fbc299bd3a4e9723e72903a0c88f443045e3695bfa3ca2ea6a831cfb07c"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-fix-build-for-qtbase-without-session-management.patch \
|
||||
|
||||
@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-apps gettext
|
||||
|
||||
DEPENDS += " \
|
||||
libssh \
|
||||
qtsvg \
|
||||
qtwebengine \
|
||||
\
|
||||
@@ -39,7 +40,6 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
# REVISIT optionals
|
||||
# libssh \
|
||||
# openslp
|
||||
# openssh <-> dropbear
|
||||
DEPENDS += " \
|
||||
@@ -49,8 +49,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "93e86cccf0b4d4868d5b32e16fa5299f"
|
||||
SRC_URI[sha256sum] = "f8879abaea6fcf31ee0bd4a55d0c24a5fded6d61abed1b059f704f797793aef2"
|
||||
SRC_URI[md5sum] = "7b21d27f91c3da8147b962d0c805130d"
|
||||
SRC_URI[sha256sum] = "7ad2df61267c274507b1ee8d592ba829ca7e60efda4a16ba301dabb26102d1c5"
|
||||
|
||||
# gperf creates hard #line links
|
||||
do_install_prepend() {
|
||||
@@ -73,3 +73,8 @@ FILES_${PN} += " \
|
||||
\
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${OE_QMAKE_PATH_PLUGINS}/.debug \
|
||||
${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \
|
||||
"
|
||||
|
||||
@@ -19,8 +19,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "f0d06288f2b55f63fd67d747f2868216"
|
||||
SRC_URI[sha256sum] = "04f1357e46bb3e32c85f08c9d5655cde6351c6efd27824a17019ea8562e8d5ba"
|
||||
SRC_URI[md5sum] = "a3a04fab22e33bed0682c1fd124571f6"
|
||||
SRC_URI[sha256sum] = "7ca8b5872832a9d0985daedb8f587b5057d7f569dee490b2a3d97c568beb2d59"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
SUMMARY = "KBlocks - Falling Blocks Game"
|
||||
LICENSE = "GPLv2 & GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-apps gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
kauth-native \
|
||||
kconfig-native \
|
||||
kcoreaddons-native \
|
||||
kdoctools-native \
|
||||
kpackage-native \
|
||||
kcrash \
|
||||
kdbusaddons \
|
||||
kdeclarative \
|
||||
knewstuff \
|
||||
kxmlgui \
|
||||
libkmahjongg \
|
||||
libkdegames \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "73db8ba5adba90700a3447833304341e"
|
||||
SRC_URI[sha256sum] = "188a8d921b72965d4ed0f6490048cde7b9d5606cca7d3cea12463dc71a90ccf6"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
${datadir}/icons \
|
||||
${datadir}/kxmlgui5 \
|
||||
"
|
||||
@@ -1,32 +0,0 @@
|
||||
SUMMARY = "KMines is the classic Minesweeper game"
|
||||
LICENSE = "GPLv2 & GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-apps gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
kauth-native \
|
||||
kconfig-native \
|
||||
kcoreaddons-native \
|
||||
kdoctools-native \
|
||||
kconfigwidgets \
|
||||
kcrash \
|
||||
kdbusaddons \
|
||||
ki18n \
|
||||
ktextwidgets \
|
||||
kwidgetsaddons \
|
||||
kxmlgui \
|
||||
libkdegames \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "f308aa02233b191051a4da306bc4b899"
|
||||
SRC_URI[sha256sum] = "40c16b57614098555c32252c75e3890922b62d7005b9059f6ae92e11c96d980f"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
${datadir}/knotifications5 \
|
||||
"
|
||||
@@ -20,20 +20,21 @@ 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] = "2071a1c7b592a238bc03503e8d0f3cfc"
|
||||
SRC_URI[sha256sum] = "4edf31a36a5d700cc190ba7a5a0d76789729069d48324a22bda7977cb4ed081a"
|
||||
SRC_URI[md5sum] = "57de2ce3a71057563465c404e3b000ef"
|
||||
SRC_URI[sha256sum] = "b7260ae4a24571fec63aae2417c444b5a7e102e45dc1c834e60f0691718ddc89"
|
||||
|
||||
SRC_URI += "file://0001-Fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
@@ -50,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 \
|
||||
"
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
SUMMARY = "Mathematical Function Plotter"
|
||||
LICENSE = "GPLv2 & GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
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] = "6f92126fc111e28b733f458a536ac914"
|
||||
SRC_URI[sha256sum] = "2dd6eec34088b5d3b591091cce41616ee310a66aa2d16e5800db56044d60dd7b"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
${datadir}/kxmlgui5 \
|
||||
${datadir}/dbus-1 \
|
||||
${datadir}/kservices5 \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
@@ -29,8 +29,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "07f4861f1b09d08fc954cf2ea8c7189c"
|
||||
SRC_URI[sha256sum] = "450b714f0d73b59d31c4ceda142a3496d14e51d84b8c8968548a15e05c138f98"
|
||||
SRC_URI[md5sum] = "09eea0db733a7fc1d13da924e46673bc"
|
||||
SRC_URI[sha256sum] = "1c0df432c88140c26d3e379a79b99d4c4c71dc75f492d9c6e36bba1ea71f6d97"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -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
|
||||
@@ -34,21 +35,23 @@ DEPENDS += " \
|
||||
kwindowsystem \
|
||||
kxmlgui \
|
||||
sonnet-native \
|
||||
knewstuff \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)} \
|
||||
"
|
||||
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "1378218f3e108403decdbc8ad846cc49"
|
||||
SRC_URI[sha256sum] = "01ff3245d755a6e38207e58e50e5f82e5c681ead2ad7176d46aec00a8a562e08"
|
||||
SRC_URI[md5sum] = "6aea3f99260440c4d1321b25a7478572"
|
||||
SRC_URI[sha256sum] = "fa0997c14a96252177e4808636ec43509eadb1482d54bb8a86b85810283f6cbc"
|
||||
|
||||
# do not move so-libs to -dev package
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/khotkeys \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
${libdir}/libkdeinit5_konsole.so \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${OE_QMAKE_PATH_PLUGINS}/.debug \
|
||||
"
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
SUMMARY = "KPat offers a selection of solitaire card games"
|
||||
LICENSE = "GPLv2 & GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=dcd3ae65d2d4ac9f347f0614d3fd4794 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-apps gtk-icon-cache mime
|
||||
|
||||
DEPENDS += " \
|
||||
kauth-native \
|
||||
kconfig-native \
|
||||
kcoreaddons-native \
|
||||
kdoctools-native \
|
||||
kcompletion \
|
||||
kconfigwidgets \
|
||||
kcrash \
|
||||
kdbusaddons \
|
||||
kguiaddons \
|
||||
ki18n \
|
||||
kio \
|
||||
knewstuff \
|
||||
kwidgetsaddons \
|
||||
kxmlgui \
|
||||
libkdegames \
|
||||
freecell-solver \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "d0b23b0430f650ce898a57edb7b11024"
|
||||
SRC_URI[sha256sum] = "62c31d6f7a9bb49c09725722bea472811d897b149e29558ca6e248b5d2a41377"
|
||||
|
||||
FILES_SOLIBSDEV = ""
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
${datadir}/icons \
|
||||
${datadir}/mime \
|
||||
${datadir}/kxmlgui5 \
|
||||
${libdir}/libkcardgame.so \
|
||||
"
|
||||
@@ -30,8 +30,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "e05fcf9365abb666b38c963988ce040e"
|
||||
SRC_URI[sha256sum] = "818ef2ded02caacf2ccf3c012e992070c3b898db319682e8a42cf5726d56b3fc"
|
||||
SRC_URI[md5sum] = "5ffbbdfd08f4ff1c6886fcca88962267"
|
||||
SRC_URI[sha256sum] = "cf01b8cd7c9f1714754d28e99462138dfda380322fb4da0cf0aa88771b40b0c2"
|
||||
SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
|
||||
|
||||
FILES_${PN} += " \
|
||||
|
||||
@@ -0,0 +1,319 @@
|
||||
From 86cad3e0edba28de83725bf7f55ceb68ff57d765 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Thu, 15 Mar 2018 14:47:57 +0100
|
||||
Subject: [PATCH] fix build with GLES2 only
|
||||
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>
|
||||
---
|
||||
libs/ui/canvas/kis_mirror_axis.cpp | 5 ++-
|
||||
libs/ui/opengl/kis_opengl_canvas2.cpp | 18 ++++++++++
|
||||
libs/ui/opengl/kis_opengl_image_textures.cpp | 54 ++++++++++++++++++++++++----
|
||||
libs/ui/opengl/kis_texture_tile.cpp | 10 ++++++
|
||||
4 files changed, 79 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/libs/ui/canvas/kis_mirror_axis.cpp b/libs/ui/canvas/kis_mirror_axis.cpp
|
||||
index 47d115c..a873040 100644
|
||||
--- a/libs/ui/canvas/kis_mirror_axis.cpp
|
||||
+++ b/libs/ui/canvas/kis_mirror_axis.cpp
|
||||
@@ -157,6 +157,7 @@ void KisMirrorAxis::drawDecoration(QPainter& gc, const QRectF& updateArea, const
|
||||
gc.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
|
||||
|
||||
QOpenGLContext *ctx = QOpenGLContext::currentContext();
|
||||
+#ifdef GL_MULTISAMPLE
|
||||
bool hasMultisample = ((gc.paintEngine()->type() == QPaintEngine::OpenGL2) &&
|
||||
(ctx->hasExtension("GL_ARB_multisample")));
|
||||
|
||||
@@ -167,7 +168,7 @@ void KisMirrorAxis::drawDecoration(QPainter& gc, const QRectF& updateArea, const
|
||||
ctx->functions()->glEnable(GL_MULTISAMPLE);
|
||||
gc.endNativePainting();
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
float halfHandleSize = d->handleSize / 2;
|
||||
|
||||
d->recomputeVisibleAxes(gc.viewport());
|
||||
@@ -225,11 +226,13 @@ void KisMirrorAxis::drawDecoration(QPainter& gc, const QRectF& updateArea, const
|
||||
}
|
||||
}
|
||||
|
||||
+#ifdef GL_MULTISAMPLE
|
||||
if (hasMultisample) {
|
||||
gc.beginNativePainting();
|
||||
ctx->functions()->glDisable(GL_MULTISAMPLE);
|
||||
gc.endNativePainting();
|
||||
}
|
||||
+#endif
|
||||
|
||||
}
|
||||
|
||||
diff --git a/libs/ui/opengl/kis_opengl_canvas2.cpp b/libs/ui/opengl/kis_opengl_canvas2.cpp
|
||||
index ab471b0..c7f09b3 100644
|
||||
--- a/libs/ui/opengl/kis_opengl_canvas2.cpp
|
||||
+++ b/libs/ui/opengl/kis_opengl_canvas2.cpp
|
||||
@@ -45,8 +45,10 @@
|
||||
#include <QMessageBox>
|
||||
|
||||
#ifndef Q_OS_OSX
|
||||
+#ifndef QT_OPENGL_ES_2
|
||||
#include <QOpenGLFunctions_2_1>
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#define NEAR_VAL -1000.0
|
||||
#define FAR_VAL 1000.0
|
||||
@@ -103,7 +105,9 @@ public:
|
||||
QVector2D texCoords[6];
|
||||
|
||||
#ifndef Q_OS_OSX
|
||||
+#ifndef QT_OPENGL_ES_2
|
||||
QOpenGLFunctions_2_1 *glFn201;
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
int xToColWithWrapCompensation(int x, const QRect &imageRect) {
|
||||
@@ -231,6 +235,7 @@ void KisOpenGLCanvas2::initializeGL()
|
||||
KisOpenGL::initializeContext(context());
|
||||
initializeOpenGLFunctions();
|
||||
#ifndef Q_OS_OSX
|
||||
+#ifndef QT_OPENGL_ES_2
|
||||
if (!KisOpenGL::hasOpenGLES()) {
|
||||
d->glFn201 = context()->versionFunctions<QOpenGLFunctions_2_1>();
|
||||
if (!d->glFn201) {
|
||||
@@ -239,6 +244,7 @@ void KisOpenGLCanvas2::initializeGL()
|
||||
} else {
|
||||
d->glFn201 = nullptr;
|
||||
}
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
KisConfig cfg;
|
||||
@@ -396,18 +402,28 @@ void KisOpenGLCanvas2::paintToolOutline(const QPainterPath &path)
|
||||
d->cursorShader->setUniformValue(d->cursorShader->location(Uniform::ModelViewProjection), modelMatrix);
|
||||
|
||||
if (!KisOpenGL::hasOpenGLES()) {
|
||||
+#ifdef GL_LINE_SMOOTH_HINT
|
||||
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
|
||||
+#endif
|
||||
|
||||
+#ifdef GL_COLOR_LOGIC_OP
|
||||
glEnable(GL_COLOR_LOGIC_OP);
|
||||
+#endif
|
||||
#ifndef Q_OS_OSX
|
||||
+#ifndef QT_OPENGL_ES_2
|
||||
if (d->glFn201) {
|
||||
d->glFn201->glLogicOp(GL_XOR);
|
||||
}
|
||||
+#endif
|
||||
#else
|
||||
+#ifdef GL_XOR
|
||||
glLogicOp(GL_XOR);
|
||||
+#endif
|
||||
#endif
|
||||
} else {
|
||||
+#ifdef GL_BLEND
|
||||
glEnable(GL_BLEND);
|
||||
+#endif
|
||||
glBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ZERO, GL_ONE, GL_ONE);
|
||||
}
|
||||
|
||||
@@ -446,7 +462,9 @@ void KisOpenGLCanvas2::paintToolOutline(const QPainterPath &path)
|
||||
}
|
||||
|
||||
if (!KisOpenGL::hasOpenGLES()) {
|
||||
+#ifdef GL_COLOR_LOGIC_OP
|
||||
glDisable(GL_COLOR_LOGIC_OP);
|
||||
+#endif
|
||||
} else {
|
||||
glDisable(GL_BLEND);
|
||||
}
|
||||
diff --git a/libs/ui/opengl/kis_opengl_image_textures.cpp b/libs/ui/opengl/kis_opengl_image_textures.cpp
|
||||
index 1210c7b..8aa84b7 100644
|
||||
--- a/libs/ui/opengl/kis_opengl_image_textures.cpp
|
||||
+++ b/libs/ui/opengl/kis_opengl_image_textures.cpp
|
||||
@@ -408,7 +408,11 @@ void KisOpenGLImageTextures::generateCheckerTexture(const QImage &checkImage)
|
||||
if (checkImage.width() != BACKGROUND_TEXTURE_SIZE || checkImage.height() != BACKGROUND_TEXTURE_SIZE) {
|
||||
img = checkImage.scaled(BACKGROUND_TEXTURE_SIZE, BACKGROUND_TEXTURE_SIZE);
|
||||
}
|
||||
+#ifdef GL_RGBA8
|
||||
GLint format = GL_BGRA, internalFormat = GL_RGBA8;
|
||||
+#else
|
||||
+ GLint format = GL_BGRA, internalFormat = GL_BGRA;
|
||||
+#endif
|
||||
if (KisOpenGL::hasOpenGLES()) {
|
||||
if (ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_format_BGRA8888"))) {
|
||||
format = GL_BGRA_EXT;
|
||||
@@ -541,18 +545,25 @@ void KisOpenGLImageTextures::updateTextureFormat()
|
||||
QOpenGLContext *ctx = QOpenGLContext::currentContext();
|
||||
if (!(m_image && ctx)) return;
|
||||
|
||||
+#ifdef GL_RGBA8
|
||||
if (!KisOpenGL::hasOpenGLES()) {
|
||||
m_texturesInfo.internalFormat = GL_RGBA8;
|
||||
m_texturesInfo.type = GL_UNSIGNED_BYTE;
|
||||
m_texturesInfo.format = GL_BGRA;
|
||||
- } else {
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
m_texturesInfo.internalFormat = GL_BGRA8_EXT;
|
||||
m_texturesInfo.type = GL_UNSIGNED_BYTE;
|
||||
m_texturesInfo.format = GL_BGRA_EXT;
|
||||
if(!ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_format_BGRA8888"))) {
|
||||
// The red and blue channels are swapped, but it will be re-swapped
|
||||
// by texture swizzle mask set in KisTextureTile::setTextureParameters
|
||||
+#ifdef GL_RGBA8
|
||||
m_texturesInfo.internalFormat = GL_RGBA8;
|
||||
+#else
|
||||
+ m_texturesInfo.internalFormat = GL_RGBA;
|
||||
+#endif
|
||||
m_texturesInfo.type = GL_UNSIGNED_BYTE;
|
||||
m_texturesInfo.format = GL_RGBA;
|
||||
}
|
||||
@@ -569,32 +580,48 @@ void KisOpenGLImageTextures::updateTextureFormat()
|
||||
if (colorModelId == RGBAColorModelID) {
|
||||
if (colorDepthId == Float16BitsColorDepthID) {
|
||||
|
||||
+#ifdef GL_RGBA16F
|
||||
if (KisOpenGL::hasOpenGLES()) {
|
||||
m_texturesInfo.internalFormat = GL_RGBA16F;
|
||||
dbgUI << "Using half (GLES)";
|
||||
- } else if (ctx->hasExtension("GL_ARB_texture_float")) {
|
||||
+ } else
|
||||
+#endif
|
||||
+#ifdef GL_RGBA16F_ARB
|
||||
+ if (ctx->hasExtension("GL_ARB_texture_float")) {
|
||||
m_texturesInfo.internalFormat = GL_RGBA16F_ARB;
|
||||
dbgUI << "Using ARB half";
|
||||
}
|
||||
- else if (ctx->hasExtension("GL_ATI_texture_float")) {
|
||||
+ else
|
||||
+#endif
|
||||
+#ifdef GL_RGBA_FLOAT16_ATI
|
||||
+ if (ctx->hasExtension("GL_ATI_texture_float")) {
|
||||
m_texturesInfo.internalFormat = GL_RGBA_FLOAT16_ATI;
|
||||
dbgUI << "Using ATI half";
|
||||
}
|
||||
+#endif
|
||||
+ // make ifdefs 'else' happy
|
||||
+ if(false) {}
|
||||
|
||||
bool haveBuiltInOpenExr = false;
|
||||
#ifdef HAVE_OPENEXR
|
||||
haveBuiltInOpenExr = true;
|
||||
#endif
|
||||
|
||||
+#ifdef GL_HALF_FLOAT
|
||||
if (haveBuiltInOpenExr && KisOpenGL::hasOpenGLES()) {
|
||||
m_texturesInfo.type = GL_HALF_FLOAT;
|
||||
destinationColorDepthId = Float16BitsColorDepthID;
|
||||
dbgUI << "Pixel type half (GLES)";
|
||||
- } else if (haveBuiltInOpenExr && ctx->hasExtension("GL_ARB_half_float_pixel")) {
|
||||
+ } else
|
||||
+#endif
|
||||
+#ifdef GL_HALF_FLOAT_ARB
|
||||
+ if (haveBuiltInOpenExr && ctx->hasExtension("GL_ARB_half_float_pixel")) {
|
||||
m_texturesInfo.type = GL_HALF_FLOAT_ARB;
|
||||
destinationColorDepthId = Float16BitsColorDepthID;
|
||||
dbgUI << "Pixel type half";
|
||||
- } else {
|
||||
+ } else
|
||||
+#endif
|
||||
+ {
|
||||
m_texturesInfo.type = GL_FLOAT;
|
||||
destinationColorDepthId = Float32BitsColorDepthID;
|
||||
dbgUI << "Pixel type float";
|
||||
@@ -602,22 +629,32 @@ void KisOpenGLImageTextures::updateTextureFormat()
|
||||
m_texturesInfo.format = GL_RGBA;
|
||||
}
|
||||
else if (colorDepthId == Float32BitsColorDepthID) {
|
||||
+ m_texturesInfo.internalFormat = GL_RGBA;
|
||||
+#ifdef GL_RGBA32F
|
||||
if (KisOpenGL::hasOpenGLES()) {
|
||||
m_texturesInfo.internalFormat = GL_RGBA32F;
|
||||
dbgUI << "Using float (GLES)";
|
||||
- } else if (ctx->hasExtension("GL_ARB_texture_float")) {
|
||||
+ } else
|
||||
+#endif
|
||||
+#ifdef GL_RGBA32F_ARB
|
||||
+ if (ctx->hasExtension("GL_ARB_texture_float")) {
|
||||
m_texturesInfo.internalFormat = GL_RGBA32F_ARB;
|
||||
dbgUI << "Using ARB float";
|
||||
- } else if (ctx->hasExtension("GL_ATI_texture_float")) {
|
||||
+ } else
|
||||
+#endif
|
||||
+#ifdef GL_RGBA_FLOAT32_ATI
|
||||
+ if (ctx->hasExtension("GL_ATI_texture_float")) {
|
||||
m_texturesInfo.internalFormat = GL_RGBA_FLOAT32_ATI;
|
||||
dbgUI << "Using ATI float";
|
||||
}
|
||||
+#endif
|
||||
|
||||
m_texturesInfo.type = GL_FLOAT;
|
||||
m_texturesInfo.format = GL_RGBA;
|
||||
destinationColorDepthId = Float32BitsColorDepthID;
|
||||
}
|
||||
else if (colorDepthId == Integer16BitsColorDepthID) {
|
||||
+#ifdef GL_RGBA16
|
||||
if (!KisOpenGL::hasOpenGLES()) {
|
||||
m_texturesInfo.internalFormat = GL_RGBA16;
|
||||
m_texturesInfo.type = GL_UNSIGNED_SHORT;
|
||||
@@ -625,9 +662,11 @@ void KisOpenGLImageTextures::updateTextureFormat()
|
||||
destinationColorDepthId = Integer16BitsColorDepthID;
|
||||
dbgUI << "Using 16 bits rgba";
|
||||
}
|
||||
+#endif
|
||||
// TODO: for ANGLE, see if we can convert to 16f to support 10-bit display
|
||||
}
|
||||
}
|
||||
+#ifdef GL_RGBA16
|
||||
else {
|
||||
// We will convert the colorspace to 16 bits rgba, instead of 8 bits
|
||||
if (colorDepthId == Integer16BitsColorDepthID && !KisOpenGL::hasOpenGLES()) {
|
||||
@@ -639,6 +678,7 @@ void KisOpenGLImageTextures::updateTextureFormat()
|
||||
}
|
||||
// TODO: for ANGLE, see if we can convert to 16f to support 10-bit display
|
||||
}
|
||||
+#endif
|
||||
|
||||
if (!m_internalColorManagementActive &&
|
||||
colorModelId != destinationColorModelId) {
|
||||
diff --git a/libs/ui/opengl/kis_texture_tile.cpp b/libs/ui/opengl/kis_texture_tile.cpp
|
||||
index d8fb03d..90e9996 100644
|
||||
--- a/libs/ui/opengl/kis_texture_tile.cpp
|
||||
+++ b/libs/ui/opengl/kis_texture_tile.cpp
|
||||
@@ -34,17 +34,27 @@ void KisTextureTile::setTextureParameters()
|
||||
|
||||
f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
|
||||
f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
|
||||
+#ifdef GL_TEXTURE_MIN_LOD
|
||||
f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_LOD, 0);
|
||||
+#endif
|
||||
+#ifdef GL_TEXTURE_MAX_LOD
|
||||
f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, m_numMipmapLevels);
|
||||
+#endif
|
||||
+#ifdef GL_TEXTURE_BASE_LEVEL
|
||||
f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
|
||||
+#endif
|
||||
+#ifdef GL_TEXTURE_MAX_LEVEL
|
||||
f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, m_numMipmapLevels);
|
||||
+#endif
|
||||
|
||||
+#ifdef GL_RGBA8
|
||||
if (m_texturesInfo->internalFormat == GL_RGBA8 && m_texturesInfo->format == GL_RGBA) {
|
||||
// If image format is RGBA8, swap the red and blue channels for the proper colour
|
||||
// This is for OpenGL ES support and only used if lacking GL_EXT_texture_format_BGRA8888
|
||||
f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
|
||||
f->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_RED);
|
||||
}
|
||||
+#endif
|
||||
|
||||
f->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
|
||||
}
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
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 \
|
||||
"
|
||||
|
||||
inherit kde-apps python3native gtk-icon-cache
|
||||
inherit kde-apps gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
qtmultimedia \
|
||||
@@ -33,13 +32,12 @@ DEPENDS += " \
|
||||
kcrash \
|
||||
"
|
||||
|
||||
PVEXT = ".101"
|
||||
SRC_URI = " \
|
||||
${KDE_MIRROR}/stable/${BPN}/${PV}/${BPN}-${PV}${PVEXT}.tar.gz \
|
||||
${KDE_MIRROR}/stable/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
|
||||
file://0001-fix-build-with-GLES2-only.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "a172b864ca7723b5a033fdc730d9296c"
|
||||
SRC_URI[sha256sum] = "5bc95baa3980b7d75eb6bf103f72344014eac7733fd8a0780a7ec87dc2826f5f"
|
||||
S = "${WORKDIR}/${BPN}-${PV}${PVEXT}"
|
||||
SRC_URI[md5sum] = "eb3224bbf09b7b88364c6308cd5a5d18"
|
||||
SRC_URI[sha256sum] = "bec04e3392e9b311477c5c6a50e2201b43a3afda91d9b24a0fc8e3399585865d"
|
||||
|
||||
OECMAKE_GENERATOR="Unix Makefiles"
|
||||
|
||||
@@ -61,5 +59,4 @@ FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
${datadir}/kritaplugins \
|
||||
${libdir}/kritaplugins \
|
||||
${OE_QMAKE_PATH_QML}/org/krita \
|
||||
"
|
||||
@@ -1,38 +0,0 @@
|
||||
SUMMARY = "KSudoku is a logic-based symbol placement puzzle"
|
||||
LICENSE = "GPLv2 & GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-apps gtk-icon-cache distro_features_check
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11 opengl"
|
||||
|
||||
DEPENDS += " \
|
||||
libglu \
|
||||
kauth-native \
|
||||
kconfig-native \
|
||||
kcoreaddons-native \
|
||||
kdoctools-native \
|
||||
karchive \
|
||||
kconfigwidgets \
|
||||
kcrash \
|
||||
kguiaddons \
|
||||
ki18n \
|
||||
kiconthemes \
|
||||
kio \
|
||||
kjobwidgets \
|
||||
kwidgetsaddons \
|
||||
kxmlgui \
|
||||
libkdegames \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "904d4cdab886484afb1fc90dfd522a14"
|
||||
SRC_URI[sha256sum] = "4a44248f2bde9c66c911fe7ed7bd54e31956053dac18e29217a355ad2b3a05e1"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/icons \
|
||||
${datadir}/kxmlgui5 \
|
||||
"
|
||||
@@ -22,7 +22,7 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "ce0e9290effc7ed38ab6232809843f4b"
|
||||
SRC_URI[sha256sum] = "93f276698b74af654f3ed147d5c025162bd919ec6c79a7c7dd7678051c307e52"
|
||||
SRC_URI[md5sum] = "540d4f44309d8fdbadec063a52d9aaec"
|
||||
SRC_URI[sha256sum] = "991203b77c322f7a56f73b2ae381c3b57ebc9c913b5dc0a98898f681796cd252"
|
||||
|
||||
FILES_${PN} += "${datadir}/kxmlgui5"
|
||||
|
||||
@@ -24,8 +24,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "6d90a44ee14a0937bc5a1f983fc46421"
|
||||
SRC_URI[sha256sum] = "78232285c08241dc06cd6da88dcdce0d850417dd73f0d07034ec6d9a6f97f478"
|
||||
SRC_URI[md5sum] = "44da3a1ce114df919edb8b94dfa8c8bd"
|
||||
SRC_URI[sha256sum] = "a129051f2f93baaecbde8c302ff528a1d4218da8ca27caadd6befa12baa69ad3"
|
||||
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 \
|
||||
"
|
||||
|
||||
@@ -20,14 +20,14 @@ index b509ab1..ffb7baa 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -91,7 +91,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
|
||||
### Kwave version number ###
|
||||
|
||||
INCLUDE(FindRequiredProgram)
|
||||
|
||||
-FIND_REQUIRED_PROGRAM(CAT_EXECUTABLE cat)
|
||||
+SET(CAT_EXECUTABLE cat)
|
||||
SET(KWAVE_VERSION_MAJOR ${KDE_APPLICATIONS_VERSION_MAJOR})
|
||||
SET(KWAVE_VERSION_MINOR ${KDE_APPLICATIONS_VERSION_MINOR})
|
||||
SET(KWAVE_VERSION_MICRO ${KDE_APPLICATIONS_VERSION_MICRO})
|
||||
INCLUDE(FindKwaveVersion)
|
||||
|
||||
#############################################################################
|
||||
@@ -406,7 +406,7 @@ ADD_CUSTOM_TARGET(distfiles
|
||||
#############################################################################
|
||||
### uninstall support ###
|
||||
@@ -38,10 +38,10 @@ index b509ab1..ffb7baa 100644
|
||||
CONFIGURE_FILE(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/cmake/uninstall.cmake.in
|
||||
diff --git a/cmake/KwaveL10N.cmake b/cmake/KwaveL10N.cmake
|
||||
index cd036cd..9b63f0a 100644
|
||||
index 64ef8e2..cb615f2 100644
|
||||
--- a/cmake/KwaveL10N.cmake
|
||||
+++ b/cmake/KwaveL10N.cmake
|
||||
@@ -22,11 +22,11 @@
|
||||
@@ -22,12 +22,12 @@
|
||||
# #
|
||||
#############################################################################
|
||||
|
||||
@@ -50,11 +50,13 @@ index cd036cd..9b63f0a 100644
|
||||
-FIND_REQUIRED_PROGRAM(XGETTEXT_EXECUTABLE xgettext)
|
||||
-FIND_REQUIRED_PROGRAM(MSGMERGE_EXECUTABLE msgmerge)
|
||||
-FIND_REQUIRED_PROGRAM(MSGFMT_EXECUTABLE msgfmt)
|
||||
-FIND_REQUIRED_PROGRAM(RM_EXECUTABLE rm)
|
||||
+SET(FIND_EXECUTABLE find)
|
||||
+SET(MSGCAT_EXECUTABLE msgcat)
|
||||
+SET(XGETTEXT_EXECUTABLE xgettext)
|
||||
+SET(MSGMERGE_EXECUTABLE msgmerge)
|
||||
+SET(MSGFMT_EXECUTABLE msgfmt)
|
||||
+SET(RM_EXECUTABLE rm)
|
||||
|
||||
SET(PO_SRC_DIR "${CMAKE_SOURCE_DIR}/po")
|
||||
SET(PO_BIN_DIR "${CMAKE_BINARY_DIR}/po")
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
SUMMARY = "Kwave is a sound editor for KDE"
|
||||
LICENSE = "GPLv2 & LGPLv2 & CC-BY-SA-3.0 & CC-BY-SA-4.0 & GFDL-1.2 & BSD"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://LICENSES;md5=a5262554ba5698535ed8c962a5248dff \
|
||||
file://LICENSES;md5=90ff5adc50ce32f0425aaa40f1e606bf \
|
||||
file://GNU-LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
"
|
||||
|
||||
@@ -32,9 +32,9 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "e9c5692d83493a4293a706c41b0762fe"
|
||||
SRC_URI[sha256sum] = "4ca9a15ecd06b96e013855f8109b52fcd4a848652438b2e7a2f55a8fcb1d1c48"
|
||||
SRC_URI += "file://0001-FIND_REQUIRED_PROGRAM-is-broken-use-the-tools-direct.patch"
|
||||
SRC_URI[md5sum] = "f96b60911d674dedb44771fbaef8560d"
|
||||
SRC_URI[sha256sum] = "cf665ba77c9e8372e09d34ec19eb69b4d3be80e1b1f6fb96fcc1b1c0649310f3"
|
||||
|
||||
# Aagh: To select a soundcard we need to select another type - so keep oss in as dummy
|
||||
#EXTRA_OECMAKE += "-DWITH_OSS=OFF"
|
||||
|
||||
@@ -13,5 +13,5 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "75999ed863aef72bcf62a40910c0ca20"
|
||||
SRC_URI[sha256sum] = "c4b6541419b2ebee15d24744d10e67c9a137e616766e765c13e5056c2a37ef99"
|
||||
SRC_URI[md5sum] = "60112edfec27a3f31dbed12067c1052b"
|
||||
SRC_URI[sha256sum] = "cc02d7bfef7fed0f35ea5e1467e6d67939ca0bf2ca5551169cc4e7b11b2de286"
|
||||
|
||||
@@ -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] = "69830d93bd7dfa8882a45a9d7a45a0a1"
|
||||
SRC_URI[sha256sum] = "7c833fe476043f0492a09a52af60ee7652805cccbbb72e5f473a9d35abff9ed9"
|
||||
SRC_URI[md5sum] = "e8fde2ad87216cbd29002786c0de29e9"
|
||||
SRC_URI[sha256sum] = "6d12bf8f389e07dc8cd8681e61757c817082ffb5e9e409e488a17da9dae501ce"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/carddecks \
|
||||
${datadir}/kconf_update \
|
||||
${OE_QMAKE_PATH_QML} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${OE_QMAKE_PATH_QML}/*/*/*/*/.debug \
|
||||
"
|
||||
|
||||
@@ -13,5 +13,5 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "50ef0905ed41eb586145dac0274ca226"
|
||||
SRC_URI[sha256sum] = "1d14ff63af42ab7e19e2039648a95ea5dc946afbe3e3df52c17ce1618a02ebdc"
|
||||
SRC_URI[md5sum] = "1ec4ef8f065ac034669158b498682a64"
|
||||
SRC_URI[sha256sum] = "8f8ea9817ca16df2736925e6f0c4fd5b4c1dbe5eb8eb209c760a75625bc2f9f7"
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
SUMMARY = "Common code, backgrounds and tile sets for Mahjongg games"
|
||||
LICENSE = "GPLv2 & GFDL-1.2"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
|
||||
"
|
||||
|
||||
inherit kde-apps gtk-icon-cache
|
||||
|
||||
DEPENDS += " \
|
||||
qtsvg \
|
||||
kauth-native \
|
||||
kcoreaddons-native \
|
||||
kconfig-native \
|
||||
kconfigwidgets \
|
||||
kwidgetsaddons \
|
||||
kcompletion \
|
||||
ki18n \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "a2ffeb6f68f7a84ad6e01c2a58b12708"
|
||||
SRC_URI[sha256sum] = "25e5cea50b6c96f18efa8d013ab58abfaac7845edb969b8e63e0c297482a6be4"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kmahjongglib \
|
||||
"
|
||||
@@ -26,8 +26,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "4ae0ce5d6989aeb8f877f63e2a4ea473"
|
||||
SRC_URI[sha256sum] = "cce11b9384d27006855a141d2241a67d05679baa7096db2311c49a78bd642fed"
|
||||
SRC_URI[md5sum] = "068d66195bde7baaf6f0bc178b274a0a"
|
||||
SRC_URI[sha256sum] = "e9ae73a9bba912018160d0556561c15dea8e8ef0872b76dd348414b27d3dae58"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/config.kcfg \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -31,17 +31,15 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "49b86d84d38ccc0804c922a9502a2b12"
|
||||
SRC_URI[sha256sum] = "0bfd7ae576e42ebbddadc8c83c2fec5edaf462bcf284642b1002d36d751b24ee"
|
||||
SRC_URI[md5sum] = "c878d04b3145caf2f4fec66b700ec481"
|
||||
SRC_URI[sha256sum] = "f1004b0a63767cfba91865623598c309ca7529a7e37ccf451d439f5edbb6f8dd"
|
||||
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 \
|
||||
"
|
||||
|
||||
@@ -21,9 +21,8 @@ DEPENDS += "\
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "44c25f80973304f0d683dd7fc4a48aa9"
|
||||
SRC_URI[sha256sum] = "9244ec364d031c73f9aed9568012a28b847ec4dceca61040324af7afd3d64009"
|
||||
SRC_URI += "file://0001-Do-not-try-to-find-qtquick-compiler.patch"
|
||||
SRC_URI[md5sum] = "8ac3c50c3f1b885253fee172c81cc2ce"
|
||||
SRC_URI[sha256sum] = "0bf1f32fedb3345a7bf3fba715fc670edf442c53cc150a30f43311bde66519aa"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/kxmlgui5 \
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From 08d1d50a8e9433a0fe163d7b1251dafc66bcc40e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 14 Dec 2018 01:41:47 +0100
|
||||
Subject: [PATCH] Do not try to find qtquick-compiler
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
we do not have qtdeclarative-native and even if we would: is output target
|
||||
binary compatible?
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f13838b..9788aeb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -41,7 +41,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
|
||||
Svg
|
||||
)
|
||||
|
||||
-find_package(Qt5 CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler)
|
||||
+#find_package(Qt5 CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler)
|
||||
|
||||
IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android")
|
||||
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
|
||||
--
|
||||
2.14.5
|
||||
|
||||
@@ -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 = "${KDE_APP_VERSION}"
|
||||
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 \
|
||||
"
|
||||
@@ -36,8 +36,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "6d76a028cd3c84e392326d095244bf91"
|
||||
SRC_URI[sha256sum] = "d7ef9b59acb5746ebc64399f4c1a99faf0c1530bf6a818b3bfd34b73476d90ab"
|
||||
SRC_URI[md5sum] = "7b8d91f781d0e46da097d853d4a0ed8c"
|
||||
SRC_URI[sha256sum] = "0a12549c2d90c13b8fa0838707924596eb12981bffc3a5b81410785a4e9e061d"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
|
||||
@@ -21,7 +21,6 @@ DEPENDS += " \
|
||||
kio \
|
||||
kxmlgui \
|
||||
kwindowsystem \
|
||||
knewstuff \
|
||||
"
|
||||
|
||||
# REVISIT optionals
|
||||
@@ -31,8 +30,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "39ef496c6cadd6ae308ea9cf612fa447"
|
||||
SRC_URI[sha256sum] = "8abf85b85de7844c503ef84182303c47cf425f5c14d71e723e3c887ee87ce06e"
|
||||
SRC_URI[md5sum] = "563558fe7fea33fdea9f8ee29c9ff4ca"
|
||||
SRC_URI[sha256sum] = "d93346f99dbbd7d36b7b140bdf37e0bd2e24a29af817a28045483da1bd39e989"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/dbus-1 \
|
||||
|
||||
@@ -32,8 +32,8 @@ DEPENDS += " \
|
||||
"
|
||||
|
||||
PV = "${KDE_APP_VERSION}"
|
||||
SRC_URI[md5sum] = "56d4d078d980d2133a9cc08b07006e59"
|
||||
SRC_URI[sha256sum] = "2ab53b33cf1fcaea470c01b2421e911d4287b1d0421fa33e0b60043fe6943cc7"
|
||||
SRC_URI[md5sum] = "30de7ed79be25707424ac1c0aa776307"
|
||||
SRC_URI[sha256sum] = "20c36aaf4c7e7ace87c56839d7c5a1fbadab5b244d92d2f17d1bab8475e47848"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_KF5=1"
|
||||
|
||||
|
||||
@@ -1,34 +1,52 @@
|
||||
From b5bea99b3f7b61e56e028bafcc88a07731987c18 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sun, 19 Aug 2018 17:57:04 +0200
|
||||
From 0f4de58c3478d38cc261e6025142881afebf0b5b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Tue, 17 Mar 2015 01:33:25 +0100
|
||||
Subject: [PATCH] native: build and install icemaker only
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded-specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/CMakeLists.txt | 2 +-
|
||||
CMakeLists.txt | 4 ++--
|
||||
src/CMakeLists.txt | 1 -
|
||||
src/kjs/CMakeLists.txt | 3 +++
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
3 files changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index dd80f9e..fe4d8fd 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -54,8 +54,8 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
|
||||
find_package(KF5DocTools ${KF5_DEP_VERSION})
|
||||
|
||||
add_subdirectory(src)
|
||||
-add_subdirectory(autotests)
|
||||
-add_subdirectory(tests)
|
||||
+#add_subdirectory(autotests)
|
||||
+#add_subdirectory(tests)
|
||||
if(KF5DocTools_FOUND)
|
||||
add_subdirectory(docs)
|
||||
endif()
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index de1d59f..7736d4e 100644
|
||||
index de1d59f..ad1af7e 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -1,3 +1,3 @@
|
||||
@@ -1,3 +1,2 @@
|
||||
add_subdirectory(kjs)
|
||||
|
||||
-add_subdirectory(wtf)
|
||||
+#add_subdirectory(wtf)
|
||||
diff --git a/src/kjs/CMakeLists.txt b/src/kjs/CMakeLists.txt
|
||||
index a51a71d..1208399 100644
|
||||
index a51a71d..fc74820 100644
|
||||
--- a/src/kjs/CMakeLists.txt
|
||||
+++ b/src/kjs/CMakeLists.txt
|
||||
@@ -68,6 +68,8 @@ endif()
|
||||
ecm_mark_nongui_executable(icemaker)
|
||||
target_include_directories(icemaker PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
|
||||
+install(TARGETS icemaker EXPORT KF5JSTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
+ install(TARGETS icemaker EXPORT KF5JSTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
+if(FALSE)
|
||||
# get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
|
||||
#get_target_property(ICEMAKER_EXECUTABLE icemaker WRAPPER_SCRIPT)
|
||||
@@ -42,5 +60,5 @@ index a51a71d..1208399 100644
|
||||
include(ECMGeneratePriFile)
|
||||
ecm_generate_pri_file(BASE_NAME KJS LIB_NAME KF5JS DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KJS)
|
||||
--
|
||||
2.14.4
|
||||
2.10.2
|
||||
|
||||
|
||||
@@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
|
||||
inherit kde-kf5-porting-aids perlnative
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[md5sum] = "56101da043e93122262cf1ab1510fa4e"
|
||||
SRC_URI[sha256sum] = "963e452ff3aa18ddc858fbfdcf234bdc97576b9496b871f742d90177a33974ac"
|
||||
SRC_URI[md5sum] = "55efc004c27a79e66111e68e739472ae"
|
||||
SRC_URI[sha256sum] = "1e46643b0cb189db98aa5cec46751d259e5589f48b7eab3ea738ddd85f0765f8"
|
||||
SRC_URI += "file://0001-create_hash_table-avoid-polution-of-files-with-build.patch"
|
||||
|
||||
DEPENDS += " \
|
||||
kdoctools \
|
||||
"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
From ac2556aa6a1bdbbdb7347079bfe4bddb74756263 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 10 Dec 2018 22:47:59 +0100
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Mon, 8 Dec 2014 13:37:14 +0100
|
||||
Subject: [PATCH 3/3] only build kf5-config for native
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@@ -8,24 +8,24 @@ Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross-specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
|
||||
---
|
||||
CMakeLists.txt | 29 +-----
|
||||
src/CMakeLists.txt | 200 +-----------------------------------------
|
||||
CMakeLists.txt | 29 +------
|
||||
src/CMakeLists.txt | 197 +-----------------------------------------
|
||||
src/kdecore/kglobal.cpp | 18 ----
|
||||
src/kdecore/klocale_kde.cpp | 4 -
|
||||
src/kdecore/kstandarddirs.cpp | 1 -
|
||||
5 files changed, 4 insertions(+), 248 deletions(-)
|
||||
5 files changed, 4 insertions(+), 245 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2d1f57a..5394b0a 100644
|
||||
index a3ea743..237b801 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -20,30 +20,11 @@ include(GenerateExportHeader)
|
||||
include(CMakeFindFrameworks)
|
||||
|
||||
set(REQUIRED_QT_VERSION 5.10.0)
|
||||
set(REQUIRED_QT_VERSION 5.7.0)
|
||||
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer)
|
||||
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network DBus Test)
|
||||
|
||||
@@ -38,7 +38,7 @@ index 2d1f57a..5394b0a 100644
|
||||
-find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED)
|
||||
-find_package(KF5Emoticons ${KF5_DEP_VERSION} REQUIRED)
|
||||
-find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
|
||||
+find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
|
||||
+ find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
|
||||
find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
|
||||
-find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
|
||||
-find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED)
|
||||
@@ -63,7 +63,7 @@ index 2d1f57a..5394b0a 100644
|
||||
endif ()
|
||||
if (APPLE)
|
||||
cmake_find_frameworks(CoreFoundation)
|
||||
@@ -153,13 +133,8 @@ install(
|
||||
@@ -151,13 +131,8 @@ install(
|
||||
|
||||
|
||||
|
||||
@@ -78,7 +78,7 @@ index 2d1f57a..5394b0a 100644
|
||||
|
||||
if (BUILD_TESTING)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index ab0b246..0751644 100644
|
||||
index ab0b246..e134bd9 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -1,6 +1,4 @@
|
||||
@@ -96,16 +96,15 @@ index ab0b246..0751644 100644
|
||||
find_package(OpenSSL)
|
||||
set_package_properties(OpenSSL PROPERTIES DESCRIPTION "Support for secure network communications (SSL and TLS)"
|
||||
URL "http://openssl.org"
|
||||
@@ -50,7 +49,7 @@ else()
|
||||
set(libkdelibs4support_SRCS solid/networking_unix.cpp)
|
||||
@@ -51,6 +50,7 @@ else()
|
||||
endif()
|
||||
|
||||
-
|
||||
|
||||
+endif()
|
||||
set(libkdelibs4support_SRCS
|
||||
${libkdelibs4support_SRCS}
|
||||
kdecore/k4aboutdata.cpp
|
||||
@@ -58,39 +57,9 @@ set(libkdelibs4support_SRCS
|
||||
@@ -58,39 +58,9 @@ set(libkdelibs4support_SRCS
|
||||
kdecore/kcurrencycode.cpp
|
||||
kdecore/kdebug.cpp
|
||||
kdecore/kdebugdbusiface.cpp
|
||||
@@ -145,7 +144,7 @@ index ab0b246..0751644 100644
|
||||
kdecore/kcalendarera.cpp
|
||||
kdecore/kcalendarsystem.cpp
|
||||
kdecore/kcalendarsystemcoptic.cpp
|
||||
@@ -115,95 +84,6 @@ set(libkdelibs4support_SRCS
|
||||
@@ -115,95 +85,6 @@ set(libkdelibs4support_SRCS
|
||||
kdecore/klocale.cpp
|
||||
kdecore/klocale_kde.cpp
|
||||
|
||||
@@ -241,7 +240,7 @@ index ab0b246..0751644 100644
|
||||
)
|
||||
|
||||
set_source_files_properties( solid/org.freedesktop.PowerManagement.xml
|
||||
@@ -211,37 +91,6 @@ set_source_files_properties( solid/org.freedesktop.PowerManagement.xml
|
||||
@@ -211,36 +92,6 @@ set_source_files_properties( solid/org.freedesktop.PowerManagement.xml
|
||||
solid/org.kde.Solid.PowerManagement.PolicyAgent.xml
|
||||
PROPERTIES NO_NAMESPACE TRUE)
|
||||
|
||||
@@ -275,11 +274,10 @@ index ab0b246..0751644 100644
|
||||
-else()
|
||||
- set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS} kdecore/klockfile_unix.cpp)
|
||||
-endif ()
|
||||
-
|
||||
|
||||
if (APPLE)
|
||||
set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS}
|
||||
kdecore/klocale_mac.cpp
|
||||
@@ -266,10 +115,6 @@ configure_file(kdecore/config-date.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-da
|
||||
@@ -266,10 +117,6 @@ configure_file(kdecore/config-date.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-da
|
||||
configure_file(kdecore/config-localization.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-localization.h)
|
||||
|
||||
|
||||
@@ -290,7 +288,7 @@ index ab0b246..0751644 100644
|
||||
check_function_exists(mmap HAVE_MMAP)
|
||||
check_symbol_exists(posix_madvise "sys/mman.h" HAVE_MADVISE)
|
||||
configure_file(config-kdelibs4support.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdelibs4support.h )
|
||||
@@ -315,32 +160,12 @@ endif()
|
||||
@@ -315,32 +162,12 @@ endif()
|
||||
|
||||
target_link_libraries(KF5KDELibs4Support
|
||||
PUBLIC
|
||||
@@ -323,7 +321,7 @@ index ab0b246..0751644 100644
|
||||
${platformLinkLibraries}
|
||||
)
|
||||
|
||||
@@ -368,27 +193,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES
|
||||
@@ -368,26 +195,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES
|
||||
)
|
||||
|
||||
|
||||
@@ -347,12 +345,11 @@ index ab0b246..0751644 100644
|
||||
-install(TARGETS kf5deprecatedwidgets DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/designer)
|
||||
-
|
||||
-##########
|
||||
-
|
||||
|
||||
add_subdirectory(pics)
|
||||
|
||||
install(TARGETS KF5KDELibs4Support
|
||||
diff --git a/src/kdecore/kglobal.cpp b/src/kdecore/kglobal.cpp
|
||||
index ac3daa6..2dcafe2 100644
|
||||
index bd2ba59..f06f73e 100644
|
||||
--- a/src/kdecore/kglobal.cpp
|
||||
+++ b/src/kdecore/kglobal.cpp
|
||||
@@ -42,7 +42,6 @@
|
||||
@@ -365,8 +362,8 @@ index ac3daa6..2dcafe2 100644
|
||||
#undef QT_NO_TRANSLATION
|
||||
@@ -50,14 +49,12 @@
|
||||
#define QT_NO_TRANSLATION
|
||||
#include <QDebug>
|
||||
#include <QTextCodec>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QTextCodec>
|
||||
-#include <unistd.h> // umask
|
||||
|
||||
// ~KConfig needs qrand(). qrand() depends on a Q_GLOBAL_STATIC. With this Q_CONSTRUCTOR_FUNCTION we
|
||||
@@ -408,17 +405,17 @@ index ac3daa6..2dcafe2 100644
|
||||
{
|
||||
return KComponentData::activeComponent();
|
||||
diff --git a/src/kdecore/klocale_kde.cpp b/src/kdecore/klocale_kde.cpp
|
||||
index dd58c73..c66bd48 100644
|
||||
index d7e45ed..278cf0c 100644
|
||||
--- a/src/kdecore/klocale_kde.cpp
|
||||
+++ b/src/kdecore/klocale_kde.cpp
|
||||
@@ -42,7 +42,6 @@
|
||||
#include <QTextCodec>
|
||||
#include <QFile>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QTextCodec>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QDebug>
|
||||
-#include <QPrinter>
|
||||
#include <QRegExp>
|
||||
#include <QLocale>
|
||||
#include <QHash>
|
||||
#include <QtCore/QRegExp>
|
||||
#include <QtCore/QLocale>
|
||||
#include <QtCore/QHash>
|
||||
@@ -485,9 +484,6 @@ void KLocalePrivate::initFormat()
|
||||
m_weekNumberSystem, KLocale::WeekNumberSystem);
|
||||
|
||||
@@ -430,7 +427,7 @@ index dd58c73..c66bd48 100644
|
||||
QString calendarType;
|
||||
readConfigEntry("CalendarSystem", "gregorian", calendarType);
|
||||
diff --git a/src/kdecore/kstandarddirs.cpp b/src/kdecore/kstandarddirs.cpp
|
||||
index f366c9d..e5ded7f 100644
|
||||
index 01560dc..344aa43 100644
|
||||
--- a/src/kdecore/kstandarddirs.cpp
|
||||
+++ b/src/kdecore/kstandarddirs.cpp
|
||||
@@ -35,7 +35,6 @@
|
||||
@@ -442,5 +439,5 @@ index f366c9d..e5ded7f 100644
|
||||
#include <config-kstandarddirs.h>
|
||||
#include <config-kdelibs4support.h>
|
||||
--
|
||||
2.14.5
|
||||
1.9.3
|
||||
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From f70a18e936616d448a56015009b8a4f0004bd9b8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Mon, 29 Oct 2018 15:12:25 +0100
|
||||
Subject: [PATCH] Hack away SSL configure check
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
it fails for -isystem <sysroot>/usr/include failure on gcc8
|
||||
|
||||
Upstream-Status: Inappropriate [cross-specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
src/ConfigureChecks.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake
|
||||
index d44aca6..689ac0e 100644
|
||||
--- a/src/ConfigureChecks.cmake
|
||||
+++ b/src/ConfigureChecks.cmake
|
||||
@@ -13,7 +13,7 @@ set( KDELIBSUFF ${LIB_SUFFIX} )
|
||||
|
||||
set(CMAKE_REQUIRED_LIBRARIES Qt5::Network)
|
||||
check_cxx_source_compiles(
|
||||
-"#include <QtNetwork/QSslSocket>
|
||||
+"class QSslSocket;
|
||||
int main()
|
||||
{
|
||||
QSslSocket *socket;
|
||||
--
|
||||
2.14.5
|
||||
|
||||
@@ -9,7 +9,6 @@ DEPENDS += " \
|
||||
kcoreaddons-native \
|
||||
ki18n-native \
|
||||
liburi-perl-native \
|
||||
gettext-native \
|
||||
"
|
||||
|
||||
SRC_URI += " \
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
require ${BPN}.inc
|
||||
|
||||
inherit gettext
|
||||
inherit cmake_lib gettext
|
||||
|
||||
DEPENDS += " \
|
||||
${BPN}-native \
|
||||
@@ -36,9 +36,6 @@ DEPENDS += " \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
|
||||
"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0004-Hack-away-SSL-configure-check.patch \
|
||||
"
|
||||
# uncomment for broken gelib getaddr / AI_PASSIVE
|
||||
#EXTRA_OECMAKE += "-DHAVE_GOOD_GETADDRINFO=OFF"
|
||||
|
||||
@@ -52,8 +49,18 @@ do_configure_append() {
|
||||
sed -i 's:${STAGING_LIBDIR_NATIVE}:${libdir}:g' ${B}/src/config-kstandarddirs.h
|
||||
}
|
||||
|
||||
# native executables
|
||||
CMAKE_ALIGN_SYSROOT[1] = "KF5KDELibs4Support, -s${_IMPORT_PREFIX}/bin, -s${KDE_PATH_EXTERNAL_HOST_BINS}"
|
||||
CMAKE_ALIGN_SYSROOT[2] = "KDELibs4, -s${_IMPORT_PREFIX}/bin, -S${STAGING_BINDIR_NATIVE}"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/k*5 \
|
||||
${datadir}/dbus-1 \
|
||||
${OE_QMAKE_PATH_PLUGINS} \
|
||||
"
|
||||
|
||||
FILES_${PN}-dbg += " \
|
||||
${OE_QMAKE_PATH_PLUGINS}/.debug \
|
||||
${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \
|
||||
${OE_QMAKE_PATH_PLUGINS}/*/.debug \
|
||||
"
|
||||
|
||||
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \
|
||||
inherit kde-kf5-porting-aids perlnative
|
||||
|
||||
PV = "${KF5_VERSION}"
|
||||
SRC_URI[md5sum] = "df51f32b53128527e6afd7db86fc3b9f"
|
||||
SRC_URI[sha256sum] = "edcc14715699f247c57303d7418014202bd0ed3b06cf9752ddd156fefeb60efa"
|
||||
SRC_URI[md5sum] = "06f6ce6072fe043b1d19a82c1e989e3b"
|
||||
SRC_URI[sha256sum] = "564e1ccb196119ab29c44cd606d0633a13875259576205a7608b5a9c80cfddb3"
|
||||
|
||||
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user