[arch-commits] Commit in qt5-doc/kde-unstable (PKGBUILD)

2019-06-12 Thread Antonio Rojas via arch-commits
Date: Wednesday, June 12, 2019 @ 15:13:04
  Author: arojas
Revision: 355927

Remove no longer needed hack

Modified:
  qt5-doc/kde-unstable/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-12 15:03:42 UTC (rev 355926)
+++ PKGBUILD2019-06-12 15:13:04 UTC (rev 355927)
@@ -22,17 +22,11 @@
 
   ln -s /usr/bin qttools/
   ln -s /usr/bin/{rcc,uic,moc} qtbase/bin/
-
-  # Hack to force using python2
-  cd "$srcdir"
-  mkdir -p bin
-  ln -s /usr/bin/python2 bin/python
 }
 
 build() {
   cd ${_pkgfqn}
 
-  export PATH="$srcdir/bin:$PATH"
   PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
 -prefix /usr \
 -docdir /usr/share/doc/qt \


[arch-commits] Commit in qt5-doc/kde-unstable (PKGBUILD)

2019-05-29 Thread Antonio Rojas via arch-commits
Date: Wednesday, May 29, 2019 @ 13:39:46
  Author: arojas
Revision: 354510

Don't build examples

Modified:
  qt5-doc/kde-unstable/PKGBUILD

--+
 PKGBUILD |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-29 12:52:10 UTC (rev 354509)
+++ PKGBUILD2019-05-29 13:39:46 UTC (rev 354510)
@@ -41,7 +41,7 @@
 -archdatadir /usr/lib/qt \
 -datadir /usr/share/qt \
 -sysconfdir /etc/xdg \
--examplesdir /usr/share/doc/qt/examples
+-nomake examples
   make docs
 }
 
@@ -51,7 +51,4 @@
 
   install -d "$pkgdir"/usr/share/licenses
   ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-
-# Fix conflicts with qt5-examples
-  rm -r "$pkgdir"/usr/share/doc/qt/examples
 }


[arch-commits] Commit in qt5-doc/kde-unstable (PKGBUILD qt-no-statx.patch)

2018-03-01 Thread Antonio Rojas via arch-commits
Date: Thursday, March 1, 2018 @ 20:52:55
  Author: arojas
Revision: 317734

Fix build, drop obsolete patch

Modified:
  qt5-doc/kde-unstable/PKGBUILD
Deleted:
  qt5-doc/kde-unstable/qt-no-statx.patch

---+
 PKGBUILD  |   16 +++-
 qt-no-statx.patch |   11 ---
 2 files changed, 7 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-01 17:13:39 UTC (rev 317733)
+++ PKGBUILD2018-03-01 20:52:55 UTC (rev 317734)
@@ -12,16 +12,18 @@
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework (Documentation)'
 depends=('qt5-base')
-makedepends=('qt5-tools' 'python2' 'pciutils' 'libxtst' 'libxcursor' 
'libxrandr' 'libxss' 'libxcomposite' 'gperf' 'nss')
+makedepends=('qt5-tools' 'python2' 'pciutils' 'libxtst' 'libxcursor' 
'libxrandr' 'libxss' 'libxcomposite'
+ 'gperf' 'nss' 'clang')
 groups=('qt' 'qt5')
 _pkgfqn="qt-everywhere-src-${_qtver}"
-source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz;
-qt-no-statx.patch)
-sha256sums=('4884a2a122da603343f5066147be7be32a9cadc7daa017980bf47731d15699b5'
-'5cd1d90622cc53609806a3ce0b2811b28f0e6e20eb835861de4492dddeef6e52')
+source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz;)
+sha256sums=('4884a2a122da603343f5066147be7be32a9cadc7daa017980bf47731d15699b5')
 
 prepare() {
   cd ${_pkgfqn}
+  cd qtbase
+   bin/syncqt.pl -version ${_qtver%-*}
+  cd ..
 
   ln -s /usr/bin qttools/
   ln -s /usr/bin/{rcc,uic,moc} qtbase/bin/
@@ -30,10 +32,6 @@
   cd "$srcdir"
   mkdir -p bin
   ln -s /usr/bin/python2 bin/python
-
-  # Don't use the statx syscall https://bugs.archlinux.org/task/56289 
https://bugreports.qt.io/browse/QTBUG-64490
-  cd ${_pkgfqn}/qtbase
-  patch -p1 -i "$srcdir"/qt-no-statx.patch
 }
 
 build() {

Deleted: qt-no-statx.patch
===
--- qt-no-statx.patch   2018-03-01 17:13:39 UTC (rev 317733)
+++ qt-no-statx.patch   2018-03-01 20:52:55 UTC (rev 317734)
@@ -1,11 +0,0 @@
 
qtbase-everywhere-src-5.10.0-beta4/src/corelib/io/qfilesystemengine_unix.cpp.orig
  2017-11-14 12:10:28.156094557 +
-+++ 
qtbase-everywhere-src-5.10.0-beta4/src/corelib/io/qfilesystemengine_unix.cpp
   2017-11-14 12:10:46.156136206 +
-@@ -95,7 +95,7 @@
- { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
- #  endif
- 
--#  if !QT_CONFIG(statx) && defined(SYS_statx) && 
QT_HAS_INCLUDE()
-+#  if 0
- #include 
- static int statx(int dirfd, const char *pathname, int flag, unsigned mask, 
struct statx *statxbuf)
- { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }


[arch-commits] Commit in qt5-doc/kde-unstable (PKGBUILD)

2017-10-10 Thread Antonio Rojas
Date: Tuesday, October 10, 2017 @ 21:58:59
  Author: arojas
Revision: 307406

Add missing makedepends for qtwebengine docs

Modified:
  qt5-doc/kde-unstable/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-10 21:26:53 UTC (rev 307405)
+++ PKGBUILD2017-10-10 21:58:59 UTC (rev 307406)
@@ -12,7 +12,7 @@
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework (Documentation)'
 depends=('qt5-base')
-makedepends=('qt5-tools' 'python2' 'pciutils' 'libxtst' 'libxcursor' 
'libxrandr' 'libxss' 'libxcomposite' 'git')
+makedepends=('qt5-tools' 'python2' 'pciutils' 'libxtst' 'libxcursor' 
'libxrandr' 'libxss' 'libxcomposite' 'gperf' 'nss')
 groups=('qt' 'qt5')
 _pkgfqn="qt-everywhere-src-${_qtver}"
 
source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz;)


[arch-commits] Commit in qt5-doc/kde-unstable (PKGBUILD)

2017-05-02 Thread Antonio Rojas
Date: Tuesday, May 2, 2017 @ 14:57:49
  Author: arojas
Revision: 295183

Update to 5.9.0beta3

Modified:
  qt5-doc/kde-unstable/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-02 14:44:52 UTC (rev 295182)
+++ PKGBUILD2017-05-02 14:57:49 UTC (rev 295183)
@@ -12,7 +12,7 @@
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework (Documentation)'
 depends=('qt5-base')
-makedepends=('qt5-tools' 'python2' 'pciutils' 'libxtst' 'libxcursor' 
'libxrandr' 'libxss' 'libxcomposite')
+makedepends=('qt5-tools' 'python2' 'pciutils' 'libxtst' 'libxcursor' 
'libxrandr' 'libxss' 'libxcomposite' 'git')
 groups=('qt' 'qt5')
 _pkgfqn="qt-everywhere-opensource-src-${_qtver}"
 
source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/single/${_pkgfqn}.tar.xz;)
@@ -21,17 +21,9 @@
 prepare() {
   cd ${_pkgfqn}
 
-  # Use python2 for Python 2.x
-  find . -name '*.py' -exec sed -i \
-'s|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
-  find -name '*.pro' -o -name '*.pri' -o -name '*.prf' | xargs sed -i -e 
's|python -c|python2 -c|g' -e 's|python \$|python2 \$|g'
-
   ln -s /usr/bin qttools/
   ln -s /usr/bin/{rcc,uic,moc} qtbase/bin/
 
-  # workaround c++11 detection with GCC6
-  sed -e '/requires(c++11)/d' -i qtserialbus/qtserialbus.pro
-
   # Hack to force using python2
   cd "$srcdir"
   mkdir -p bin