diff options
| -rw-r--r-- | .SRCINFO | 34 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | PKGBUILD | 72 |
3 files changed, 46 insertions, 63 deletions
@@ -1,32 +1,23 @@ pkgbase = wxwidgets-light - pkgdesc = wxWidgets suite for Base and GTK2 and GTK3 toolkits (GNOME/GStreamer free!) + pkgdesc = wxWidgets suite for Base, GTK2 and GTK3 toolkits (GNOME/GStreamer free!) pkgver = 3.0.5.1 - pkgrel = 2 + pkgrel = 3 url = http://wxwidgets.org arch = x86_64 license = custom:wxWindows makedepends = git makedepends = glu - makedepends = bash + makedepends = sh makedepends = gtk2 makedepends = gtk3 makedepends = libsm makedepends = libgl makedepends = libnotify + options = debug source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.0.5.1 - source = make-abicheck-non-fatal.patch + source = https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/wxgtk/trunk/wxgtk-abicheck.patch sha256sums = SKIP - sha256sums = 46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453 - -pkgname = wxbase-light - pkgdesc = wxWidgets Base (GNOME/GStreamer free!) - depends = wxcommon-light - depends = bash - depends = expat - depends = zlib - provides = wxbase - conflicts = wxbase - options = !emptydirs + sha256sums = 53501db871290b71967af08b60aedb738c920a307ef9bd32dd19c30498732cf8 pkgname = wxgtk2-light pkgdesc = wxWidgets GTK2 Toolkit (GNOME/GStreamer free!) @@ -54,11 +45,14 @@ pkgname = wxgtk3-light options = !emptydirs pkgname = wxcommon-light - pkgdesc = wxWidgets common (GNOME/GStreamer free!) - depends = wxbase-light - provides = wxcommon + pkgdesc = wxWidgets common & base (GNOME/GStreamer free!) + depends = sh + depends = expat + depends = zlib + provides = wxbase + provides = wxbase-light provides = wxgtk-common - conflicts = wxcommon + conflicts = wxbase + conflicts = wxbase-light conflicts = wxgtk-common options = !emptydirs - diff --git a/.gitignore b/.gitignore index aa4b62f36c2b..05c6d4d4c97b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,3 @@ !.gitignore !.SRCINFO !PKGBUILD -!config.conf -!wx-config.sh -!make-abicheck-non-fatal.patch @@ -1,20 +1,19 @@ # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com> pkgbase=wxwidgets-light -pkgname=('wxbase-light' - 'wxgtk2-light' +pkgname=('wxgtk2-light' 'wxgtk3-light' 'wxcommon-light' ) pkgver=3.0.5.1 -pkgrel=2 -pkgdesc="wxWidgets suite for Base and GTK2 and GTK3 toolkits (GNOME/GStreamer free!)" +pkgrel=3 +pkgdesc="wxWidgets suite for Base, GTK2 and GTK3 toolkits (GNOME/GStreamer free!)" arch=('x86_64') url='http://wxwidgets.org' license=('custom:wxWindows') makedepends=('git' 'glu' - 'bash' + 'sh' 'gtk2' 'gtk3' 'libsm' @@ -22,20 +21,20 @@ makedepends=('git' 'libnotify' ) source=("wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v${pkgver}" - 'make-abicheck-non-fatal.patch' + 'https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/wxgtk/trunk/wxgtk-abicheck.patch' ) sha256sums=('SKIP' - '46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453' + '53501db871290b71967af08b60aedb738c920a307ef9bd32dd19c30498732cf8' ) +options=('debug') prepare() { mkdir -p build-{base,gtk{2,3}} cd wxwidgets - # C++ ABI check is too strict and breaks with GCC 5.1 - # https://bugzilla.redhat.com/show_bug.cgi?id=1200611 - patch -Np1 -i "${srcdir}/make-abicheck-non-fatal.patch" + # C++ ABI check is too strict + patch -Np1 -i "${srcdir}/wxgtk-abicheck.patch" } build() { @@ -83,26 +82,6 @@ build() { make -C ../wxwidgets/locale allmo } -package_wxbase-light() { - pkgdesc="wxWidgets Base (GNOME/GStreamer free!)" - depends=('wxcommon-light' - 'bash' - 'expat' - 'zlib' - ) - provides=('wxbase') - conflicts=('wxbase') - options=('!emptydirs') - - make -C build-base DESTDIR="${pkgdir}" install - - mv "${pkgdir}/usr/bin/wx-config" "${pkgdir}/usr/bin/wx-config-base" - rm -fr "${pkgdir}/usr/include" - rm -fr "${pkgdir}/usr/share" - - install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxbase-light/LICENSE" -} - package_wxgtk2-light() { pkgdesc="wxWidgets GTK2 Toolkit (GNOME/GStreamer free!)" depends=('wxcommon-light' @@ -121,12 +100,14 @@ package_wxgtk2-light() { options=('!emptydirs') make -C build-gtk2 DESTDIR="${pkgdir}" install + make -C build-gtk2 DESTDIR="${pkgdir}" uninstall_basedll uninstall_netdll uninstall_xmldll locale_uninstall + make -C build-gtk2/utils DESTDIR="${pkgdir}" uninstall_wxrc 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" + rm -fr "${pkgdir}/usr/share/bakefile" + rm -fr "${pkgdir}/usr/share/"{aclocal,locale} install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxgtk2-light/LICENSE" } @@ -144,23 +125,30 @@ package_wxgtk3-light() { options=('!emptydirs') make -C build-gtk3 DESTDIR="${pkgdir}" install + make -C build-gtk3 DESTDIR="${pkgdir}" uninstall_basedll uninstall_netdll uninstall_xmldll locale_uninstall + make -C build-gtk3/utils DESTDIR="${pkgdir}" uninstall_wxrc 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" + rm -fr "${pkgdir}/usr/share/bakefile" + rm -fr "${pkgdir}/usr/share/"{aclocal,locale} install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxgtk3-light/LICENSE" } package_wxcommon-light() { - pkgdesc="wxWidgets common (GNOME/GStreamer free!)" - depends=('wxbase-light') - provides=('wxcommon' + pkgdesc="wxWidgets common & base (GNOME/GStreamer free!)" + depends=('sh' + 'expat' + 'zlib' + ) + provides=('wxbase' + 'wxbase-light' 'wxgtk-common' ) - conflicts=('wxcommon' + conflicts=('wxbase' + 'wxbase-light' 'wxgtk-common' ) options=('!emptydirs') @@ -169,8 +157,12 @@ package_wxcommon-light() { make -C build-gtk3 DESTDIR="${pkgdir}" install make -C build-base DESTDIR="${pkgdir}" install - rm -fr "${pkgdir}/usr/bin/wx-config" - rm -fr "${pkgdir}/usr/lib" + make -C build-gtk2 DESTDIR="${pkgdir}" uninstall_advdll uninstall_auidll uninstall_coredll uninstall_gldll uninstall_htmldll uninstall_propgriddll uninstall_qadll uninstall_ribbondll uninstall_richtextdll uninstall_stcdll uninstall_xrcdll + make -C build-gtk3 DESTDIR="${pkgdir}" uninstall_advdll uninstall_auidll uninstall_coredll uninstall_gldll uninstall_htmldll uninstall_propgriddll uninstall_qadll uninstall_ribbondll uninstall_richtextdll uninstall_stcdll uninstall_xrcdll + + mv "${pkgdir}/usr/bin/wx-config" "${pkgdir}/usr/bin/wx-config-base" + rm -fr "${pkgdir}/usr/bin/wxrc" + rm -fr "${pkgdir}/usr/lib/wx/"{config,include}/gtk* install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxcommon-light/LICENSE" } |