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

qt5-base kde_patch

Browse Source
This commit is contained in:
Rmys
2021-11-16 13:35:05 +02:00
committed by GitHub
parent b291cdb0aa
commit 870cccea0c
3 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-base/actions.py
+5 -1
View File
@@ -12,7 +12,8 @@ from pisi.actionsapi import get
import os import os
WorkDir = "qtbase-everywhere-src-%s" % get.srcVERSION().replace('_','-').replace('pre1', 'tp') WorkDir = "qtbase-kde-5.15"
#WorkDir = "qtbase-everywhere-src-%s" % get.srcVERSION().replace('_','-').replace('pre1', 'tp')
qtbase = qt5.prefix qtbase = qt5.prefix
absoluteWorkDir = "%s/%s" % (get.workDIR(), WorkDir) absoluteWorkDir = "%s/%s" % (get.workDIR(), WorkDir)
@@ -22,6 +23,9 @@ absoluteWorkDir = "%s/%s" % (get.workDIR(), WorkDir)
bindirQt5="/usr/bin" bindirQt5="/usr/bin"
def setup(): def setup():
shelltools.system("mkdir .git")
pisitools.dosed(".qmake.conf", "5.15.3", "5.15.2")
#shelltools.system("patch -Rp1 < qt5-base-nouveau-freeze.patch") #shelltools.system("patch -Rp1 < qt5-base-nouveau-freeze.patch")
checkdeletepath="%s/qtbase/src/3rdparty" % absoluteWorkDir checkdeletepath="%s/qtbase/src/3rdparty" % absoluteWorkDir
desktop/toolkit/qt5/qt5-base/files/mkspecs.patch
+20 -22
View File
@@ -1,49 +1,47 @@
diff -Nurp qtbase-opensource/mkspecs/common/g++-base.conf qtbase-opensourcey/mkspecs/common/g++-base.conf diff -Nuar a/mkspecs/common/g++-base.conf b/mkspecs/common/g++-base.conf
--- qtbase-opensource/mkspecs/common/g++-base.conf 2015-10-13 07:35:32.000000000 +0300 --- a/mkspecs/common/g++-base.conf 2021-11-15 00:00:01.000000000 +0200
+++ mkspecs/common/g++-base.conf 2015-10-18 00:30:49.000000000 +0300 +++ b/mkspecs/common/g++-base.conf 2021-11-15 22:49:20.969099951 +0200
@@ -10,15 +10,19 @@ @@ -10,15 +10,17 @@
QMAKE_COMPILER = gcc QMAKE_COMPILER = gcc
-QMAKE_CC = gcc -QMAKE_CC = $${CROSS_COMPILE}gcc
+QMAKE_CC = PISILINUX_CC +QMAKE_CC = PISILINUX_CC
QMAKE_LINK_C = $$QMAKE_CC -QMAKE_LINK_C = $$QMAKE_CC
QMAKE_LINK_C_SHLIB = $$QMAKE_CC -QMAKE_LINK_C_SHLIB = $$QMAKE_CC
+QMAKE_LINK_C = PISILINUX_CC
+QMAKE_LINK_C_SHLIB = PISILINUX_CC
-QMAKE_CXX = g++ -QMAKE_CXX = $${CROSS_COMPILE}g++
+QMAKE_CXX = PISILINUX_CXX +QMAKE_CXX = PISILINUX_CXX
-QMAKE_LINK = $$QMAKE_CXX -QMAKE_LINK = $$QMAKE_CXX
-QMAKE_LINK_SHLIB = $$QMAKE_CXX -QMAKE_LINK_SHLIB = $$QMAKE_CXX
+QMAKE_LINK = PISILINUX_CXX +QMAKE_LINK = PISILINUX_CXX
+QMAKE_LINK_SHLIB = PISILINUX_CXX +QMAKE_LINK_SHLIB = PISILINUX_CXX
+QMAKE_LINK_C = PISILINUX_CC
+QMAKE_LINK_C_SHLIB = PISILINUX_CC
+ +
+QMAKE_LFLAGS_RELEASE += PISILINUX_LDFLAGS +QMAKE_LFLAGS_RELEASE += PISILINUX_LDFLAGS
QMAKE_PCH_OUTPUT_EXT = .gch QMAKE_PCH_OUTPUT_EXT = .gch
diff -Nurp qtbase-opensource/mkspecs/common/g++-unix.conf qtbase-opensourcey/mkspecs/common/g++-unix.conf diff -Nuar a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
--- qtbase-opensource/mkspecs/common/g++-unix.conf 2015-10-13 07:35:32.000000000 +0300 --- a/mkspecs/common/g++-unix.conf 2021-11-15 00:00:01.000000000 +0200
+++ mkspecs/common/g++-unix.conf 2015-10-18 00:31:47.000000000 +0300 +++ b/mkspecs/common/g++-unix.conf 2021-11-15 22:51:51.058450056 +0200
@@ -10,5 +10,5 @@ @@ -10,5 +10,5 @@
include(g++-base.conf) include(g++-base.conf)
-QMAKE_LFLAGS_RELEASE += -Wl,-O1 -QMAKE_LFLAGS_RELEASE += -Wl,-O1
+QMAKE_LFLAGS_RELEASE += PISILINUX_LDFLAGS +QMAKE_LFLAGS_RELEASE += PISILINUX_LDFLAGS
QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
diff -Nurp qtbase-opensource/mkspecs/common/linux.conf qtbase-opensourcey/mkspecs/common/linux.conf diff -Nuar a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
--- qtbase-opensource/mkspecs/common/linux.conf 2015-10-13 07:35:32.000000000 +0300 --- a/mkspecs/common/linux.conf 2021-11-15 00:00:01.000000000 +0200
+++ mkspecs/common/linux.conf 2015-10-18 00:33:07.000000000 +0300 +++ b/mkspecs/common/linux.conf 2021-11-15 22:52:35.802019704 +0200
@@ -49,7 +49,7 @@ QMAKE_OBJCOPY = objcopy @@ -48,5 +48,5 @@
QMAKE_NM = nm -P QMAKE_NM = nm -P
QMAKE_RANLIB = QMAKE_RANLIB =
-QMAKE_STRIP = strip -QMAKE_STRIP = strip
+QMAKE_STRIP = +QMAKE_STRIP =
QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_STRIPFLAGS_LIB += --strip-unneeded
include(unix.conf)
desktop/toolkit/qt5/qt5-base/pspec.xml
+10 -3
View File
@@ -11,7 +11,7 @@
<Summary>Cross platform application and UI framework</Summary> <Summary>Cross platform application and UI framework</Summary>
<Description>Cross platform application and UI development framework</Description> <Description>Cross platform application and UI development framework</Description>
<License>'GPL3' 'LGPL3' 'FDL' 'custom'</License> <License>'GPL3' 'LGPL3' 'FDL' 'custom'</License>
<Archive sha1sum="b5ad67fc6381ad7fae0296944734198488d096a3" type="tarxz">http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz</Archive> <Archive sha1sum="f275e688bd3f9febfef6bc4f63ddb09f131f5ace" type="tarbz2">https://invent.kde.org/qt/qt/qtbase/-/archive/kde/5.15/qtbase-kde-5.15.tar.bz2</Archive>
<AdditionalFiles> <AdditionalFiles>
<!-- <AdditionalFile target="qt5-base-nouveau-freeze.patch">qt5-base-nouveau-freeze.patch</AdditionalFile> --> <!-- <AdditionalFile target="qt5-base-nouveau-freeze.patch">qt5-base-nouveau-freeze.patch</AdditionalFile> -->
</AdditionalFiles> </AdditionalFiles>
@@ -84,8 +84,8 @@
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- Pisilinux Patches --> <!-- Pisilinux Patches -->
<Patch>mkspecs2.patch</Patch> <Patch level="1">mkspecs3.patch</Patch>
<Patch level="1">qt_kde.patch</Patch> <!-- <Patch level="1">qt_kde.patch</Patch> -->
<Patch level="1">qt5-base-nostrip.patch</Patch> <Patch level="1">qt5-base-nostrip.patch</Patch>
<!-- <Patch level="1">qtbug-86319.patch</Patch> --> <!-- <Patch level="1">qtbug-86319.patch</Patch> -->
<!-- <Patch level="1">qtbug-78966.patch</Patch> --> <!-- <Patch level="1">qtbug-78966.patch</Patch> -->
@@ -280,6 +280,13 @@
</Package>--> </Package>-->
<History> <History>
<Update release="34">
<Date>2021-11-15</Date>
<Version>5.15.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="33"> <Update release="33">
<Date>2021-11-10</Date> <Date>2021-11-10</Date>
<Version>5.15.2</Version> <Version>5.15.2</Version>