aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2020-08-15 18:45:49 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2020-08-15 18:47:15 +0000
commit6bd7a5b0da4ff89406e4e50f71687305c224b570 (patch)
treea0320a2d8e96dacdc7a908d261bb3d49d5d0279b
parentf5a97d6ce8debabe70b3b504bab3a60dd03ea19a (diff)
downloadaports-6bd7a5b0da4ff89406e4e50f71687305c224b570.tar.gz
aports-6bd7a5b0da4ff89406e4e50f71687305c224b570.tar.bz2
aports-6bd7a5b0da4ff89406e4e50f71687305c224b570.tar.xz
testing/libmlocale: disable werror
Qt 5.15 deprecated some features and -Werror=deprecated-declerations is enabled, causing these deprecated warnings to turn into errors. This is someting upstream should fix. In the meantime, disble -Werror to fix the build for now.
-rw-r--r--testing/libmlocale/APKBUILD7
-rw-r--r--testing/libmlocale/disable-werror.patch26
2 files changed, 31 insertions, 2 deletions
diff --git a/testing/libmlocale/APKBUILD b/testing/libmlocale/APKBUILD
index 55d2b28a26..0efe95a244 100644
--- a/testing/libmlocale/APKBUILD
+++ b/testing/libmlocale/APKBUILD
@@ -10,7 +10,9 @@ license="LGPL-2.1-only"
depends_dev="libexecinfo-dev icu-dev"
makedepends="$depends_dev qt5-qtbase-dev qt5-qttools-dev bash"
subpackages="$pkgname-dev"
-source="https://git.sailfishos.org/mer-core/libmlocale/-/archive/$pkgver/libmlocale-$pkgver.tar.gz"
+source="https://git.sailfishos.org/mer-core/libmlocale/-/archive/$pkgver/libmlocale-$pkgver.tar.gz
+ disable-werror.patch
+ "
options="!check" # No suitable tests
build() {
@@ -27,4 +29,5 @@ package() {
rm -rf "$pkgdir"/opt
}
-sha512sums="6903cde728e22c77c22cbde5e4ef44110bbd3d620a78bf177c090eac3d784f14806d67599f28bf214d480fc67e6ab6c6d4c5a9bdeeb839f7d61f69c68ad4b97e libmlocale-0.7.2.tar.gz"
+sha512sums="6903cde728e22c77c22cbde5e4ef44110bbd3d620a78bf177c090eac3d784f14806d67599f28bf214d480fc67e6ab6c6d4c5a9bdeeb839f7d61f69c68ad4b97e libmlocale-0.7.2.tar.gz
+9c0b177d9f8698d0c5733c5bc16b47d114e3d705f134df074b20d1abe5326bdda59a1a21eb9045342899883ba933d566060237b8d14260b0cfef846a533cc3fc disable-werror.patch"
diff --git a/testing/libmlocale/disable-werror.patch b/testing/libmlocale/disable-werror.patch
new file mode 100644
index 0000000000..764400fa9a
--- /dev/null
+++ b/testing/libmlocale/disable-werror.patch
@@ -0,0 +1,26 @@
+Reason: qmake includes deprecated-declerations, which causes deprecated warnings
+to result in errors. This is something for upstream to solve, so disable.
+Upstream: no
+diff --git a/mkspecs/common.pri b/mkspecs/common.pri
+index 27fa779..67a8b6d 100644
+--- a/mkspecs/common.pri
++++ b/mkspecs/common.pri
+@@ -15,18 +15,6 @@ QMAKE_TARGET_COPYRIGHT = Copyright (C) 2010 Nokia
+ include($${M_BUILD_TREE}/mkspecs/mlocaleconfig.pri)
+ }
+
+-#disable werrors on windows and freemantle (M_OS_MAEMO5 comes from meegotouchconfig.pri)
+-win32 {
+- } else {
+- contains( DEFINES, M_OS_MAEMO5 ) {
+- } else {
+- !contains( M_BUILD_FEATURES, no-werror ) {
+- QMAKE_CFLAGS *= -Werror
+- QMAKE_CXXFLAGS *= -Werror
+- }
+- }
+- }
+-
+ mac {
+ INCLUDEPATH += include
+ }