diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-04 14:14:00 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-04 14:14:00 +0000 |
| commit | e2c1a088a2aec3bc8dbbb63dd5e796861d3b3a86 (patch) | |
| tree | 85a9321775d5158a64a8244e3a60e6e1e1aac045 | |
| parent | 461eef5557d1dfe322bac7aa63ffa7ee354f4d7f (diff) | |
| download | aports-e2c1a088a2aec3bc8dbbb63dd5e796861d3b3a86.tar.bz2 aports-e2c1a088a2aec3bc8dbbb63dd5e796861d3b3a86.tar.xz | |
main/abuild: better support for qt5
| -rw-r--r-- | main/abuild/0001-abuild-support-qt5-mkspecs.patch | 30 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 15 |
2 files changed, 40 insertions, 5 deletions
diff --git a/main/abuild/0001-abuild-support-qt5-mkspecs.patch b/main/abuild/0001-abuild-support-qt5-mkspecs.patch new file mode 100644 index 0000000000..56756fd1af --- /dev/null +++ b/main/abuild/0001-abuild-support-qt5-mkspecs.patch @@ -0,0 +1,30 @@ +From 7b47e30b8725fe6bf6c929f55b1108489b0887f2 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 4 Oct 2013 14:05:12 +0000 +Subject: [PATCH] abuild: support qt5 mkspecs + +--- + abuild.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/abuild.in b/abuild.in +index b12df7a..d004ffb 100755 +--- a/abuild.in ++++ b/abuild.in +@@ -1301,9 +1301,11 @@ default_dev() { + for i in usr/include usr/lib/pkgconfig usr/share/aclocal\ + usr/share/gettext usr/bin/*-config \ + usr/share/vala/vapi usr/share/gir-[0-9]*\ +- usr/share/qt/mkspecs \ ++ usr/share/qt*/mkspecs \ ++ usr/lib/qt*/mkspecs \ + $(find -name include -type d) \ +- $(find lib/ usr/ -name '*.[acho]' 2>/dev/null); do ++ $(find lib/ usr/ -name '*.[acho]' \ ++ -o -name '*.prl' 2>/dev/null); do + if [ -e "$pkgdir/$i" ] || [ -L "$pkgdir/$i" ]; then + d="$subpkgdir/${i%/*}" # dirname $i + mkdir -p "$d" +-- +1.8.4 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index f4ebc4c809..f6ae08d5cd 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -3,7 +3,7 @@ pkgdesc="Script to build Alpine Packages" pkgname=abuild pkgver=2.17.0 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 url=http://git.alpinelinux.org/cgit/abuild/ depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 abuildhelper libc-utils" @@ -16,7 +16,9 @@ subpackages="apkbuild-cpan:cpan" pkggroups="abuild" arch="all" license=GPL-2 -source="http://dev.alpinelinux.org/archive/abuild/abuild-$pkgver.tar.xz" +source="http://dev.alpinelinux.org/archive/abuild/abuild-$pkgver.tar.xz + 0001-abuild-support-qt5-mkspecs.patch + " _builddir="$srcdir/$pkgname-$_ver" prepare() { @@ -52,6 +54,9 @@ cpan() { mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/ } -md5sums="e3000a6841f865a4404733185d9a2eff abuild-2.17.0.tar.xz" -sha256sums="9238fedc66e2af99b041cb9096d982027650fa7ece79fcfc22d6abdae11ed6de abuild-2.17.0.tar.xz" -sha512sums="26385f6a3e39851826d170c2b379205a51f034412b03b4a2b86ff61b14e34cbe2300d0f2280a14439d4342c1495d67d07e47910d5cba73c29b44d46d77120635 abuild-2.17.0.tar.xz" +md5sums="e3000a6841f865a4404733185d9a2eff abuild-2.17.0.tar.xz +7b1b5016e26bdef9f95034724f60d3f2 0001-abuild-support-qt5-mkspecs.patch" +sha256sums="9238fedc66e2af99b041cb9096d982027650fa7ece79fcfc22d6abdae11ed6de abuild-2.17.0.tar.xz +7a7e1f63be5da6bf15da272e7043147336a383d4277f6342e0faf8a596d32ef9 0001-abuild-support-qt5-mkspecs.patch" +sha512sums="26385f6a3e39851826d170c2b379205a51f034412b03b4a2b86ff61b14e34cbe2300d0f2280a14439d4342c1495d67d07e47910d5cba73c29b44d46d77120635 abuild-2.17.0.tar.xz +91c543695677d34a3353d667d79f302587e72ad13d5c221a930bce5dbb74524933f2d30cdd045cd77539f2526bb25a6d1d1491e396d59c654a3ddd534da06cd4 0001-abuild-support-qt5-mkspecs.patch" |