diff options
| author | sL1pKn07 | 2017-06-06 00:57:40 +0200 |
|---|---|---|
| committer | sL1pKn07 | 2017-06-06 00:57:40 +0200 |
| commit | a5485d8298d680d80622eef006005f86720ff46e (patch) | |
| tree | 839a2bf3aeadf278b307ccd486d65aa3ab4d7a32 | |
| parent | aa57eaa652979e9abd9d84c18f027ef9f58fc578 (diff) | |
| download | aur-a5485d8298d680d80622eef006005f86720ff46e.tar.gz | |
Drop own wx-config
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | config.conf | 5 | ||||
| -rw-r--r-- | wx-config.sh | 5 |
4 files changed, 6 insertions, 27 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Mon Jun 5 22:36:16 UTC 2017 +# Mon Jun 5 22:57:23 UTC 2017 pkgbase = wxwidgets-light pkgdesc = wxWidgets suite for Base and GTK2 and GTK3 toolkits (GNOME/GStreamer free!) pkgver = 3.0.3 @@ -16,12 +16,8 @@ pkgbase = wxwidgets-light makedepends = libsm makedepends = libgl source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.0.3 - source = config.conf - source = wx-config.sh source = make-abicheck-non-fatal.patch sha256sums = SKIP - sha256sums = 770b976681e7b5fe513b1b6dcabc1472802eb67fc777a07e903a77772825120f - sha256sums = 55a54da8396923f413bdf0c582ade281e014dc6f7ab65854b0f0fe24d4697c2a sha256sums = 46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453 pkgname = wxbase-light @@ -59,5 +55,4 @@ pkgname = wxcommon-light provides = wxcommon=3.0.3 conflicts = wxcommon options = !emptydirs - backup = etc/wx/config @@ -21,13 +21,9 @@ makedepends=('git' 'libgl' ) source=("wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v${pkgver}" - 'config.conf' - 'wx-config.sh' 'make-abicheck-non-fatal.patch' ) sha256sums=('SKIP' - '770b976681e7b5fe513b1b6dcabc1472802eb67fc777a07e903a77772825120f' - '55a54da8396923f413bdf0c582ade281e014dc6f7ab65854b0f0fe24d4697c2a' '46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453' ) @@ -93,7 +89,7 @@ package_wxbase-light() { make -C build-base DESTDIR="${pkgdir}" install - rm -fr "${pkgdir}/usr/bin/wx-config" + mv "${pkgdir}/usr/bin/wx-config" "${pkgdir}/usr/bin/wx-config-base" rm -fr "${pkgdir}/usr/include" rm -fr "${pkgdir}/usr/share/" @@ -114,7 +110,8 @@ package_wxgtk2-light() { make -C build-gtk2 DESTDIR="${pkgdir}" install - rm -fr "${pkgdir}/usr/bin" + cp -P "${pkgdir}/usr/bin/wx-config" "${pkgdir}/usr/bin/wx-config-gtk2" + rm -fr "${pkgdir}/usr/bin/"wxrc{,-3.0} rm -fr "${pkgdir}/usr/include" rm -fr "${pkgdir}/usr/lib/"*baseu* rm -fr "${pkgdir}/usr/share" @@ -134,7 +131,8 @@ package_wxgtk3-light() { make -C build-gtk3 DESTDIR="${pkgdir}" install - rm -fr "${pkgdir}/usr/bin" + mv "${pkgdir}/usr/bin/wx-config" "${pkgdir}/usr/bin/wx-config-gtk3" + rm -fr "${pkgdir}/usr/bin/"wxrc{,-3.0} rm -fr "${pkgdir}/usr/include" rm -fr "${pkgdir}/usr/lib/"*baseu* rm -fr "${pkgdir}/usr/share" @@ -150,7 +148,6 @@ package_wxcommon-light() { provides=("wxcommon=${pkgver}") conflicts=('wxcommon') options=('!emptydirs') - backup=('etc/wx/config') make -C build-gtk2 DESTDIR="${pkgdir}" install make -C build-gtk3 DESTDIR="${pkgdir}" install @@ -160,7 +157,4 @@ package_wxcommon-light() { rm -fr "${pkgdir}/usr/lib" install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxcommon-light/LICENSE" - - install -Dm644 config.conf "${pkgdir}/etc/wx/config" - install -Dm755 wx-config.sh "${pkgdir}/usr/bin/wx-config" } diff --git a/config.conf b/config.conf deleted file mode 100644 index 3d4d28f19882..000000000000 --- a/config.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Set wx-config executable - -#wx=base-unicode-3.0 -#wx=gtk2-unicode-3.0 -wx=gtk3-unicode-3.0 diff --git a/wx-config.sh b/wx-config.sh deleted file mode 100644 index e616f367142c..000000000000 --- a/wx-config.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -source /etc/wx/config - -. /usr/lib/wx/config/$wx $@ |