upgpkg : 5.12.2-2

PKGBUILD

-# Maintainer: Eric Vidal <eric@obarun.org>
-# based on the original https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/qt5-base
-# 						Maintainer: Felix Yan <felixonmars@archlinux.org>
-# 						Contributor: Andrea Scarpino <andrea@archlinux.org
+# Obarun      : 66 init/supervisor
+# Maintainer  : Jean-Michel T.Dydak <jean-michel@obarun.org> <jean-michel@syntazia.org>
+# Maintainer  : Eric Vidal <eric@obarun.org>
+# PkgSource   : https://framagit.org/obarun-pkgbuild/qt5-base
+#--------------
+## PkgSource  : https://www.archlinux.org/packages/extra/x86_64/qt5-base/
+## Maintainer : Felix Yan <felixonmars@archlinux.org>
+## Contributor: Andrea Scarpino <andrea@archlinux.org
+#--------------------------------------------------------------------------------------
 
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.12.1
+_qtver=5.12.2
 pkgver=${_qtver/-/}
-pkgrel=4
-arch=(x86_64)
-url='https://www.qt.io'
+pkgrel=2
+arch=('x86_64')
+url="https://www.qt.io"
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='A cross-platform application and UI framework'
-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')
-makedepends=('libfbclient' 'mariadb-libs' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
-			'gtk3' 'libpulse' 'cups' 'freetds' 'vulkan-headers' 'icu')
-optdepends=('qt5-svg: to use SVG icon themes'
-			'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')
-conflicts=('qtchooser')
-groups=('qt' 'qt5')
+pkgdesc="A cross-platform application and UI framework"
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-		qt-delayed-highlight.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=f8f0f3ee
-        qtbug-69310.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=fcba9fa8"
-        qt5-base-nouveau-freeze.patch::"http://code.qt.io/cgit/qt/qtbase.git/patch?id=97600d2c")
-sha256sums=('533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049'
-            '0080b1e208090c729018db1ac224e5940d06a38b9c28c918a892b01f84a82cf9'
-            '2186ce7b8d6310ebc005da9b00dcc88388df3e8b83bff37230fa1bb9253c4970'
-            'e0a7cdda2ebc403e2b3a62b3d104d2dd3f8b4e79d92395cf3c6419ebe6d8b19c')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
 
+conflicts=(
+	'qtchooser')
+groups=(
+	'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')
+makedepends=(
+	'libfbclient'
+	'mariadb-libs'
+	'sqlite'
+	'unixodbc'
+	'postgresql-libs'
+	'alsa-lib'
+	'gst-plugins-base-libs'
+	'gtk3'
+	'libpulse'
+	'cups'
+	'freetds'
+	'vulkan-headers')
+optdepends=(
+	'qt5-svg: to use SVG icon themes'
+	'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')
+
+#--------------------------------------------------------------------------------------
 prepare() {
-  cd ${_pkgfqn}
-	
-  # Build qmake using Arch {C,LD}FLAGS
-  # This also sets default {C,CXX,LD}FLAGS for projects built using qmake
-  sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
-    mkspecs/common/gcc-base.conf
-  sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
-    mkspecs/common/g++-unix.conf
-    
-  patch -p1 -i ../qt-delayed-highlight.patch # https://codereview.qt-project.org/#/c/249881/
-  patch -p1 -i ../qtbug-69310.patch # https://bugreports.qt.io/browse/QTBUG-69310
-  patch -Rp1 -i ../qt5-base-nouveau-freeze.patch # Revert commit that causes freezes on nouveau https://bugreports.qt.io/browse/QTBUG-73691
+	cd ${_pkgfqn}
+
+	## Build qmake using Arch {C,LD}FLAGS
+	## This also sets default {C,CXX,LD}FLAGS for projects built using qmake
+	sed -i -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${CFLAGS}|" \
+	  mkspecs/common/gcc-base.conf
+	sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
+	  mkspecs/common/g++-unix.conf
 }
 
 build() {
-  cd ${_pkgfqn}
-
-  echo "INCLUDEPATH += /usr/include/openssl-1.0" >> src/network/network.pro
-  export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -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 \
-    -optimized-qmake \
-    -dbus-linked \
-    -system-harfbuzz \
-    -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 \
+		-optimized-qmake \
+		-dbus-linked \
+		-system-harfbuzz \
+		-no-use-gold-linker \
+		-reduce-relocations
+	make
 }
 
 package_qt5-base() {
-  
-  pkgdesc='A cross-platform application and UI framework'
-  
-  cd ${_pkgfqn}
-  make INSTALL_ROOT="${pkgdir}" install
-
-  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' {} \;
-
-  # 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
+	pkgdesc='A cross-platform application and UI framework'
+
+	cd ${_pkgfqn}
+	make INSTALL_ROOT="${pkgdir}" install
+
+	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' {} \;
+
+	## 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
 }
-package_qt5-xcb-private-headers() {
 
-  pkgdesc='Private headers for Qt5 Xcb'
+package_qt5-xcb-private-headers() {
+	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/
 }
+
+#--------------------------------------------------------------------------------------
+sha512sums=('6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613')