diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-05 12:14:43 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-05 12:14:43 -0300 |
| commit | 1a2fd51887f77ba9c41195c1a2eb9ee80ea28866 (patch) | |
| tree | 65f7f8ade72ab0e933e8be39880cb71992204e3b /extra/wpa_supplicant_gui | |
| parent | 4e3e2f9e625584fee1cdb96fcec3a49f0cacdc8b (diff) | |
| parent | 7f6f69dc52c8601768ba48fa7b69507a80d532cb (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vhba-module/PKGBUILD
community-testing/vhba-module/vhba-module.install
core/gcc/PKGBUILD
core/wpa_supplicant/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/wine/PKGBUILD
testing/gcc/PKGBUILD
testing/glibc/PKGBUILD
testing/glibc/glibc-2.15-revert-c5a0802a.patch
testing/kmod/PKGBUILD
testing/lvm2/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/wpa_supplicant_gui')
| -rw-r--r-- | extra/wpa_supplicant_gui/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/wpa_supplicant_gui/compile-fix.patch | 14 |
2 files changed, 24 insertions, 6 deletions
diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD index 510cb533c..0a9edeaac 100644 --- a/extra/wpa_supplicant_gui/PKGBUILD +++ b/extra/wpa_supplicant_gui/PKGBUILD @@ -1,19 +1,23 @@ -# $Id: PKGBUILD 149922 2012-02-11 22:38:54Z thomas $ +# $Id: PKGBUILD 162910 2012-07-03 19:17:02Z dreisner $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant_gui -pkgver=0.7.3 -pkgrel=2 +pkgver=1.0 +pkgrel=1 pkgdesc="A Qt frontend to wpa_supplicant" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64' 'mips64el') depends=('qt' "wpa_supplicant=$pkgver") license=('GPL') -source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz") -sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443') +source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz" + compile-fix.patch) +sha256sums=('91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c' + '044be1032faf93c5f0abf22d7ae77dc0d1d1fef0c2c30646d54950b86601709f') build() { - cd "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/wpa_gui-qt4" + cd wpa_supplicant-${pkgver} + patch -p1 <../compile-fix.patch + cd wpa_supplicant/wpa_gui-qt4 qmake make } diff --git a/extra/wpa_supplicant_gui/compile-fix.patch b/extra/wpa_supplicant_gui/compile-fix.patch new file mode 100644 index 000000000..3303b3699 --- /dev/null +++ b/extra/wpa_supplicant_gui/compile-fix.patch @@ -0,0 +1,14 @@ +diff -u -r wpa_supplicant-1.0/wpa_supplicant/wpa_gui-qt4/wpagui.cpp wpa_supplicant-1.0-fix/wpa_supplicant/wpa_gui-qt4/wpagui.cpp +--- wpa_supplicant-1.0/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2012-05-09 23:56:09.000000000 +0200 ++++ wpa_supplicant-1.0-fix/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2012-06-25 12:06:46.045261398 +0200 +@@ -12,10 +12,8 @@ + * See README and COPYING for more details. + */ + +-#ifdef __MINGW32__ + /* Need to get getopt() */ + #include <unistd.h> +-#endif + + #ifdef CONFIG_NATIVE_WINDOWS + #include <windows.h> |