[arch-commits] Commit in wxgtk/repos (3 files)

[Antonio Rojas]

    Date: Friday, March 9, 2018 @ 19:52:39
  Author: arojas
Revision: 318360

archrelease: copy trunk to testing-x86_64

Added:
  wxgtk/repos/testing-x86_64/
  wxgtk/repos/testing-x86_64/PKGBUILD
    (from rev 318359, wxgtk/trunk/PKGBUILD)
  wxgtk/repos/testing-x86_64/make-abicheck-non-fatal.patch
    (from rev 318359, wxgtk/trunk/make-abicheck-non-fatal.patch)

-------------------------------+
 PKGBUILD                      |   85 ++++++++++++++++++++++++++++++++++++++++
 make-abicheck-non-fatal.patch |   15 +++++++
 2 files changed, 100 insertions(+)

Copied: wxgtk/repos/testing-x86_64/PKGBUILD (from rev 318359, wxgtk/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2018-03-09 19:52:39 UTC (rev 318360)
@@ -0,0 +1,85 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgbase=wxgtk
+pkgname=(wxgtk2 wxgtk3 wxgtk-common)
+pkgver=3.0.4
+pkgrel=1
+arch=('x86_64')
+url="https://wxwidgets.org"
+license=('custom:wxWindows')
+makedepends=('gst-plugins-base' 'gconf' 'glu' 'webkit2gtk' 'libnotify' 'gtk2')
+options=('!emptydirs')
+source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
+        make-abicheck-non-fatal.patch)
+sha256sums=('96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0'
+            '46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453')
+
+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
+
+  cd ..
+  cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3
+}
+
+build() {
+  cd wxWidgets-${pkgver}
+  ./autogen.sh
+  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
+    --enable-graphics_ctx --enable-mediactrl --with-regex=builtin \
+    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
+    --disable-precomp-headers
+  make
+  make -C locale allmo
+
+  cd ../wxWidgets-${pkgver}-gtk3
+  ./autogen.sh
+  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=3 --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
+}
+
+package_wxgtk-common() {
+  pkgdesc='Common libraries and headers for wxgtk2 and wxgtk3'
+  depends=('zlib' 'gcc-libs' 'expat')
+
+  cd wxWidgets-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  rm -r "$pkgdir"/usr/{bin/wx-config,lib/{wx,libwx_gtk*}}
+
+  install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_wxgtk2() {
+  pkgdesc='GTK+2 implementation of wxWidgets API for GUI'
+  depends=('gtk2' 'libgl' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common' 'libnotify')
+  conflicts=('wxgtk')
+  provides=('wxgtk')
+  replaces=('wxgtk')
+
+  cd wxWidgets-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*}
+  
+  install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_wxgtk3() {
+  pkgdesc='GTK+3 implementation of wxWidgets API for GUI'
+  depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common' 'libnotify')
+  optdepends=('webkit2gtk: for webview support')
+  conflicts=('wxgtk<3.0.3.1-2')
+
+  cd wxWidgets-${pkgver}-gtk3
+  make DESTDIR="${pkgdir}" install  
+  rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*}
+  mv "$pkgdir"/usr/bin/wx-config{,-gtk3}
+   
+  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 318359, 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	2018-03-09 19:52:39 UTC (rev 318360)
@@ -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
+