Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

octoxbps: update to 0.3.0. #23654

Merged
merged 1 commit into from
Jul 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed srcpkgs/octoxbps/files/octoxbps-128.png
Binary file not shown.
Binary file removed srcpkgs/octoxbps/files/octoxbps-256.png
Binary file not shown.
Binary file removed srcpkgs/octoxbps/files/octoxbps-32.png
Binary file not shown.
Binary file removed srcpkgs/octoxbps/files/octoxbps-48.png
Binary file not shown.
Binary file removed srcpkgs/octoxbps/files/octoxbps-64.png
Binary file not shown.
9 changes: 0 additions & 9 deletions srcpkgs/octoxbps/files/octoxbps.desktop

This file was deleted.

Binary file removed srcpkgs/octoxbps/files/octoxbps.xcf
Binary file not shown.
10 changes: 0 additions & 10 deletions srcpkgs/octoxbps/patches/fix-qt5.11.patch

This file was deleted.

75 changes: 0 additions & 75 deletions srcpkgs/octoxbps/patches/no-force.patch

This file was deleted.

38 changes: 18 additions & 20 deletions srcpkgs/octoxbps/template
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
# Template file for 'octoxbps'
pkgname=octoxbps
version=0.2.2
revision=3
version=0.3.0
revision=1
build_style=qmake
hostmakedepends="qt5-qmake"
makedepends="qt5-declarative-devel"
depends="curl"
hostmakedepends="qt5-qmake pkg-config"
makedepends="qt5-declarative-devel qtermwidget-devel"
depends="curl sudo"
short_desc="Qt-based XBPS front-end"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/aarnt/octoxbps"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=6f7643bb07960d8c8f60ce70dc495f866ae60a4d6d8160a7f108f79bf53d2d22
changelog="https://raw.githubusercontent.com/aarnt/octoxbps/master/CHANGELOG"
distfiles="https://github.com/aarnt/octoxbps/archive/v${version}.tar.gz"
checksum=3c3e1b58c7211a5ef4aac1b1a2f9d71891404b41963f683efccc0f43165c8313

if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-declarative-devel"
Expand All @@ -22,9 +23,13 @@ post_configure() {
if [ "$CROSS_BUILD" ]; then
qmake_args="-qtconf ${wrksrc}/qt.conf"
fi
cd ${wrksrc}/notifier/octoxbps-notifier && qmake-qt5 ${configure_args} \
PREFIX=/usr \
LIB=/usr/lib \
cd ${wrksrc}/notifier && qmake-qt5 ${configure_args} \
QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
QMAKE_CFLAGS="${CFLAGS}" \
QMAKE_CXXFLAGS="${CXXFLAGS}" \
QMAKE_LFLAGS="${LDFLAGS}" \
${qmake_args}
cd ${wrksrc}/sudo && qmake-qt5 ${configure_args} \
QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
QMAKE_CFLAGS="${CFLAGS}" \
QMAKE_CXXFLAGS="${CXXFLAGS}" \
Expand All @@ -33,20 +38,13 @@ post_configure() {
}

do_build() {
for _dir in ${wrksrc} ${wrksrc}/notifier/octoxbps-notifier; do
for _dir in ${wrksrc} ${wrksrc}/notifier ${wrksrc}/sudo; do
cd $_dir && make ${makejobs} ${make_build_args} ${make_build_target} CC="$CC" CXX="$CXX" LINK="$CXX"
done
}

do_install() {
vbin bin/octoxbps
vbin notifier/bin/octoxbps-notifier
vmkdir usr/share/applications
vinstall ${FILESDIR}/octoxbps.desktop 644 usr/share/applications
local size
for size in 32 48 64 128 256; do
vinstall ${FILESDIR}/octoxbps-${size}.png 644 \
usr/share/icons/hicolor/${size}x${size}/apps octoxbps.png
for _dir in ${wrksrc} ${wrksrc}/notifier ${wrksrc}/sudo; do
cd $_dir && make INSTALL_ROOT=${DESTDIR} install
done
vinstall ${FILESDIR}/octoxbps-128.png 644 usr/share/pixmaps octoxbps.png
}