summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Zardi2021-09-02 22:51:26 +0200
committerFrancesco Zardi2021-09-02 22:51:26 +0200
commit29d1cec0105217195ee39c65263884dd6028383b (patch)
treecd99dacd72ce78b3f624dd7cb4d5ef166d3e5d8f
parent35b7b5b83f7ba1945fa2ac98896b9c90cbc28641 (diff)
downloadaur-29d1cec0105217195ee39c65263884dd6028383b.tar.gz
Fix compilation error
This time, don't disable the error but rather fix the issue in the code
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
-rw-r--r--qt3-other-patches.tar.bz2bin23177 -> 23320 bytes
3 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0341d76400ee..b01dd644ec64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -32,7 +32,7 @@ pkgbase = qt3
source = qt3-other-patches.tar.bz2
source = qt3-fedora-patches.tar.bz2
sha256sums = 1b7a1ff62ec5a9cb7a388e2ba28fda6f960b27f27999482ebeceeadb72ac9f6e
- sha256sums = d8a7c622b0a5054d85d465f7b1b6db03233fbcf9fd132f7f0bd7c6848ff906ce
+ sha256sums = 7e51f87792db4e2ffa557a7fe7614a9ac9ebc54328b2e998363bd102f78d2185
sha256sums = 673b10f3652d72d65515f5a0c21c27d39d0c3b7fade30ae77ebd7facca6acacb
pkgname = qt3
diff --git a/PKGBUILD b/PKGBUILD
index 65d656a8b6f6..72e8ee5628a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,7 +23,7 @@ source=(https://download.qt.io/archive/qt/3/qt-x11-free-${pkgver}.tar.gz
qt3-other-patches.tar.bz2
qt3-fedora-patches.tar.bz2)
sha256sums=('1b7a1ff62ec5a9cb7a388e2ba28fda6f960b27f27999482ebeceeadb72ac9f6e'
- 'd8a7c622b0a5054d85d465f7b1b6db03233fbcf9fd132f7f0bd7c6848ff906ce'
+ '7e51f87792db4e2ffa557a7fe7614a9ac9ebc54328b2e998363bd102f78d2185'
'673b10f3652d72d65515f5a0c21c27d39d0c3b7fade30ae77ebd7facca6acacb')
prepare() {
@@ -161,6 +161,9 @@ prepare() {
# Fix CJK font/chars select error (FS#11245)
patch -p1 -i ../qt3-other-patches/eastern_asian_languagues.diff
+ # Fix compilation error
+ patch -p0 -i ../qt3-other-patches/fix-error-format-security.patch
+
# For immodule
sh ./make-symlinks.sh
@@ -178,7 +181,6 @@ prepare() {
sed -i "s|-O2|$CXXFLAGS -fno-strict-aliasing|" mkspecs/linux-g++{,-32,-64}/qmake.conf
sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
sed -i "s|read acceptance|acceptance=yes|" configure
- sed -i "s|-Werror=format-security||" qmake/Makefile.unix
}
build() {
diff --git a/qt3-other-patches.tar.bz2 b/qt3-other-patches.tar.bz2
index 07821192b814..92a360d62fc3 100644
--- a/qt3-other-patches.tar.bz2
+++ b/qt3-other-patches.tar.bz2
Binary files differ