mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-03 04:47:13 +08:00
update qt and vc for gcc 6
This commit is contained in:
Weng Xuetian
parent
6d05e75161
commit
e5abe7d146
70
qt/PKGBUILD
70
qt/PKGBUILD
@ -3,7 +3,7 @@
|
||||
pkgbase=qt
|
||||
pkgname=('qt' 'qt-private-headers' 'qt-docs')
|
||||
pkgver=4.8.7
|
||||
pkgrel=4
|
||||
pkgrel=5
|
||||
arch=('x86_64')
|
||||
url='http://www.qt.io'
|
||||
license=('GPL3' 'LGPL')
|
||||
@ -15,57 +15,74 @@ options=('staticlibs' 'debug')
|
||||
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
|
||||
source=("http://download.qt.io/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz"
|
||||
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
|
||||
'qtconfig.desktop' 'improve-cups-support.patch' 'qt_no_debug.patch'
|
||||
'qtconfig.desktop'
|
||||
'qt_no_debug.patch'
|
||||
'add_nostrip_for_debug_packages.diff'
|
||||
'improve-cups-support.patch'
|
||||
'moc-boost-workaround.patch'
|
||||
'kubuntu_14_systemtrayicon.diff'
|
||||
'kde4-settings.patch'
|
||||
'glib-honor-ExcludeSocketNotifiers-flag.diff'
|
||||
'qtcore-4.8.5-qeventdispatcher-recursive.patch'
|
||||
'disable-sslv3.patch'
|
||||
'l-qclipboard_fix_recursive.patch'
|
||||
'l-qclipboard_delay.patch'
|
||||
'add_nostrip_for_debug_packages.diff'
|
||||
'kde4-settings.patch')
|
||||
'qt4-gcc6.patch' 'qt4-glibc-2.25.patch')
|
||||
md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
|
||||
'fc211414130ab2764132e7370f8e5caa'
|
||||
'85179f5e0437514f8639957e1d8baf62'
|
||||
'f11852b97583610f3dbb669ebc3e21bc'
|
||||
'6b771c8a81dd90b45e8a79afa0e5bbfd'
|
||||
'b9fb6b953cec428d59c026b1ef370e86'
|
||||
'742bfebaebc44c26f6cabe654f702cc8'
|
||||
'41587e01bb0ca6d0c52fcf39eb737459'
|
||||
'b9fb6b953cec428d59c026b1ef370e86'
|
||||
'da387bde22ae1c446f12525d2a31f070'
|
||||
'a523644faa8f98a73f55c4aa23c114a6'
|
||||
'66dfea63916c8dbf47b23cb012ffdccc'
|
||||
'85679531c8a7310317adfb7002d9f99a'
|
||||
'1803ab6313df762d807678e58fc85f53'
|
||||
'009de09b4e589a7770fba74405656c99'
|
||||
'addc5e88d538ee55e17bd49ba337ca67'
|
||||
'41587e01bb0ca6d0c52fcf39eb737459'
|
||||
'66dfea63916c8dbf47b23cb012ffdccc')
|
||||
'98e00c5c7e5fee12e11ecbedd03f01ff'
|
||||
'296a06554222ff5839cccc41c5d3987e')
|
||||
|
||||
prepare() {
|
||||
cd ${_pkgfqn}
|
||||
|
||||
# tray icon with sni
|
||||
patch -Np1 -i "${srcdir}"/kubuntu_14_systemtrayicon.diff
|
||||
# from Fedora, removing "QDBusConnection:..." message for qt apps
|
||||
patch -p1 -i "${srcdir}"/qt_no_debug.patch
|
||||
|
||||
# (FS#28381) (KDEBUG#180051)
|
||||
patch -p1 -i "${srcdir}"/improve-cups-support.patch
|
||||
patch -Np1 -i "${srcdir}"/moc-boost-workaround.patch
|
||||
|
||||
|
||||
# QTBUG#22829
|
||||
patch -p1 -i "${srcdir}"/moc-boost-workaround.patch
|
||||
|
||||
# http://blog.martin-graesslin.com/blog/2014/06/where-are-my-systray-icons/
|
||||
patch -p1 -i "${srcdir}"/kubuntu_14_systemtrayicon.diff
|
||||
|
||||
# FS#45106
|
||||
patch -p0 -i "${srcdir}"/kde4-settings.patch
|
||||
|
||||
# https://bugreports.qt-project.org/browse/QTBUG-37380 (use by LibreOffice)
|
||||
patch -Np1 -i "${srcdir}"/glib-honor-ExcludeSocketNotifiers-flag.diff
|
||||
# https://bugreports.qt-project.org/browse/QTBUG-34614 (use by LibreOffice)
|
||||
patch -Np0 -i "${srcdir}"/qtcore-4.8.5-qeventdispatcher-recursive.patch
|
||||
# https://bugreports.qt-project.org/browse/QTBUG-38585 (use by LibreOffice)
|
||||
patch -Np0 -i "${srcdir}"/l-qclipboard_delay.patch
|
||||
|
||||
# To include the debug symbols we should add the nostrip option
|
||||
# http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt4-x11.git;a=blob;f=debian/patches/12_add_nostrip_for_debug_packages.diff;h=d5f3083eff90ae0b748b6ab542aa951f4e6d0004;hb=HEAD
|
||||
patch -p0 -i "${srcdir}"/kde4-settings.patch
|
||||
|
||||
# fixes for LibreOffice from the upstream Qt bug tracker FS#46436, FS#41648, FS#39819
|
||||
# https://bugreports.qt.io/browse/QTBUG-37380
|
||||
patch -p1 -i "${srcdir}"/glib-honor-ExcludeSocketNotifiers-flag.diff
|
||||
# https://bugreports.qt.io/browse/QTBUG-34614
|
||||
patch -p0 -i "${srcdir}"/l-qclipboard_fix_recursive.patch
|
||||
# https://bugreports.qt.io/browse/QTBUG-38585
|
||||
patch -p0 -i "${srcdir}"/l-qclipboard_delay.patch
|
||||
|
||||
# React to OpenSSL's OPENSSL_NO_SSL3 define
|
||||
patch -p1 -i "${srcdir}"/disable-sslv3.patch
|
||||
|
||||
patch -Np1 -i "${srcdir}"/add_nostrip_for_debug_packages.diff
|
||||
|
||||
sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
|
||||
sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
|
||||
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
|
||||
|
||||
# Fix build with GCC6 (Fedora)
|
||||
patch -p1 -i "$srcdir"/qt4-gcc6.patch
|
||||
|
||||
# Fix build of Qt4 applications with glibc 2.25 (Fedora)
|
||||
patch -p1 -i "$srcdir"/qt4-glibc-2.25.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
@ -73,6 +90,9 @@ build() {
|
||||
|
||||
export QT4DIR="${srcdir}"/${_pkgfqn}
|
||||
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
|
||||
export CXXFLAGS+=" -std=gnu++98" # Fix build with GCC 6
|
||||
export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto'
|
||||
export CXXFLAGS+=" -I/usr/include/openssl-1.0"
|
||||
|
||||
|
||||
./configure -confirm-license -opensource \
|
||||
|
||||
11
vc/PKGBUILD
11
vc/PKGBUILD
@ -1,20 +1,21 @@
|
||||
pkgname=vc
|
||||
epoch=2
|
||||
pkgver=1.2.0
|
||||
pkgver=1.3.1
|
||||
pkgrel=1
|
||||
pkgdesc="A library to ease explicit vectorization of C++ code"
|
||||
url='http://code.compeng.uni-frankfurt.de/projects/vc/'
|
||||
url='https://github.com/VcDevel/Vc'
|
||||
arch=('x86_64')
|
||||
license=('BSD')
|
||||
license=(LGPL3)
|
||||
makedepends=('cmake')
|
||||
source=("https://github.com/VcDevel/Vc/releases/download/${pkgver}/Vc-${pkgver}.tar.gz")
|
||||
md5sums=('f2a213ae4bad0dcf4ec6469e4dad41c1')
|
||||
md5sums=('97f754e878ddae5a481486dcb270bb8e')
|
||||
|
||||
build() {
|
||||
mkdir -p build && cd build
|
||||
cmake ../Vc-${pkgver} \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_BUILD_TYPE=Release
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DTARGET_ARCHITECTURE=generic
|
||||
make
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user