added thunderbird and qt5

10 files changed, 0 insertions, 342 deletions

diff --git a/skip/cabal-stage0/cabal-stage0.xibuild b/skip/cabal-stage0/cabal-stage0.xibuild
deleted file mode 100644
index 4905da8..0000000
--- a/skip/cabal-stage0/cabal-stage0.xibuild
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-NAME="cabal-stage0"
-DESC="Cabal version used for bootstrapping"
-
-MAKEDEPS="make ghc"
-DEPS="gmp libffi musl zlib "
-
-PKG_VER=5b4258cbfa536b6362c4e20578ced51676206ea8
-SOURCE="https://github.com/haskell/cabal"
-BRANCH=$PKG_VER
-
-ADDITIONAL="linux-9.0.1.json depends-for-ghc-9.0.1.patch "
-
-prepare () {
-    apply_patches
-    cp linux-9.0.1.json "bootstrap"
-}
-
-build () {
-    ./bootstrap/bootstrap.py \
-    -d ./bootstrap/linux-9.0.1.json \
-		-w "$(command -v ghc)"
-}
-
-package () {
-    install -m 755 -D _build/bin/cabal "$PKG_DEST/usr/bin/cabal"
-	install -Dm644 LICENSE "$PKG_DEST/usr/share/licenses/cabal-stage0/LICENSE"
-}
diff --git a/skip/cabal-stage0/depends-for-ghc-9.0.1.patch b/skip/cabal-stage0/depends-for-ghc-9.0.1.patch
deleted file mode 100644
index 90dfae9..0000000
--- a/skip/cabal-stage0/depends-for-ghc-9.0.1.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-A lot of packages do not work with GHC 9.0.1 by default since their
-version constraint for packages from the standard library is too
-restrictive. Adjust these version constrains to fix the build.
-
-Only in b: _build
-diff -upr a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py
---- a/bootstrap/bootstrap.py	2021-11-17 20:24:56.563114540 +0100
-+++ b/bootstrap/bootstrap.py	2021-11-17 20:13:30.311479911 +0100
-@@ -147,6 +147,11 @@ def fetch_package(package: PackageName,
-             shutil.copyfileobj(resp, cabal_file.open('wb'))
-             verify_sha256(cabal_sha256, cabal_file)
- 
-+    if package == "ed25519":
-+        subprocess_run(["sed", "-e", "s/ghc-prim ..*/ghc-prim >= 0.1,/", "-i", cabal_file], check=True)
-+    elif package == "hackage-security":
-+        subprocess_run(["sed", "-e", "s/template-haskell ..*/template-haskell >= 2.7,/", "-i", cabal_file], check=True)
-+
-     return (tarball, cabal_file)
- 
- def read_bootstrap_info(path: Path) -> BootstrapInfo:
-diff -upr a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
---- a/cabal-install/cabal-install.cabal	2021-11-05 00:16:33.000000000 +0100
-+++ b/cabal-install/cabal-install.cabal	2021-11-17 20:17:03.488421095 +0100
-@@ -209,7 +209,7 @@ library
-         edit-distance >= 0.2.2 && < 0.3,
-         exceptions,
-         filepath   >= 1.4.0.0  && < 1.5,
--        hashable   >= 1.0      && < 1.4,
-+        hashable   >= 1.0,
-         HTTP       >= 4000.1.5 && < 4000.4,
-         mtl        >= 2.0      && < 2.3,
-         network-uri >= 2.6.0.2 && < 2.7,
-diff -upr a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal
---- a/cabal-install-solver/cabal-install-solver.cabal	2021-11-05 00:16:33.000000000 +0100
-+++ b/cabal-install-solver/cabal-install-solver.cabal	2021-11-17 19:42:41.703460745 +0100
-@@ -103,7 +103,7 @@ library
- 
-   build-depends:
-     , array         >=0.4      && <0.6
--    , base          >=4.10     && <4.15
-+    , base          >=4.10
-     , binary        >=0.7.3    && <0.9
-     , bytestring    >=0.10.6.0 && <0.12
-     , Cabal         ^>=3.7
diff --git a/skip/cabal-stage0/linux-9.0.1.json b/skip/cabal-stage0/linux-9.0.1.json
deleted file mode 100644
index 99cb1cb..0000000
--- a/skip/cabal-stage0/linux-9.0.1.json
+++ /dev/null
@@ -1 +0,0 @@
-{"builtin":[{"package":"rts","version":"1.0"},{"package":"ghc-prim","version":"0.7.0"},{"package":"ghc-bignum","version":"1.0"},{"package":"base","version":"4.15.0.0"},{"package":"array","version":"0.5.4.0"},{"package":"deepseq","version":"1.4.5.0"},{"package":"bytestring","version":"0.10.12.1"},{"package":"containers","version":"0.6.4.1"},{"package":"binary","version":"0.8.8.0"},{"package":"filepath","version":"1.4.2.1"},{"package":"time","version":"1.9.3"},{"package":"unix","version":"2.7.2.2"},{"package":"directory","version":"1.3.6.1"},{"package":"transformers","version":"0.5.6.2"},{"package":"mtl","version":"2.2.2"},{"package":"ghc-boot-th","version":"9.0.1"},{"package":"pretty","version":"1.1.3.6"},{"package":"template-haskell","version":"2.17.0.0"},{"package":"text","version":"1.2.4.1"},{"package":"parsec","version":"3.1.14.0"},{"package":"process","version":"1.6.11.0"},{"package":"stm","version":"2.5.0.0"},{"package":"exceptions","version":"0.10.4"}],"dependencies":[{"cabal_sha256":null,"flags":["-bundled-binary-generic"],"package":"Cabal","revision":null,"source":"local","src_sha256":null,"version":"3.7.0.0"},{"cabal_sha256":"714a55fd28d3e2533bd5b49e74f604ef8e5d7b06f249c8816f6c54aed431dcf1","flags":["-optimised-mixer"],"package":"splitmix","revision":0,"source":"hackage","src_sha256":"6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa","version":"0.1.0.4"},{"cabal_sha256":"8bee24dc0c985a90ee78d94c61f8aed21c49633686f0f1c14c5078d818ee43a2","flags":[],"package":"random","revision":0,"source":"hackage","src_sha256":"265c768fc5f2ca53cde6a87e706b4448cad474c3deece933c103f24453661457","version":"1.2.1"},{"cabal_sha256":"eb6758d0160d607e0c45dbd6b196f515b9a589fd4f6d2f926929dd5d56282d37","flags":[],"package":"base-orphans","revision":0,"source":"hackage","src_sha256":"20a21c4b7adb0fd844b25e196241467406a28286b021f9b7a082ab03fa8015eb","version":"0.8.6"},{"cabal_sha256":"4f6dfb2a191dd3068c2915ba96a1ab3c4b78b4b4e57186698b9ab42007bfa926","flags":[],"package":"ghc-bignum-orphans","revision":0,"source":"hackage","src_sha256":"a4c617c7b90288ba3e24c67633f99e97e11c2367686463b8884d2cd3591241db","version":"0.1.1"},{"cabal_sha256":"2d553c615bfea61a0b0ff7bc208904d009ff57dbd56f211fbae8584c12f432f9","flags":["+containers","+integer-gmp","-random-initial-seed"],"package":"hashable","revision":0,"source":"hackage","src_sha256":"a1af47889e6ddcbe137d625b7d40665930e935eb396aecbf35399862f276e57d","version":"1.4.0.0"},{"cabal_sha256":"b83dec34a53520de84c6dd3dc7aae45d22409b46eb471c478b98108215a370f0","flags":["-bench"],"package":"async","revision":1,"source":"hackage","src_sha256":"484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725","version":"2.2.4"},{"cabal_sha256":"d8699f46b485f105eea9c7158f3d432ca578e6bbe5d68751184e9899a41d430d","flags":["-old-bytestring","-old-time"],"package":"tar","revision":4,"source":"hackage","src_sha256":"b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de","version":"0.5.1.1"},{"cabal_sha256":"433a5e076aaa8eb3e4158abae78fb409c6bd754e9af99bc2e87583d2bcd8404a","flags":["-devel"],"package":"network","revision":0,"source":"hackage","src_sha256":"f223c08e1c67b1bae4e595dfe87c4873e9f8de7d3f92d0c18e44fd1b2ab01851","version":"3.1.2.5"},{"cabal_sha256":"a16dd922947a6877defe52c4c38d1ab48ed3f85a826930f5d1a568741d619993","flags":[],"package":"th-compat","revision":0,"source":"hackage","src_sha256":"6b5059caf6714f47da92953badf2f556119877e09708c14e206b3ae98b8681c6","version":"0.1.3"},{"cabal_sha256":"a4765164ed0a2d1668446eb2e03460ce98645fbf083598c690846af79b7de10d","flags":[],"package":"network-uri","revision":0,"source":"hackage","src_sha256":"57856db93608a4d419f681b881c9b8d4448800d5a687587dc37e8a9e0b223584","version":"2.6.4.1"},{"cabal_sha256":"6042643c15a0b43e522a6693f1e322f05000d519543a84149cb80aeffee34f71","flags":["-conduit10","-mtl1","+network-uri","-warn-as-error","-warp-tests"],"package":"HTTP","revision":1,"source":"hackage","src_sha256":"d6091c037871ac3d08d021c906206174567499d5a26a6cb804cf530cd590fe2d","version":"4000.3.16"},{"cabal_sha256":"64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a","flags":[],"package":"base16-bytestring","revision":0,"source":"hackage","src_sha256":"1d5a91143ef0e22157536093ec8e59d226a68220ec89378d5dcaeea86472c784","version":"1.0.2.0"},{"cabal_sha256":"50ec0e229255d4c45cbdd568da011311b8887f304b931564886016f4984334d8","flags":[],"package":"base64-bytestring","revision":0,"source":"hackage","src_sha256":"fbf8ed30edde271eb605352021431d8f1b055f95a56af31fe2eacf6bdfdc49c9","version":"1.2.1.0"},{"cabal_sha256":"4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee","flags":[],"package":"edit-distance","revision":1,"source":"hackage","src_sha256":"3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a","version":"0.2.2.1"},{"cabal_sha256":null,"flags":["-debug-conflict-sets","-debug-expensive-assertions","-debug-tracetree"],"package":"cabal-install-solver","revision":null,"source":"local","src_sha256":null,"version":"3.7.0.0"},{"cabal_sha256":"188d0b5a0491e8b686b32d9b144c9287760ba333d2509bf3f17e3d846fbc2332","flags":["-exe","+use-cbits"],"package":"cryptohash-sha256","revision":0,"source":"hackage","src_sha256":"73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6","version":"0.11.102.1"},{"cabal_sha256":"ccce771562c49a2b29a52046ca68c62179e97e8fbeacdae32ca84a85445e8f42","flags":["-example"],"package":"echo","revision":0,"source":"hackage","src_sha256":"c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43","version":"0.1.4"},{"cabal_sha256":"fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa","flags":["+no-donna","+test-doctests","+test-hlint","+test-properties"],"package":"ed25519","revision":3,"source":"hackage","src_sha256":"d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d","version":"0.0.5.0"},{"cabal_sha256":"2db49b6cb6632a46ec446fc51870cd0d49e0a66d1c5d2063f46ae52a100eb856","flags":["+ofd-locking"],"package":"lukko","revision":1,"source":"hackage","src_sha256":"a80efb60cfa3dae18682c01980d76d5f7e413e191cd186992e1bf7388d48ab1f","version":"0.1.1.3"},{"cabal_sha256":"262a93dbf370be59f4ee57f3b1a51b338bc2c309797daa37c14f2262ae61dae4","flags":["-bundled-c-zlib","-non-blocking-ffi","-pkg-config"],"package":"zlib","revision":1,"source":"hackage","src_sha256":"807f6bddf9cb3c517ce5757d991dde3c7e319953a22c86ee03d74534bd5abc88","version":"0.6.2.3"},{"cabal_sha256":"ae6cdda307237c0b7efeebfb0bf23ff8a26c30f5ba295dce5e4f81ef6e63fff6","flags":["+base48","+lukko","-mtl21","-old-directory","+use-network-uri"],"package":"hackage-security","revision":8,"source":"hackage","src_sha256":"9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17","version":"0.6.0.1"},{"cabal_sha256":"2561adac8ce373910948066debe090a22b336b129ba5af18c0332524d16e72ce","flags":[],"package":"regex-base","revision":0,"source":"hackage","src_sha256":"7b99408f580f5bb67a1c413e0bc735886608251331ad36322020f2169aea2ef1","version":"0.94.0.2"},{"cabal_sha256":"b6421e5356766b0c0a78b6094ae2e3a6259b42c147b717283c03c1cb09163dca","flags":["-_regex-posix-clib"],"package":"regex-posix","revision":0,"source":"hackage","src_sha256":"c7827c391919227711e1cff0a762b1678fd8739f9c902fc183041ff34f59259c","version":"0.96.0.1"},{"cabal_sha256":"25c6e802dc342307e78e5e60433f5e20d03aa783b08b009a399100eb9b6ec529","flags":[],"package":"resolv","revision":3,"source":"hackage","src_sha256":"81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671","version":"0.1.2.0"},{"cabal_sha256":null,"flags":["+lukko","+native-dns"],"package":"cabal-install","revision":null,"source":"local","src_sha256":null,"version":"3.7.0.0"},{"cabal_sha256":null,"flags":["+lukko","+native-dns"],"package":"cabal-install","revision":null,"source":"local","src_sha256":null,"version":"3.7.0.0"}]}
\ No newline at end of file
diff --git a/skip/cabal/cabal.project.freeze b/skip/cabal/cabal.project.freeze
deleted file mode 100644
index 07c927e..0000000
--- a/skip/cabal/cabal.project.freeze
+++ /dev/null
@@ -1,65 +0,0 @@
-active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.6.2.0,
-             Cabal -bundled-binary-generic,
-             any.HTTP ==4000.3.16,
-             HTTP -conduit10 -mtl1 +network-uri -warn-as-error -warp-tests,
-             any.array ==0.5.4.0,
-             any.async ==2.2.4,
-             async -bench,
-             any.base ==4.15.0.0,
-             any.base-orphans ==0.8.6,
-             any.base16-bytestring ==1.0.2.0,
-             any.base64-bytestring ==1.2.1.0,
-             any.binary ==0.8.8.0,
-             any.bytestring ==0.10.12.1,
-             cabal-install -debug-conflict-sets -debug-expensive-assertions -debug-tracetree +lukko +native-dns,
-             any.containers ==0.6.4.1,
-             any.cryptohash-sha256 ==0.11.102.1,
-             cryptohash-sha256 -exe +use-cbits,
-             any.deepseq ==1.4.5.0,
-             any.directory ==1.3.6.1,
-             any.echo ==0.1.4,
-             echo -example,
-             any.ed25519 ==0.0.5.0,
-             ed25519 +no-donna +test-doctests +test-hlint +test-properties,
-             any.edit-distance ==0.2.2.1,
-             any.filepath ==1.4.2.1,
-             any.ghc-bignum ==1.0,
-             any.ghc-bignum-orphans ==0.1.1,
-             any.ghc-boot-th ==9.0.1,
-             any.ghc-prim ==0.7.0,
-             any.hackage-security ==0.6.0.1,
-             hackage-security +base48 +lukko -mtl21 -old-directory +use-network-uri,
-             any.hashable ==1.4.0.0,
-             hashable +containers +integer-gmp -random-initial-seed,
-             any.hsc2hs ==0.68.8,
-             hsc2hs -in-ghc-tree,
-             any.lukko ==0.1.1.3,
-             lukko +ofd-locking,
-             any.mtl ==2.2.2,
-             any.network ==3.1.2.5,
-             network -devel,
-             any.network-uri ==2.6.4.1,
-             any.parsec ==3.1.14.0,
-             any.pretty ==1.1.3.6,
-             any.process ==1.6.11.0,
-             any.random ==1.2.1,
-             any.regex-base ==0.94.0.2,
-             any.regex-posix ==0.96.0.1,
-             regex-posix -_regex-posix-clib,
-             any.resolv ==0.1.2.0,
-             any.rts ==1.0,
-             any.splitmix ==0.1.0.4,
-             splitmix -optimised-mixer,
-             any.stm ==2.5.0.0,
-             any.tar ==0.5.1.1,
-             tar -old-bytestring -old-time,
-             any.template-haskell ==2.17.0.0,
-             any.text ==1.2.4.1,
-             any.th-compat ==0.1.3,
-             any.time ==1.9.3,
-             any.transformers ==0.5.6.2,
-             any.unix ==2.7.2.2,
-             any.zlib ==0.6.2.3,
-             zlib -bundled-c-zlib -non-blocking-ffi -pkg-config
-index-state: hackage.haskell.org 2021-11-17T20:47:55Z
diff --git a/skip/cabal/cabal.xibuild b/skip/cabal/cabal.xibuild
deleted file mode 100644
index 501b0e3..0000000
--- a/skip/cabal/cabal.xibuild
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-NAME="cabal"
-DESC="The Haskell Cabal"
-
-MAKEDEPS="cabal-stage0"
-DEPS="gmp libffi musl zlib "
-
-PKG_VER=3.6.2.0
-SOURCE="https://hackage.haskell.org/package/cabal-install-$PKG_VER/cabal-install-$PKG_VER.tar.gz"
-ADDITIONAL="cabal.project.freeze "
-
-
-prepare () {
-    export cabal_home="$BUILD_ROOT/dist"
-
-	ln -sf cabal.project.freeze \
-		"cabal.project.freeze"
-}
-
-build () {
-    HOME="$cabal_home" cabal v2-update
-	HOME="$cabal_home" cabal v2-build all \
-		--allow-newer \
-		--jobs=${JOBS:-1} \
-		--prefix=/usr \
-		--docdir=/usr/share/doc/cabal \
-		--sysconfdir=/etc
-}
-
-package () {
-    HOME="$cabal_home" cabal list-bin --allow-newer all:exes | \
-    xargs install -Dm755 -t "$PKG_DEST"/usr/bin
-
-	mkdir -p "$PKG_DEST"/usr/share/man/man1
-	HOME="$cabal_home" cabal man --raw \
-		> "$PKG_DEST"/usr/share/man/man1/cabal.1
-
-	install -Dm644 LICENSE "$PKG_DEST/usr/share/licenses/cabal/LICENSE"
-}
diff --git a/skip/linux-firmware/linux-firmware.xibuild b/skip/linux-firmware/linux-firmware.xibuild
deleted file mode 100644
index 67f5f14..0000000
--- a/skip/linux-firmware/linux-firmware.xibuild
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS=""
-DEPS="linux"
-
-PKG_VER=5.15.14
-SOURCE=https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
-BRANCH=0c6a7b3bf728b95c8b7b95328f94335e2bb2c967
-
-DESC="All firmware files for linux"
-
-package () {
-    mkdir -p $PKG_DEST/usr/lib/firmware
-    cp -r * $PKG_DEST/usr/lib/firmware
-}
diff --git a/skip/qt5-qtbase/qt-musl-iconv-no-bom.patch b/skip/qt5-qtbase/qt-musl-iconv-no-bom.patch
deleted file mode 100644
index 8bf35ec..0000000
--- a/skip/qt5-qtbase/qt-musl-iconv-no-bom.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qtbase/src/corelib/codecs/qiconvcodec.cpp	2017-01-18 15:20:58.000000000 +0100
-+++ qtbase/src/corelib/codecs/qiconvcodec.cpp	2017-02-21 14:33:32.423808603 +0100
-@@ -64,7 +64,7 @@
- #elif defined(Q_OS_AIX)
- #  define NO_BOM
- #  define UTF16 "UCS-2"
--#elif defined(Q_OS_FREEBSD)
-+#elif defined(Q_OS_FREEBSD) || (defined(Q_OS_LINUX) && !defined(__GLIBC__))
- #  define NO_BOM
- #  if Q_BYTE_ORDER == Q_BIG_ENDIAN
- #    define UTF16 "UTF-16BE"
diff --git a/skip/qt5-qtbase/qt5-base-cflags.patch b/skip/qt5-qtbase/qt5-base-cflags.patch
deleted file mode 100644
index c33aa78..0000000
--- a/skip/qt5-qtbase/qt5-base-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
diff --git a/skip/qt5-qtbase/qt5-base-nostrip.patch b/skip/qt5-qtbase/qt5-base-nostrip.patch
deleted file mode 100644
index 17d24b4..0000000
--- a/skip/qt5-qtbase/qt5-base-nostrip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
- 
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
diff --git a/skip/qt5-qtbase/qt5-qtbase.xibuild b/skip/qt5-qtbase/qt5-qtbase.xibuild
deleted file mode 100644
index d9e4791..0000000
--- a/skip/qt5-qtbase/qt5-qtbase.xibuild
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-NAME="qt5-qtbase"
-DESC="Qt5 - QtBase components"
-
-MAKEDEPS="make libexecinfo"
-DEPS="dbus glib icu openssl pcre2 xdg-utils zlib zstd musl "
-
-PKG_VER=5.15.4
-commit="e0a15c11b853954d4189b2e30aa2450184de0987"
-SOURCE="https://invent.kde.org/qt/qt/qtbase/-/archive/$commit/qtbase-$commit.tar.gz"
-ADDITIONAL="
-compile-with-libexecinfo-enabled.patch
-qt-musl-iconv-no-bom.patch
-qt5-base-cflags.patch
-qt5-base-nostrip.patch
-qt5-qtbase.xibuild
-"
-
-qt5_prefix=/usr/lib/qt5
-qt5_datadir=/usr/share/qt5
-
-prepare () {
-    apply_patches
-    sed -i -e "s|-O2|$CXXFLAGS|" \
-    -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \
-    -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \
-		mkspecs/common/*.conf
-
-	mkdir .git
-}
-
-build () {
-    	./configure -confirm-license -opensource \
-		-archdatadir "$qt5_prefix" \
-		-bindir  "$qt5_prefix"/bin \
-		-datadir "$qt5_datadir" \
-		-dbus-linked \
-		-docdir /usr/share/doc/qt5 \
-		-examplesdir /usr/share/doc/qt5/examples \
-		-glib \
-		-headerdir /usr/include/qt5 \
-		-icu \
-		-importdir "$qt5_prefix"/imports \
-		-libexecdir "$qt5_prefix"/libexec \
-		-no-rpath \
-		-no-separate-debug-info \
-		-no-pch \
-		-nomake examples \
-        -opengl \
-		-openssl-linked \
-		-optimized-qmake \
-		-plugin-sql-sqlite \
-		-plugindir "$qt5_prefix"/plugins \
-		-prefix /usr \
-		-sysconfdir /etc/xdg \
-		-system-libjpeg \
-		-system-libpng \
-		-system-sqlite \
-		-system-zlib \
-		-translationdir "$qt5_datadir"/translations \
-		-no-reduce-relocations 
-    export LDFLAGS="-lexecinfo"
-	make
-}
-
-package () {
-    make INSTALL_ROOT=$PKG_DEST install
-    install -d $PKG_DEST/usr/bin
-	for i in "$PKG_DEST"/"$qt5_prefix"/bin/*; do
-		name=${i##*/}
-		case $_name in
-		*.*)	dest="$PKG_DEST"/usr/bin/${name%.*}-qt5.${name##*.};;
-		*)	dest="$PKG_DEST"/usr/bin/${name%.*}-qt5;;
-		esac
-		ln -s ../lib/qt5/bin/"$name" "$dest"
-	done
-}