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

Antonio Rojas arojas at archlinux.org
Tue May 2 15:07:12 UTC 2017


    Date: Tuesday, May 2, 2017 @ 15:07:11
  Author: arojas
Revision: 295186

archrelease: copy trunk to testing-i686, testing-x86_64

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

----------------------------------------------+
 testing-i686/PKGBUILD                        |   43 +++++++++++++++++++++++++
 testing-i686/make-abicheck-non-fatal.patch   |   15 ++++++++
 testing-x86_64/PKGBUILD                      |   43 +++++++++++++++++++++++++
 testing-x86_64/make-abicheck-non-fatal.patch |   15 ++++++++
 4 files changed, 116 insertions(+)

Copied: wxgtk/repos/testing-i686/PKGBUILD (from rev 295185, wxgtk/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2017-05-02 15:07:11 UTC (rev 295186)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=wxgtk
+pkgver=3.0.3
+pkgrel=1
+pkgdesc="GTK+ implementation of wxWidgets API for GUI"
+arch=('i686' 'x86_64')
+url="https://wxwidgets.org"
+license=('custom:wxWindows')
+depends=('gtk2' 'gst-plugins-base-libs' 'libsm')
+makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu')
+optdepends=('webkitgtk2: for webview support')
+options=('!emptydirs')
+source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
+        make-abicheck-non-fatal.patch)
+sha1sums=('3525306c926e208d9b0272aaa9c091b8c7264e5b'
+          '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}
+  ./autogen.sh
+  ./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 295185, wxgtk/trunk/make-abicheck-non-fatal.patch)
===================================================================
--- testing-i686/make-abicheck-non-fatal.patch	                        (rev 0)
+++ testing-i686/make-abicheck-non-fatal.patch	2017-05-02 15:07:11 UTC (rev 295186)
@@ -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
+ 

Copied: wxgtk/repos/testing-x86_64/PKGBUILD (from rev 295185, wxgtk/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2017-05-02 15:07:11 UTC (rev 295186)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=wxgtk
+pkgver=3.0.3
+pkgrel=1
+pkgdesc="GTK+ implementation of wxWidgets API for GUI"
+arch=('i686' 'x86_64')
+url="https://wxwidgets.org"
+license=('custom:wxWindows')
+depends=('gtk2' 'gst-plugins-base-libs' 'libsm')
+makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu')
+optdepends=('webkitgtk2: for webview support')
+options=('!emptydirs')
+source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
+        make-abicheck-non-fatal.patch)
+sha1sums=('3525306c926e208d9b0272aaa9c091b8c7264e5b'
+          '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}
+  ./autogen.sh
+  ./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 295185, 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	2017-05-02 15:07:11 UTC (rev 295186)
@@ -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
+ 



More information about the arch-commits mailing list