From 0767a1478d4294142c330a1b834480c2b921744b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 27 Feb 2016 02:47:18 +0100 Subject: [PATCH] updated versions --- c++utilities/default/PKGBUILD | 4 +-- c++utilities/mingw-w64/PKGBUILD | 4 +-- pkgbuilds.pro | 2 ++ repoindex/default/PKGBUILD | 44 ++++++++++++++++++++++---- repoindex/default/repoindex.install | 12 +++++++ repoindex/git/PKGBUILD | 49 +++++++++++++++++++++++++---- repoindex/git/repoindex.install | 12 +++++++ 7 files changed, 111 insertions(+), 16 deletions(-) create mode 100644 repoindex/default/repoindex.install create mode 100644 repoindex/git/repoindex.install diff --git a/c++utilities/default/PKGBUILD b/c++utilities/default/PKGBUILD index 65193beb..e3b0bc55 100644 --- a/c++utilities/default/PKGBUILD +++ b/c++utilities/default/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Martchus _reponame=cpp-utilities pkgname=c++utilities -pkgver=3.1.1 +pkgver=3.2.0 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities." @@ -10,7 +10,7 @@ depends=('gcc-libs') makedepends=('cmake') url="https://github.com/Martchus/${_reponame}" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('6d94b823b9ec8e645e79f6bcdfed65bc2c8d3e3ac748f5ce969af1680cee9274') +sha256sums=('b76a56237f5e318bb0e3d69fa9e685527807d77c6d89bcc9b59249a1d1a86d22') build() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" diff --git a/c++utilities/mingw-w64/PKGBUILD b/c++utilities/mingw-w64/PKGBUILD index 4d3cb786..5ea8cbda 100644 --- a/c++utilities/mingw-w64/PKGBUILD +++ b/c++utilities/mingw-w64/PKGBUILD @@ -2,7 +2,7 @@ _name=c++utilities _reponame=cpp-utilities pkgname=mingw-w64-c++utilities -pkgver=3.1.1 +pkgver=3.2.0 pkgrel=1 arch=('any') pkgdesc="Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities (mingw-w64)." @@ -11,7 +11,7 @@ depends=('mingw-w64-crt') makedepends=('mingw-w64-gcc' 'mingw-w64-cmake') url="https://github.com/Martchus/${_reponame}" source=("c++utilities-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") -sha256sums=('6d94b823b9ec8e645e79f6bcdfed65bc2c8d3e3ac748f5ce969af1680cee9274') +sha256sums=('b76a56237f5e318bb0e3d69fa9e685527807d77c6d89bcc9b59249a1d1a86d22') options=(!buildflags staticlibs !strip !emptydirs) _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/pkgbuilds.pro b/pkgbuilds.pro index 9a802a14..f72ebfa8 100644 --- a/pkgbuilds.pro +++ b/pkgbuilds.pro @@ -18,7 +18,9 @@ OTHER_FILES += \ qtutilities/git/PKGBUILD \ qtutilities/mingw-w64/PKGBUILD \ repoindex/default/PKGBUILD \ + repoindex/default/repoindex.install \ repoindex/git/PKGBUILD \ + repoindex/git/repoindex.install \ repoindex/mingw-w64/PKGBUILD \ tageditor/default/PKGBUILD \ tageditor/default/tageditor.install \ diff --git a/repoindex/default/PKGBUILD b/repoindex/default/PKGBUILD index a3bed19c..4b545257 100644 --- a/repoindex/default/PKGBUILD +++ b/repoindex/default/PKGBUILD @@ -1,17 +1,17 @@ # Maintainer: Martchus _reponame=repoindex -pkgname=('repoindex' 'repoindex-web') -pkgver=0.1.1 +pkgname=(repoindex{,-header,-web,-gui}) +pkgver=0.2.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Provides a web interface to browse Arch Linux package repositories." license=('GPL') -depends=('qt5-base' 'qt5-websockets' 'karchive' 'c++utilities') -makedepends=('cmake') +depends=('qt5-websockets' 'qt5-webengine' 'karchive' 'c++utilities' 'qtutilities') +makedepends=('cmake' 'yuicompressor') backup=("etc/${_reponame}.conf") url="https://github.com/Martchus/${_reponame}" options=(emptydirs) -source=("repoindex-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") +source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz") sha256sums=('SKIP') build() { @@ -22,7 +22,10 @@ build() { package_repoindex() { pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides server binary)." - optdepends=('repoindex-web: Web UI') + depends=('qt5-base' 'qt5-websockets' 'karchive' 'c++utilities') + optdepends=('repoindex-header: header files') + optdepends=('repoindex-web: file for web UI') + optdepends=('repoindex-gui: application showing the web UI') # install files cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" @@ -37,6 +40,20 @@ package_repoindex() { cp "$pkgdir/usr/share/$_reponame/skel/repoindex.conf.js" "$pkgdir/etc/repoindex.conf" } +package_repoindex-header() { + arch=('any') + pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides header files)." + depends=('repoindex') + backup=() + + # 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" + + # install files + make install-header +} + package_repoindex-web() { arch=('any') pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides assets for web interface)." @@ -50,3 +67,18 @@ package_repoindex-web() { # install files make install-web } + +package_repoindex-gui() { + arch=('any') + pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides an application showing the web UI)." + depends=('repoindex-web' 'qt5-webengine') + install=${_reponame}.install + backup=() + + # 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" + + # install files + make install-binary-gui install-desktop +} diff --git a/repoindex/default/repoindex.install b/repoindex/default/repoindex.install new file mode 100644 index 00000000..5c501dc4 --- /dev/null +++ b/repoindex/default/repoindex.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/repoindex/git/PKGBUILD b/repoindex/git/PKGBUILD index 6d120e7c..5ec1e5e6 100644 --- a/repoindex/git/PKGBUILD +++ b/repoindex/git/PKGBUILD @@ -1,13 +1,13 @@ # Maintainer: Martchus _reponame=repoindex -pkgname=('repoindex-git' 'repoindex-web-git') +pkgname=(repoindex{,-header,-web,-gui}) pkgver=0.0.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Provides a web interface to browse Arch Linux package repositories (git version)." license=('GPL') depends=('qt5-base' 'qt5-websockets' 'karchive' 'pacman' 'c++utilities') -makedepends=('cmake' 'git') +makedepends=('cmake' 'git' 'yuicompressor') backup=("etc/${_reponame}.conf") url="https://github.com/Martchus/${_reponame}" options=(emptydirs) @@ -20,8 +20,17 @@ pkgver() { } build() { + cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" + make +} + +package_repoindex() { pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides server binary)." - optdepends=('repoindex-web: Web UI') + depends=('qt5-base' 'qt5-websockets' 'karchive' 'c++utilities') + optdepends=('repoindex-header: header files') + optdepends=('repoindex-web: file for web UI') + optdepends=('repoindex-gui: application showing the web UI') # install files cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}" @@ -30,13 +39,27 @@ build() { # make directories for cache and data mkdir -p "$pkgdir/var/cache/$_reponame" chown http:http "$pkgdir/var/cache/$_reponame" - mkdir -p "$pkgdir/var/lib/$_reponame" - chown http:http "$pkgdir/var/lib/$_reponame" + mkdir -p "$pkgdir/var/lib/$_reponame/sync" + chown http:http "$pkgdir/var/lib/$_reponame/"{,sync} mkdir -p "$pkgdir/etc" cp "$pkgdir/usr/share/$_reponame/skel/repoindex.conf.js" "$pkgdir/etc/repoindex.conf" } -package() { +package_repoindex-header() { + arch=('any') + pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides header files)." + depends=('repoindex') + backup=() + + # 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" + + # install files + make install-header +} + +package_repoindex-web() { arch=('any') pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides assets for web interface)." depends=('repoindex') @@ -50,3 +73,17 @@ package() { make install-web } +package_repoindex-gui() { + arch=('any') + pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides an application showing the web UI)." + depends=('repoindex-web' 'qt5-webengine') + install=${_reponame}.install + backup=() + + # 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" + + # install files + make install-binary-gui install-desktop +} diff --git a/repoindex/git/repoindex.install b/repoindex/git/repoindex.install new file mode 100644 index 00000000..5c501dc4 --- /dev/null +++ b/repoindex/git/repoindex.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}