...
 
Commits (865)

Too many changes to show.

To preserve performance only 657 of 657+ files are displayed.

*.orig
*.rej
__pycache__
*.egg-info
*.trace
......@@ -28,3 +29,5 @@ GSYMS
BROWSE
*.kate-swp
/po/
build_dir
.flatpak-builder
......@@ -124,6 +124,10 @@ if (APPLE)
set(PATCH_COMMAND patch)
endif ()
if (ANDROID)
set (GLOBAL_PROFILE ${GLOBAL_PROFILE} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DANDROID_PLATFORM=${ANDROID_PLATFORM} -DANDROID_ABI=${ANDROID_ABI})
endif()
if (UNIX AND NOT APPLE)
set(LINUX true)
set(PATCH_COMMAND patch)
......
SET(PREFIX_ext_exiv2 "${EXTPREFIX}" )
if (ANDROID)
ExternalProject_Add( ext_exiv2
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/exiv2-0.26-trunk.tar.gz
URL_MD5 5399e3b570d7f9205f0e76d47582da4c
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/tzname.patch
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch_mingw.patch
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/disable_exiv_apps.diff
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gcccheck.patch
INSTALL_DIR ${PREFIX_ext_exiv2}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_exiv2} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DEXIV2_ENABLE_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_BUILD_PO=OFF -DEXIV2_ENABLE_NLS=OFF -DICONV_INCLUDE_DIR=${PREFIX_ext_exiv2}/include -DEXPAT_LIBRARY=$ENV{BUILD_ROOT}/i/lib/libexpat.so -DEXPAT_INCLUDE_DIR=$ENV{BUILD_ROOT}/i/include
UPDATE_COMMAND ""
DEPENDS ext_iconv ext_expat
)
else()
ExternalProject_Add( ext_exiv2
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/exiv2-0.26-trunk.tar.gz
......@@ -16,3 +36,4 @@ ExternalProject_Add( ext_exiv2
UPDATE_COMMAND ""
DEPENDS ext_iconv ext_expat
)
endif()
......@@ -14,6 +14,20 @@ ExternalProject_Add( ext_expat
DEPENDS ext_patch
)
elseif (ANDROID)
ExternalProject_Add( ext_expat
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/expat-2.1.0.tar.gz
URL_MD5 dd7dab7a5fea97d2a6a43f511449b7cd
INSTALL_DIR ${PREFIX_ext_expat}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_expat} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
BUILD_COMMAND make
INSTALL_COMMAND make install
UPDATE_COMMAND ""
)
else()
ExternalProject_Add( ext_expat
......@@ -22,9 +36,9 @@ ExternalProject_Add( ext_expat
URL_MD5 dd7dab7a5fea97d2a6a43f511449b7cd
INSTALL_DIR ${PREFIX_ext_expat}
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_expat} ${GLOBAL_AUTOMAKE_PROFILE}
BUILD_COMMAND make
INSTALL_COMMAND make install
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_expat} ${GLOBAL_AUTOMAKE_PROFILE}
BUILD_COMMAND make
INSTALL_COMMAND make install
UPDATE_COMMAND ""
......
This source diff could not be displayed because it is too large. You can view the blob instead.
diff -Nru -x '*~' fftw-3.2.2.orig/simd/simd-sse.h fftw-3.2.2/simd/simd-sse.h
--- fftw-3.2.2.orig/simd/simd-sse.h 2009-07-12 07:35:49.000000000 -0300
+++ fftw-3.2.2/simd/simd-sse.h 2013-08-18 14:36:21.511098200 -0300
@@ -82,7 +82,7 @@
# define LOADH(addr, val) _mm_loadh_pi(val, (const __m64 *)(addr))
# define LOADL0(addr, val) _mm_loadl_pi(val, (const __m64 *)(addr))
- static inline V LD(const R *x, INT ivs, const R *aligned_like)
+ static V LD(const R *x, INT ivs, const R *aligned_like)
{
V var;
(void)aligned_like; /* UNUSED */
@@ -111,14 +111,14 @@
(((fp3) << 6) | ((fp2) << 4) | ((fp1) << 2) | ((fp0)))
-static inline V LDA(const R *x, INT ivs, const R *aligned_like)
+static V LDA(const R *x, INT ivs, const R *aligned_like)
{
(void)aligned_like; /* UNUSED */
(void)ivs; /* UNUSED */
return *(const V *)x;
}
-static inline void ST(R *x, V v, INT ovs, const R *aligned_like)
+static void ST(R *x, V v, INT ovs, const R *aligned_like)
{
(void)aligned_like; /* UNUSED */
/* WARNING: the extra_iter hack depends upon STOREL occurring
@@ -127,7 +127,7 @@
STOREL(x, v);
}
-static inline void STA(R *x, V v, INT ovs, const R *aligned_like)
+static void STA(R *x, V v, INT ovs, const R *aligned_like)
{
(void)aligned_like; /* UNUSED */
(void)ovs; /* UNUSED */
@@ -136,7 +136,7 @@
#if 0
/* this should be faster but it isn't. */
-static inline void STN2(R *x, V v0, V v1, INT ovs)
+static void STN2(R *x, V v0, V v1, INT ovs)
{
STA(x, SHUFPS(v0, v1, SHUFVAL(0, 1, 0, 1)), ovs, 0);
STA(x + ovs, SHUFPS(v0, v1, SHUFVAL(2, 3, 2, 3)), ovs, 0);
@@ -148,7 +148,7 @@
#define STM4(x, v, ovs, aligned_like) /* no-op */
#ifdef VISUAL_CXX_DOES_NOT_SUCK
-static inline void STN4(R *x, V v0, V v1, V v2, V v3, INT ovs)
+static void STN4(R *x, V v0, V v1, V v2, V v3, INT ovs)
{
V x0, x1, x2, x3;
x0 = UNPCKL(v0, v2);
@@ -198,23 +198,23 @@
}
#endif
-static inline V FLIP_RI(V x)
+static V FLIP_RI(V x)
{
return SHUFPS(x, x, SHUFVAL(1, 0, 3, 2));
}
extern const union uvec X(sse_pmpm);
-static inline V VCONJ(V x)
+static V VCONJ(V x)
{
return VXOR(X(sse_pmpm).v, x);
}
-static inline V VBYI(V x)
+static V VBYI(V x)
{
return FLIP_RI(VCONJ(x));
}
-static inline V VZMUL(V tx, V sr)
+static V VZMUL(V tx, V sr)
{
V tr = SHUFPS(tx, tx, SHUFVAL(0, 0, 2, 2));
V ti = SHUFPS(tx, tx, SHUFVAL(1, 1, 3, 3));
@@ -223,7 +223,7 @@
return VADD(tr, VMUL(ti, sr));
}
-static inline V VZMULJ(V tx, V sr)
+static V VZMULJ(V tx, V sr)
{
V tr = SHUFPS(tx, tx, SHUFVAL(0, 0, 2, 2));
V ti = SHUFPS(tx, tx, SHUFVAL(1, 1, 3, 3));
@@ -232,7 +232,7 @@
return VSUB(tr, VMUL(ti, sr));
}
-static inline V VZMULI(V tx, V sr)
+static V VZMULI(V tx, V sr)
{
V tr = SHUFPS(tx, tx, SHUFVAL(0, 0, 2, 2));
V ti = SHUFPS(tx, tx, SHUFVAL(1, 1, 3, 3));
@@ -241,7 +241,7 @@
return VSUB(VMUL(tr, sr), ti);
}
-static inline V VZMULIJ(V tx, V sr)
+static V VZMULIJ(V tx, V sr)
{
V tr = SHUFPS(tx, tx, SHUFVAL(0, 0, 2, 2));
V ti = SHUFPS(tx, tx, SHUFVAL(1, 1, 3, 3));
@@ -258,7 +258,7 @@
{TW_COS, v, x}, {TW_COS, v+1, x}, {TW_SIN, v, x}, {TW_SIN, v+1, x}
#define TWVL1 (VL)
-static inline V BYTW1(const R *t, V sr)
+static V BYTW1(const R *t, V sr)
{
const V *twp = (const V *)t;
V tx = twp[0];
@@ -269,7 +269,7 @@
return VADD(tr, VMUL(ti, sr));
}
-static inline V BYTWJ1(const R *t, V sr)
+static V BYTWJ1(const R *t, V sr)
{
const V *twp = (const V *)t;
V tx = twp[0];
@@ -286,7 +286,7 @@
{TW_SIN, v, -x}, {TW_SIN, v, x}, {TW_SIN, v+1, -x}, {TW_SIN, v+1, x}
#define TWVL2 (2 * VL)
-static inline V BYTW2(const R *t, V sr)
+static V BYTW2(const R *t, V sr)
{
const V *twp = (const V *)t;
V si = FLIP_RI(sr);
@@ -294,7 +294,7 @@
return VADD(VMUL(tr, sr), VMUL(ti, si));
}
-static inline V BYTWJ2(const R *t, V sr)
+static V BYTWJ2(const R *t, V sr)
{
const V *twp = (const V *)t;
V si = FLIP_RI(sr);
diff -Nru -x '*~' fftw-3.2.2.orig/simd/simd-sse.h.bak fftw-3.2.2/simd/simd-sse.h.bak
--- fftw-3.2.2.orig/simd/simd-sse.h.bak 1969-12-31 22:00:00.000000000 -0200
+++ fftw-3.2.2/simd/simd-sse.h.bak 2013-08-18 14:32:55.234299800 -0300
@@ -0,0 +1,319 @@
+/*
+ * Copyright (c) 2003, 2007-8 Matteo Frigo
+ * Copyright (c) 2003, 2007-8 Massachusetts Institute of Technology
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef FFTW_SINGLE
+#error "SSE only works in single precision"
+#endif
+
+#define VL 2 /* SIMD complex vector length */
+#define ALIGNMENT 8 /* alignment for LD/ST */
+#define ALIGNMENTA 16 /* alignment for LDA/STA */
+#define SIMD_VSTRIDE_OKA(x) ((x) == 2)
+#define SIMD_STRIDE_OKPAIR SIMD_STRIDE_OK
+
+#define RIGHT_CPU X(have_sse)
+extern int RIGHT_CPU(void);
+
+/* gcc compiles the following code only when __SSE__ is defined */
+#if defined(__SSE__) || !defined(__GNUC__)
+
+/* some versions of glibc's sys/cdefs.h define __inline to be empty,
+ which is wrong because xmmintrin.h defines several inline
+ procedures */
+#undef __inline
+
+#include <xmmintrin.h>
+
+typedef __m128 V;
+#define VADD _mm_add_ps
+#define VSUB _mm_sub_ps
+#define VMUL _mm_mul_ps
+#define VXOR _mm_xor_ps
+#define SHUFPS _mm_shuffle_ps
+#define STOREH(addr, val) _mm_storeh_pi((__m64 *)(addr), val)
+#define STOREL(addr, val) _mm_storel_pi((__m64 *)(addr), val)
+#define UNPCKH _mm_unpackhi_ps
+#define UNPCKL _mm_unpacklo_ps
+
+#ifdef __GNUC__
+# define DVK(var, val) const V var = __extension__ ({ \
+ static const union fvec _var = { {val, val, val, val} }; \
+ _var.v; \
+ })
+# define LDK(x) x
+
+ /* we use inline asm because gcc generates slow code for
+ _mm_loadh_pi(). gcc insists upon having an existing variable for
+ VAL, which is however never used. Thus, it generates code to move
+ values in and out the variable. Worse still, gcc-4.0 stores VAL on
+ the stack, causing valgrind to complain about uninitialized reads.
+ */
+
+ static inline V LD(const R *x, INT ivs, const R *aligned_like)
+ {
+ V var;
+ (void)aligned_like; /* UNUSED */
+ __asm__("movlps %1, %0\n\tmovhps %2, %0"
+ : "=x"(var) : "m"(x[0]), "m"(x[ivs]));
+ return var;
+ }
+
+#else
+
+# define DVK(var, val) const R var = K(val)
+# define LDK(x) _mm_set_ps1(x)
+# define LOADH(addr, val) _mm_loadh_pi(val, (const __m64 *)(addr))
+# define LOADL0(addr, val) _mm_loadl_pi(val, (const __m64 *)(addr))
+
+#ifndef __INTEL_COMPILER
+ static inline V LD(const R *x, INT ivs, const R *aligned_like)
+#else
+ static V LD(const R *x, INT ivs, const R *aligned_like)
+#endif
+ {
+ V var;
+ (void)aligned_like; /* UNUSED */
+ var = LOADL0(x, var);
+ var = LOADH(x + ivs, var);
+ return var;
+ }
+
+#endif
+
+union fvec {
+ R f[4];
+ V v;
+};
+
+union uvec {
+ unsigned u[4];
+ V v;
+};
+
+#define VFMA(a, b, c) VADD(c, VMUL(a, b))
+#define VFNMS(a, b, c) VSUB(c, VMUL(a, b))
+#define VFMS(a, b, c) VSUB(VMUL(a, b), c)
+
+#define SHUFVAL(fp0,fp1,fp2,fp3) \
+ (((fp3) << 6) | ((fp2) << 4) | ((fp1) << 2) | ((fp0)))
+
+
+static inline V LDA(const R *x, INT ivs, const R *aligned_like)
+{
+ (void)aligned_like; /* UNUSED */
+ (void)ivs; /* UNUSED */
+ return *(const V *)x;
+}
+
+static inline void ST(R *x, V v, INT ovs, const R *aligned_like)
+{
+ (void)aligned_like; /* UNUSED */
+ /* WARNING: the extra_iter hack depends upon STOREL occurring
+ after STOREH */
+ STOREH(x + ovs, v);
+ STOREL(x, v);
+}
+
+static inline void STA(R *x, V v, INT ovs, const R *aligned_like)
+{
+ (void)aligned_like; /* UNUSED */
+ (void)ovs; /* UNUSED */
+ *(V *)x = v;
+}
+
+#if 0
+/* this should be faster but it isn't. */
+static inline void STN2(R *x, V v0, V v1, INT ovs)
+{
+ STA(x, SHUFPS(v0, v1, SHUFVAL(0, 1, 0, 1)), ovs, 0);
+ STA(x + ovs, SHUFPS(v0, v1, SHUFVAL(2, 3, 2, 3)), ovs, 0);
+}
+#endif
+#define STM2 ST
+#define STN2(x, v0, v1, ovs) /* nop */
+
+#define STM4(x, v, ovs, aligned_like) /* no-op */
+
+#ifdef VISUAL_CXX_DOES_NOT_SUCK
+static inline void STN4(R *x, V v0, V v1, V v2, V v3, INT ovs)
+{
+ V x0, x1, x2, x3;
+ x0 = UNPCKL(v0, v2);
+ x1 = UNPCKH(v0, v2);
+ x2 = UNPCKL(v1, v3);
+ x3 = UNPCKH(v1, v3);
+ STA(x, UNPCKL(x0, x2), 0, 0);
+ STA(x + ovs, UNPCKH(x0, x2), 0, 0);
+ STA(x + 2 * ovs, UNPCKL(x1, x3), 0, 0);
+ STA(x + 3 * ovs, UNPCKH(x1, x3), 0, 0);
+}
+#else /* Visual C++ sucks */
+
+/*
+ Straight from the mouth of the horse:
+
+ We "reserved" the possibility of aligning arguments with
+ __declspec(align(X)) passed by value by issuing this error.
+
+ The first 3 parameters of type __m64 (or other MMX types) are
+ passed in registers. The rest would be passed on the stack. We
+ decided aligning the stack was wasteful, especially for __m128
+ parameters. Also, we thought it would be infrequent that people
+ would want to pass more than 3 by value.
+
+ If we didn't issue an error, we would have to binary compatibility
+ in the future if we decided to align the arguments.
+
+
+ Hope that explains it.
+ --
+ Jason Shirk, Visual C++ Compiler Team
+ This posting is provided AS IS with no warranties, and confers no rights
+*/
+
+#define STN4(x, v0, v1, v2, v3, ovs) \
+{ \
+ V xxx0, xxx1, xxx2, xxx3; \
+ xxx0 = UNPCKL(v0, v2); \
+ xxx1 = UNPCKH(v0, v2); \
+ xxx2 = UNPCKL(v1, v3); \
+ xxx3 = UNPCKH(v1, v3); \
+ STA(x, UNPCKL(xxx0, xxx2), 0, 0); \
+ STA(x + ovs, UNPCKH(xxx0, xxx2), 0, 0); \
+ STA(x + 2 * ovs, UNPCKL(xxx1, xxx3), 0, 0); \
+ STA(x + 3 * ovs, UNPCKH(xxx1, xxx3), 0, 0); \
+}
+#endif
+
+static inline V FLIP_RI(V x)
+{
+ return SHUFPS(x, x, SHUFVAL(1, 0, 3, 2));
+}
+
+extern const union uvec X(sse_pmpm);
+static inline V VCONJ(V x)
+{
+ return VXOR(X(sse_pmpm).v, x);
+}
+
+static inline V VBYI(V x)
+{
+ return FLIP_RI(VCONJ(x));
+}
+
+static inline V VZMUL(V tx, V sr)
+{
+ V tr = SHUFPS(tx, tx, SHUFVAL(0, 0, 2, 2));
+ V ti = SHUFPS(tx, tx, SHUFVAL(1, 1, 3, 3));
+ tr = VMUL(tr, sr);
+ sr = VBYI(sr);
+ return VADD(tr, VMUL(ti, sr));
+}
+
+static inline V VZMULJ(V tx, V sr)
+{
+ V tr = SHUFPS(tx, tx, SHUFVAL(0, 0, 2, 2));
+ V ti = SHUFPS(tx, tx, SHUFVAL(1, 1, 3, 3));
+ tr = VMUL(tr, sr);
+ sr = VBYI(sr);
+ return VSUB(tr, VMUL(ti, sr));
+}
+
+static inline V VZMULI(V tx, V sr)
+{
+ V tr = SHUFPS(tx, tx, SHUFVAL(0, 0, 2, 2));
+ V ti = SHUFPS(tx, tx, SHUFVAL(1, 1, 3, 3));
+ ti = VMUL(ti, sr);
+ sr = VBYI(sr);
+ return VSUB(VMUL(tr, sr), ti);
+}
+
+static inline V VZMULIJ(V tx, V sr)
+{
+ V tr = SHUFPS(tx, tx, SHUFVAL(0, 0, 2, 2));
+ V ti = SHUFPS(tx, tx, SHUFVAL(1, 1, 3, 3));
+ ti = VMUL(ti, sr);
+ sr = VBYI(sr);
+ return VADD(VMUL(tr, sr), ti);
+}
+
+#define VFMAI(b, c) VADD(c, VBYI(b))
+#define VFNMSI(b, c) VSUB(c, VBYI(b))
+
+/* twiddle storage #1: compact, slower */
+#define VTW1(v,x) \
+ {TW_COS, v, x}, {TW_COS, v+1, x}, {TW_SIN, v, x}, {TW_SIN, v+1, x}
+#define TWVL1 (VL)
+
+static inline V BYTW1(const R *t, V sr)
+{
+ const V *twp = (const V *)t;
+ V tx = twp[0];
+ V tr = UNPCKL(tx, tx);
+ V ti = UNPCKH(tx, tx);
+ tr = VMUL(tr, sr);
+ sr = VBYI(sr);
+ return VADD(tr, VMUL(ti, sr));
+}
+
+static inline V BYTWJ1(const R *t, V sr)
+{
+ const V *twp = (const V *)t;
+ V tx = twp[0];
+ V tr = UNPCKL(tx, tx);
+ V ti = UNPCKH(tx, tx);
+ tr = VMUL(tr, sr);
+ sr = VBYI(sr);
+ return VSUB(tr, VMUL(ti, sr));
+}
+
+/* twiddle storage #2: twice the space, faster (when in cache) */
+#define VTW2(v,x) \
+ {TW_COS, v, x}, {TW_COS, v, x}, {TW_COS, v+1, x}, {TW_COS, v+1, x}, \
+ {TW_SIN, v, -x}, {TW_SIN, v, x}, {TW_SIN, v+1, -x}, {TW_SIN, v+1, x}
+#define TWVL2 (2 * VL)
+
+static inline V BYTW2(const R *t, V sr)
+{
+ const V *twp = (const V *)t;
+ V si = FLIP_RI(sr);
+ V tr = twp[0], ti = twp[1];
+ return VADD(VMUL(tr, sr), VMUL(ti, si));
+}
+
+static inline V BYTWJ2(const R *t, V sr)
+{
+ const V *twp = (const V *)t;
+ V si = FLIP_RI(sr);
+ V tr = twp[0], ti = twp[1];
+ return VSUB(VMUL(tr, sr), VMUL(ti, si));
+}
+
+/* twiddle storage #3 */
+#define VTW3(v,x) {TW_CEXP, v, x}, {TW_CEXP, v+1, x}
+#define TWVL3 (VL)
+
+/* twiddle storage for split arrays */
+#define VTWS(v,x) \
+ {TW_COS, v, x}, {TW_COS, v+1, x}, {TW_COS, v+2, x}, {TW_COS, v+3, x}, \
+ {TW_SIN, v, x}, {TW_SIN, v+1, x}, {TW_SIN, v+2, x}, {TW_SIN, v+3, x}
+#define TWVLS (2 * VL)
+
+#endif /* __SSE__ */
This source diff could not be displayed because it is too large. You can view the blob instead.
# -*- coding: utf-8 -*-
import info
class subinfo(info.infoclass):
def setTargets(self):
self.targets['3.2.2'] = 'http://www.fftw.org/fftw-3.2.2.tar.gz'
self.targetDigests['3.2.2'] = 'd43b799eedfb9408f62f9f056f5e8a645618467b'
self.targetInstSrc['3.2.2'] = "fftw-3.2.2"
self.patchToApply['3.2.2'] = [('fftw-3.2.2-20111221.diff', 1),
('fftw-3.2.2-20130818.diff', 1)]
self.shortDescription = "a C subroutine library for computing the discrete Fourier transform (DFT)"
self.defaultTarget = '3.2.2'
def setDependencies(self):
self.buildDependencies['virtual/base'] = 'default'
from Package.CMakePackageBase import *
class Package(CMakePackageBase):
def __init__(self):
CMakePackageBase.__init__(self)
self.supportsNinja = False
self.subinfo.options.configure.defines = "-DFFTW_SINGLE=ON -DFFTW_DOUBLE=OFF -DBUILD_BENCHMARKS=OFF"
......@@ -12,14 +12,15 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" )
# ItemModels
# ItemViews
# WindowSystem
# kimageformats
# On Linux:
# KCrash
ExternalProject_Add(
ext_extra_cmake_modules
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/extra-cmake-modules-5.44.0.zip
URL_MD5 74aa8fc501e27024390b01c81f2925eb
URL http://download.kde.org/stable/frameworks/5.60/extra-cmake-modules-5.60.0.zip
URL_MD5 c205e17d89028ab0b034e68081d5ebfb
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ecm_install_to_share.diff
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -34,8 +35,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_karchive
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/karchive-5.44.0.zip
URL_MD5 c60a8e22b88cc7328610041638459689
URL http://download.kde.org/stable/frameworks/5.60/karchive-5.60.0.zip
URL_MD5 50ae1495ef5b19898a06e43160d9b84d
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/karchive.diff
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -51,15 +52,16 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kconfig
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kconfig-5.44.0.zip
URL_MD5 d0223ea471bbf463ec42c2a2355a5183
URL http://download.kde.org/stable/frameworks/5.60/kconfig-5.60.0.zip
URL_MD5 db96fdd78a574d07b09abb720dae1a06
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kconfig.diff
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
-DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
-DBUILD_TESTING=false
-DKCONFIG_USE_DBUS=off
UPDATE_COMMAND ""
DEPENDS ext_karchive
)
......@@ -68,10 +70,10 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwidgetsaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kwidgetsaddons-5.44.0.zip
URL_MD5 a9911d8d0f8aaf7a7afd84c41c8f80a1
URL http://download.kde.org/stable/frameworks/5.60/kwidgetsaddons-5.60.0.zip
URL_MD5 1b09306fe482dd5665b16a243eb2be94
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwidgetsaddons.diff
# PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwidgetsaddons.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
${GLOBAL_PROFILE}
......@@ -85,8 +87,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcompletion
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kcompletion-5.44.0.zip
URL_MD5 0647885a702c338a1b656eb4f311ad16
URL http://download.kde.org/stable/frameworks/5.60/kcompletion-5.60.0.zip
URL_MD5 a9848cb26ff96246769c56244f0db25f
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -101,8 +103,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcoreaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kcoreaddons-5.44.0.zip
URL_MD5 16a7379f3e2941d1c19d6f80939f15e8
URL http://download.kde.org/stable/frameworks/5.60/kcoreaddons-5.60.0.zip
URL_MD5 da21c1532042c2c8a7e56f444c581196
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktoptojson.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -118,8 +120,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kguiaddons
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kguiaddons-5.44.0.zip
URL_MD5 440eefbf5abcafc492dcf857f7e4eaf5
URL http://download.kde.org/stable/frameworks/5.60/kguiaddons-5.60.0.zip
URL_MD5 f8aeea516e264c80df470efafab6ded0
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -134,8 +136,8 @@ if(APPLE)
ExternalProject_Add(
ext_ki18n
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/ki18n-5.44.0.zip
URL_MD5 333ab0a3f65a298e928d746144d4dc8e
URL http://download.kde.org/stable/frameworks/5.60/ki18n-5.60.0.zip
URL_MD5 e53f479f22ea17629319fec710dda036
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n-appdatalocation.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -150,8 +152,8 @@ else()
ExternalProject_Add(
ext_ki18n
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/ki18n-5.44.0.zip
URL_MD5 333ab0a3f65a298e928d746144d4dc8e
URL http://download.kde.org/stable/frameworks/5.60/ki18n-5.60.0.zip
URL_MD5 e53f479f22ea17629319fec710dda036
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n-appdatalocation.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -167,8 +169,8 @@ endif()
ExternalProject_Add(
ext_kitemmodels
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kitemmodels-5.44.0.zip
URL_MD5 ea43a5e2cc7033eb672796b108d7403b
URL http://download.kde.org/stable/frameworks/5.60/kitemmodels-5.60.0.zip
URL_MD5 c8f02881a65d496d6114bb2155cdfc36
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -182,8 +184,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kitemviews
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kitemviews-5.44.0.zip
URL_MD5 8b15c703313c7a790c7db897ef17de7d
URL http://download.kde.org/stable/frameworks/5.60/kitemviews-5.60.0.zip
URL_MD5 9d94b8da72f43fac39aa782f7efd941e
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......@@ -197,8 +199,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kimageformats
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kimageformats-5.44.0.zip
URL_MD5 02a98b682f9cb655592148d7ebcc05e7
URL http://download.kde.org/stable/frameworks/5.60/kimageformats-5.60.0.zip
URL_MD5 a8b413560d12cd956d689784a056d6e0
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kimageformats.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -213,8 +215,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kwindowsystem
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kwindowsystem-5.44.0.zip
URL_MD5 75329f47cf8cd413fa1d15a57c298563
URL http://download.kde.org/stable/frameworks/5.60/kwindowsystem-5.60.0.zip
URL_MD5 c15c29141b5edca67143b735a94d3f43
INSTALL_DIR ${EXTPREFIX_frameworks}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwindowsystem-x11.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
......@@ -229,8 +231,8 @@ ExternalProject_Add(
ExternalProject_Add(
ext_kcrash
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://download.kde.org/stable/frameworks/5.44/kcrash-5.44.0.zip
URL_MD5 61adc0e125c65288968d958acf25f4aa
URL http://download.kde.org/stable/frameworks/5.60/kcrash-5.60.0.zip
URL_MD5 7449a6f2b314b944ab2bed00124fe69b
INSTALL_DIR ${EXTPREFIX_frameworks}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks}
-DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
......
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2441977..2a20a13 100644
index 45b3bf0..6afd3cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,20 +29,20 @@ set_package_properties(ZLIB PROPERTIES
PURPOSE "Required by the core KDE libraries and some critical kioslaves"
@@ -33,7 +33,7 @@ find_package(BZip2)
set_package_properties(BZip2 PROPERTIES
URL "https://sourceware.org/bzip2/"
DESCRIPTION "Support for BZip2 compressed files and data streams"
- TYPE RECOMMENDED
+ TYPE OPTIONAL
PURPOSE "Support for BZip2 compressed files and data streams"
)
-find_package(BZip2)
-set_package_properties(BZip2 PROPERTIES
- URL "http://www.bzip.org"
- DESCRIPTION "Support for BZip2 compressed files and data streams"
- TYPE RECOMMENDED
- PURPOSE "Support for BZip2 compressed files and data streams"
-)
-
-find_package(LibLZMA)
-set_package_properties(LibLZMA PROPERTIES
- URL "http://tukaani.org/xz/"
- DESCRIPTION "Support for xz compressed files and data streams"
- PURPOSE "Support for xz compressed files and data streams"
-)
+#find_package(BZip2)
+#set_package_properties(BZip2 PROPERTIES
+# URL "http://www.bzip.org"
+# DESCRIPTION "Support for BZip2 compressed files and data streams"
+# TYPE RECOMMENDED
+# PURPOSE "Support for BZip2 compressed files and data streams"
+#)
+
+#find_package(LibLZMA)
+#set_package_properties(LibLZMA PROPERTIES
+# URL "http://tukaani.org/xz/"
+# DESCRIPTION "Support for xz compressed files and data streams"
+# PURPOSE "Support for xz compressed files and data streams"
+#)
include_directories(
${ZLIB_INCLUDE_DIR}
@@ -41,6 +41,7 @@ find_package(LibLZMA)
set_package_properties(LibLZMA PROPERTIES
URL "http://tukaani.org/xz/"
DESCRIPTION "Support for xz compressed files and data streams"
+ TYPE OPTIONAL
PURPOSE "Support for xz compressed files and data streams"
)
include_directories(
diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp
index 3e0578f..6c4408d 100644
--- a/autotests/kconfigtest.cpp
+++ b/autotests/kconfigtest.cpp
@@ -587,7 +587,7 @@ void KConfigTest::testPathQtHome()
qunsetenv("QT_CACHE_HOME");
qunsetenv("QT_CONFIG_HOME");
QVERIFY(group.hasKey("dataDir"));
- QCOMPARE(group.readEntry("dataDir", QString()), QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation).append(QStringLiteral("/kconfigtest")));
+ QCOMPARE(group.readEntry("dataDir", QString()), QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).append(QStringLiteral("/kconfigtest")));
QVERIFY(group.hasKey("cacheDir"));
QCOMPARE(group.readEntry("cacheDir", QString()), QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation).append(QStringLiteral("/kconfigtest")));
QVERIFY(group.hasKey("configDir"));
diff --git a/autotests/kdesktopfiletest.cpp b/autotests/kdesktopfiletest.cpp
index fd4a5c9..db08f22 100644
--- a/autotests/kdesktopfiletest.cpp
+++ b/autotests/kdesktopfiletest.cpp
@@ -222,7 +222,7 @@ void KDesktopFileTest::testIsAuthorizedDesktopFile()
QVERIFY(QFile::exists(fileName));
QVERIFY(!KDesktopFile::isAuthorizedDesktopFile(fileName));
- const QString installedFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("/kservices5/http_cache_cleaner.desktop"));
+ const QString installedFile = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("/kservices5/http_cache_cleaner.desktop"));
if (!installedFile.isEmpty()) {
QVERIFY(KDesktopFile::isAuthorizedDesktopFile(installedFile));
} else {
@@ -281,8 +281,8 @@ void KDesktopFileTest::testLocateLocal_data()
{
QString systemConfigLocation = QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation).last();
QString writableConfigLocation = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
- QString systemDataLocation = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).last();
- QString writableDataLocation = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+ QString systemDataLocation = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).last();
+ QString writableDataLocation = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
QTest::addColumn<QString>("path");
QTest::addColumn<QString>("result");
diff --git a/autotests/test_kconf_update.cpp b/autotests/test_kconf_update.cpp
index 3353061..a80ae1e 100644
--- a/autotests/test_kconf_update.cpp
+++ b/autotests/test_kconf_update.cpp
@@ -625,7 +625,7 @@ void TestKConfUpdate::testScript()
QSharedPointer<QTemporaryFile> updFile(writeUpdFile(updContent));
- const QString scriptDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/kconf_update";
+ const QString scriptDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/kconf_update";
QVERIFY(QDir().mkpath(scriptDir));
QString scriptPath = scriptDir + "/test.sh";
writeFile(scriptPath, updScript);
diff --git a/docs/options.md b/docs/options.md
index fab22e1..8823818 100644
index c634c00..5e59219 100644
--- a/docs/options.md
+++ b/docs/options.md
@@ -96,4 +96,4 @@ They are:
......@@ -59,10 +9,10 @@ index fab22e1..8823818 100644
-* `$QT_DATA_HOME` - QStandardPaths::GenericDataLocation
+* `$QT_DATA_HOME` - QStandardPaths::AppDataLocation
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index c8eb90a..18d1b69 100644
index e1b11ed..e3511cf 100644
--- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp
@@ -229,7 +229,7 @@ QString KConfigPrivate::expandString(const QString &value)
@@ -237,7 +237,7 @@ QString KConfigPrivate::expandString(const QString &value)
env = QString::fromLocal8Bit(pEnv.constData());
} else {
if (aVarName == QStringLiteral("QT_DATA_HOME")) {
......@@ -72,19 +22,21 @@ index c8eb90a..18d1b69 100644
env = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
} else if (aVarName == QStringLiteral("QT_CACHE_HOME")) {
diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp
index b0b6a87..daddd54 100644
index d9283ce..f869fb0 100644
--- a/src/core/kdesktopfile.cpp
+++ b/src/core/kdesktopfile.cpp
@@ -88,7 +88,7 @@ QString KDesktopFile::locateLocal(const QString &path)
@@ -89,8 +89,8 @@ QString KDesktopFile::locateLocal(const QString &path)
}
}
// Relative to xdg data dir? (much more common)
- Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) {
+ Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)) {
- const QStringList lstGenericDataLocation = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
- for (const QString &dir : lstGenericDataLocation) {
+ const QStringList lstAppDataLocation = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
+ for (const QString &dir : lstAppDataLocation) {
if (path.startsWith(dir + plus)) {
relativePath = path.mid(dir.length() + 1);
}
@@ -97,7 +97,7 @@ QString KDesktopFile::locateLocal(const QString &path)
@@ -99,7 +99,7 @@ QString KDesktopFile::locateLocal(const QString &path)