[arch-commits] Commit in wxgtk/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Mon Jun 5 21:23:46 UTC 2017
Date: Monday, June 5, 2017 @ 21:23:46
Author: arojas
Revision: 297825
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
wxgtk/repos/testing-i686/PKGBUILD
(from rev 297824, wxgtk/trunk/PKGBUILD)
wxgtk/repos/testing-i686/make-abicheck-non-fatal.patch
(from rev 297824, wxgtk/trunk/make-abicheck-non-fatal.patch)
wxgtk/repos/testing-x86_64/PKGBUILD
(from rev 297824, wxgtk/trunk/PKGBUILD)
wxgtk/repos/testing-x86_64/make-abicheck-non-fatal.patch
(from rev 297824, wxgtk/trunk/make-abicheck-non-fatal.patch)
Deleted:
wxgtk/repos/testing-i686/PKGBUILD
wxgtk/repos/testing-i686/make-abicheck-non-fatal.patch
wxgtk/repos/testing-x86_64/PKGBUILD
wxgtk/repos/testing-x86_64/make-abicheck-non-fatal.patch
----------------------------------------------+
/PKGBUILD | 172 +++++++++++++++++++++++++
/make-abicheck-non-fatal.patch | 30 ++++
testing-i686/PKGBUILD | 90 -------------
testing-i686/make-abicheck-non-fatal.patch | 15 --
testing-x86_64/PKGBUILD | 90 -------------
testing-x86_64/make-abicheck-non-fatal.patch | 15 --
6 files changed, 202 insertions(+), 210 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2017-06-05 21:23:05 UTC (rev 297824)
+++ testing-i686/PKGBUILD 2017-06-05 21:23:46 UTC (rev 297825)
@@ -1,90 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgbase=wxgtk
-pkgname=(wxgtk2 wxgtk3 wxgtk-common)
-pkgver=3.0.3.1
-pkgrel=2
-pkgdesc="GTK+ implementation of wxWidgets API for GUI"
-arch=('i686' 'x86_64')
-url="https://wxwidgets.org"
-license=('custom:wxWindows')
-makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkitgtk' 'libnotify')
-options=('!emptydirs')
-source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
- make-abicheck-non-fatal.patch)
-sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a'
- '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
-
- 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 --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
-
- 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() {
- depends=('zlib' 'gcc-libs' 'expat')
-
- cd wxWidgets-${pkgver}
- make DESTDIR="${pkgdir}" install
- rm -r "$pkgdir"/usr/{bin,lib/{wx,libwx_gtk*}}
-
- install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_wxgtk2() {
- depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
- optdepends=('webkitgtk2: for webview support')
- conflicts=('wxgtk')
- provides=('wxgtk')
- replaces=('wxgtk')
-
- cd wxWidgets-${pkgver}
- make DESTDIR="${pkgdir}" install
- rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*}
-
- install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_wxgtk3() {
- depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
- optdepends=('webkitgtk: 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*}
- for _i in wx-config wxrc-3.0
- do
- mv "$pkgdir"/usr/bin/{${_i},${_i}-gtk3}
- done
- rm "$pkgdir"/usr/bin/wxrc
- ln -s wxrc-3.0-gtk3 "$pkgdir"/usr/bin/wxrc-gtk3
-
- install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
Copied: wxgtk/repos/testing-i686/PKGBUILD (from rev 297824, wxgtk/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-06-05 21:23:46 UTC (rev 297825)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgbase=wxgtk
+pkgname=(wxgtk2 wxgtk3 wxgtk-common)
+pkgver=3.0.3.1
+pkgrel=3
+arch=('i686' 'x86_64')
+url="https://wxwidgets.org"
+license=('custom:wxWindows')
+makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkitgtk' 'libnotify')
+options=('!emptydirs')
+source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
+ make-abicheck-non-fatal.patch)
+sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a'
+ '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
+
+ 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 --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
+
+ 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' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
+ optdepends=('webkitgtk2: for webview support')
+ 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' 'wxgtk-common' 'libnotify')
+ optdepends=('webkitgtk: 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"
+}
Deleted: testing-i686/make-abicheck-non-fatal.patch
===================================================================
--- testing-i686/make-abicheck-non-fatal.patch 2017-06-05 21:23:05 UTC (rev 297824)
+++ testing-i686/make-abicheck-non-fatal.patch 2017-06-05 21:23:46 UTC (rev 297825)
@@ -1,15 +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: wxgtk/repos/testing-i686/make-abicheck-non-fatal.patch (from rev 297824, wxgtk/trunk/make-abicheck-non-fatal.patch)
===================================================================
--- testing-i686/make-abicheck-non-fatal.patch (rev 0)
+++ testing-i686/make-abicheck-non-fatal.patch 2017-06-05 21:23:46 UTC (rev 297825)
@@ -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 2017-06-05 21:23:05 UTC (rev 297824)
+++ testing-x86_64/PKGBUILD 2017-06-05 21:23:46 UTC (rev 297825)
@@ -1,90 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgbase=wxgtk
-pkgname=(wxgtk2 wxgtk3 wxgtk-common)
-pkgver=3.0.3.1
-pkgrel=2
-pkgdesc="GTK+ implementation of wxWidgets API for GUI"
-arch=('i686' 'x86_64')
-url="https://wxwidgets.org"
-license=('custom:wxWindows')
-makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkitgtk' 'libnotify')
-options=('!emptydirs')
-source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
- make-abicheck-non-fatal.patch)
-sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a'
- '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
-
- 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 --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
-
- 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() {
- depends=('zlib' 'gcc-libs' 'expat')
-
- cd wxWidgets-${pkgver}
- make DESTDIR="${pkgdir}" install
- rm -r "$pkgdir"/usr/{bin,lib/{wx,libwx_gtk*}}
-
- install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_wxgtk2() {
- depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
- optdepends=('webkitgtk2: for webview support')
- conflicts=('wxgtk')
- provides=('wxgtk')
- replaces=('wxgtk')
-
- cd wxWidgets-${pkgver}
- make DESTDIR="${pkgdir}" install
- rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*}
-
- install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_wxgtk3() {
- depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
- optdepends=('webkitgtk: 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*}
- for _i in wx-config wxrc-3.0
- do
- mv "$pkgdir"/usr/bin/{${_i},${_i}-gtk3}
- done
- rm "$pkgdir"/usr/bin/wxrc
- ln -s wxrc-3.0-gtk3 "$pkgdir"/usr/bin/wxrc-gtk3
-
- install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
Copied: wxgtk/repos/testing-x86_64/PKGBUILD (from rev 297824, wxgtk/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-06-05 21:23:46 UTC (rev 297825)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgbase=wxgtk
+pkgname=(wxgtk2 wxgtk3 wxgtk-common)
+pkgver=3.0.3.1
+pkgrel=3
+arch=('i686' 'x86_64')
+url="https://wxwidgets.org"
+license=('custom:wxWindows')
+makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkitgtk' 'libnotify')
+options=('!emptydirs')
+source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
+ make-abicheck-non-fatal.patch)
+sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a'
+ '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
+
+ 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 --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
+
+ 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' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
+ optdepends=('webkitgtk2: for webview support')
+ 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' 'wxgtk-common' 'libnotify')
+ optdepends=('webkitgtk: 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"
+}
Deleted: testing-x86_64/make-abicheck-non-fatal.patch
===================================================================
--- testing-x86_64/make-abicheck-non-fatal.patch 2017-06-05 21:23:05 UTC (rev 297824)
+++ testing-x86_64/make-abicheck-non-fatal.patch 2017-06-05 21:23:46 UTC (rev 297825)
@@ -1,15 +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: wxgtk/repos/testing-x86_64/make-abicheck-non-fatal.patch (from rev 297824, 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-06-05 21:23:46 UTC (rev 297825)
@@ -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