Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md4c

Browse Source
This commit is contained in:
Rmys
2020-01-15 23:33:13 +03:00
parent cb44e975c0
commit 2ef1b965c8
9 changed files with 203794 additions and 203475 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-base/files/mkspecs2.patch
+47
View File
@@ -0,0 +1,47 @@
diff -Nuar a/mkspecs/common/g++-base.conf b/mkspecs/common/g++-base.conf
--- a/mkspecs/common/g++-base.conf 2019-12-07 09:27:07.000000000 +0300
+++ b/mkspecs/common/g++-base.conf 2019-12-22 16:09:06.575953931 +0300
@@ -10,15 +10,19 @@
QMAKE_COMPILER = gcc
-QMAKE_CC = $${CROSS_COMPILE}gcc
+QMAKE_CC = PISILINUX_CC
QMAKE_LINK_C = $$QMAKE_CC
QMAKE_LINK_C_SHLIB = $$QMAKE_CC
-QMAKE_CXX = $${CROSS_COMPILE}g++
+QMAKE_CXX = PISILINUX_CXX
-QMAKE_LINK = $$QMAKE_CXX
-QMAKE_LINK_SHLIB = $$QMAKE_CXX
+QMAKE_LINK = PISILINUX_CXX
+QMAKE_LINK_SHLIB = PISILINUX_CXX
+QMAKE_LINK_C = PISILINUX_CC
+QMAKE_LINK_C_SHLIB = PISILINUX_CC
+
+QMAKE_LFLAGS_RELEASE += PISILINUX_LDFLAGS
QMAKE_PCH_OUTPUT_EXT = .gch
diff -Nuar a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
--- a/mkspecs/common/g++-unix.conf 2019-12-07 09:27:07.000000000 +0300
+++ b/mkspecs/common/g++-unix.conf 2019-12-22 16:09:48.917950875 +0300
@@ -10,5 +10,5 @@
include(g++-base.conf)
-QMAKE_LFLAGS_RELEASE += -Wl,-O1
+QMAKE_LFLAGS_RELEASE += PISILINUX_LDFLAGS
QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
diff -Nuar a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
--- a/mkspecs/common/linux.conf 2019-12-07 09:27:07.000000000 +0300
+++ b/mkspecs/common/linux.conf 2019-12-22 16:10:34.108947615 +0300
@@ -48,5 +48,5 @@
QMAKE_NM = nm -P
QMAKE_RANLIB =
-QMAKE_STRIP = strip
+QMAKE_STRIP =
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
desktop/toolkit/qt5/qt5-base/pspec.xml
+13 -2
View File
@@ -11,7 +11,7 @@
<Summary>Cross platform application and UI framework</Summary>
<Description>Cross platform application and UI development framework</Description>
<License>'GPL3' 'LGPL3' 'FDL' 'custom'</License>
<Archive sha1sum="3e073387a08599641a154de758f729d47db8986f" type="tarxz">http://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtbase-everywhere-src-5.13.2.tar.xz</Archive>
<Archive sha1sum="bd1b54cb5cc38bea4a84e18ac1e304b2a8f7fd55" type="tarxz">http://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtbase-everywhere-src-5.14.0.tar.xz</Archive>
<AdditionalFiles>
<!-- <AdditionalFile target="qt5-base-nouveau-freeze.patch">qt5-base-nouveau-freeze.patch</AdditionalFile> -->
</AdditionalFiles>
@@ -75,10 +75,11 @@
<Dependency>libXcursor-devel</Dependency>
<Dependency>tslib-devel</Dependency>
<Dependency>shared-mime-info</Dependency>
<Dependency>md4c-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- Pisilinux Patches -->
<Patch>mkspecs.patch</Patch>
<Patch>mkspecs2.patch</Patch>
<!-- <Patch level="1">qtbug-77364.patch</Patch> -->
<!-- <Patch level="1">qtbase-zlib-compression.patch</Patch> -->
<!-- <Patch level="1">virtualbox-focus.patch</Patch> -->
@@ -123,6 +124,9 @@
<Dependency>xcb-util-image</Dependency>
<Dependency>xcb-util-keysyms</Dependency>
<Dependency>xcb-util-renderutil</Dependency>
<Dependency>md4c</Dependency>
<Dependency>mit-kerberos</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
@@ -264,6 +268,13 @@
</Package>-->
<History>
<Update release="22">
<Date>2019-12-22</Date>
<Version>5.14.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="21">
<Date>2019-11-02</Date>
<Version>5.13.2</Version>