mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-03 22:47:14 +08:00
downgrade to qt-4.7.0 due lokalize-bug
This commit is contained in:
Phil Miller
parent
a8b5d13f5d
commit
b6b6912b56
39
qt/PKGBUILD
39
qt/PKGBUILD
@ -16,10 +16,9 @@ pkgname=('qt'
|
||||
'qt-demos'
|
||||
'qt-tools')
|
||||
|
||||
pkgver=4.7.1
|
||||
pkgrel=1
|
||||
kdeqtver=stock-qt-version
|
||||
#kdeqtver=7abde40e7484d0ab7d61de3531bc0aeedf24aa85
|
||||
pkgver=4.7.0
|
||||
pkgrel=2
|
||||
kdeqtver=7abde40e7484d0ab7d61de3531bc0aeedf24aa85
|
||||
|
||||
pkgdesc="A cross-platform application and UI framework"
|
||||
arch=('i686' 'x86_64')
|
||||
@ -58,23 +57,28 @@ makedepends=('inputproto'
|
||||
_pkgfqn=${_origname}-everywhere-opensource-src-${pkgver}
|
||||
|
||||
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
|
||||
# "http://chakra-project.org/sources/qt/kde-qt-${kdeqtver}.patch.gz"
|
||||
"http://chakra-project.org/sources/qt/kde-qt-${kdeqtver}.patch.gz"
|
||||
'assistant.desktop'
|
||||
'designer.desktop'
|
||||
'linguist.desktop'
|
||||
'qtconfig.desktop'
|
||||
'demosexamples-manual-install.patch'
|
||||
'appmenu.patch')
|
||||
'http://chakra-project.org/sources/qt/qt-any-demosexamples-manual-install.patch'
|
||||
'http://chakra-project.org/sources/qt/qt-any-appmenu.patch'
|
||||
'http://chakra-project.org/sources/qt/qt-4.7.0-qmake-linker-flags-as-needed.patch'
|
||||
'http://chakra-project.org/sources/qt/qt-4.7.0-fix-scroll-when-last-item-is-removed.patch'
|
||||
'http://chakra-project.org/sources/qt/qt-4.7.0-fix-opengl-multisampling-for-some-graphics-drivers.patch')
|
||||
|
||||
|
||||
md5sums=('6f88d96507c84e9fea5bf3a71ebeb6d7'
|
||||
# '9d665e17a64c9e32b374ba5b1eafb350' # kde-qt-7abde40e7484d0ab7d61de3531bc0aeedf24aa85.patch.gz
|
||||
md5sums=('3a2f25b9b115037277f4fb759194a7a5'
|
||||
'9d665e17a64c9e32b374ba5b1eafb350' # kde-qt-7abde40e7484d0ab7d61de3531bc0aeedf24aa85.patch.gz
|
||||
'20d333282c43f9e643cb8e91b6307dcc'
|
||||
'bf89ee0bdd178933f19d8bc4090173ec'
|
||||
'a9bfeeffab8ba103bc8153fdb31474a1'
|
||||
'83b2a4aece6c9d86301c53a979af0b63'
|
||||
'579e63488320a8d692d25502551787af'
|
||||
'dba7f852bce6e1ebd78f6a78f9979c68')
|
||||
'dba7f852bce6e1ebd78f6a78f9979c68'
|
||||
'c436732fc467271e8a3838145c122070'
|
||||
'ef20c34afc5be5ed62f2935be66d9402'
|
||||
'b2e0f134bbb848ebef41134a45a36ee9')
|
||||
|
||||
# source PKGBUILD && _create-kdeqt-patch
|
||||
_create-kdeqt-patch() {
|
||||
@ -104,19 +108,24 @@ build() {
|
||||
cd $srcdir/$_pkgfqn
|
||||
msg "applying kde-qt patches"
|
||||
cd $srcdir/$_pkgfqn
|
||||
# patch -p1 -i $srcdir/kde-qt-${kdeqtver}.patch || return 1
|
||||
patch -p1 -i $srcdir/kde-qt-${kdeqtver}.patch || return 1
|
||||
# editing qt.install
|
||||
sed -i -e 's/^.*> Qt .*/ echo " > Qt '${pkgver}'"/' $startdir/qt.install
|
||||
sed -i -e 's/^.*kde-qt .*/ echo " kde-qt '${kdeqtver}'"/' $startdir/qt.install
|
||||
|
||||
msg "apply other patches"
|
||||
# Already fixed in 4.7.1
|
||||
patch -Np1 -i ${srcdir}/qt-4.7.0-fix-scroll-when-last-item-is-removed.patch || return 1
|
||||
patch -Np1 -i ${srcdir}/qt-4.7.0-qmake-linker-flags-as-needed.patch || return 1
|
||||
patch -Np1 -i ${srcdir}/qt-4.7.0-fix-opengl-multisampling-for-some-graphics-drivers.patch
|
||||
# apply appmenu patch from Aurelien Gateau
|
||||
patch -Np1 -i ${srcdir}/appmenu.patch || return 1
|
||||
patch -Np1 -i ${srcdir}/qt-any-appmenu.patch || return 1
|
||||
|
||||
# we want our cflags etc
|
||||
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
|
||||
sed -i "/^QMAKE_RPATH/s| -Wl,-rpath,||g" mkspecs/common/g++.conf
|
||||
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
|
||||
# undash it in 4.7.1
|
||||
# sed -i "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" mkspecs/common/g++.conf
|
||||
|
||||
msg "starting configure"
|
||||
|
||||
@ -157,7 +166,7 @@ build() {
|
||||
-ptmalloc || return 1
|
||||
|
||||
# disable automatic installation of demos and examples, we want to do that manually
|
||||
patch -p0 -i $srcdir/demosexamples-manual-install.patch || return 1
|
||||
patch -p0 -i $srcdir/qt-any-demosexamples-manual-install.patch || return 1
|
||||
|
||||
msg "starting the build"
|
||||
make || return 1
|
||||
|
||||
3869
qt/appmenu.patch
3869
qt/appmenu.patch
File diff suppressed because it is too large
Load Diff
@ -1,26 +0,0 @@
|
||||
--- Makefile.orig 2010-01-20 01:46:53.000000000 +0100
|
||||
+++ Makefile 2010-01-20 02:37:45.000000000 +0100
|
||||
@@ -908,9 +908,9 @@ sub-examples-distclean-ordered: examples
|
||||
sub-examples-distclean: examples/$(MAKEFILE) FORCE
|
||||
cd examples/ && $(MAKE) -f $(MAKEFILE) distclean
|
||||
sub-examples-install_subtargets-ordered: examples/$(MAKEFILE) sub-translations-install_subtargets-ordered FORCE
|
||||
- cd examples/ && $(MAKE) -f $(MAKEFILE) install
|
||||
+ /bin/true
|
||||
sub-examples-install_subtargets: examples/$(MAKEFILE) FORCE
|
||||
- cd examples/ && $(MAKE) -f $(MAKEFILE) install
|
||||
+ /bin/true
|
||||
sub-examples-uninstall_subtargets-ordered: examples/$(MAKEFILE) sub-translations-uninstall_subtargets-ordered FORCE
|
||||
cd examples/ && $(MAKE) -f $(MAKEFILE) uninstall
|
||||
sub-examples-uninstall_subtargets: examples/$(MAKEFILE) FORCE
|
||||
@@ -944,9 +944,9 @@ sub-demos-distclean-ordered: demos/$(MAK
|
||||
sub-demos-distclean: demos/$(MAKEFILE) FORCE
|
||||
cd demos/ && $(MAKE) -f $(MAKEFILE) distclean
|
||||
sub-demos-install_subtargets-ordered: demos/$(MAKEFILE) sub-examples-install_subtargets-ordered FORCE
|
||||
- cd demos/ && $(MAKE) -f $(MAKEFILE) install
|
||||
+ /bin/true
|
||||
sub-demos-install_subtargets: demos/$(MAKEFILE) FORCE
|
||||
- cd demos/ && $(MAKE) -f $(MAKEFILE) install
|
||||
+ /bin/true
|
||||
sub-demos-uninstall_subtargets-ordered: demos/$(MAKEFILE) sub-examples-uninstall_subtargets-ordered FORCE
|
||||
cd demos/ && $(MAKE) -f $(MAKEFILE) uninstall
|
||||
sub-demos-uninstall_subtargets: demos/$(MAKEFILE) FORCE
|
||||
Loading…
Reference in New Issue
Block a user