diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-10-17 13:33:32 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-10-17 13:33:32 +0000 |
| commit | 88ec317f89795db60e6ba9f6fbcb570a88174d03 (patch) | |
| tree | a31a86b6ffc9e6f719a1b512d61ffcbfa6ce0fa1 /main/qt | |
| parent | 9ef320d788deb38a2727e2ee4ff6629a181f5329 (diff) | |
| download | aports-88ec317f89795db60e6ba9f6fbcb570a88174d03.tar.bz2 aports-88ec317f89795db60e6ba9f6fbcb570a88174d03.tar.xz | |
main/qt: workaround for gcc bug
remove -O2 for declarative to work around a bug in gcc
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78004
Diffstat (limited to 'main/qt')
| -rw-r--r-- | main/qt/APKBUILD | 12 | ||||
| -rw-r--r-- | main/qt/gcc-6.2.1-workaround.patch | 15 |
2 files changed, 23 insertions, 4 deletions
diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD index ff53cff9a1..97b159476d 100644 --- a/main/qt/APKBUILD +++ b/main/qt/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt pkgver=4.8.7 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform application and UI framework" url="http://qt-project.org/" arch="all" @@ -34,6 +34,7 @@ source="http://download.qt-project.org/official_releases/qt/4.8/$pkgver/qt-every qt-everywhere-opensource-src-4.8.7-gcc6.patch qt-aarch64.patch qtcore-4.8.5-libressl.patch + gcc-6.2.1-workaround.patch " _builddir="$srcdir"/qt-everywhere-opensource-src-$pkgver @@ -291,7 +292,8 @@ bc83dc99f866423b4803453a0e2949d2 qt-musl.patch 7467e168418c50b2737b4b2fab4448fe qsettings-recursive-global-mutex.patch 8ba77cd8f325c38daca8eadc982395a4 qt-everywhere-opensource-src-4.8.7-gcc6.patch 2a9572f3b758fc3ca9ff5fc40012a2a4 qt-aarch64.patch -5fb430ea26cc72dcb16164bd952c1b91 qtcore-4.8.5-libressl.patch" +5fb430ea26cc72dcb16164bd952c1b91 qtcore-4.8.5-libressl.patch +2cbcd6e279e50eb2f230960c235dd35f gcc-6.2.1-workaround.patch" sha256sums="e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 qt-everywhere-opensource-src-4.8.7.tar.gz 1094300e3d69e55eb69d87cbaac6724f68b0618938c6eb1b0ddd22ba99c7f8a2 assistant.desktop 74c2c5d27a1c1ad08ab01122bcf333f75d0a014b4755d3ddd8764c2425f6e320 designer.desktop @@ -304,7 +306,8 @@ e70bdddf67c358c02099bebee460e3c5456666562bff9ef9ebaacf9f4ea7a6df qt-musl.patch 8ef97783ff93a515a31c1e27c6b3b22e2ad2fd9cf0fa94965e5c413ae579e64c qsettings-recursive-global-mutex.patch aaa073195b6fc47ebdc241574da4a29e7ba0a1ae51bdf9a64b866c683f30684a qt-everywhere-opensource-src-4.8.7-gcc6.patch 9269bd8552688b75be1468eaca6afdc0c054e644a73a9cffddb6855a96faf86f qt-aarch64.patch -0efa3b6f7f25e775874a5f2e09c4111143aafcf9b17b4494b0922a501750bc2c qtcore-4.8.5-libressl.patch" +0efa3b6f7f25e775874a5f2e09c4111143aafcf9b17b4494b0922a501750bc2c qtcore-4.8.5-libressl.patch +781d8ec3a2cfe4980e6707d1dcbb2a223c3aaa23f68a553527f0d38a765d98f6 gcc-6.2.1-workaround.patch" sha512sums="f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 qt-everywhere-opensource-src-4.8.7.tar.gz 005ed6fe50b237e4541c0f30cbd87ec5425eff7e7c8d55d2b9b24ea8469e75e1fc8a3f26296841ab4cbd566517b3f1aa1fa7b36e1a9677d284cfff615fd24614 assistant.desktop 731aae6a0d776c1be5a49dadc5480b205ba5c8e056d108e2bb96a19dd52b6c6ca22387b37505cf97a2575228cd5dd65c773d0fde1c26299e47fdc11a49f651fd designer.desktop @@ -317,4 +320,5 @@ a4947c7210f5b9a39f78b1056d2fe87bc9e25dda7d6287f138f8889ae8a3a8687ed7346261f219e9 277e5ceec4fcc5d77a8591eafdb24125a54770576b7997aee6df39d85a7f1deabf8547fb42127cb118ebb8e7f81e3a3624a75d461581052dadf7abb99f1c9bd7 qsettings-recursive-global-mutex.patch dd58096123e99d8cdd1a29dfca45d1f23c912a21edc6074a5398637ecca29b8b3535d862043c5d15b4ab44609d674242d93c31fcae835fede4ddfcc36e63ea26 qt-everywhere-opensource-src-4.8.7-gcc6.patch c76f7cb83e3e48e9798ada7c1d2406d560294fe7c38a73e42317db8f83ff9e86fdf7c18bd408cf658c07782733b72dcf03328b267db30cb9bccc11394b2ee93a qt-aarch64.patch -bde982ca01a6ee6a5d10a08babd8474e67e84932d996b1e19970e75fa4a9b71a08e81065a13f0a1cce1ac681d44d2e559562ee5ab92e9dfd5fd2cafe28370a74 qtcore-4.8.5-libressl.patch" +bde982ca01a6ee6a5d10a08babd8474e67e84932d996b1e19970e75fa4a9b71a08e81065a13f0a1cce1ac681d44d2e559562ee5ab92e9dfd5fd2cafe28370a74 qtcore-4.8.5-libressl.patch +bf316db4fbd3dfae40aad25573a201c7acc2fb5e34daff73e074a7c0232d9952f392c08b3b1271c7444c5d7da4d7d03fc56efee86a58a4578a9140739d45a616 gcc-6.2.1-workaround.patch" diff --git a/main/qt/gcc-6.2.1-workaround.patch b/main/qt/gcc-6.2.1-workaround.patch new file mode 100644 index 0000000000..b3ec25c90b --- /dev/null +++ b/main/qt/gcc-6.2.1-workaround.patch @@ -0,0 +1,15 @@ +This is a workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78004 + +diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro +index 5bf4e01..d1c56ae 100644 +--- a/src/declarative/declarative.pro ++++ b/src/declarative/declarative.pro +@@ -4,7 +4,7 @@ QT = core gui script network + contains(QT_CONFIG, svg): QT += svg + DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING + win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 +-solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 ++QMAKE_CXXFLAGS_RELEASE -= -O2 + + unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui + |