From f8a6e1c6af6fbcbddad62e4f8deb8be2ffb0fa3e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 3 May 2016 19:24:53 +0200
Subject: [PATCH] mingw-w64-qt5-base*: removed glib2 dependency, small
 adjustments

---
 qt5-base/mingw-w64-opengl/PKGBUILD | 60 +++++++++++++++---------------
 qt5-base/mingw-w64-static/PKGBUILD | 60 +++++++++++++++---------------
 qt5-base/mingw-w64/PKGBUILD        | 60 +++++++++++++++---------------
 qt5-webkit/mingw-w64/PKGBUILD      |  2 +-
 repoindex/default/PKGBUILD         | 22 +++++------
 5 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/qt5-base/mingw-w64-opengl/PKGBUILD b/qt5-base/mingw-w64-opengl/PKGBUILD
index 9f62fa0a..33fdc8a4 100644
--- a/qt5-base/mingw-w64-opengl/PKGBUILD
+++ b/qt5-base/mingw-w64-opengl/PKGBUILD
@@ -6,36 +6,45 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
+# Helper functions for the split builds
+isStatic() {
+  [ $pkgname = "mingw-w64-qt5-base-static" ]
+}
+
+isOpenGL() {
+  [ $pkgname = "mingw-w64-qt5-base-opengl" ]
+}
+
 pkgname=mingw-w64-qt5-base-opengl
 pkgver=5.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A cross-platform application and UI framework (mingw-w64, OpenGL)"
-arch=(i686 x86_64)
+! isStatic && arch=('i686' 'x86_64')
+isStatic && arch=('any') # the static variant doesn't contain any executables which need to be executed on the host
 url="https://www.qt.io/"
 license=("custom, FDL, GPL3, LGPL")
 depends=(
-  mingw-w64-crt
-  mingw-w64-zlib
-  mingw-w64-libjpeg-turbo
-  mingw-w64-libiconv
-  mingw-w64-sqlite
-  mingw-w64-libpng
-  mingw-w64-openssl
-  mingw-w64-libdbus
-  mingw-w64-pcre
-  mingw-w64-harfbuzz
-  mingw-w64-glib2
+  'mingw-w64-crt'
+  'mingw-w64-zlib'
+  'mingw-w64-libjpeg-turbo'
+  'mingw-w64-libiconv'
+  'mingw-w64-sqlite'
+  'mingw-w64-libpng'
+  'mingw-w64-openssl'
+  'mingw-w64-libdbus'
+  'mingw-w64-pcre'
+  'mingw-w64-harfbuzz'
 )
-groups=(mingw-w64-qt mingw-w64-qt5)
+groups=('mingw-w64-qt' 'mingw-w64-qt5')
 optdepends=(
-  "mingw-w64-postgresql-libs: PostgreSQL support"
-  "mingw-w64-mariadb-connector-c: MySQL support"
-  "qtchooser"
+  'mingw-w64-postgresql-libs: PostgreSQL support'
+  'mingw-w64-mariadb-connector-c: MySQL support'
+  'qtchooser'
 )
-makedepends=(mingw-w64-gcc
-             mingw-w64-postgresql-libs
-             mingw-w64-mariadb-connector-c
-             mingw-w64-pkg-config)
+makedepends=('mingw-w64-gcc'
+             'mingw-w64-postgresql-libs'
+             'mingw-w64-mariadb-connector-c'
+             'mingw-w64-pkg-config')
 options=(!strip !buildflags staticlibs)
 _pkgfqn="qtbase-opensource-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
@@ -76,15 +85,6 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
          '83139869355c2d46921adb25e47cf0fa')
 _architectures="x86_64-w64-mingw32 i686-w64-mingw32"
 
-# Helper functions for the split builds
-isStatic() {
-  [ $pkgname = "mingw-w64-qt5-base-static" ]
-}
-
-isOpenGL() {
-  [ $pkgname = "mingw-w64-qt5-base-opengl" ]
-}
-
 isStatic && depends+=("mingw-w64-qt5-base")
 ! isOpenGL && depends+=("mingw-w64-angleproject")
 isOpenGL && provides+=("mingw-w64-qt5-base")
diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD
index 7f5ad62a..1f9f8969 100644
--- a/qt5-base/mingw-w64-static/PKGBUILD
+++ b/qt5-base/mingw-w64-static/PKGBUILD
@@ -6,36 +6,45 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
+# Helper functions for the split builds
+isStatic() {
+  [ $pkgname = "mingw-w64-qt5-base-static" ]
+}
+
+isOpenGL() {
+  [ $pkgname = "mingw-w64-qt5-base-opengl" ]
+}
+
 pkgname=mingw-w64-qt5-base-static
 pkgver=5.6.0
-pkgrel=1 # not updated because the latest changes are not relevant for the static variant
+pkgrel=2
 pkgdesc="A cross-platform application and UI framework (mingw-w64, static)"
-arch=(i686 x86_64)
+! isStatic && arch=('i686' 'x86_64')
+isStatic && arch=('any') # the static variant doesn't contain any executables which need to be executed on the host
 url="https://www.qt.io/"
 license=("custom, FDL, GPL3, LGPL")
 depends=(
-  mingw-w64-crt
-  mingw-w64-zlib
-  mingw-w64-libjpeg-turbo
-  mingw-w64-libiconv
-  mingw-w64-sqlite
-  mingw-w64-libpng
-  mingw-w64-openssl
-  mingw-w64-libdbus
-  mingw-w64-pcre
-  mingw-w64-harfbuzz
-  mingw-w64-glib2
+  'mingw-w64-crt'
+  'mingw-w64-zlib'
+  'mingw-w64-libjpeg-turbo'
+  'mingw-w64-libiconv'
+  'mingw-w64-sqlite'
+  'mingw-w64-libpng'
+  'mingw-w64-openssl'
+  'mingw-w64-libdbus'
+  'mingw-w64-pcre'
+  'mingw-w64-harfbuzz'
 )
-groups=(mingw-w64-qt mingw-w64-qt5)
+groups=('mingw-w64-qt' 'mingw-w64-qt5')
 optdepends=(
-  "mingw-w64-postgresql-libs: PostgreSQL support"
-  "mingw-w64-mariadb-connector-c: MySQL support"
-  "qtchooser"
+  'mingw-w64-postgresql-libs: PostgreSQL support'
+  'mingw-w64-mariadb-connector-c: MySQL support'
+  'qtchooser'
 )
-makedepends=(mingw-w64-gcc
-             mingw-w64-postgresql-libs
-             mingw-w64-mariadb-connector-c
-             mingw-w64-pkg-config)
+makedepends=('mingw-w64-gcc'
+             'mingw-w64-postgresql-libs'
+             'mingw-w64-mariadb-connector-c'
+             'mingw-w64-pkg-config')
 options=(!strip !buildflags staticlibs)
 _pkgfqn="qtbase-opensource-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
@@ -76,15 +85,6 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
          '83139869355c2d46921adb25e47cf0fa')
 _architectures="x86_64-w64-mingw32 i686-w64-mingw32"
 
-# Helper functions for the split builds
-isStatic() {
-  [ $pkgname = "mingw-w64-qt5-base-static" ]
-}
-
-isOpenGL() {
-  [ $pkgname = "mingw-w64-qt5-base-opengl" ]
-}
-
 isStatic && depends+=("mingw-w64-qt5-base")
 ! isOpenGL && depends+=("mingw-w64-angleproject")
 isOpenGL && provides+=("mingw-w64-qt5-base")
diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD
index e9acc4fa..2d552ef8 100644
--- a/qt5-base/mingw-w64/PKGBUILD
+++ b/qt5-base/mingw-w64/PKGBUILD
@@ -6,36 +6,45 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
+# Helper functions for the split builds
+isStatic() {
+  [ $pkgname = "mingw-w64-qt5-base-static" ]
+}
+
+isOpenGL() {
+  [ $pkgname = "mingw-w64-qt5-base-opengl" ]
+}
+
 pkgname=mingw-w64-qt5-base
 pkgver=5.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A cross-platform application and UI framework (mingw-w64)"
-arch=(i686 x86_64)
+! isStatic && arch=('i686' 'x86_64')
+isStatic && arch=('any') # the static variant doesn't contain any executables which need to be executed on the host
 url="https://www.qt.io/"
 license=("custom, FDL, GPL3, LGPL")
 depends=(
-  mingw-w64-crt
-  mingw-w64-zlib
-  mingw-w64-libjpeg-turbo
-  mingw-w64-libiconv
-  mingw-w64-sqlite
-  mingw-w64-libpng
-  mingw-w64-openssl
-  mingw-w64-libdbus
-  mingw-w64-pcre
-  mingw-w64-harfbuzz
-  mingw-w64-glib2
+  'mingw-w64-crt'
+  'mingw-w64-zlib'
+  'mingw-w64-libjpeg-turbo'
+  'mingw-w64-libiconv'
+  'mingw-w64-sqlite'
+  'mingw-w64-libpng'
+  'mingw-w64-openssl'
+  'mingw-w64-libdbus'
+  'mingw-w64-pcre'
+  'mingw-w64-harfbuzz'
 )
-groups=(mingw-w64-qt mingw-w64-qt5)
+groups=('mingw-w64-qt' 'mingw-w64-qt5')
 optdepends=(
-  "mingw-w64-postgresql-libs: PostgreSQL support"
-  "mingw-w64-mariadb-connector-c: MySQL support"
-  "qtchooser"
+  'mingw-w64-postgresql-libs: PostgreSQL support'
+  'mingw-w64-mariadb-connector-c: MySQL support'
+  'qtchooser'
 )
-makedepends=(mingw-w64-gcc
-             mingw-w64-postgresql-libs
-             mingw-w64-mariadb-connector-c
-             mingw-w64-pkg-config)
+makedepends=('mingw-w64-gcc'
+             'mingw-w64-postgresql-libs'
+             'mingw-w64-mariadb-connector-c'
+             'mingw-w64-pkg-config')
 options=(!strip !buildflags staticlibs)
 _pkgfqn="qtbase-opensource-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
@@ -76,15 +85,6 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
          '83139869355c2d46921adb25e47cf0fa')
 _architectures="x86_64-w64-mingw32 i686-w64-mingw32"
 
-# Helper functions for the split builds
-isStatic() {
-  [ $pkgname = "mingw-w64-qt5-base-static" ]
-}
-
-isOpenGL() {
-  [ $pkgname = "mingw-w64-qt5-base-opengl" ]
-}
-
 isStatic && depends+=("mingw-w64-qt5-base")
 ! isOpenGL && depends+=("mingw-w64-angleproject")
 isOpenGL && provides+=("mingw-w64-qt5-base")
diff --git a/qt5-webkit/mingw-w64/PKGBUILD b/qt5-webkit/mingw-w64/PKGBUILD
index 61188268..ba45d62b 100644
--- a/qt5-webkit/mingw-w64/PKGBUILD
+++ b/qt5-webkit/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 _qt_module=qtwebkit
 pkgname=mingw-w64-qt5-webkit
 pkgver=5.6.0
-pkgrel=2
+pkgrel=2.1
 arch=('any')
 pkgdesc="Classes for a WebKit2 based implementation and a new QML API (mingw-w64)"
 depends=('mingw-w64-qt5-declarative'
diff --git a/repoindex/default/PKGBUILD b/repoindex/default/PKGBUILD
index 4586d199..d2c61f67 100644
--- a/repoindex/default/PKGBUILD
+++ b/repoindex/default/PKGBUILD
@@ -5,13 +5,13 @@
 
 _reponame=repoindex
 pkgname=(repoindex{,-header,-web,-gui})
-pkgver=0.2.2
-pkgrel=1
+pkgver=0.2.3
+pkgrel=0.1
 arch=('i686' 'x86_64')
 pkgdesc="Repository browser for Arch Linux"
 license=('GPL')
 depends=('qt5-websockets' 'qt5-webengine' 'karchive' 'c++utilities' 'qtutilities')
-makedepends=('cmake' 'yuicompressor')
+makedepends=('cmake' 'yuicompressor' 'qtutilities')
 backup=("etc/${_reponame}.conf")
 url="https://github.com/Martchus/${_reponame}"
 options=(emptydirs)
@@ -20,7 +20,7 @@ sha256sums=('SKIP')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"
   make
 }
 
@@ -33,7 +33,7 @@ package_repoindex() {
 
   # install files
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  make install-binary install-service install-config
+  make DESTDIR="${pkgdir}" install-binary install-service install-config
 
   # make directories for cache and data
   mkdir -p "$pkgdir/var/cache/$_reponame"
@@ -51,10 +51,10 @@ package_repoindex-header() {
 
   # must call cmake again to adjust install prefix
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"
 
   # install files
-  make install-header
+  make DESTDIR="${pkgdir}" install-header
 }
 
 package_repoindex-web() {
@@ -65,10 +65,10 @@ package_repoindex-web() {
 
   # must call cmake again to adjust install prefix
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"
 
   # install files
-  make install-web
+  make DESTDIR="${pkgdir}" install-web
 }
 
 package_repoindex-gui() {
@@ -80,8 +80,8 @@ package_repoindex-gui() {
 
   # must call cmake again to adjust install prefix
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"
 
   # install files
-  make install-binary-gui install-desktop
+  make DESTDIR="${pkgdir}" install-binary-gui install-desktop
 }