diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-09-22 15:29:43 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-09-29 09:27:57 +0200 |
| commit | 746eb0ba7a5d89e64bb5da2e6fff7fb9ce335210 (patch) | |
| tree | 72cbb87e192cb13d5e4f8559cda6f8a06bcba468 /arch | |
| parent | f118e744072671eb4ac939b1e3bcd6d5b837d72e (diff) | |
| download | tde-packaging-746eb0ba7a5d89e64bb5da2e6fff7fb9ce335210.tar.gz tde-packaging-746eb0ba7a5d89e64bb5da2e6fff7fb9ce335210.zip | |
ArchLinux tqt3: Add 'glu' to depends to be sure build with OpenGL support.
Backport patch to fix buildkey.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9ef3d4a4b9fc3e366f4a169482997f5ce2fbdf4f)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/tde-core/tde-tqt3/PKGBUILD | 11 | ||||
| -rw-r--r-- | arch/tde-core/tde-tqt3/bp000-fix-build-key.diff | 21 |
2 files changed, 29 insertions, 3 deletions
diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD index 36583a4eb..0f56bd687 100644 --- a/arch/tde-core/tde-tqt3/PKGBUILD +++ b/arch/tde-core/tde-tqt3/PKGBUILD @@ -21,9 +21,12 @@ makedepends=('libcups' 'unixodbc' 'libmng' 'xorg-xrandr' - 'libxft') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqt3-trinity-${pkgver}.tar.xz") -md5sums=('47d8495fcf444c5db2cf56843be3f746') + 'libxft' + 'glu') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqt3-trinity-${pkgver}.tar.xz" + 'bp000-fix-build-key.diff') +md5sums=('47d8495fcf444c5db2cf56843be3f746' + '950e3885135fd9844de856c770f19767') _prefix="/opt/trinity/tqt3" @@ -31,6 +34,8 @@ build() { cd ${srcdir}/tqt3-trinity-${pkgver} + patch -p1 < ${srcdir}/bp000-fix-build-key.diff + # These are probably arch-specific. They were present in old qt3 # PKGBULD, they were present in kdemod3 PKGBUILD, they are present # here. diff --git a/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff b/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff new file mode 100644 index 000000000..a0a0aa42e --- /dev/null +++ b/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff @@ -0,0 +1,21 @@ +commit 0d60417c83fd2bd8b6fccb6dd7171b113296860a +Author: Slávek Banko <slavek.banko@axis.cz> +Date: Wed Sep 22 15:00:08 2021 +0200 + + Fix buildkey for GCC >= 7 if the version is listed including minor numbers. + + Signed-off-by: Slávek Banko <slavek.banko@axis.cz> + +diff --git a/configure b/configure +index 92cec273..f021f563 100755 +--- a/configure ++++ b/configure +@@ -2828,7 +2828,7 @@ g++*) + 3.*) + COMPILER_VERSION="3.*" + ;; +- [1-9][0-9]|[7-9]|[4-6].*) ++ [1-9][0-9]|[1-9][0-9].*|[7-9]|[4-9].*) + COMPILER_VERSION="4.*" + ;; + *) |