update qt5-base 5.15.0-2

a5a79155 · Jean-Michel T.Dydak · 1d4f60f9 · a5a79155
Commit a5a79155 authored 4 years ago by Jean-Michel T.Dydak
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -2,167 +2,165 @@
 # Maintainer    : Eric Vidal <eric@obarun.org>
 # Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
 # PkgSource     : url="https://framagit.org/pkg/obextra/qt5-base"
-#-----------------------------------------------------------------------------------------------
-
-#-----------------------------------------| DESCRIPTION |---------------------------------------
+#----------------------------------------------------------------------------
+#--DESCRIPTION---------------------------------------------------------------

 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)

 pkgdesc="A cross-platform application and UI framework"

-_qtver=5.14.2
+_qtver=5.15.0
 pkgver=${_qtver/-/}
-pkgrel=4
+pkgrel=2

 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
 url="https://www.qt.io"
 source=(
-	"http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-	"qt5-base-QTBUG-82910.patch::https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=54aa63be9b74e8de72db9efbe6809ab1a97b29a7"
-	'qt5-base-cflags.patch')
+    "http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+    "qt5-base-QTBUG-82910.patch::https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=54aa63be9b74e8de72db9efbe6809ab1a97b29a7"
+    'qt5-base-cflags.patch')

-#-------------------------------------| BUILD CONFIGURATION |-----------------------------------
+#--BUILD CONFIGURATION-------------------------------------------------------

 makedepends=(
-	'libfbclient'
-	'mariadb-libs'
-	'sqlite'
-	'unixodbc'
-	'postgresql-libs'
-	'alsa-lib'
-	'gst-plugins-base-libs'
-	'gtk3'
-	'libpulse'
-	'cups'
-	'freetds'
-	'vulkan-headers')
-	
-#--------------------------------------| BUILD PREPARATION |------------------------------------
+    'libfbclient'
+    'mariadb-libs'
+    'sqlite'
+    'unixodbc'
+    'postgresql-libs'
+    'alsa-lib'
+    'gst-plugins-base-libs'
+    'gtk3'
+    'libpulse'
+    'cups'
+    'freetds'
+    'vulkan-headers')
+
+#--BUILD PREPARATION---------------------------------------------------------

 prepare() {
-	cd ${_pkgfqn}
+    cd ${_pkgfqn}

-	patch -p1 -i ../qt5-base-QTBUG-82910.patch # https://codereview.qt-project.org/c/qt/qtbase/+/299182
-	patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
+    patch -p1 -i ../qt5-base-QTBUG-82910.patch # https://codereview.qt-project.org/c/qt/qtbase/+/299182
+    patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS
 }

-#--------------------------------------------| BUILD |------------------------------------------
+#--BUILD---------------------------------------------------------------------

 build() {
-	cd ${_pkgfqn}
-
-	#echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
-	#export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
-
-	./configure \
-		-confirm-license -opensource -v \
-		-prefix /usr \
-		-docdir /usr/share/doc/qt \
-		-headerdir /usr/include/qt \
-		-archdatadir /usr/lib/qt \
-		-datadir /usr/share/qt \
-		-sysconfdir /etc/xdg \
-		-examplesdir /usr/share/doc/qt/examples \
-		-plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-		-system-sqlite \
-		-openssl-linked \
-		-nomake examples \
-		-no-rpath \
-		-dbus-linked \
-		-system-harfbuzz \
-		-no-mimetype-database \
-		-no-use-gold-linker \
-		-reduce-relocations
-	make
+    cd ${_pkgfqn}
+
+    #echo "INCLUDEPATH += /usr/include/openssl" >> src/network/network.pro
+    #export OPENSSL_LIBS='-L/usr/lib -lssl -lcrypto'
+
+    ./configure \
+        -confirm-license -opensource -v \
+        -prefix /usr \
+        -docdir /usr/share/doc/qt \
+        -headerdir /usr/include/qt \
+        -archdatadir /usr/lib/qt \
+        -datadir /usr/share/qt \
+        -sysconfdir /etc/xdg \
+        -examplesdir /usr/share/doc/qt/examples \
+        -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
+        -system-sqlite \
+        -openssl-linked \
+        -nomake examples \
+        -no-rpath \
+        -dbus-linked \
+        -system-harfbuzz \
+        -no-mimetype-database \
+        -no-use-gold-linker \
+        -reduce-relocations
+    make
 }

-#-------------------------------------------| PACKAGE |-----------------------------------------
+#--PACKAGE-------------------------------------------------------------------

 package_qt5-base() {
-	pkgdesc='A cross-platform application and UI framework'
+    pkgdesc='A cross-platform application and UI framework'

-	cd ${_pkgfqn}
-	make INSTALL_ROOT="${pkgdir}" install
+    cd ${_pkgfqn}
+    make INSTALL_ROOT="${pkgdir}" install

-	install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
+    install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase

-	## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-	find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-	 -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+    ## Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;

-	## Fix wrong qmake path in pri file
-	sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
-	 "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
+    ## Fix wrong qmake path in pri file
+    sed -i "s|${srcdir}/${_pkgfqn}|/usr|" \
+     "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri

-	## Symlinks for backwards compatibility
-	for b in "${pkgdir}"/usr/bin/*; do
-	 ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-	done
+    ## Symlinks for backwards compatibility
+    for b in "${pkgdir}"/usr/bin/*; do
+     ln -s $(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
+    done
 }

 package_qt5-xcb-private-headers() {
-	pkgdesc='Private headers for Qt5 Xcb'
+    pkgdesc='Private headers for Qt5 Xcb'

-	depends=("qt5-base=$pkgver")
-	optdepends=()
-	groups=()
-	conflicts=()
+    depends=("qt5-base=$pkgver")
+    optdepends=()
+    groups=()
+    conflicts=()

-	cd ${_pkgfqn}
-	install -d -m755 "$pkgdir"/usr/include/qtxcb-private
-	cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
+    cd ${_pkgfqn}
+    install -d -m755 "$pkgdir"/usr/include/qtxcb-private
+    cp -r src/plugins/platforms/xcb/*.h "$pkgdir"/usr/include/qtxcb-private/
 }

-#------------------------------------| INSTALL CONFIGURATION |----------------------------------
+#--INSTALL CONFIGURATION-----------------------------------------------------

 arch=('x86_64')

 conflicts=(
-	'qtchooser')
+    'qtchooser')

 groups=(
-	'qt'
-	'qt5')
-	
+    'qt'
+    'qt5')
+
 depends=(
-	'libjpeg-turbo'
-	'xcb-util-keysyms'
-	'xcb-util-renderutil'
-	'libgl'
-	'fontconfig'
-	'xdg-utils'
-	'shared-mime-info'
-	'xcb-util-wm'
-	'libxrender'
-	'libxi'
-	'sqlite'
-	'xcb-util-image'
-	'mesa'
-	'tslib'
-	'libinput'
-	'libxkbcommon-x11'
-	'libproxy'
-	'libcups'
-	'double-conversion'
-	'md4c')
+    'libjpeg-turbo'
+    'xcb-util-keysyms'
+    'xcb-util-renderutil'
+    'libgl'
+    'fontconfig'
+    'xdg-utils'
+    'shared-mime-info'
+    'xcb-util-wm'
+    'libxrender'
+    'libxi'
+    'sqlite'
+    'xcb-util-image'
+    'mesa'
+    'tslib'
+    'libinput'
+    'libxkbcommon-x11'
+    'libproxy'
+    'libcups'
+    'double-conversion'
+    'md4c')

 optdepends=(
-	'qt5-svg: to use SVG icon themes'
-	'qt5-wayland: to run Qt applications in a Wayland session'
-	'qt5-translations: for some native UI translations'
-	'postgresql-libs: PostgreSQL driver'
-	'mariadb-libs: MariaDB driver'
-	'unixodbc: ODBC driver'
-	'libfbclient: Firebird/iBase driver'
-	'freetds: MS SQL driver'
-	'gtk3: GTK platform plugin'
-	'perl: for fixqt4hearders and syncqt')
-	
-#-------------------------------------| SECURITY AND LICENCE |----------------------------------
+    'qt5-svg: to use SVG icon themes'
+    'qt5-wayland: to run Qt applications in a Wayland session'
+    'qt5-translations: for some native UI translations'
+    'postgresql-libs: PostgreSQL driver'
+    'mariadb-libs: MariaDB driver'
+    'unixodbc: ODBC driver'
+    'libfbclient: Firebird/iBase driver'
+    'freetds: MS SQL driver'
+    'gtk3: GTK platform plugin'
+    'perl: for fixqt4hearders and syncqt')
+
+#--SECURITY AND LICENCE------------------------------------------------------

 license=('GPL3' 'LGPL3' 'FDL' 'custom')

-sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
+sha512sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a'
            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c')
-