Date: Friday, April 24, 2015 @ 22:32:21 Author: foutrelis Revision: 238023
archrelease: copy trunk to testing-i686, testing-x86_64 Added: wxgtk/repos/testing-i686/PKGBUILD (from rev 238022, wxgtk/trunk/PKGBUILD) wxgtk/repos/testing-i686/make-abicheck-non-fatal.patch (from rev 238022, wxgtk/trunk/make-abicheck-non-fatal.patch) wxgtk/repos/testing-x86_64/PKGBUILD (from rev 238022, wxgtk/trunk/PKGBUILD) wxgtk/repos/testing-x86_64/make-abicheck-non-fatal.patch (from rev 238022, wxgtk/trunk/make-abicheck-non-fatal.patch) Deleted: wxgtk/repos/testing-i686/PKGBUILD wxgtk/repos/testing-x86_64/PKGBUILD ----------------------------------------------+ /PKGBUILD | 84 +++++++++++++++++++++++++ testing-i686/PKGBUILD | 32 --------- testing-i686/make-abicheck-non-fatal.patch | 15 ++++ testing-x86_64/PKGBUILD | 32 --------- testing-x86_64/make-abicheck-non-fatal.patch | 15 ++++ 5 files changed, 114 insertions(+), 64 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2015-04-24 20:32:09 UTC (rev 238022) +++ testing-i686/PKGBUILD 2015-04-24 20:32:21 UTC (rev 238023) @@ -1,32 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=wxgtk -pkgver=3.0.2 -pkgrel=3 -pkgdesc="GTK+ implementation of wxWidgets API for GUI" -arch=('i686' 'x86_64') -url="http://wxwidgets.org" -license=('custom:wxWindows') -depends=('gtk2' 'gstreamer0.10-base' 'libsm') -makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu') -optdepends=('webkitgtk2: for webview support') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2) -sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800') - -build() { - cd wxWidgets-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ - --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --disable-precomp-headers - make - make -C locale allmo -} - -package() { - cd wxWidgets-${pkgver} - make DESTDIR="${pkgdir}" install - install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: wxgtk/repos/testing-i686/PKGBUILD (from rev 238022, wxgtk/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2015-04-24 20:32:21 UTC (rev 238023) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=wxgtk +pkgver=3.0.2 +pkgrel=4 +pkgdesc="GTK+ implementation of wxWidgets API for GUI" +arch=('i686' 'x86_64') +url="http://wxwidgets.org" +license=('custom:wxWindows') +depends=('gtk2' 'gstreamer0.10-base' 'libsm') +makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu') +optdepends=('webkitgtk2: for webview support') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2 + make-abicheck-non-fatal.patch) +sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800' + 'dfe38650c655395b90bf082b5734c4093508bfa3') + +prepare() { + cd wxWidgets-${pkgver} + + # C++ ABI check is too strict and breaks with GCC 5.1 + # https://bugzilla.redhat.com/show_bug.cgi?id=1200611 + patch -Np1 -i ../make-abicheck-non-fatal.patch +} + +build() { + cd wxWidgets-${pkgver} + ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ + --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ + --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ + --disable-precomp-headers + make + make -C locale allmo +} + +package() { + cd wxWidgets-${pkgver} + make DESTDIR="${pkgdir}" install + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: wxgtk/repos/testing-i686/make-abicheck-non-fatal.patch (from rev 238022, wxgtk/trunk/make-abicheck-non-fatal.patch) =================================================================== --- testing-i686/make-abicheck-non-fatal.patch (rev 0) +++ testing-i686/make-abicheck-non-fatal.patch 2015-04-24 20:32:21 UTC (rev 238023) @@ -0,0 +1,15 @@ +diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp +--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100 ++++ wxGTK-2.8.12/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100 +@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con + msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), + lib.c_str(), progName.c_str(), prog.c_str()); + +- wxLogFatalError(msg.c_str()); +- +- // normally wxLogFatalError doesn't return +- return false; ++ wxLogWarning(msg.c_str()); + } + #undef wxCMP + Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2015-04-24 20:32:09 UTC (rev 238022) +++ testing-x86_64/PKGBUILD 2015-04-24 20:32:21 UTC (rev 238023) @@ -1,32 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=wxgtk -pkgver=3.0.2 -pkgrel=3 -pkgdesc="GTK+ implementation of wxWidgets API for GUI" -arch=('i686' 'x86_64') -url="http://wxwidgets.org" -license=('custom:wxWindows') -depends=('gtk2' 'gstreamer0.10-base' 'libsm') -makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu') -optdepends=('webkitgtk2: for webview support') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2) -sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800') - -build() { - cd wxWidgets-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ - --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --disable-precomp-headers - make - make -C locale allmo -} - -package() { - cd wxWidgets-${pkgver} - make DESTDIR="${pkgdir}" install - install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: wxgtk/repos/testing-x86_64/PKGBUILD (from rev 238022, wxgtk/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2015-04-24 20:32:21 UTC (rev 238023) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=wxgtk +pkgver=3.0.2 +pkgrel=4 +pkgdesc="GTK+ implementation of wxWidgets API for GUI" +arch=('i686' 'x86_64') +url="http://wxwidgets.org" +license=('custom:wxWindows') +depends=('gtk2' 'gstreamer0.10-base' 'libsm') +makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2' 'glu') +optdepends=('webkitgtk2: for webview support') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2 + make-abicheck-non-fatal.patch) +sha1sums=('6461eab4428c0a8b9e41781b8787510484dea800' + 'dfe38650c655395b90bf082b5734c4093508bfa3') + +prepare() { + cd wxWidgets-${pkgver} + + # C++ ABI check is too strict and breaks with GCC 5.1 + # https://bugzilla.redhat.com/show_bug.cgi?id=1200611 + patch -Np1 -i ../make-abicheck-non-fatal.patch +} + +build() { + cd wxWidgets-${pkgver} + ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ + --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ + --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ + --disable-precomp-headers + make + make -C locale allmo +} + +package() { + cd wxWidgets-${pkgver} + make DESTDIR="${pkgdir}" install + install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: wxgtk/repos/testing-x86_64/make-abicheck-non-fatal.patch (from rev 238022, wxgtk/trunk/make-abicheck-non-fatal.patch) =================================================================== --- testing-x86_64/make-abicheck-non-fatal.patch (rev 0) +++ testing-x86_64/make-abicheck-non-fatal.patch 2015-04-24 20:32:21 UTC (rev 238023) @@ -0,0 +1,15 @@ +diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp +--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100 ++++ wxGTK-2.8.12/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100 +@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con + msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), + lib.c_str(), progName.c_str(), prog.c_str()); + +- wxLogFatalError(msg.c_str()); +- +- // normally wxLogFatalError doesn't return +- return false; ++ wxLogWarning(msg.c_str()); + } + #undef wxCMP +