[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Thursday, May 21, 2020 @ 07:27:30 Author: felixonmars Revision: 387356 upgpkg: qt5-base 5.15.0rc2-2 Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |5 - 1 file changed, 4 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-05-21 07:03:24 UTC (rev 387355) +++ PKGBUILD2020-05-21 07:27:30 UTC (rev 387356) @@ -5,7 +5,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.15.0-rc2 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -29,13 +29,16 @@ groups=('qt' 'qt5') _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_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) sha256sums=('3d5b8cf628cfe793b671938bd92a88540fec8a87cde264607ddaf06119270836' +'abb94453c9fe54fde4811bc5475b88796c8db1f5cd75ddc68918aff20139b1aa' 'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c') prepare() { 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 }
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Thursday, April 30, 2020 @ 13:02:32 Author: foutrelis Revision: 381972 icu 67.1 rebuild Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-04-30 13:02:03 UTC (rev 381971) +++ PKGBUILD2020-04-30 13:02:32 UTC (rev 381972) @@ -5,7 +5,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.15.0-beta4 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom')
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Monday, April 6, 2020 @ 21:42:05 Author: arojas Revision: 379708 Fix double cmake targets Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-04-06 21:21:15 UTC (rev 379707) +++ PKGBUILD2020-04-06 21:42:05 UTC (rev 379708) @@ -5,7 +5,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.15.0-beta3 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -29,14 +29,20 @@ groups=('qt' 'qt5') _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz; - qt5-base-cflags.patch) + qt5-base-cflags.patch + qtbug-83282a.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=7e7c6498; + qtbug-83282b.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=3f9862db;) sha256sums=('7a12551eb7a8924fe4bc01a2c14cdcbe884839146b6eb687fe87a35f55e0fbc5' -'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c') +'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c' +'9f55121e80ad0cae3619446efd90151bded04433518e95848677e142245fcfe3' +'a1593d8b133eaaf4ee7df61cb9265bd32f9fa566a3b8a5eb47e8ae6d7e3a009a') prepare() { cd ${_pkgfqn} patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS + patch -p1 -i ../qtbug-83282a.patch # Fix double cmake targets + patch -p1 -i ../qtbug-83282b.patch } build() {
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD qt5-base-cflags.patch)
Date: Monday, March 30, 2020 @ 11:51:01 Author: arojas Revision: 378725 Sync patch with stable Modified: qt5-base/kde-unstable/PKGBUILD qt5-base/kde-unstable/qt5-base-cflags.patch ---+ PKGBUILD |4 ++-- qt5-base-cflags.patch | 36 2 files changed, 30 insertions(+), 10 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-03-30 11:50:19 UTC (rev 378724) +++ PKGBUILD2020-03-30 11:51:01 UTC (rev 378725) @@ -5,7 +5,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.15.0-beta2 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -32,7 +32,7 @@ qt5-base-cflags.patch qtbug-82700.patch) sha256sums=('4b07983d9b8ae611bbb65388beea0629990080b99813788e4e7db56cb7897677' -'c70640499637314df68cc7a56519f0bf8b65dd808dd982c96c6f045bba993adf' +'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c' '38c28c63e86dbae8d27db38d274bb9b5f4d2702feab9023f86d50555c84a96af') prepare() { Modified: qt5-base-cflags.patch === --- qt5-base-cflags.patch 2020-03-30 11:50:19 UTC (rev 378724) +++ qt5-base-cflags.patch 2020-03-30 11:51:01 UTC (rev 378725) @@ -1,26 +1,46 @@ diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf -index a493cd5984..79f2d2fff9 100644 +index a493cd5984..41342f5020 100644 --- a/mkspecs/common/g++-unix.conf +++ b/mkspecs/common/g++-unix.conf -@@ -10,5 +10,5 @@ +@@ -10,5 +10,6 @@ include(g++-base.conf) -QMAKE_LFLAGS_RELEASE += -Wl,-O1 -+eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) ++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 4d82321cba..4a61fc9d25 100644 +index 1f919d270a..7ef6046326 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf -@@ -40,8 +40,8 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os +@@ -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 -+eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) -+eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) - QMAKE_CFLAGS_DEBUG += -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
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD qt5-base-cflags.patch)
Date: Friday, March 6, 2020 @ 11:51:23 Author: arojas Revision: 376850 Improve qt5-base-cflags.patch as suggested by upstream Modified: qt5-base/kde-unstable/PKGBUILD qt5-base/kde-unstable/qt5-base-cflags.patch ---+ PKGBUILD |2 +- qt5-base-cflags.patch | 12 +--- 2 files changed, 6 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-03-06 11:50:26 UTC (rev 376849) +++ PKGBUILD2020-03-06 11:51:23 UTC (rev 376850) @@ -34,7 +34,7 @@ qtbug-82547b.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=1edf586e; qtbug-82700.patch) sha256sums=('d835c6ba15e1a443bb0114a5eeea4efd512bc74700bb1ae003514d1465cd7b94' -'7cbf56fd6076f0c193f06715d1dfdae61905504cb01bd907ac33cc487f48d8c6' +'c70640499637314df68cc7a56519f0bf8b65dd808dd982c96c6f045bba993adf' 'd829a91b91f2f0c8c7e50b24ca98a3dca931f5e89f61e5dbd2cbe45ae8d47632' '83ed9cf370078a87ae2dceabc602baccd9a23e6d1aec376344a29cf168ed72d7' '38c28c63e86dbae8d27db38d274bb9b5f4d2702feab9023f86d50555c84a96af') Modified: qt5-base-cflags.patch === --- qt5-base-cflags.patch 2020-03-06 11:50:26 UTC (rev 376849) +++ qt5-base-cflags.patch 2020-03-06 11:51:23 UTC (rev 376850) @@ -2,27 +2,25 @@ index a493cd5984..79f2d2fff9 100644 --- a/mkspecs/common/g++-unix.conf +++ b/mkspecs/common/g++-unix.conf -@@ -10,5 +10,6 @@ +@@ -10,5 +10,5 @@ include(g++-base.conf) -QMAKE_LFLAGS_RELEASE += -Wl,-O1 -+ENV_LDFLAGS = $$(LDFLAGS) -+QMAKE_LFLAGS_RELEASE += $$split(ENV_LDFLAGS, " ") ++eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf index 4d82321cba..4a61fc9d25 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf -@@ -40,8 +40,9 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os +@@ -40,8 +40,8 @@ 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 -+ENV_CFLAGS = $$(CFLAGS) -+QMAKE_CFLAGS_RELEASE += $$split(ENV_CFLAGS, " ") -+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$split(ENV_CFLAGS, " ") ++eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) ++eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC QMAKE_CFLAGS_STATIC_LIB+= $$QMAKE_CFLAGS_PIC
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD qtbug-82547.patch)
Date: Wednesday, March 4, 2020 @ 08:45:03 Author: arojas Revision: 376550 Fix build with -no-mimetype-database Modified: qt5-base/kde-unstable/PKGBUILD Deleted: qt5-base/kde-unstable/qtbug-82547.patch ---+ PKGBUILD | 14 +- qtbug-82547.patch | 22 -- 2 files changed, 9 insertions(+), 27 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-03-04 08:17:11 UTC (rev 376549) +++ PKGBUILD2020-03-04 08:45:03 UTC (rev 376550) @@ -5,7 +5,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.15.0-beta1 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -30,16 +30,19 @@ _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}" source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz; qt5-base-cflags.patch - qtbug-82547.patch) + qtbug-82547a.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=ede85452; + qtbug-82547b.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=1edf586e;) sha256sums=('d835c6ba15e1a443bb0114a5eeea4efd512bc74700bb1ae003514d1465cd7b94' 'c3ccc95178203a4ce2c84862009309ab507dc84e846f30ddd8cea95564a46c01' -'d41852acfb5c7eb6415a0efdb3ec9a501ca31ebdddce2311e973854753da2eeb') +'d829a91b91f2f0c8c7e50b24ca98a3dca931f5e89f61e5dbd2cbe45ae8d47632' +'83ed9cf370078a87ae2dceabc602baccd9a23e6d1aec376344a29cf168ed72d7') prepare() { cd ${_pkgfqn} patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS - patch -p1 -i ../qtbug-82547.patch # fix build with system mimetype database + patch -p1 -i ../qtbug-82547a.patch # fix build with system mimetype database + patch -p1 -i ../qtbug-82547b.patch } build() { @@ -62,8 +65,9 @@ -dbus-linked \ -system-harfbuzz \ -journald \ +-no-mimetype-database \ -no-use-gold-linker \ --reduce-relocations # -no-mimetype-database https://bugreports.qt.io/browse/QTBUG-82547 +-reduce-relocations make } Deleted: qtbug-82547.patch === --- qtbug-82547.patch 2020-03-04 08:17:11 UTC (rev 376549) +++ qtbug-82547.patch 2020-03-04 08:45:03 UTC (rev 376550) @@ -1,22 +0,0 @@ -From 6a0d9896165998ef415c7169dcd8fe7eb2ec41cf Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Thu, 27 Feb 2020 08:08:25 -0800 -Subject: [PATCH] QMimeXMLProvider: add missing semi-colon in the #else case - -Fixes: QTBUG-82547 -Change-Id: Ia8b65350cd5d49debca9fffd15f74e22c0536805 - -diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h -index 0629df8..c4e712b 100644 a/src/corelib/mimetypes/qmimeprovider_p.h -+++ b/src/corelib/mimetypes/qmimeprovider_p.h -@@ -140,7 +140,7 @@ - enum : bool { InternalDatabaseAvailable = false }; - QMimeXMLProvider(QMimeDatabasePrivate *db, InternalDatabaseEnum) - : QMimeProviderBase(db, QString()) --{ Q_UNREACHABLE() }; -+{ Q_UNREACHABLE(); }; - #endif - QMimeXMLProvider(QMimeDatabasePrivate *db, const QString ); - ~QMimeXMLProvider();
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Thursday, November 14, 2019 @ 10:16:54 Author: arojas Revision: 368482 Add qt5-wayland optdepend (FS#64488) Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |1 + 1 file changed, 1 insertion(+) Modified: PKGBUILD === --- PKGBUILD2019-11-14 09:39:02 UTC (rev 368481) +++ PKGBUILD2019-11-14 10:16:54 UTC (rev 368482) @@ -16,6 +16,7 @@ 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-wayland: to run Qt applications in a Wayland session' 'qt5-translations: for some native UI translations' 'postgresql-libs: PostgreSQL driver' 'mariadb-libs: MariaDB driver'
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Wednesday, November 13, 2019 @ 08:00:15 Author: foutrelis Revision: 368081 icu 65.1 rebuild Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-11-13 07:54:23 UTC (rev 368080) +++ PKGBUILD2019-11-13 08:00:15 UTC (rev 368081) @@ -5,7 +5,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.14.0-beta3 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom')
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Wednesday, June 12, 2019 @ 10:43:44 Author: arojas Revision: 355917 Fix kwin build Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-06-12 08:36:04 UTC (rev 355916) +++ PKGBUILD2019-06-12 10:43:44 UTC (rev 355917) @@ -5,7 +5,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.13.0-rc2 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -26,12 +26,16 @@ 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;) -sha256sums=('21619fa2259f96558684400e1a23a17e3463d227347cac3e47151e7f75b1f579') +source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz; + qtbug-76244.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=90aefe08;) +sha256sums=('21619fa2259f96558684400e1a23a17e3463d227347cac3e47151e7f75b1f579' +'9a59f4485b964509b004785a0345419443a1e400c32fb85d09af84d1e8638add') prepare() { cd ${_pkgfqn} + patch -p1 -i ../qtbug-76244.patch # Fix build of kwin + # 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}|" \
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Tuesday, April 30, 2019 @ 14:22:46 Author: arojas Revision: 352314 Restore patch, still not included Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-04-30 13:46:36 UTC (rev 352313) +++ PKGBUILD2019-04-30 14:22:46 UTC (rev 352314) @@ -5,7 +5,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.13.0-beta3 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -26,8 +26,10 @@ 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;) -sha256sums=('3076eb13e31d2370c54c6d92e7ed06fbd47d8ade17e9a81c3760394ce5101205') +source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz; + kdebug-405837.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/src/widgets/itemviews?id=ed66c932;) +sha256sums=('3076eb13e31d2370c54c6d92e7ed06fbd47d8ade17e9a81c3760394ce5101205' +'4e7bf7e5298fc49643ae7900982577dab5c1400c3592938daa24e05de38656b5') prepare() { cd ${_pkgfqn} @@ -38,6 +40,8 @@ mkspecs/common/gcc-base.conf sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \ mkspecs/common/g++-unix.conf + + patch -p1 -i ../kdebug-405837.patch # Fix kitemviews crash } build() {
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Thursday, April 25, 2019 @ 10:38:25 Author: arojas Revision: 352116 Fix kitemviews crash (FS#62441) Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-04-25 08:50:42 UTC (rev 352115) +++ PKGBUILD2019-04-25 10:38:25 UTC (rev 352116) @@ -5,7 +5,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.13.0-beta2 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -26,8 +26,10 @@ 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;) -sha256sums=('55a592491b0a7a94ca4c7d5fc69ee96614502ec88b69da9514a9fd2ff87a8e2c') +source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz; + kdebug-405837.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/src/widgets/itemviews?id=ed66c932;) +sha256sums=('55a592491b0a7a94ca4c7d5fc69ee96614502ec88b69da9514a9fd2ff87a8e2c' +'4e7bf7e5298fc49643ae7900982577dab5c1400c3592938daa24e05de38656b5') prepare() { cd ${_pkgfqn} @@ -38,6 +40,8 @@ mkspecs/common/gcc-base.conf sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \ mkspecs/common/g++-unix.conf + + patch -p1 -i ../kdebug-405837.patch # Fix kitemmodels crash } build() {
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Saturday, April 6, 2019 @ 05:10:31 Author: foutrelis Revision: 350202 ICU 64 rebuild Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-04-06 04:55:32 UTC (rev 350201) +++ PKGBUILD2019-04-06 05:10:31 UTC (rev 350202) @@ -5,7 +5,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.13.0-beta1 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=3 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom')
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD qtbug-74578.patch)
Date: Wednesday, March 20, 2019 @ 13:59:23 Author: arojas Revision: 348760 Fix transparency Added: qt5-base/kde-unstable/qtbug-74578.patch Modified: qt5-base/kde-unstable/PKGBUILD ---+ PKGBUILD | 10 +++--- qtbug-74578.patch | 39 +++ 2 files changed, 46 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-03-20 13:40:45 UTC (rev 348759) +++ PKGBUILD2019-03-20 13:59:23 UTC (rev 348760) @@ -5,7 +5,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.13.0-beta1 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -26,8 +26,10 @@ 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;) -sha256sums=('2a25181ea33bab1e356311ee72ca3e748a72f958e864fe6a94fa965050a1b4f9') +source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz; +qtbug-74578.patch) +sha256sums=('2a25181ea33bab1e356311ee72ca3e748a72f958e864fe6a94fa965050a1b4f9' +'bfb983991f7a321bb6ef539ae4f5cf23ac7bc1d7a8ae13bbe8f0899f34dd4128') prepare() { cd ${_pkgfqn} @@ -38,6 +40,8 @@ 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() { Added: qtbug-74578.patch === --- qtbug-74578.patch (rev 0) +++ qtbug-74578.patch 2019-03-20 13:59:23 UTC (rev 348760) @@ -0,0 +1,39 @@ +From 6897c999fdbc3b93c1bed422e10479346dbd7e7f Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +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 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, ); + glXGetFBConfigAttrib(display, candidate, GLX_BLUE_SIZE, ); + glXGetFBConfigAttrib(display, candidate, GLX_ALPHA_SIZE, ); +- ++// 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 +
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Sunday, October 28, 2018 @ 13:19:00 Author: arojas Revision: 337466 ICU 63 rebuild Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-10-28 12:57:59 UTC (rev 337465) +++ PKGBUILD2018-10-28 13:19:00 UTC (rev 337466) @@ -5,7 +5,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.12.0-beta3 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom')
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Friday, April 27, 2018 @ 10:21:26 Author: arojas Revision: 323067 Use upstream fix for missing private include dirs Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-04-27 03:44:43 UTC (rev 323066) +++ PKGBUILD2018-04-27 10:21:26 UTC (rev 323067) @@ -11,7 +11,7 @@ url='http://qt-project.org/' 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' +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' 'icu' 'pcre2' 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'double-conversion') makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs' @@ -26,8 +26,10 @@ conflicts=('qtchooser') groups=('qt' 'qt5') _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}" -source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz;) -sha256sums=('d10d57228ca1f7a85e1beccc6c7fa4b0b16fceea3a5dba6ccbfc2254b1bc1667') +source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz; + qt-private-includes.patch::"http://code.qt.io/cgit/qt/qtbase.git/patch/?id=67aa365d;) +sha256sums=('d10d57228ca1f7a85e1beccc6c7fa4b0b16fceea3a5dba6ccbfc2254b1bc1667' +'bf6e52cc613599ff3dc756113ffb61aa1896a84abefbe69f42bdb846202d1f71') prepare() { cd ${_pkgfqn} @@ -44,7 +46,7 @@ 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} + # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417 - sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i mkspecs/features/create_cmake.prf + patch -p1 -i ../qt-private-includes.patch } build() {
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Monday, April 9, 2018 @ 10:23:04 Author: arojas Revision: 321344 Qt 5.11 beta 3 Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-04-09 10:22:45 UTC (rev 321343) +++ PKGBUILD2018-04-09 10:23:04 UTC (rev 321344) @@ -6,7 +6,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.11.0-beta3 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=1 arch=('x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom')
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Wednesday, March 28, 2018 @ 04:43:44 Author: foutrelis Revision: 320524 icu 61.1 rebuild Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-03-28 04:32:48 UTC (rev 320523) +++ PKGBUILD2018-03-28 04:43:44 UTC (rev 320524) @@ -6,7 +6,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.11.0-beta2 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom')
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Sunday, December 3, 2017 @ 10:17:01 Author: arojas Revision: 311536 Add xdg-utils dependency (FS#56547) Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-12-03 10:06:37 UTC (rev 311535) +++ PKGBUILD2017-12-03 10:17:01 UTC (rev 311536) @@ -11,7 +11,7 @@ url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') pkgdesc='A cross-platform application and UI framework' -depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig' +depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig' 'xdg-utils' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' 'pcre2' 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'double-conversion') makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Friday, May 19, 2017 @ 19:48:24 Author: arojas Revision: 296299 openssl 1.0 rebuild Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-05-19 19:33:00 UTC (rev 296298) +++ PKGBUILD2017-05-19 19:48:24 UTC (rev 296299) @@ -6,7 +6,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.9.0-beta3 pkgver=${_qtver/-/} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom')
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Friday, May 5, 2017 @ 18:08:26 Author: arojas Revision: 295327 Workaround missing private include dirs in cmake files (FS#48786) Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |5 - 1 file changed, 4 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-05-05 17:54:39 UTC (rev 295326) +++ PKGBUILD2017-05-05 18:08:26 UTC (rev 295327) @@ -6,7 +6,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.9.0-beta3 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -42,6 +42,9 @@ # Use python2 for Python 2.x find . -name '*.py' -exec sed -i \ 's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} + + + # Fix missing private includes https://bugreports.qt.io/browse/QTBUG-37417 + sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' -i mkspecs/features/create_cmake.prf } build() {
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Wednesday, April 26, 2017 @ 20:21:43 Author: arojas Revision: 294843 ICU 59 rebuild Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-04-26 20:15:55 UTC (rev 294842) +++ PKGBUILD2017-04-26 20:21:43 UTC (rev 294843) @@ -6,7 +6,7 @@ pkgname=(qt5-base qt5-xcb-private-headers) _qtver=5.9.0-beta2 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom')
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Monday, January 9, 2017 @ 19:36:35 Author: arojas Revision: 285600 tslib 1.3 rebuild Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-01-09 19:33:08 UTC (rev 285599) +++ PKGBUILD2017-01-09 19:36:35 UTC (rev 285600) @@ -5,7 +5,7 @@ pkgname=qt5-base _qtver=5.8.0-rc pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom')
[arch-commits] Commit in qt5-base/kde-unstable (PKGBUILD)
Date: Sunday, June 12, 2016 @ 02:34:25 Author: arojas Revision: 269365 Add missing libproxy dependency Modified: qt5-base/kde-unstable/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-06-11 20:16:44 UTC (rev 269364) +++ PKGBUILD2016-06-12 00:34:25 UTC (rev 269365) @@ -5,7 +5,7 @@ pkgname=qt5-base _qtver=5.7.0-rc pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -12,7 +12,7 @@ pkgdesc='A cross-platform application and UI framework' depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'fontconfig' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu' - 'qtchooser' 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11') + 'qtchooser' 'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy') makedepends=('mtdev' 'libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs' 'gtk3' 'libpulse' 'cups' 'freetds') optdepends=('qt5-svg: to use SVG icon themes'