diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-10-07 12:29:29 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-10-07 12:29:29 +0000 |
| commit | 0448bbf267163f245d410ae86879390b6d502f39 (patch) | |
| tree | fbd33d222caa082fce13d301011b24455849613e /main | |
| parent | c5461a8402d2c56f1e0c63da482b179e945b1242 (diff) | |
| download | aports-0448bbf267163f245d410ae86879390b6d502f39.tar.bz2 aports-0448bbf267163f245d410ae86879390b6d502f39.tar.xz | |
main/qt: fix musl build
Diffstat (limited to 'main')
| -rw-r--r-- | main/qt/APKBUILD | 10 | ||||
| -rw-r--r-- | main/qt/qt-clucene-timeb.patch | 17 | ||||
| -rw-r--r-- | main/qt/qt-musl.patch | 14 |
3 files changed, 40 insertions, 1 deletions
diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD index 703ec76284..dd1878d79b 100644 --- a/main/qt/APKBUILD +++ b/main/qt/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=qt pkgver=4.8.5 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform application and UI framework" url="http://qt-project.org/" arch="all" @@ -21,6 +21,8 @@ makedepends="$depends_dev postgresql-dev mysql-dev unixodbc-dev cups-dev install= source="http://download.qt-project.org/official_releases/qt/4.8/$pkgver/qt-everywhere-opensource-src-4.8.5.tar.gz qt-gtk-theme-fix.patch + qt-musl.patch + qt-clucene-timeb.patch qsettings-recursive-global-mutex.patch assistant.desktop designer.desktop @@ -273,6 +275,8 @@ lang() { md5sums="1864987bdbb2f58f8ae8b350dfdbe133 qt-everywhere-opensource-src-4.8.5.tar.gz 8eeac363a5d9bc1ca06501a7cbe59b08 qt-gtk-theme-fix.patch +bc83dc99f866423b4803453a0e2949d2 qt-musl.patch +14549e243772acfe2e9e0bf5d8d001f3 qt-clucene-timeb.patch 7467e168418c50b2737b4b2fab4448fe qsettings-recursive-global-mutex.patch a445c6917086d80f1cfc1e40cb6b0132 assistant.desktop d457f0a0ad68a3861c3cadefe3b42ded designer.desktop @@ -280,6 +284,8 @@ d457f0a0ad68a3861c3cadefe3b42ded designer.desktop c29f2993d6a0f73d756d2fa36e130e1c qtconfig.desktop" sha256sums="eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 qt-everywhere-opensource-src-4.8.5.tar.gz b64ea69ca9ed18f464a3810964b340432c528ebb02c9c7851ecc8e99cfe74877 qt-gtk-theme-fix.patch +e70bdddf67c358c02099bebee460e3c5456666562bff9ef9ebaacf9f4ea7a6df qt-musl.patch +0c74a82080bcb8f4a700e907f4f1ed98a0338c6954620ee42c82002b199acedc qt-clucene-timeb.patch 8ef97783ff93a515a31c1e27c6b3b22e2ad2fd9cf0fa94965e5c413ae579e64c qsettings-recursive-global-mutex.patch 1094300e3d69e55eb69d87cbaac6724f68b0618938c6eb1b0ddd22ba99c7f8a2 assistant.desktop 74c2c5d27a1c1ad08ab01122bcf333f75d0a014b4755d3ddd8764c2425f6e320 designer.desktop @@ -287,6 +293,8 @@ b64ea69ca9ed18f464a3810964b340432c528ebb02c9c7851ecc8e99cfe74877 qt-gtk-theme-f 1e5cb7c2f12d4db35d668f01548a2bef131fe92133d76c78170fb74a377d5ef8 qtconfig.desktop" sha512sums="47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb qt-everywhere-opensource-src-4.8.5.tar.gz 4be22db63c27ce2fa8c4f0af47f951b3aebb1f41c63c1ff02cec429be26d86f869ce8d137e313ea59a7540ebf1866ef2245471b754588776d20f881041141b55 qt-gtk-theme-fix.patch +fb621e9e5a60bb5bd4ad86fa41772fd8db7e8ad3a6e8d36a3d720d493d462db618e4bf3187e3eb66d123fceca64bbbd2df2afba506cc4c79bafa456cd67e82aa qt-musl.patch +a4947c7210f5b9a39f78b1056d2fe87bc9e25dda7d6287f138f8889ae8a3a8687ed7346261f219e9e39afb5143e895b52804347484d10c42907868c4eac9ef0a qt-clucene-timeb.patch 277e5ceec4fcc5d77a8591eafdb24125a54770576b7997aee6df39d85a7f1deabf8547fb42127cb118ebb8e7f81e3a3624a75d461581052dadf7abb99f1c9bd7 qsettings-recursive-global-mutex.patch 005ed6fe50b237e4541c0f30cbd87ec5425eff7e7c8d55d2b9b24ea8469e75e1fc8a3f26296841ab4cbd566517b3f1aa1fa7b36e1a9677d284cfff615fd24614 assistant.desktop 731aae6a0d776c1be5a49dadc5480b205ba5c8e056d108e2bb96a19dd52b6c6ca22387b37505cf97a2575228cd5dd65c773d0fde1c26299e47fdc11a49f651fd designer.desktop diff --git a/main/qt/qt-clucene-timeb.patch b/main/qt/qt-clucene-timeb.patch new file mode 100644 index 0000000000..a0d3ed6400 --- /dev/null +++ b/main/qt/qt-clucene-timeb.patch @@ -0,0 +1,17 @@ +--- qt-everywhere-opensource-src-4.8.5/src/3rdparty/clucene/src/CLucene/util/Misc.cpp.orig ++++ qt-everywhere-opensource-src-4.8.5/src/3rdparty/clucene/src/CLucene/util/Misc.cpp +@@ -20,11 +20,11 @@ + # endif + #endif + +-#ifdef _CL_HAVE_SYS_TIMEB_H ++#ifndef UNDER_CE ++#ifdef _defined(_CLCOMPILER_MSVC) || defined(__MINGW32__) || defined(__BORLANDC__) + # include <sys/timeb.h> + #endif +- +-#ifdef UNDER_CE ++#else + #include <QTime> + #endif + diff --git a/main/qt/qt-musl.patch b/main/qt/qt-musl.patch new file mode 100644 index 0000000000..90b9ccda08 --- /dev/null +++ b/main/qt/qt-musl.patch @@ -0,0 +1,14 @@ +--- qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h.orig ++++ qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h +@@ -86,11 +86,7 @@ + + #undef QT_SOCKLEN_T + +-#if defined(__GLIBC__) && (__GLIBC__ >= 2) + #define QT_SOCKLEN_T socklen_t +-#else +-#define QT_SOCKLEN_T int +-#endif + + #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) + #define QT_SNPRINTF ::snprintf |