Commit 6c9243c
5
plików
+12
dodanych
-15
usuniętych
@@ -6432,7 +6432,7 @@ footprint: "drwxr-xr-x\troot/root\tusr/\ndrwxr-xr-x\troot/root\tusr/share/\ndrwx
6432
6432
-rw-r--r--\troot/root\tusr/share/doc/qt/qtxmlpatterns/xmlpattern-examples.html\n-rw-r--r--\troot/root\tusr/share/doc/qt/qtxmlpatterns/xmlprocessing.html\n\
6433
6433
-rw-r--r--\troot/root\tusr/share/doc/qt/qtxmlpatterns/xquery-introduction.html\n"
6434
6434
build: |
6435
- cd qt-everywhere-src-${pkgver}/qtbase
6435
+ cd qt-everywhere-opensource-src-${pkgver}/qtbase
6436
6436
ln -s /usr/bin/{rcc,uic,moc,qmake} bin/
6437
6437
patch -Np1 -i ../../no-qmake.patch
6438
6438
cd ../qtwebengine
@@ -6440,7 +6440,7 @@ build: |
6440
6440
cd ../qttools
6441
6441
ln -s /usr/bin
6442
6442
export PATH="$SCR/bin:$PATH"
6443
- cd qt-everywhere-src-${pkgver}
6443
+ cd qt-everywhere-opensource-src-${pkgver}
6444
6444
6445
6445
./configure -confirm-license -opensource \
6446
6446
-prefix /usr \
@@ -426,16 +426,16 @@ footprint: |
426
426
-rw-r--r-- root/root usr/lib/qt/qml/QtPositioning/qmldir
427
427
428
428
build: |
429
- cd ${pkgname}-${pkgver}
430
- patch -Np1 -i ../kf5-1.patch
431
- patch -Np1 -i ../consolidate-1.patch
429
+ _src="${SRCDIR}/${pkgname}"
430
+ patch -d "$_src" -Np1 -i ${SRCDIR}/kf5-1.patch
431
+ patch -d "$_src" -Np1 -i ${SRCDIR}/consolidate-1.patch
432
432
sed -e 's|c++14|c++17|g' -e '/c++1z/d' -i \
433
- src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro
433
+ "$_src/src/3rdparty/mapbox-gl-native/mapbox-gl-native.pro"
434
434
435
435
sed -e "/pragma once/a#include <cstdint>" \
436
- -i src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp \
437
- src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp \
438
- src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
436
+ -i "$_src/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp" \
437
+ "$_src/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp" \
438
+ "$_src/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp"
439
439
mkdir build
440
440
cd build
441
441
@@ -214,8 +214,7 @@ footprint: |
214
214
-rw-r--r-- root/root usr/lib/qt/mkspecs/modules/qt_lib_scripttools_private.pri
215
215
216
216
build: |
217
- cd ${pkgname}-${pkgver}
218
- sed -i 's|^asm volatile ($|asm (|' src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
217
+ sed -i 's|^asm volatile ($|asm (|' ${SRCDIR}/${pkgname}/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
219
218
mkdir build
220
219
cd build
221
220
qmake ../${pkgname}-everywhere-src-${pkgver}
@@ -73,8 +73,7 @@ footprint: |
73
73
-rw-r--r-- root/root usr/lib/qt/qml/QtWebChannel/qmldir
74
74
75
75
build: |
76
- cd ${pkgname}-${pkgver}
77
- patch -Np1 -i ../kf5-1.patch
76
+ patch -d ${SRCDIR}/${pkgname} -Np1 -i ${SRCDIR}/kf5-1.patch
78
77
mkdir build
79
78
cd build
80
79
@@ -76,8 +76,7 @@ footprint: |
76
76
-rw-r--r-- root/root usr/lib/qt/mkspecs/modules/qt_lib_websockets_private.pri
77
77
78
78
build: |
79
- cd ${pkgname}-${pkgver}
80
- patch -Np1 -i ../kf5-1.patch
79
+ patch -d ${SRCDIR}/${pkgname} -Np1 -i ${SRCDIR}/kf5-1.patch
81
80
mkdir build
82
81
cd build
83
82