7 Commits
sumo ... rocko

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

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2020-03-05 22:35:17 +01:00
Andreas Müller
79e2668652 ladspa-sdk: remove executable permission in recipe/patches
Flags change was introduced in previous commit.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-05-19 13:25:51 +02:00
wata2ki
c1830c1411 ladspa-sdk: fix build fail in rocko
In the current recipe, the following error may occur.

ladspa-sdk/1.13-r0/temp/run.do_compile.7692: 105: export: --hash-style: bad variable name

This error seems to be due to this description of the recipe.
export LDLDFLAGS=echo ${LDFLAGS} | sed s:-Wl,::g

This patch changed to use CC instead of LD to fix this problem.

Signed-off-by: wata2ki <wata2ki@gmail.com>
2018-05-19 13:25:26 +02:00
wata2ki
d296e689ee exiv2: Fix link failure caused by lost dependency on libpthread
0001-CMakeLists.txt-do-not-find-system-thread-library-it-.patch caused the following link error.

| CMakeFiles/Makefile2:277: recipe for target 'src/CMakeFiles/exiv2.dir/all' failed
| make[1]: *** [src/CMakeFiles/exiv2.dir/all] Error 2
| ../src/libexiv2.so.26.0.0: undefined reference to `pthread_rwlock_unlock'
| ../src/libexiv2.so.26.0.0: undefined reference to `pthread_rwlock_init'
| ../src/libexiv2.so.26.0.0: undefined reference to `pthread_rwlock_rdlock'
| ../src/libexiv2.so.26.0.0: undefined reference to `pthread_rwlock_destroy'
| ../src/libexiv2.so.26.0.0: undefined reference to `pthread_rwlock_wrlock'

These link error caused by lost dependency on libpthread.
This patch disables the TRY_RUN call in the -pthread test to avoid the original error.
With this change, 0001-CMakeLists.txt-do-not-find-system-thread-library-it-.patch can be deleted.

Signed-off-by: wata2ki <wata2ki@gmail.com>
2018-05-19 13:25:13 +02:00
Andreas Müller
c6789fc33b clxclient: : Remove host paths from compiler/linker flags
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-05-07 13:37:39 +02:00
Andreas Müller
26f541be0d zita-resampler: Remove host paths from linker flags
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-05-07 13:37:28 +02:00
Andreas Müller
de5207d1e3 layer.conf: Add LAYERSERIES_COMPAT
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-04-06 20:48:31 +02:00
442 changed files with 2816 additions and 7080 deletions

2
README
View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -11,12 +11,9 @@ 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"
LAYERSERIES_COMPAT_meta-qt5-extra = "rocko"
LICENSE_PATH += "${LAYERDIR}/files/licenses"
# required for fluxbox - supplied by e.g fedora glibc-common
HOSTTOOLS_NONFATAL += "gencat"
PREFERRED_PROVIDER_zyn = "${@bb.utils.contains("DISTRO_FEATURES", "opengl", "zyn-fusion", "zynaddsubfx",d)}"

View File

@@ -0,0 +1,6 @@
PACKAGECONFIG ?= "nss ifupdown netconfig dhclient dnsmasq \
${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
wifi \
bluez5 \
modemmanager \
"

View File

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

View File

@@ -28,8 +28,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "ca6926e80afc64f8ab1b3a0adb5286e1"
SRC_URI[sha256sum] = "e544c3433350fb837570b62e14faeb1033ef31458084a819d49c630b58a6e736"
SRC_URI[md5sum] = "e9ab1b82b80b3901de35cdaf3b32267a"
SRC_URI[sha256sum] = "b13d102e06eeaf080270a710a6b82d11d444fde78f0c701ac5efca682cfb5642"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \

View File

@@ -19,10 +19,5 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "5d27fce69637836b315c9d6baf30da14"
SRC_URI[sha256sum] = "4903d58bf747e5d2898c750f179bb5539eaabcd77fbbc7a70a18dd752aaad408"
FILES_${PN} += " \
${datadir}/kservices5 \
${OE_QMAKE_PATH_PLUGINS} \
"
SRC_URI[md5sum] = "959165128d97a132b2b18d886af6c4f1"
SRC_URI[sha256sum] = "10956500e389cce6b043fbda7bdc16916cda75548f285268025d72dc5546c1be"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -19,8 +19,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "898477ec482c80eeda7784fd57bf1fe4"
SRC_URI[sha256sum] = "3bea72ffe16aac221e2ffa2f91c910b78912dca557aba4866204aa3ed85c26c9"
SRC_URI[md5sum] = "6dc086cfb23a47f46c99946f71406004"
SRC_URI[sha256sum] = "8e31695ea1ddfd58b35059d5389e5b9b401fd10294d50765a834ae81a8e6bb2d"
FILES_${PN} += " \
${datadir}/config.kcfg \

View File

@@ -36,9 +36,12 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "645ecbd2896ef47ac5ce7a7f1fd3b738"
SRC_URI[sha256sum] = "5efb4c5dc304a6d179915b6553ad0f5232dc4e6b38a9d4dbd80a72a5351e6fe4"
SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"
SRC_URI[md5sum] = "c79b7db37e9c5cd84eab7673eeb563d3"
SRC_URI[sha256sum] = "40dc96fa05cf6a09c49329cd69c9f1079b4ddb57592c9ff0e957eec6e761a439"
SRC_URI += " \
file://0001-align-paths-to-phonon.patch \
file://0002-fix-build-for-qtbase-without-session-management.patch \
"
FILES_SOLIBSDEV = "${libdir}/libdolphin*${SOLIBSDEV}"
@@ -49,3 +52,7 @@ FILES_${PN} += " \
${libdir}/libkdeinit5_dolphin.so \
${OE_QMAKE_PATH_PLUGINS} \
"
FILES_${PN}-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/.debug \
"

View File

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

View File

@@ -29,8 +29,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "06baf39ea96ece188be9157e12ce9e6c"
SRC_URI[sha256sum] = "a6f7ae038b3f7f753bec5e99e9b257225f48000cc4b1d5d0ce3bb3d3beb51b08"
SRC_URI[md5sum] = "6352cbdc575a4b0da1eabce763d24602"
SRC_URI[sha256sum] = "448725522965fd06779034fad9342526d9a1ac88c3ac5ea7b73e7cefc089b4c8"
CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE"

View File

@@ -21,8 +21,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "5973b0176f48e80a52ea1eca33ec4bc7"
SRC_URI[sha256sum] = "69de0bafa3e407cc6c9b52cb942cbb414db526fee7e99154498f7e821fc0a6f3"
SRC_URI[md5sum] = "3d00b1ca499e4bc55d71aa7ee21f6c7c"
SRC_URI[sha256sum] = "ceaa8441d94651e665790af6cb419bf39b34b7246f4848b070a8a2dde78a1bcd"
SRC_URI += " \
file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \
"

View File

@@ -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] = "fa563c48468f03dcc6be6605402ccc7c"
SRC_URI[sha256sum] = "5898f962dfde9f124c9967c75581c2e2d8015fecac765f1c3470edb7f97ddf1a"
FILES_${PN} += " \
${datadir}/config.kcfg \
${datadir}/icons \
${datadir}/kxmlgui5 \
"

View File

@@ -25,8 +25,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "702ea798307dbb07f7216df928c1be78"
SRC_URI[sha256sum] = "d4b22bd4a3935c84e9aaa7eb8437ee43df12efe07200ff3b1f554020ef5169db"
SRC_URI[md5sum] = "c0e224d49d0e80e5f1e24f43de81920d"
SRC_URI[sha256sum] = "3987dcfbfaea60130d98d7708f7c0f468eec3efff6f45241aeb08751882aff0d"
SRC_URI += " \
file://0001-Set-Kipi-package-properties.patch \
@@ -39,7 +39,6 @@ FILES_${PN} += " \
${datadir}/k*5 \
${datadir}/icons \
${datadir}/solid \
${datadir}/kconf_update \
${OE_QMAKE_PATH_PLUGINS} \
"

View File

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

View File

@@ -34,8 +34,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "4a825ea7da1e8102031d82f99576399e"
SRC_URI[sha256sum] = "c7fc7ebab1c9ce8933bcf6bf6fc265e20b3a858a21d379ae7259b34f5dbe2cd2"
SRC_URI[md5sum] = "4c6c8a35d1293f04c00bea822367837b"
SRC_URI[sha256sum] = "e5b6a3ccb688ee358dadbcca86c0060a481ff60a81a472865429beba6bea2a10"
SRC_URI += " \
file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \

View File

@@ -27,8 +27,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "afebac9c1ac7e77aa281ef72ef44919b"
SRC_URI[sha256sum] = "9ad461b3470eab3c5d8c59af41ecbccf042265ae628de850a094ab8c5f8ea91d"
SRC_URI[md5sum] = "a60927adb222fbd1c1c1482a3c03cd5d"
SRC_URI[sha256sum] = "54b689973be0690bec5412f6198750bcfa63e71c5435543e6683e96705444cd2"
SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch"
FILES_${PN} += " \

View File

@@ -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] = "0a9e9609035e68add688d47e3d4e66ed"
SRC_URI[sha256sum] = "41451d1e296b83cd82591e84b0a81917187e258f20eab6e44a08b435aefbddde"
FILES_${PN} += " \
${datadir}/config.kcfg \
${datadir}/icons \
${datadir}/kxmlgui5 \
"

View File

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

View File

@@ -22,8 +22,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "d2aca9d304748cb5c1434f146446db1d"
SRC_URI[sha256sum] = "66494c778cad6a422136cca755f04f79bf31854bdcd4d940347ed2c47c5b6d11"
SRC_URI[md5sum] = "6bd85ec27c474fd9c67e775e3fb6d5e3"
SRC_URI[sha256sum] = "124d2cb3cad885fa948d17d485ceb406c782d2d456e18917128508aae5c49970"
FILES_SOLIBSDEV = ""

View File

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

View File

@@ -31,13 +31,12 @@ DEPENDS += "\
kiconthemes \
kdoctools-native \
xapian-core \
purpose \
shared-mime-info-native \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "4cda25856cd790a5e9c1face9f2be7c5"
SRC_URI[sha256sum] = "43247d070e6898c26271235b915b45422ee8668e512f38f6df711e5571dca019"
SRC_URI[md5sum] = "b2d2571e20547d54fe7b7108882e7e8d"
SRC_URI[sha256sum] = "371f860365d01c4c0aebe931354cc99a646d44f17e6846c93ee2c002258f503e"
SRC_URI += " \
file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \

View File

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

View File

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

View File

@@ -28,8 +28,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "7a9b73167ce946a011673f8f60c6ec20"
SRC_URI[sha256sum] = "5e251e62c52260424c023989eb51eb4f2e805722b5536f881925151e74487cfa"
SRC_URI[md5sum] = "533d441f6c4bc76b581eb4ffc5f17d1d"
SRC_URI[sha256sum] = "f6c41fbc299bd3a4e9723e72903a0c88f443045e3695bfa3ca2ea6a831cfb07c"
SRC_URI += " \
file://0001-fix-build-for-qtbase-without-session-management.patch \

View File

@@ -49,8 +49,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "39eb2427a4af8b12457a8214590406f0"
SRC_URI[sha256sum] = "764cb0e970da6df0e775d8eb793930005e893e8a2093fdb4a54ef36fc4ffaacc"
SRC_URI[md5sum] = "7b21d27f91c3da8147b962d0c805130d"
SRC_URI[sha256sum] = "7ad2df61267c274507b1ee8d592ba829ca7e60efda4a16ba301dabb26102d1c5"
# gperf creates hard #line links
do_install_prepend() {

View File

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

View File

@@ -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] = "bd68f0c992a83443d2e8a7553a13b4b7"
SRC_URI[sha256sum] = "2bf392334c9c9a2fd07326a562b65fd03f526899ab72eef53adb8bd925ead451"
FILES_${PN} += " \
${datadir}/config.kcfg \
${datadir}/icons \
${datadir}/kxmlgui5 \
"

View File

@@ -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] = "5ea8467d386e1137405cbebdd984d74e"
SRC_URI[sha256sum] = "d6a312be8e3d0c13bc5b14d33f2177b54c9f22cfdfbbd7ea4e6e82cb688b0e7c"
FILES_${PN} += " \
${datadir}/icons \
${datadir}/knotifications5 \
"

View File

@@ -33,8 +33,8 @@ PACKAGECONFIG = "pulseaudio"
PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "cc77bb8af8cfdec36a3666296ec1c9b7"
SRC_URI[sha256sum] = "f075a162cc8b0d7f06cea2727159a75f76480ac8d8769250e3d2085d6f2b9420"
SRC_URI[md5sum] = "57de2ce3a71057563465c404e3b000ef"
SRC_URI[sha256sum] = "b7260ae4a24571fec63aae2417c444b5a7e102e45dc1c834e60f0691718ddc89"
SRC_URI += "file://0001-Fix-build-with-QT_NO_SESSIONMANAGER-set.patch"

View File

@@ -29,8 +29,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "288c52f48ed3ae35d9e245d1b43a7aa3"
SRC_URI[sha256sum] = "f1e2e5d0bb1086037517c691c6bfb1159c7dd9ef86eccadba29485a810eb085c"
SRC_URI[md5sum] = "09eea0db733a7fc1d13da924e46673bc"
SRC_URI[sha256sum] = "1c0df432c88140c26d3e379a79b99d4c4c71dc75f492d9c6e36bba1ea71f6d97"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -35,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] = "5273faf4b6fb3ecce8df30620cf84b2c"
SRC_URI[sha256sum] = "e778feebc01850e3965f5b2e173011c1b0205ea6d3d98e0045b17f74fc4c21dc"
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 \
"

View File

@@ -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] = "89d1f7917d73e21363ad05c12a22919a"
SRC_URI[sha256sum] = "b4ba00d0d90ccb60a8b9328d22f0ce31413abe8a4ead775d712b8a5b2355a936"
FILES_SOLIBSDEV = ""
FILES_${PN} += " \
${datadir}/config.kcfg \
${datadir}/icons \
${datadir}/mime \
${datadir}/kxmlgui5 \
${libdir}/libkcardgame.so \
"

View File

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

View File

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

View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
file://COPYING-CMAKE-SCRIPTS;md5=3775480a712fc46a69647678acb234cb \
"
inherit kde-apps python3native gtk-icon-cache
inherit kde-apps gtk-icon-cache
DEPENDS += " \
qtmultimedia \
@@ -34,9 +34,10 @@ DEPENDS += " \
SRC_URI = " \
${KDE_MIRROR}/stable/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
file://0001-fix-build-with-GLES2-only.patch \
"
SRC_URI[md5sum] = "ec8933f055944598fd05a331929d8776"
SRC_URI[sha256sum] = "78792df8165b986b806dcf9960a2679f683f2263e06f3ad5a24b0f78d8f27ed5"
SRC_URI[md5sum] = "eb3224bbf09b7b88364c6308cd5a5d18"
SRC_URI[sha256sum] = "bec04e3392e9b311477c5c6a50e2201b43a3afda91d9b24a0fc8e3399585865d"
OECMAKE_GENERATOR="Unix Makefiles"
@@ -58,5 +59,4 @@ FILES_${PN} += " \
${datadir}/icons \
${datadir}/kritaplugins \
${libdir}/kritaplugins \
${OE_QMAKE_PATH_QML}/org/krita \
"

View File

@@ -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] = "ab108dd971638e8ec848c56dd2a55b37"
SRC_URI[sha256sum] = "2da6dd1cca5e647762e0929faa68373075473d2c76917ebd0d452da097698739"
FILES_${PN} += " \
${datadir}/icons \
${datadir}/kxmlgui5 \
"

View File

@@ -22,7 +22,7 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "719e43ff75f842155895b9a82cb5bb04"
SRC_URI[sha256sum] = "5001b0f54d253d1142f8794eb18a020331785abbb61cdeaedd0344c85546bed4"
SRC_URI[md5sum] = "540d4f44309d8fdbadec063a52d9aaec"
SRC_URI[sha256sum] = "991203b77c322f7a56f73b2ae381c3b57ebc9c913b5dc0a98898f681796cd252"
FILES_${PN} += "${datadir}/kxmlgui5"

View File

@@ -24,8 +24,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "e1ba8dfe67e19dd9b6587cfa1b6f7190"
SRC_URI[sha256sum] = "c958c4b43257f6874de35f998c25cf93a4c13f7e1c1ddb0883c622d30889d983"
SRC_URI[md5sum] = "44da3a1ce114df919edb8b94dfa8c8bd"
SRC_URI[sha256sum] = "a129051f2f93baaecbde8c302ff528a1d4218da8ca27caadd6befa12baa69ad3"
SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch"
FILES_${PN} += " \

View File

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

View File

@@ -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] = "f2a8fd28722ab63d3bc6cbb9ec58af91"
SRC_URI[sha256sum] = "b726904c8f3bc009a646cc8fa0f3a954af021f8e3e4221c186dcca079185352a"
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"

View File

@@ -13,5 +13,5 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "81813d4cff8cdd7dead94db7d67127ae"
SRC_URI[sha256sum] = "dd146eebd1e0eea7e6a20ebd66b7d9ac2c79cc573de39faf6d34efaafb9bf376"
SRC_URI[md5sum] = "60112edfec27a3f31dbed12067c1052b"
SRC_URI[sha256sum] = "cc02d7bfef7fed0f35ea5e1467e6d67939ca0bf2ca5551169cc4e7b11b2de286"

View File

@@ -44,8 +44,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "201e19f3006c86a65f01e593c8960c58"
SRC_URI[sha256sum] = "e0bca02674c5e961db17e8225affc689c437ab78eabcd620a1e38ee7b1d583ca"
SRC_URI[md5sum] = "e8fde2ad87216cbd29002786c0de29e9"
SRC_URI[sha256sum] = "6d12bf8f389e07dc8cd8681e61757c817082ffb5e9e409e488a17da9dae501ce"
FILES_${PN} += " \
${datadir}/carddecks \

View File

@@ -13,5 +13,5 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "2d33323dad9db0484a4ca9c7f43e2910"
SRC_URI[sha256sum] = "4d4171c3da949c7a0c6109f32f156237ccaff52cdb8bef2da9a96e2a1a2fb031"
SRC_URI[md5sum] = "1ec4ef8f065ac034669158b498682a64"
SRC_URI[sha256sum] = "8f8ea9817ca16df2736925e6f0c4fd5b4c1dbe5eb8eb209c760a75625bc2f9f7"

View File

@@ -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] = "1954b6613fc2f7f9f0dacb8fdc9874c1"
SRC_URI[sha256sum] = "037978ed877bea9d20a00a8da1870df3fe528bd7d9d50441a80f60ced53efb77"
FILES_${PN} += " \
${datadir}/kmahjongglib \
"

View File

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

View File

@@ -31,8 +31,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "aff6a8dedc3ac27e56c3a572be2d72e3"
SRC_URI[sha256sum] = "6e73764dd87fff112699b03653a93c92e4c87aba0305cf64280af00c9c6d8cfa"
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"

View File

@@ -21,8 +21,8 @@ DEPENDS += "\
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "b76d3bb56c3af835e7768de0205ebd62"
SRC_URI[sha256sum] = "e6f97a131ca13118064da667568842202fefa1d8b8b6bdcdcb5c84f46252743f"
SRC_URI[md5sum] = "8ac3c50c3f1b885253fee172c81cc2ce"
SRC_URI[sha256sum] = "0bf1f32fedb3345a7bf3fba715fc670edf442c53cc150a30f43311bde66519aa"
FILES_${PN} += " \
${datadir}/kxmlgui5 \

View File

@@ -32,7 +32,7 @@ DEPENDS += " \
shared-mime-info-native \
"
PV = "17.12.3"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "780530d53715ef8d579d7262b7eb823c"
SRC_URI[sha256sum] = "64b2d5264ac3b2e8010cbcf58fe03c567d4e44684a4fcd6e135eb14007da9a0f"

View File

@@ -36,8 +36,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "12b5b11d7e96d4679168e1e8d6d00b77"
SRC_URI[sha256sum] = "f6a27b9b2707358dfed713458ed52cb1ac7dbc48ce3c06bfe04dd0b036809c87"
SRC_URI[md5sum] = "7b8d91f781d0e46da097d853d4a0ed8c"
SRC_URI[sha256sum] = "0a12549c2d90c13b8fa0838707924596eb12981bffc3a5b81410785a4e9e061d"
FILES_${PN} += " \
${datadir}/k*5 \

View File

@@ -21,7 +21,6 @@ DEPENDS += " \
kio \
kxmlgui \
kwindowsystem \
knewstuff \
"
# REVISIT optionals
@@ -31,8 +30,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "116f1486cea897e98d441b856ba52d7a"
SRC_URI[sha256sum] = "79ea0e535e168ff42ee63a6e784780649cd1ea4749ff677f68542651d4c782bd"
SRC_URI[md5sum] = "563558fe7fea33fdea9f8ee29c9ff4ca"
SRC_URI[sha256sum] = "d93346f99dbbd7d36b7b140bdf37e0bd2e24a29af817a28045483da1bd39e989"
FILES_${PN} += " \
${datadir}/dbus-1 \

View File

@@ -32,8 +32,8 @@ DEPENDS += " \
"
PV = "${KDE_APP_VERSION}"
SRC_URI[md5sum] = "8753e0cb30a18c6365cd3f6b29797495"
SRC_URI[sha256sum] = "fd86383873d24a4d1a23ee2ce57d5264c51697c405745b385250ead80c154967"
SRC_URI[md5sum] = "30de7ed79be25707424ac1c0aa776307"
SRC_URI[sha256sum] = "20c36aaf4c7e7ace87c56839d7c5a1fbadab5b244d92d2f17d1bab8475e47848"
EXTRA_OECMAKE += "-DBUILD_KF5=1"

View File

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

View File

@@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
inherit kde-kf5-porting-aids perlnative
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "01ba726dc3fc0c440f9adacf66cb5681"
SRC_URI[sha256sum] = "e096be7f08a6e9f765bd0aa5ddd9e2ab6e048fac1081e95bdfd2394ea29ff114"
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"

View File

@@ -25,7 +25,7 @@ index a3ea743..237b801 100644
@@ -20,30 +20,11 @@ include(GenerateExportHeader)
include(CMakeFindFrameworks)
set(REQUIRED_QT_VERSION 5.8.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)

View File

@@ -9,7 +9,6 @@ DEPENDS += " \
kcoreaddons-native \
ki18n-native \
liburi-perl-native \
gettext-native \
"
SRC_URI += " \

View File

@@ -1,6 +1,6 @@
require ${BPN}.inc
inherit gettext
inherit cmake_lib gettext
DEPENDS += " \
${BPN}-native \
@@ -49,6 +49,10 @@ 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 \

View File

@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \
inherit kde-kf5-porting-aids perlnative
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "22f9b04aebae7ddbf3fe5d3bfd93e541"
SRC_URI[sha256sum] = "112a8e541e173f1d737a57781575c7cb37ea025eaebee5085fd4187a0e03e7b3"
SRC_URI[md5sum] = "06f6ce6072fe043b1d19a82c1e989e3b"
SRC_URI[sha256sum] = "564e1ccb196119ab29c44cd606d0633a13875259576205a7608b5a9c80cfddb3"
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"

View File

@@ -37,8 +37,8 @@ DEPENDS += " \
"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "b854adbf8ef148a426f079055e16b182"
SRC_URI[sha256sum] = "c4f819588a5eb8c5abf875491ee7741cc162ac75ff726fd8abf91183df15354d"
SRC_URI[md5sum] = "15d93ed792c702a26894b74fa2d77180"
SRC_URI[sha256sum] = "f7f5b8d64e93815a65a4491b7bb5deb4846357e815c168d4310060ee1848f0ea"
do_compile_append() {
# gperf-native sets absolut debug comments/links in header

View File

@@ -16,5 +16,5 @@ DEPENDS += " \
"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "7025261ab8657c34b8110fd1419a6bc4"
SRC_URI[sha256sum] = "15403504c1140b35a43e26bddfc95ccdf95787a0236e6c7d2b0e3853dd94ad61"
SRC_URI[md5sum] = "c64352754c44f51a31e1a19c8c3ed36b"
SRC_URI[sha256sum] = "f3be43e553ce3a944ffe67b3cab704335bad70880854c02eedd4bbd29dbde134"

View File

@@ -25,8 +25,8 @@ DEPENDS += "\
"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "7297399799ef96f2a29b9e35c0dc57a7"
SRC_URI[sha256sum] = "bf61a292f7d1581f5feecf40ec8b7d08a6e8001d6c0ecdf8987cba9488639fa4"
SRC_URI[md5sum] = "55e651830e0e04b0e6a53be5790fc844"
SRC_URI[sha256sum] = "1bb3d0eebc3d0d069deda77010e923f2d06205ed8eba0960c41910fcc66302bf"
FILES_${PN} += " \
${OE_QMAKE_PATH_PLUGINS} \

View File

@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
inherit kde-kf5
SRC_URI[md5sum] = "1b9a8d7fa78f14df0395d6533e07c233"
SRC_URI[sha256sum] = "f60d6a737c5365de45eab19ada6413156123138528fff5a795fefba4a1a20cc7"
SRC_URI[md5sum] = "11096d84cbb73669df7435736f91ee72"
SRC_URI[sha256sum] = "4376a1910477b3e0e2b6dae904ce53576a2d4d0bab616413d3a5b5c2f29882a9"
PV = "${KF5_VERSION}"

View File

@@ -7,8 +7,8 @@ inherit kde-kf5
DEPENDS += "qtdeclarative"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "e311eee50522f739951b0fec7add2374"
SRC_URI[sha256sum] = "2dab323fedc04b971081ef29bd42003e6e9be3a8c109edcf42594f51f8c1f655"
SRC_URI[md5sum] = "1a55fbb9b663e8e752d58406f2e5a20f"
SRC_URI[sha256sum] = "bb73134db489fab1adde6e6f26a4298b07a36dfb3edba1671c01f3c3e0809f14"
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"

View File

@@ -1,10 +0,0 @@
require ${BPN}.inc
inherit native
SRC_URI += "file://0002-build-native-qrcAlias-only.patch"
do_install() {
install -d ${D}/${bindir}
install -m 755 ${B}/bin/qrcAlias ${D}/${bindir}/
}

View File

@@ -1,16 +1,19 @@
require ${BPN}.inc
SUMMARY = "Breeze icon theme"
LICENSE = "LGPLv2.1 & LGPLv3"
LIC_FILES_CHKSUM = " \
file://COPYING-ICONS;md5=3e7f6a3da5801872be1084a978cfc0eb \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 gtk-icon-cache
SRC_URI[md5sum] = "78b4d77f4b183f0db4111ed176d7a416"
SRC_URI[sha256sum] = "efa5fe1ac1bd8716c9bc0c952709b63f2052daae528f15156a8d6c9e6fc5cd16"
PV = "${KF5_VERSION}"
DEPENDS += " \
${BPN}-native \
kiconthemes \
"
SRC_URI += "file://0003-Find-native-qrcAlias.patch"
FILES_${PN} += "${datadir}/icons"
PACKAGES =+ "${PN}-binres"
FILES_${PN}-binres = " \
${datadir}/icons/breeze/breeze-icons.rcc \
${datadir}/icons/breeze-dark/breeze-icons-dark.rcc \
"

View File

@@ -1,14 +0,0 @@
SUMMARY = "Breeze icon theme"
LICENSE = "LGPLv2.1 & LGPLv3"
LIC_FILES_CHKSUM = " \
file://COPYING-ICONS;md5=3e7f6a3da5801872be1084a978cfc0eb \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
"
inherit kde-kf5 gtk-icon-cache
SRC_URI[md5sum] = "aa29fe929300b41c44be52b9ee8a9e9c"
SRC_URI[sha256sum] = "f0b26f538905175ce763089b00c91d0be95278ac4b5085116d66530c2110069d"
SRC_URI += "file://0001-Force-build-of-Qt-binary-resource-files.patch"
PV = "${KF5_VERSION}"

View File

@@ -1,31 +0,0 @@
From f2a47f18e8f15fcf78e9d3bab29a5f553cd461e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 28 Jun 2018 00:06:30 +0200
Subject: [PATCH] Force build of Qt binary resource files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [cross 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 ffc718b..f76650a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ else()
set(BINARY_ICONS_RESOURCE_OPTION_DEFAULT ON)
endif()
-option(BINARY_ICONS_RESOURCE "Install Qt binary resource files containing breeze icons (breeze-icons.rcc, breeze-icons-dark.rcc)" ${BINARY_ICONS_RESOURCE_OPTION_DEFAULT})
+option(BINARY_ICONS_RESOURCE "Install Qt binary resource files containing breeze icons (breeze-icons.rcc, breeze-icons-dark.rcc)" ON)
option(SKIP_INSTALL_ICONS "Skip installing the icons files" OFF)
if(BINARY_ICONS_RESOURCE)
--
2.14.3

View File

@@ -1,31 +0,0 @@
From 2edcfaf8e189ac569192f48ed00aa0e13fc79962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 28 Jun 2018 00:41:48 +0200
Subject: [PATCH] build native qrcAlias only
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [cross specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
CMakeLists.txt | 4 ----
1 file changed, 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f76650a..3c67d5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,8 +84,4 @@ if(NOT WIN32)
endif()
endif()
-add_subdirectory(autotests)
-add_subdirectory(icons)
-add_subdirectory(icons-dark)
-
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES INCLUDE_QUIET_PACKAGES)
--
2.14.3

View File

@@ -1,31 +0,0 @@
From 27d2ed89920a1910f7c42dd2ecfb86ddbe5a244c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 28 Jun 2018 00:57:32 +0200
Subject: [PATCH] Find native qrcAlias
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [cross 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 3c67d5b..63c3c00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ function(generate_binary_resource target outfile)
${RESOURCES_WORKING_DIR}/.gitignore
${RESOURCES_WORKING_DIR}/CMakeLists.txt
COMMAND ${QT_RCC_EXECUTABLE} --project -o ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc
- COMMAND $<TARGET_FILE:qrcAlias> -i ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc -o ${RESOURCE_FILE}
+ COMMAND qrcAlias -i ${CMAKE_CURRENT_BINARY_DIR}/tmp.qrc -o ${RESOURCE_FILE}
WORKING_DIRECTORY ${RESOURCES_WORKING_DIR}
DEPENDS breeze-${target}-mkdir
--
2.14.3

View File

@@ -0,0 +1,30 @@
From 39b270db699edb25293c49fe8904a810534c48b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 16 Dec 2015 21:03:20 +0100
Subject: [PATCH] avoid autotests
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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d1f96d..92eec98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,6 @@ ecm_setup_version(${KF5_VERSION}
SOVERSION 5)
add_subdirectory(src)
-add_subdirectory(autotests)
add_subdirectory(tests)
--
2.5.0

View File

@@ -1,3 +1,7 @@
require ${BPN}.inc
SRC_URI += " \
file://0001-avoid-autotests.patch \
"
inherit native

View File

@@ -10,7 +10,5 @@ inherit kde-kf5
DEPENDS += "bzip2 xz zlib"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "541071a7a336ca167d66b6bee5bb98a0"
SRC_URI[sha256sum] = "c0d6df96d86d2a8f21e3c3f67200755eabd5a86efc3d72b56f522fa11ae62fdc"
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
SRC_URI[md5sum] = "ab8e11f4556a52634299305a0b8894b5"
SRC_URI[sha256sum] = "b2d8d8e945515870b363ad98ac90a94103056afd5d7c57d5148b12a673b2bb02"

View File

@@ -10,8 +10,8 @@ inherit kde-kf5
DEPENDS += "gperf-native"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "3189f9540de1bcf93edeef7fc8fdb853"
SRC_URI[sha256sum] = "df0ed5de74ac1c0edd0fee75b4c7bafd7bce864891b69c142c2c4ba7df306a1f"
SRC_URI[md5sum] = "0cfc73368e2d205dafa96a0f8edeff06"
SRC_URI[sha256sum] = "53b227c3cad6e359c85d00b17fccd79cb0ff4bb3221b998bb1e8cba9841bdb95"
do_compile_append() {
# gperf-native sets absolut debug comments/links in header

View File

@@ -0,0 +1,32 @@
From ccaed10501ee608b1c3ea795a3a12e93ecca938d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 1 Feb 2017 17:51:27 +0100
Subject: [PATCH] make autotests optional by BUILD_TESTING
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8cc674..94d0295 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,9 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KCONFIG
add_subdirectory(src)
+if(BUILD_TESTING)
add_subdirectory(autotests)
+endif()
include (ECMPoQmTools)
if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
--
2.7.4

View File

@@ -7,12 +7,13 @@ LIC_FILES_CHKSUM = " \
inherit kde-kf5 cmake_lib
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "57f6c446d29483fb2cfb285eb956a91b"
SRC_URI[sha256sum] = "4e3f2b98fd15fa9c90763fe6fca79f75324f1aee6efa81af2d19a24c6d666331"
SRC_URI[md5sum] = "aef7a5956f1693100edd3cf8663c4d44"
SRC_URI[sha256sum] = "b5b2b3cb0f8e773b7537a09cc4e6bdbe37e0884acb8e60dc8488670a993cd4ed"
# REVISIT remove ugly hack for wayland-only environments
SRC_URI += " \
file://0001-kconfiggui-do-only-compile-in-case-sessions-are-aval.patch \
file://0002-make-autotests-optional-by-BUILD_TESTING.patch \
"
EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"

View File

@@ -7,5 +7,5 @@ LIC_FILES_CHKSUM = " \
inherit kde-kf5 mime
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "2e5cd09584c276416d56f66b8b3ee97b"
SRC_URI[sha256sum] = "12afb12f79505614f6d5624d6c39b90b5fc39e4b1b5ddb2203622bbeb6144203"
SRC_URI[md5sum] = "febd7644ebb1607da20381494929f567"
SRC_URI[sha256sum] = "b4c57b5a49157a78dc39ed642e4d7d748e86c11852b7c0251ee8aa67c4509d53"

View File

@@ -11,5 +11,5 @@ DEPENDS += " \
"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "a496b86727152d8b59ed2a2228003ac2"
SRC_URI[sha256sum] = "70c5e439c2ecfa56ef0d65492ad77fd85fea7ea47fe2efa4e76e8eeb5cced5ba"
SRC_URI[md5sum] = "9049781e1906ed6513ab26c768cc9b6e"
SRC_URI[sha256sum] = "6f7e8ccb12f243fadb881b7b958000081b89ee115b43d5a0d067e7b9a3b76795"

View File

@@ -10,5 +10,5 @@ inherit kde-kf5
DEPENDS += "avahi"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "19c1372fb1a702f57c66cf5803049d50"
SRC_URI[sha256sum] = "d93971a066e435769eb530498d20f930e29ad0e0ce3cf4a0b62ac6d0458bc1d8"
SRC_URI[md5sum] = "67b0c4f58cbb2f26c2bf4be4a14752c7"
SRC_URI[sha256sum] = "24be6b134f80cbf11f1a15568e3022bf005ebe8fcf4202d9755c9e680f1da4a3"

View File

@@ -12,5 +12,5 @@ DEPENDS += " \
"
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "4a733f7fb98fb936d74a688fe9959dd7"
SRC_URI[sha256sum] = "b393163c4ca80f08126d9601e70d2a705fdb157e6dd1c4188d7bfb5be86872fe"
SRC_URI[md5sum] = "9e75318f5ec29b0901be343d8924542f"
SRC_URI[sha256sum] = "ace931f71cb7cf688c3ac0504b2eae129b4f0571dbd2ed2b8b9ac6335714f4da"

View File

@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \
inherit kde-kf5
SRC_URI[md5sum] = "ba7bac91aeeddb03631dd12b6d44f9e2"
SRC_URI[sha256sum] = "b7e9cdc3aed84ce898071390804d32e03415f43de3f06615d8818fa931898479"
SRC_URI[md5sum] = "730a77d2873dd3b9cc975f8bb12cf66a"
SRC_URI[sha256sum] = "22a0951cbd2a73eb332f76d6f71fcbbc770aeb0d530987017c2640caa6ed9f8c"
PV = "${KF5_VERSION}"

View File

@@ -0,0 +1,48 @@
From 1f7e6c3b0bbbb25e83550739692e857fc5d7ea84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 5 Jan 2015 13:39:45 +0100
Subject: [PATCH 2/2] CMakeLists.txt: do not search for libintl / gettext
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>
---
CMakeLists.txt | 6 ------
cmake/KF5I18NMacros.cmake | 1 -
2 files changed, 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 875ceb4..a50e083 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,12 +39,6 @@ include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
-find_package(LibIntl)
-set_package_properties(LibIntl PROPERTIES TYPE REQUIRED
- URL "http://gnuwin32.sourceforge.net/packages/libintl.htm"
- PURPOSE "Needed for building KI18n unless glibc is the system libc implementation"
-)
-
# usually is called using find_package(KF5I18n),
# KF5I18NMacros.cmake needs to know the scripts directory
set(KF5I18n_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake)
diff --git a/cmake/KF5I18NMacros.cmake b/cmake/KF5I18NMacros.cmake
index 022de52..95ce68a 100644
--- a/cmake/KF5I18NMacros.cmake
+++ b/cmake/KF5I18NMacros.cmake
@@ -25,7 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
-find_package(Gettext REQUIRED)
find_package(PythonInterp REQUIRED)
set(_ki18n_pmap_compile_script ${CMAKE_CURRENT_LIST_DIR}/ts-pmap-compile.py)
--
2.9.3

View File

@@ -1,31 +0,0 @@
From ddf59b7c75744cb4bd3d305fcf0c70dff2bfe46c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 25 Apr 2018 22:55:13 +0200
Subject: [PATCH] Do not force my native depends to find gettext
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>
---
cmake/KF5I18nMacros.cmake.in | 2 --
1 file changed, 2 deletions(-)
diff --git a/cmake/KF5I18nMacros.cmake.in b/cmake/KF5I18nMacros.cmake.in
index 3824acb..151d964 100644
--- a/cmake/KF5I18nMacros.cmake.in
+++ b/cmake/KF5I18nMacros.cmake.in
@@ -25,8 +25,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
-find_package(Gettext REQUIRED)
-
# The Python executable used for building ki18n will be used as a fallback
# solution if it cannot be found in $PATH when building applications.
set(_KI18N_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@")
--
2.14.4

View File

@@ -1,51 +0,0 @@
From 19e25a85ac0c35653546be6633502941768a5206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 3 Aug 2018 11:30:05 +0200
Subject: [PATCH] Do not hardcode python path - it points to sysroot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded-specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
cmake/KF5I18nMacros.cmake.in | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/cmake/KF5I18nMacros.cmake.in b/cmake/KF5I18nMacros.cmake.in
index 7e99468..5099fb2 100644
--- a/cmake/KF5I18nMacros.cmake.in
+++ b/cmake/KF5I18nMacros.cmake.in
@@ -27,10 +27,6 @@
find_package(Gettext REQUIRED)
-# The Python executable used for building ki18n will be used as a fallback
-# solution if it cannot be found in $PATH when building applications.
-set(_KI18N_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@")
-
find_program(KI18N_PYTHON_EXECUTABLE NAMES python3 python2 python)
if(NOT KI18N_PYTHON_EXECUTABLE)
set(KI18N_PYTHON_EXECUTABLE "${_KI18N_PYTHON_EXECUTABLE}")
@@ -128,7 +124,7 @@ function(KI18N_INSTALL podir)
add_custom_target(tsfiles-${pathmd5} ALL
COMMENT "Generating ts..."
COMMAND ${CMAKE_COMMAND}
- -DPYTHON_EXECUTABLE=${KI18N_PYTHON_EXECUTABLE}
+ -DPYTHON_EXECUTABLE=python3
-D_ki18n_pmap_compile_script=${_ki18n_pmap_compile_script}
-DCOPY_TO=${CMAKE_CURRENT_BINARY_DIR}/${dirname}
-DPO_DIR=${absolute_podir}
@@ -171,7 +167,7 @@ function(KI18N_INSTALL_TS_FILES lang scripts_dir)
set(pmapc_basename "${pmap_basename}c")
set(pmapc_file "${lang}-${subpath}-${pmapc_basename}")
add_custom_command(OUTPUT ${pmapc_file}
- COMMAND ${KI18N_PYTHON_EXECUTABLE}
+ COMMAND python3
ARGS
-B
${_ki18n_pmap_compile_script}
--
2.14.4

View File

@@ -3,8 +3,8 @@ require ${BPN}.inc
inherit native
SRC_URI += " \
file://0001-do-not-install-po-files-for-native-build.patch \
file://0002-Do-not-force-my-native-depends-to-find-gettext.patch \
file://0001-CMakeLists.txt-do-not-search-for-libintl-gettext.patch \
file://0002-do-not-install-po-files-for-native-build.patch \
"
EXTRA_OECMAKE += "-DBUILD_WITH_QTSCRIPT=OFF -DBUILD_TESTING=OFF"

View File

@@ -2,10 +2,9 @@ require ${BPN}.inc
inherit pythonnative
SRC_URI += "file://0003-Do-not-hardcode-python-path-it-points-to-sysroot.patch"
# revisit python?
DEPENDS += "${BPN}-native gettext-native qtscript qtdeclarative"
FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/kf5"
RDEPENDS_${PN}-dev += "python3"
FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/kf5/.debug"

View File

@@ -8,5 +8,5 @@ LIC_FILES_CHKSUM = " \
inherit kde-kf5
PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "a04e3c5b5c23c273fbdbdb3dea8fc0a1"
SRC_URI[sha256sum] = "5f4a54e755990104537729f4c26e054f146cd20acdd5e90cfd8558ab7a6e99c4"
SRC_URI[md5sum] = "f4a2c3a3d9f3951fe5a2ced112c25caa"
SRC_URI[sha256sum] = "8cdd6337798a6382b25933f9ad89f4bf9082c18bed03acb5cfbd163d5124e2e5"

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