X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id EFEB3DC00C0 for ; Tue, 10 May 2016 17:44:41 +0000 (UTC) Received: from nov-007-i612.relay.mailchannels.net (nov-007-i612.relay.mailchannels.net [46.232.183.166]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 25A66DC0E99 for ; Tue, 10 May 2016 17:44:39 +0000 (UTC) X-Sender-Id: mxroute|x-authuser|developer@it-offshore.co.uk Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id B4ABA10085B for ; Tue, 10 May 2016 17:44:34 +0000 (UTC) Received: from ocean.mxroute.com (ip-10-21-3-36.us-west-2.compute.internal [10.21.3.36]) by relay.mailchannels.net (Postfix) with ESMTPA id E4DB4100C58 for ; Tue, 10 May 2016 17:44:32 +0000 (UTC) X-Sender-Id: mxroute|x-authuser|developer@it-offshore.co.uk Received: from ocean.mxroute.com ([TEMPUNAVAIL]. [10.196.16.214]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.6.11); Tue, 10 May 2016 17:44:34 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: mxroute|x-authuser|developer@it-offshore.co.uk X-MailChannels-Auth-Id: mxroute X-MC-Loop-Signature: 1462902273173:1871317595 X-MC-Ingress-Time: 1462902273173 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=it-offshore.co.uk; s=default; h=References:In-Reply-To:Message-Id:Date: Subject:To:From:Sender:Reply-To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=VVYkVfEiNCp+vbjcVweLf1Itcn/62bHTZrk+rM5QurA=; b=r0K2MVdm/A4RZgvbErUdeTVnj ZXc2oRwiM11ORvUDj3+F/LkzMOYSQhBEm3J/vqk9RnhepyNWZz+eDXnOAsJ25JGRuH3om77CmpgwN VPI7nTaAdm5HI329slc46dKe7sPzRVZecQCTnny2FqPFsTUwpiOwVNs2L8hkdsurXssZS8Q7wPZdl 6B4UqaGTU0blUF8NhFOtwHYcHzio553XJDdu5sbWnP3qtse43OBMJrnXUfEPurP0YaYb8jND+Q/oh a3sbfejZ+jwAbKl1lCLF4SPTRn5cdfRo4Q29aMYrIaB7QeuDvE0SC1Scsvon7eNos5ebnd9QkaZ6D CGqipskNw==; Received: from [81.4.121.188] (port=49909 helo=localhost.localdomain) by ocean.mxroute.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.87) (envelope-from ) id 1b0Bhu-0008Rd-S5 for alpine-aports@lists.alpinelinux.org; Tue, 10 May 2016 13:44:31 -0400 From: Stuart Cardall To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH 2/2] testing/firetools: new aport Date: Tue, 10 May 2016 17:44:24 +0000 Message-Id: <1462902264-4587-3-git-send-email-developer@it-offshore.co.uk> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1462902264-4587-1-git-send-email-developer@it-offshore.co.uk> References: <1462902264-4587-1-git-send-email-developer@it-offshore.co.uk> X-AuthUser: developer@it-offshore.co.uk X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: firetools is a GUI / systray app for firejail --- testing/firetools/APKBUILD | 44 ++++++++++++++++++++++++++++++ testing/firetools/fix-qt-configure.patch | 46 ++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 testing/firetools/APKBUILD create mode 100644 testing/firetools/fix-qt-configure.patch diff --git a/testing/firetools/APKBUILD b/testing/firetools/APKBUILD new file mode 100644 index 0000000..670c137 --- /dev/null +++ b/testing/firetools/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: Stuart Cardall +# Maintainer: Stuart Cardall +pkgname=firetools +pkgver=0.9.30 +pkgrel=0 +pkgdesc="Firejail sandbox launcher integrated with the system tray" +url="https://l3net.wordpress.com/projects/firejail/#firetools" +arch="all" +license="GPL2" +depends="firejail xterm icu-libs" +#depends="firejail xterm" #building against qt5 requires v.5.60 which is currently in edge +depends_dev="" +#makedepends="$depends_dev qt5-qtbase-dev qt5-qtsvg-dev" +makedepends="$depends_dev qt-dev" +install="" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/netblue30/firetools/archive/$pkgver.tar.gz + fix-qt-configure.patch + " + +builddir="$srcdir"/$pkgname-$pkgver +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + || return 1 + make || return 1 +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums="11ddf9c6645f2d218e9cc5ad20070277 firetools-0.9.30.tar.gz +2f8c60628d3155c30d988a8b5745916a fix-qt-configure.patch" +sha256sums="b54e3ae5f619a4e77f9a0044b791ea0cc86ccaf9ad07014898222bc8ae0bd56d firetools-0.9.30.tar.gz +9788d0b5c3738fe12b41cd9040f1c8b9a3718e57809d76c12b67ff79b818f4e7 fix-qt-configure.patch" +sha512sums="237e1dc0b091874f34a326cca799a9b515861ff8966e319c6b79a6cd717f74d38d39fbd1cbbdaa85563cbfd3eddf61c204d1acf4caf9923c020638080225b199 firetools-0.9.30.tar.gz +3a732d6fbd7e93b9bbd0cdf6484aff339069304333a319273e43d3147a32476d0812a7779187a5874a9d59f2f6bf5307fc2b93acf39f631e68f9d9eb8eddb5b5 fix-qt-configure.patch" diff --git a/testing/firetools/fix-qt-configure.patch b/testing/firetools/fix-qt-configure.patch new file mode 100644 index 0000000..c0db8c9 --- /dev/null +++ b/testing/firetools/fix-qt-configure.patch @@ -0,0 +1,46 @@ +--- firetools-0.9.30/configure ++++ firetools-0.9.30/configure.new +@@ -3811,18 +3811,24 @@ + as_fn_error $? "*** Please install Qt5 svg support - apt-get install libqt5svg5 ***" "$LINENO" 5 + fi + +-# Arch Linux 64bit ++# Arch Linux 64bit & Alpine Linux + elif test -f /usr/lib/libQt5Core.so + then ++ if test -d /usr/lib/qt5 ++ then ++ qtdir='qt5' ++ else ++ qtdir='qt' ++ fi + echo "Found qt5 library in /usr/lib directory" + # check libqt5svg5 library +- if test -f /usr/lib/qt/plugins/imageformats/libqsvg.so ++ if test -f /usr/lib/$qtdir/plugins/imageformats/libqsvg.so + then + echo "Found qt5 svg library" + else + as_fn_error $? "*** Please install Qt5 svg support - pacman -S qt5-svg ***" "$LINENO" 5 + fi +- if test -f /usr/lib/qt/plugins/iconengines/libqsvgicon.so ++ if test -f /usr/lib/$qtdir/plugins/iconengines/libqsvgicon.so + then + echo "Found qt5 svg icon library" + else + +--- firetools-0.9.30/configure ++++ firetools-0.9.30/configure.new +@@ -3939,6 +3939,11 @@ + QMAKE=/usr/lib64/qt4/bin/qmake + fi + ++ # fix for Alpine Linux ++ if test -f /usr/lib/qt5/bin/qmake; then ++ QMAKE=/usr/lib/qt5/bin/qmake ++ fi ++ + if test -z "$QMAKE" + then + as_fn_error $? "qmake is missing, please install Qt4 or Qt5 development packages." "$LINENO" 5 + -- 2.8.2 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---