mingw-w64-qt5-base*: removed glib2 dependency, small adjustments

This commit is contained in:
Martchus 2016-05-03 19:24:53 +02:00
parent 7a394f8a7d
commit f8a6e1c6af
5 changed files with 102 additions and 102 deletions

View File

@ -6,36 +6,45 @@
# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
# you also find the URL of a binary repository. # 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 pkgname=mingw-w64-qt5-base-opengl
pkgver=5.6.0 pkgver=5.6.0
pkgrel=2 pkgrel=3
pkgdesc="A cross-platform application and UI framework (mingw-w64, OpenGL)" 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/" url="https://www.qt.io/"
license=("custom, FDL, GPL3, LGPL") license=("custom, FDL, GPL3, LGPL")
depends=( depends=(
mingw-w64-crt 'mingw-w64-crt'
mingw-w64-zlib 'mingw-w64-zlib'
mingw-w64-libjpeg-turbo 'mingw-w64-libjpeg-turbo'
mingw-w64-libiconv 'mingw-w64-libiconv'
mingw-w64-sqlite 'mingw-w64-sqlite'
mingw-w64-libpng 'mingw-w64-libpng'
mingw-w64-openssl 'mingw-w64-openssl'
mingw-w64-libdbus 'mingw-w64-libdbus'
mingw-w64-pcre 'mingw-w64-pcre'
mingw-w64-harfbuzz 'mingw-w64-harfbuzz'
mingw-w64-glib2
) )
groups=(mingw-w64-qt mingw-w64-qt5) groups=('mingw-w64-qt' 'mingw-w64-qt5')
optdepends=( optdepends=(
"mingw-w64-postgresql-libs: PostgreSQL support" 'mingw-w64-postgresql-libs: PostgreSQL support'
"mingw-w64-mariadb-connector-c: MySQL support" 'mingw-w64-mariadb-connector-c: MySQL support'
"qtchooser" 'qtchooser'
) )
makedepends=(mingw-w64-gcc makedepends=('mingw-w64-gcc'
mingw-w64-postgresql-libs 'mingw-w64-postgresql-libs'
mingw-w64-mariadb-connector-c 'mingw-w64-mariadb-connector-c'
mingw-w64-pkg-config) 'mingw-w64-pkg-config')
options=(!strip !buildflags staticlibs) options=(!strip !buildflags staticlibs)
_pkgfqn="qtbase-opensource-src-${pkgver}" _pkgfqn="qtbase-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
@ -76,15 +85,6 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
'83139869355c2d46921adb25e47cf0fa') '83139869355c2d46921adb25e47cf0fa')
_architectures="x86_64-w64-mingw32 i686-w64-mingw32" _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") isStatic && depends+=("mingw-w64-qt5-base")
! isOpenGL && depends+=("mingw-w64-angleproject") ! isOpenGL && depends+=("mingw-w64-angleproject")
isOpenGL && provides+=("mingw-w64-qt5-base") isOpenGL && provides+=("mingw-w64-qt5-base")

View File

@ -6,36 +6,45 @@
# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
# you also find the URL of a binary repository. # 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 pkgname=mingw-w64-qt5-base-static
pkgver=5.6.0 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)" 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/" url="https://www.qt.io/"
license=("custom, FDL, GPL3, LGPL") license=("custom, FDL, GPL3, LGPL")
depends=( depends=(
mingw-w64-crt 'mingw-w64-crt'
mingw-w64-zlib 'mingw-w64-zlib'
mingw-w64-libjpeg-turbo 'mingw-w64-libjpeg-turbo'
mingw-w64-libiconv 'mingw-w64-libiconv'
mingw-w64-sqlite 'mingw-w64-sqlite'
mingw-w64-libpng 'mingw-w64-libpng'
mingw-w64-openssl 'mingw-w64-openssl'
mingw-w64-libdbus 'mingw-w64-libdbus'
mingw-w64-pcre 'mingw-w64-pcre'
mingw-w64-harfbuzz 'mingw-w64-harfbuzz'
mingw-w64-glib2
) )
groups=(mingw-w64-qt mingw-w64-qt5) groups=('mingw-w64-qt' 'mingw-w64-qt5')
optdepends=( optdepends=(
"mingw-w64-postgresql-libs: PostgreSQL support" 'mingw-w64-postgresql-libs: PostgreSQL support'
"mingw-w64-mariadb-connector-c: MySQL support" 'mingw-w64-mariadb-connector-c: MySQL support'
"qtchooser" 'qtchooser'
) )
makedepends=(mingw-w64-gcc makedepends=('mingw-w64-gcc'
mingw-w64-postgresql-libs 'mingw-w64-postgresql-libs'
mingw-w64-mariadb-connector-c 'mingw-w64-mariadb-connector-c'
mingw-w64-pkg-config) 'mingw-w64-pkg-config')
options=(!strip !buildflags staticlibs) options=(!strip !buildflags staticlibs)
_pkgfqn="qtbase-opensource-src-${pkgver}" _pkgfqn="qtbase-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
@ -76,15 +85,6 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
'83139869355c2d46921adb25e47cf0fa') '83139869355c2d46921adb25e47cf0fa')
_architectures="x86_64-w64-mingw32 i686-w64-mingw32" _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") isStatic && depends+=("mingw-w64-qt5-base")
! isOpenGL && depends+=("mingw-w64-angleproject") ! isOpenGL && depends+=("mingw-w64-angleproject")
isOpenGL && provides+=("mingw-w64-qt5-base") isOpenGL && provides+=("mingw-w64-qt5-base")

View File

@ -6,36 +6,45 @@
# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
# you also find the URL of a binary repository. # 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 pkgname=mingw-w64-qt5-base
pkgver=5.6.0 pkgver=5.6.0
pkgrel=2 pkgrel=3
pkgdesc="A cross-platform application and UI framework (mingw-w64)" 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/" url="https://www.qt.io/"
license=("custom, FDL, GPL3, LGPL") license=("custom, FDL, GPL3, LGPL")
depends=( depends=(
mingw-w64-crt 'mingw-w64-crt'
mingw-w64-zlib 'mingw-w64-zlib'
mingw-w64-libjpeg-turbo 'mingw-w64-libjpeg-turbo'
mingw-w64-libiconv 'mingw-w64-libiconv'
mingw-w64-sqlite 'mingw-w64-sqlite'
mingw-w64-libpng 'mingw-w64-libpng'
mingw-w64-openssl 'mingw-w64-openssl'
mingw-w64-libdbus 'mingw-w64-libdbus'
mingw-w64-pcre 'mingw-w64-pcre'
mingw-w64-harfbuzz 'mingw-w64-harfbuzz'
mingw-w64-glib2
) )
groups=(mingw-w64-qt mingw-w64-qt5) groups=('mingw-w64-qt' 'mingw-w64-qt5')
optdepends=( optdepends=(
"mingw-w64-postgresql-libs: PostgreSQL support" 'mingw-w64-postgresql-libs: PostgreSQL support'
"mingw-w64-mariadb-connector-c: MySQL support" 'mingw-w64-mariadb-connector-c: MySQL support'
"qtchooser" 'qtchooser'
) )
makedepends=(mingw-w64-gcc makedepends=('mingw-w64-gcc'
mingw-w64-postgresql-libs 'mingw-w64-postgresql-libs'
mingw-w64-mariadb-connector-c 'mingw-w64-mariadb-connector-c'
mingw-w64-pkg-config) 'mingw-w64-pkg-config')
options=(!strip !buildflags staticlibs) options=(!strip !buildflags staticlibs)
_pkgfqn="qtbase-opensource-src-${pkgver}" _pkgfqn="qtbase-opensource-src-${pkgver}"
source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
@ -76,15 +85,6 @@ md5sums=('d6b6cfd333c22829c6c85fc52ceed019'
'83139869355c2d46921adb25e47cf0fa') '83139869355c2d46921adb25e47cf0fa')
_architectures="x86_64-w64-mingw32 i686-w64-mingw32" _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") isStatic && depends+=("mingw-w64-qt5-base")
! isOpenGL && depends+=("mingw-w64-angleproject") ! isOpenGL && depends+=("mingw-w64-angleproject")
isOpenGL && provides+=("mingw-w64-qt5-base") isOpenGL && provides+=("mingw-w64-qt5-base")

View File

@ -10,7 +10,7 @@
_qt_module=qtwebkit _qt_module=qtwebkit
pkgname=mingw-w64-qt5-webkit pkgname=mingw-w64-qt5-webkit
pkgver=5.6.0 pkgver=5.6.0
pkgrel=2 pkgrel=2.1
arch=('any') arch=('any')
pkgdesc="Classes for a WebKit2 based implementation and a new QML API (mingw-w64)" pkgdesc="Classes for a WebKit2 based implementation and a new QML API (mingw-w64)"
depends=('mingw-w64-qt5-declarative' depends=('mingw-w64-qt5-declarative'

View File

@ -5,13 +5,13 @@
_reponame=repoindex _reponame=repoindex
pkgname=(repoindex{,-header,-web,-gui}) pkgname=(repoindex{,-header,-web,-gui})
pkgver=0.2.2 pkgver=0.2.3
pkgrel=1 pkgrel=0.1
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgdesc="Repository browser for Arch Linux" pkgdesc="Repository browser for Arch Linux"
license=('GPL') license=('GPL')
depends=('qt5-websockets' 'qt5-webengine' 'karchive' 'c++utilities' 'qtutilities') depends=('qt5-websockets' 'qt5-webengine' 'karchive' 'c++utilities' 'qtutilities')
makedepends=('cmake' 'yuicompressor') makedepends=('cmake' 'yuicompressor' 'qtutilities')
backup=("etc/${_reponame}.conf") backup=("etc/${_reponame}.conf")
url="https://github.com/Martchus/${_reponame}" url="https://github.com/Martchus/${_reponame}"
options=(emptydirs) options=(emptydirs)
@ -20,7 +20,7 @@ sha256sums=('SKIP')
build() { build() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" 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 make
} }
@ -33,7 +33,7 @@ package_repoindex() {
# install files # install files
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" 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 # make directories for cache and data
mkdir -p "$pkgdir/var/cache/$_reponame" mkdir -p "$pkgdir/var/cache/$_reponame"
@ -51,10 +51,10 @@ package_repoindex-header() {
# must call cmake again to adjust install prefix # must call cmake again to adjust install prefix
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" 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 # install files
make install-header make DESTDIR="${pkgdir}" install-header
} }
package_repoindex-web() { package_repoindex-web() {
@ -65,10 +65,10 @@ package_repoindex-web() {
# must call cmake again to adjust install prefix # must call cmake again to adjust install prefix
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" 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 # install files
make install-web make DESTDIR="${pkgdir}" install-web
} }
package_repoindex-gui() { package_repoindex-gui() {
@ -80,8 +80,8 @@ package_repoindex-gui() {
# must call cmake again to adjust install prefix # must call cmake again to adjust install prefix
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" 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 # install files
make install-binary-gui install-desktop make DESTDIR="${pkgdir}" install-binary-gui install-desktop
} }