[arch-commits] Commit in qt4/kde-unstable (PKGBUILD)
Date: Monday, February 18, 2013 @ 12:00:56
Author: andrea
Revision: 178217
Whoops
Modified:
qt4/kde-unstable/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-18 09:51:49 UTC (rev 178216)
+++ PKGBUILD2013-02-18 11:00:56 UTC (rev 178217)
@@ -105,5 +105,5 @@
rm
${pkgdir}/usr/lib/qt4/bin/{lrelease,lupdate,pixeltool,qcollectiongenerator}
rm
${pkgdir}/usr/lib/qt4/bin/{qdbus,qdbusviewer,qhelpconverter,qhelpgenerator}
rm -r ${pkgdir}/usr/lib/qt4/plugins/designer
-rm /usr/share/qt4/translations/{assistant,designer,linguist,qt_help}_*.qm
+rm
${pkgdir}/usr/share/qt4/translations/{assistant,designer,linguist,qt_help}_*.qm
}
[arch-commits] Commit in qt4/kde-unstable (PKGBUILD)
Date: Monday, February 18, 2013 @ 20:28:58
Author: andrea
Revision: 178237
Replace qtwebkit 2.3 too
Modified:
qt4/kde-unstable/PKGBUILD
--+
PKGBUILD |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-18 16:46:09 UTC (rev 178236)
+++ PKGBUILD2013-02-18 19:28:58 UTC (rev 178237)
@@ -23,8 +23,8 @@
'icu: Unicode support')
install=${pkgname}.install
options=('!libtool')
-replaces=('qt')
-conflicts=('qt')
+replaces=('qt=4.8.4' 'qtwebkit=2.3.beta2')
+conflicts=('qt=4.8.4' 'qtwebkit=2.3.beta2')
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz;
'qtconfig.desktop'
@@ -62,7 +62,6 @@
-system-sqlite \
-no-phonon \
-no-phonon-backend \
--no-webkit \
-graphicssystem raster \
-openssl-linked \
-nomake demos \
[arch-commits] Commit in qt4/kde-unstable (PKGBUILD ld-gold.patch)
Date: Monday, February 18, 2013 @ 21:49:29
Author: andrea
Revision: 178238
Fix build on i686
Added:
qt4/kde-unstable/ld-gold.patch
Modified:
qt4/kde-unstable/PKGBUILD
---+
PKGBUILD |9 +++--
ld-gold.patch | 22 ++
2 files changed, 29 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-18 19:28:58 UTC (rev 178237)
+++ PKGBUILD2013-02-18 20:49:29 UTC (rev 178238)
@@ -28,10 +28,12 @@
_pkgfqn=qt-everywhere-opensource-src-${pkgver}
source=(http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz;
'qtconfig.desktop'
-'improve-cups-support.patch')
+'improve-cups-support.patch'
+'ld-gold.patch')
md5sums=('89c5ecba180cae74c66260ac732dc5cb'
'20ca06ef59775d749b9451ce7437fa9a'
- 'c439c7731c25387352d8453ca7574971')
+ 'c439c7731c25387352d8453ca7574971'
+ '864de59a34a2f72ab2668dd918634b64')
build() {
cd ${_pkgfqn}
@@ -39,6 +41,9 @@
# (FS#28381) (KDEBUG#180051)
patch -p1 -i ${srcdir}/improve-cups-support.patch
+ # build on i686 fails
+ patch -p1 -i ${srcdir}/ld-gold.patch
+
export QT4DIR=${srcdir}/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
Added: ld-gold.patch
===
--- ld-gold.patch (rev 0)
+++ ld-gold.patch 2013-02-18 20:49:29 UTC (rev 178238)
@@ -0,0 +1,22 @@
+diff -up
qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me
qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
+---
qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me
2012-01-24 13:05:50.460890750 +0100
qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
2012-01-24 13:19:08.836799974 +0100
+@@ -3,12 +3,12 @@
+ contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
+ contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
+
+-linux-g++ {
+-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
+-message(Using gold linker)
+-QMAKE_LFLAGS+=-fuse-ld=gold
+-}
+-}
++#linux-g++ {
++#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
++#message(Using gold linker)
++#QMAKE_LFLAGS+=-fuse-ld=gold
++#}
++#}
+
+ # We use this flag on production branches
+ # See https://bugs.webkit.org/show_bug.cgi?id=60824
