[arch-commits] Commit in qt5-base/repos/kde-unstable-x86_64 (4 files)

Evangelos Foutras foutrelis at archlinux.org
Sat Apr 6 05:10:43 UTC 2019


    Date: Saturday, April 6, 2019 @ 05:10:42
  Author: foutrelis
Revision: 350203

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  qt5-base/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 350202, qt5-base/kde-unstable/PKGBUILD)
  qt5-base/repos/kde-unstable-x86_64/qtbug-74578.patch
    (from rev 350202, qt5-base/kde-unstable/qtbug-74578.patch)
Deleted:
  qt5-base/repos/kde-unstable-x86_64/PKGBUILD
  qt5-base/repos/kde-unstable-x86_64/qtbug-74578.patch

-------------------+
 PKGBUILD          |  210 ++++++++++++++++++++++++++--------------------------
 qtbug-74578.patch |   78 +++++++++----------
 2 files changed, 144 insertions(+), 144 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-06 05:10:31 UTC (rev 350202)
+++ PKGBUILD	2019-04-06 05:10:42 UTC (rev 350203)
@@ -1,105 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=qt5-base
-pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.13.0-beta1
-pkgver=${_qtver/-/}
-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')
-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')
-_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-        qtbug-74578.patch)
-sha256sums=('2a25181ea33bab1e356311ee72ca3e748a72f958e864fe6a94fa965050a1b4f9'
-            'bfb983991f7a321bb6ef539ae4f5cf23ac7bc1d7a8ae13bbe8f0899f34dd4128')
-
-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 ../qtbug-74578.patch # Fix transparency
-}
-
-build() {
-  cd ${_pkgfqn}
-
-  ./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 \
-    -journald \
-    -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
-}
-
-package_qt5-xcb-private-headers() {
-  pkgdesc='Private headers for Qt5 Xcb'
-
-  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/
-}

Copied: qt5-base/repos/kde-unstable-x86_64/PKGBUILD (from rev 350202, qt5-base/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-04-06 05:10:42 UTC (rev 350203)
@@ -0,0 +1,105 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=qt5-base
+pkgname=(qt5-base qt5-xcb-private-headers)
+_qtver=5.13.0-beta1
+pkgver=${_qtver/-/}
+pkgrel=3
+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')
+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')
+_pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
+source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+        qtbug-74578.patch)
+sha256sums=('2a25181ea33bab1e356311ee72ca3e748a72f958e864fe6a94fa965050a1b4f9'
+            'bfb983991f7a321bb6ef539ae4f5cf23ac7bc1d7a8ae13bbe8f0899f34dd4128')
+
+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 ../qtbug-74578.patch # Fix transparency
+}
+
+build() {
+  cd ${_pkgfqn}
+
+  ./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 \
+    -journald \
+    -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
+}
+
+package_qt5-xcb-private-headers() {
+  pkgdesc='Private headers for Qt5 Xcb'
+
+  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/
+}

Deleted: qtbug-74578.patch
===================================================================
--- qtbug-74578.patch	2019-04-06 05:10:31 UTC (rev 350202)
+++ qtbug-74578.patch	2019-04-06 05:10:42 UTC (rev 350203)
@@ -1,39 +0,0 @@
-From 6897c999fdbc3b93c1bed422e10479346dbd7e7f Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen at qt.io>
-Date: Wed, 20 Mar 2019 14:30:54 +0100
-Subject: [PATCH] Handle when XVisuals lose the alpha channel of the FBConfig
-
-Sometimes the XVisual for an FBConfig have no alpha data, and thus
-won't work when an alpha channel is required.
-
-Fixes: QTBUG-74578
-Change-Id: Idf05cbfcaea5edf667035939e9bc5d5df2172eec
----
- src/platformsupport/glxconvenience/qglxconvenience.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp
-index 40521ef6da39..6458454336e9 100644
---- a/src/platformsupport/glxconvenience/qglxconvenience.cpp
-+++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp
-@@ -223,6 +223,7 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format
-                     continue;
-             }
- 
-+            QXlibPointer<XVisualInfo> visual(glXGetVisualFromFBConfig(display, candidate));
-             int actualRed;
-             int actualGreen;
-             int actualBlue;
-@@ -231,7 +232,8 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format
-             glXGetFBConfigAttrib(display, candidate, GLX_GREEN_SIZE, &actualGreen);
-             glXGetFBConfigAttrib(display, candidate, GLX_BLUE_SIZE, &actualBlue);
-             glXGetFBConfigAttrib(display, candidate, GLX_ALPHA_SIZE, &actualAlpha);
--
-+            // Sometimes the visuals don't have a depth that includes the alpha channel.
-+            actualAlpha = qMin(actualAlpha, visual->depth - actualRed - actualGreen - actualBlue);
- 
-             if (requestedRed && actualRed < requestedRed)
-                 continue;
--- 
-2.21.0
-

Copied: qt5-base/repos/kde-unstable-x86_64/qtbug-74578.patch (from rev 350202, qt5-base/kde-unstable/qtbug-74578.patch)
===================================================================
--- qtbug-74578.patch	                        (rev 0)
+++ qtbug-74578.patch	2019-04-06 05:10:42 UTC (rev 350203)
@@ -0,0 +1,39 @@
+From 6897c999fdbc3b93c1bed422e10479346dbd7e7f Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at qt.io>
+Date: Wed, 20 Mar 2019 14:30:54 +0100
+Subject: [PATCH] Handle when XVisuals lose the alpha channel of the FBConfig
+
+Sometimes the XVisual for an FBConfig have no alpha data, and thus
+won't work when an alpha channel is required.
+
+Fixes: QTBUG-74578
+Change-Id: Idf05cbfcaea5edf667035939e9bc5d5df2172eec
+---
+ src/platformsupport/glxconvenience/qglxconvenience.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp
+index 40521ef6da39..6458454336e9 100644
+--- a/src/platformsupport/glxconvenience/qglxconvenience.cpp
++++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp
+@@ -223,6 +223,7 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format
+                     continue;
+             }
+ 
++            QXlibPointer<XVisualInfo> visual(glXGetVisualFromFBConfig(display, candidate));
+             int actualRed;
+             int actualGreen;
+             int actualBlue;
+@@ -231,7 +232,8 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format
+             glXGetFBConfigAttrib(display, candidate, GLX_GREEN_SIZE, &actualGreen);
+             glXGetFBConfigAttrib(display, candidate, GLX_BLUE_SIZE, &actualBlue);
+             glXGetFBConfigAttrib(display, candidate, GLX_ALPHA_SIZE, &actualAlpha);
+-
++            // Sometimes the visuals don't have a depth that includes the alpha channel.
++            actualAlpha = qMin(actualAlpha, visual->depth - actualRed - actualGreen - actualBlue);
+ 
+             if (requestedRed && actualRed < requestedRed)
+                 continue;
+-- 
+2.21.0
+


More information about the arch-commits mailing list