[arch-commits] Commit in lib32-wxgtk2/repos/multilib-x86_64 (4 files)
Maxime Gauduin
alucryd at archlinux.org
Tue Jul 21 12:03:47 UTC 2020
Date: Tuesday, July 21, 2020 @ 12:03:47
Author: alucryd
Revision: 664741
archrelease: copy trunk to multilib-x86_64
Added:
lib32-wxgtk2/repos/multilib-x86_64/PKGBUILD
(from rev 664740, lib32-wxgtk2/trunk/PKGBUILD)
lib32-wxgtk2/repos/multilib-x86_64/make-abicheck-non-fatal.patch
(from rev 664740, lib32-wxgtk2/trunk/make-abicheck-non-fatal.patch)
Deleted:
lib32-wxgtk2/repos/multilib-x86_64/PKGBUILD
lib32-wxgtk2/repos/multilib-x86_64/make-abicheck-non-fatal.patch
-------------------------------+
PKGBUILD | 145 +++++++++++++++++++++-------------------
make-abicheck-non-fatal.patch | 32 ++++----
2 files changed, 95 insertions(+), 82 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-21 12:03:41 UTC (rev 664740)
+++ PKGBUILD 2020-07-21 12:03:47 UTC (rev 664741)
@@ -1,66 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Eric Bélanger <eric at archlinux.org>
-
-pkgname=lib32-wxgtk2
-pkgver=3.0.4
-pkgrel=2
-pkgdesc='GTK+ implementation of wxWidgets API for GUI'
-arch=('x86_64')
-url='https://wxwidgets.org'
-license=('custom:wxWindows')
-depends=('lib32-gtk2' 'lib32-libsm' 'wxgtk2')
-makedepends=('lib32-glu')
-conflicts=('lib32-wxgtk')
-provides=('lib32-wxgtk')
-replaces=('lib32-wxgtk')
-source=("https://github.com/wxWidgets/wxWidgets/releases/download/v${pkgver}/wxWidgets-${pkgver}.tar.bz2"
- 'make-abicheck-non-fatal.patch')
-sha256sums=('96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0'
- 'd4c2d070a06eb63f0a018c8cf687589e5ffdec601225b4d16a268ffe390fb58b')
-
-prepare() {
- cd wxWidgets-${pkgver}
-
- patch -Np1 -i ../make-abicheck-non-fatal.patch
-}
-
-build() {
- cd wxWidgets-${pkgver}
-
- export CC='gcc -m32'
- export CXX='g++ -m32'
- export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
- export CFLAGS="-I/usr/include/libtiff32 $CFLAGS"
- export CXXFLAGS="-I/usr/include/libtiff32 $CXXFLAGS"
-
- ./configure \
- --prefix='/usr' \
- --libdir='/usr/lib32' \
- --enable-graphics_ctx \
- --enable-unicode \
- --disable-mediactrl \
- --disable-precomp-headers \
- --disable-webview \
- --with-gtk='2' \
- --with-lib{jpeg,png,tiff,xpm}='sys' \
- --with-opengl \
- --with-regex='builtin' \
- --without-libnotify
- make
- make -C locale allmo
-}
-
-package() {
- cd wxWidgets-${pkgver}
-
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/usr/{bin/{wx-config,wxrc},include,share}
- mv "${pkgdir}"/usr/bin/wxrc{,32}-3.0
- ln -s /usr/bin/wxrc32-3.0 "${pkgdir}"/usr/bin/wxrc32
- ln -s /usr/lib32/wx/config/gtk2-unicode-3.0 "${pkgdir}"/usr/bin/wx-config32
-
- install -dm 755 "${pkgdir}"/usr/share/licenses
- ln -s wxgtk2 "${pkgdir}"/usr/share/licenses/lib32-wxgtk2
-}
-
-# vim: ts=2 sw=2 et:
Copied: lib32-wxgtk2/repos/multilib-x86_64/PKGBUILD (from rev 664740, lib32-wxgtk2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-07-21 12:03:47 UTC (rev 664741)
@@ -0,0 +1,79 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Eric Bélanger <eric at archlinux.org>
+
+pkgname=lib32-wxgtk2
+pkgver=3.0.5.1
+pkgrel=1
+pkgdesc='GTK+ implementation of wxWidgets API for GUI'
+arch=(x86_64)
+url=https://wxwidgets.org
+license=(custom:wxWindows)
+depends=(
+ lib32-gtk2
+ lib32-libsm
+ wxgtk2
+)
+makedepends=(
+ git
+ lib32-glu
+)
+conflicts=(lib32-wxgtk)
+provides=(lib32-wxgtk)
+replaces=(lib32-wxgtk)
+_tag=db9378c1d32e84cf7ca4453932df259471d67dc9
+source=(
+ git+https://github.com/wxWidgets/wxWidgets.git?signed#tag=${_tag}
+ make-abicheck-non-fatal.patch
+)
+validpgpkeys=(31FAF2D074EC22A10AA4C6DA06EA41DE4F6C1E86) # Vadim Zeitlin <vadim at tt-solutions.com>
+sha256sums=(
+ SKIP
+ d4c2d070a06eb63f0a018c8cf687589e5ffdec601225b4d16a268ffe390fb58b
+)
+
+prepare() {
+ cd wxWidgets
+
+ patch -Np1 -i ../make-abicheck-non-fatal.patch
+
+ ./autogen.sh
+}
+
+build() {
+ cd wxWidgets
+
+ export CC='gcc -m32'
+ export CXX='g++ -m32'
+ export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+ export CFLAGS="-I/usr/include/libtiff32 $CFLAGS"
+ export CXXFLAGS="-I/usr/include/libtiff32 $CXXFLAGS"
+
+ ./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib32 \
+ --enable-graphics_ctx \
+ --enable-unicode \
+ --disable-mediactrl \
+ --disable-precomp-headers \
+ --disable-webview \
+ --with-gtk=2 \
+ --with-lib{jpeg,png,tiff,xpm}=sys \
+ --with-opengl \
+ --with-regex=builtin \
+ --without-libnotify
+ make
+ make -C locale allmo
+}
+
+package() {
+ make DESTDIR="${pkgdir}" -C wxWidgets install
+ rm -rf "${pkgdir}"/usr/{bin/{wx-config,wxrc},include,share}
+ mv "${pkgdir}"/usr/bin/wxrc{,32}-3.0
+ ln -s /usr/bin/wxrc32-3.0 "${pkgdir}"/usr/bin/wxrc32
+ ln -s /usr/lib32/wx/config/gtk2-unicode-3.0 "${pkgdir}"/usr/bin/wx-config32
+
+ install -dm 755 "${pkgdir}"/usr/share/licenses
+ ln -s wxgtk2 "${pkgdir}"/usr/share/licenses/lib32-wxgtk2
+}
+
+# vim: ts=2 sw=2 et:
Deleted: make-abicheck-non-fatal.patch
===================================================================
--- make-abicheck-non-fatal.patch 2020-07-21 12:03:41 UTC (rev 664740)
+++ make-abicheck-non-fatal.patch 2020-07-21 12:03:47 UTC (rev 664741)
@@ -1,16 +0,0 @@
-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: lib32-wxgtk2/repos/multilib-x86_64/make-abicheck-non-fatal.patch (from rev 664740, lib32-wxgtk2/trunk/make-abicheck-non-fatal.patch)
===================================================================
--- make-abicheck-non-fatal.patch (rev 0)
+++ make-abicheck-non-fatal.patch 2020-07-21 12:03:47 UTC (rev 664741)
@@ -0,0 +1,16 @@
+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