[arch-commits] Commit in qt6-base/repos/testing-x86_64 (3 files)

Wed Dec 1 10:17:34 UTC 2021

Date: Wednesday, December 1, 2021 @ 10:17:34
  Author: arojas
Revision: 429876

archrelease: copy trunk to testing-x86_64

Deleted:
  qt6-base/repos/testing-x86_64/PKGBUILD
  qt6-base/repos/testing-x86_64/qt6-base-cflags.patch
  qt6-base/repos/testing-x86_64/qt6-base-nostrip.patch

------------------------+
 PKGBUILD               |   68 -----------------------------------------------
 qt6-base-cflags.patch  |   46 -------------------------------
 qt6-base-nostrip.patch |   13 --------
 3 files changed, 127 deletions(-)

Deleted: PKGBUILD
===================================================================

--- PKGBUILD	2021-12-01 10:15:17 UTC (rev 429875)
+++ PKGBUILD	2021-12-01 10:17:34 UTC (rev 429876)
@@ -1,68 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt6-base
-_qtver=6.2.2
-pkgver=${_qtver/-/}
-pkgrel=1
-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-cursor libgl fontconfig xdg-utils
-         shared-mime-info xcb-util-wm libxrender libxi sqlite mesa vulkan-headers
-         tslib libinput libxkbcommon-x11 libproxy libcups double-conversion brotli libb2 md4c)
-makedepends=(cmake ninja libfbclient mariadb-libs unixodbc postgresql alsa-lib gst-plugins-base-libs
-             gtk3 libpulse cups freetds xmlstarlet)
-optdepends=('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 syncqt')
-groups=(qt6)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
-        qt6-base-cflags.patch
-        qt6-base-nostrip.patch)
-sha256sums=('85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a'
-            'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
-            '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
-
-prepare() {
-  patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
-  patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake
-}
-
-build() {
-  cmake -B build -S $_pkgfn -G Ninja \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DINSTALL_BINDIR=lib/qt6/bin \
-    -DINSTALL_PUBLICBINDIR=usr/bin \
-    -DINSTALL_LIBEXECDIR=lib/qt6 \
-    -DINSTALL_DOCDIR=share/doc/qt6 \
-    -DINSTALL_ARCHDATADIR=lib/qt6 \
-    -DINSTALL_DATADIR=share/qt6 \
-    -DINSTALL_INCLUDEDIR=include/qt6 \
-    -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \
-    -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples \
-    -DQT_FEATURE_journald=ON \
-    -DQT_FEATURE_openssl_linked=ON \
-    -DQT_FEATURE_system_sqlite=ON
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-
-  install -Dm644 $_pkgfn/LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgbase
-
-# Install symlinks for user-facing tools
-  cd "$pkgdir"
-  mkdir usr/bin
-  while read _line; do
-    ln -s $_line
-  done < "$srcdir"/build/user_facing_tool_links.txt
-}

Deleted: qt6-base-cflags.patch
===================================================================
--- qt6-base-cflags.patch	2021-12-01 10:15:17 UTC (rev 429875)
+++ qt6-base-cflags.patch	2021-12-01 10:17:34 UTC (rev 429876)
@@ -1,46 +0,0 @@
-diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
-index a493cd5984..41342f5020 100644
---- a/mkspecs/common/g++-unix.conf
-+++ b/mkspecs/common/g++-unix.conf
-@@ -10,5 +10,6 @@
- 
- include(g++-base.conf)
- 
--QMAKE_LFLAGS_RELEASE   += -Wl,-O1
-+SYSTEM_LDFLAGS = $$(LDFLAGS)
-+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE   += -Wl,-O1 }
- QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..7ef6046326 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
- QMAKE_CFLAGS_DEPS          += -M
- QMAKE_CFLAGS_WARN_ON       += -Wall -Wextra
- QMAKE_CFLAGS_WARN_OFF      += -w
--QMAKE_CFLAGS_RELEASE       += $$QMAKE_CFLAGS_OPTIMIZE
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
--QMAKE_CFLAGS_DEBUG         += -g
-+SYSTEM_CFLAGS = $$(CFLAGS)
-+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CPPFLAGS) $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
-@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS            += $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS       += $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON    += $$QMAKE_CFLAGS_WARN_ON
- QMAKE_CXXFLAGS_WARN_OFF   += $$QMAKE_CFLAGS_WARN_OFF
--QMAKE_CXXFLAGS_RELEASE    += $$QMAKE_CFLAGS_RELEASE
--QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
--QMAKE_CXXFLAGS_DEBUG      += $$QMAKE_CFLAGS_DEBUG
-+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
-+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CPPFLAGS) $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
-+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$(CPPFLAGS) -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
-+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
- QMAKE_CXXFLAGS_SHLIB      += $$QMAKE_CFLAGS_SHLIB
- QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP

Deleted: qt6-base-nostrip.patch
===================================================================
--- qt6-base-nostrip.patch	2021-12-01 10:15:17 UTC (rev 429875)
+++ qt6-base-nostrip.patch	2021-12-01 10:17:34 UTC (rev 429876)
@@ -1,13 +0,0 @@
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 99d77156fd..fc840fe9f6 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -31,6 +31,8 @@
- # you can use the manual test in tests/manual/mkspecs.
- #
- 
-+CONFIG += nostrip
-+
- QMAKE_CFLAGS_OPTIMIZE      = -O2
- QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
- QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og

