[arch-commits] Commit in wxgtk/repos/extra-x86_64 (6 files)
Antonio Rojas
arojas at archlinux.org
Sun Jan 21 18:14:15 UTC 2018
Date: Sunday, January 21, 2018 @ 18:14:14
Author: arojas
Revision: 315196
archrelease: copy trunk to extra-x86_64
Added:
wxgtk/repos/extra-x86_64/PKGBUILD
(from rev 315195, wxgtk/trunk/PKGBUILD)
wxgtk/repos/extra-x86_64/make-abicheck-non-fatal.patch
(from rev 315195, wxgtk/trunk/make-abicheck-non-fatal.patch)
wxgtk/repos/extra-x86_64/wxgtk-webkit-infinite-loop.patch
(from rev 315195, wxgtk/trunk/wxgtk-webkit-infinite-loop.patch)
Deleted:
wxgtk/repos/extra-x86_64/PKGBUILD
wxgtk/repos/extra-x86_64/make-abicheck-non-fatal.patch
wxgtk/repos/extra-x86_64/wxgtk-webkit-infinite-loop.patch
----------------------------------+
PKGBUILD | 208 ++++++++++++++++++-------------------
make-abicheck-non-fatal.patch | 30 ++---
wxgtk-webkit-infinite-loop.patch | 72 ++++++------
3 files changed, 157 insertions(+), 153 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-21 18:13:51 UTC (rev 315195)
+++ PKGBUILD 2018-01-21 18:14:14 UTC (rev 315196)
@@ -1,102 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgbase=wxgtk
-pkgname=(wxgtk2 wxgtk3 wxgtk-common)
-pkgver=3.0.3.1
-pkgrel=10
-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 wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch"
- wxgtk2-fix-webview.patch::"https://github.com/wxWidgets/wxWidgets/commit/fd247cca.patch"
- wxgtk-filezilla-assert.patch::"https://github.com/wxWidgets/wxWidgets/commit/ce1dce11.patch"
- wxgtk-webkit-infinite-loop.patch)
-sha256sums=('3164ad6bc5f61c48d2185b39065ddbe44283eb834a5f62beb13f1d0923e366e4'
- '46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453'
- '5cc7804696d94f88470d99899d628f1873a5ecff359a5e6fcf67318f3dcfd3ee'
- 'c441ae48381b1d92522e6f125d733d5710105065099327c00fa35f50e146bdf4'
- '168deb2e76e21bcd46c3a1efd86c0f3e1354e9511cf12a9dc54b7dc82c0e3d63'
- 'e983e95bc321544e31ba34220665a463c99b28d7645e28c1192cf6da1978cfb5')
-
-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
-
- # Support webkit2gtk
- sed -e 's|setup0.h|setup.h|g' -i ../wxgtk-webkit2gtk.patch
- patch -p1 -i ../wxgtk-webkit2gtk.patch
- # fix webview after webkit2gtk port
- patch -p1 -i ../wxgtk2-fix-webview.patch
- # fix assert in FileZilla
- patch -p1 -i ../wxgtk-filezilla-assert.patch
- # fix infinite loop in webkit
- patch -p1 -i ../wxgtk-webkit-infinite-loop.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' '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/extra-x86_64/PKGBUILD (from rev 315195, wxgtk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-21 18:14:14 UTC (rev 315196)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgbase=wxgtk
+pkgname=(wxgtk2 wxgtk3 wxgtk-common)
+pkgver=3.0.3.1
+pkgrel=11
+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 wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch"
+ wxgtk2-fix-webview.patch::"https://github.com/wxWidgets/wxWidgets/commit/fd247cca.patch"
+ wxgtk-filezilla-assert.patch::"https://github.com/wxWidgets/wxWidgets/commit/ce1dce11.patch"
+ wxgtk-webkit-infinite-loop.patch
+ wxgtk3-scroll.patch::"https://github.com/wxWidgets/wxWidgets/commit/7626292f.patch")
+sha256sums=('3164ad6bc5f61c48d2185b39065ddbe44283eb834a5f62beb13f1d0923e366e4'
+ '46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453'
+ '5cc7804696d94f88470d99899d628f1873a5ecff359a5e6fcf67318f3dcfd3ee'
+ 'c441ae48381b1d92522e6f125d733d5710105065099327c00fa35f50e146bdf4'
+ '168deb2e76e21bcd46c3a1efd86c0f3e1354e9511cf12a9dc54b7dc82c0e3d63'
+ 'e983e95bc321544e31ba34220665a463c99b28d7645e28c1192cf6da1978cfb5'
+ '7f21db7139d5c3423282227698fd31f68299fd75ed0e028da979e091bd02d168')
+
+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
+
+ # Support webkit2gtk
+ sed -e 's|setup0.h|setup.h|g' -i ../wxgtk-webkit2gtk.patch
+ patch -p1 -i ../wxgtk-webkit2gtk.patch
+ # fix webview after webkit2gtk port
+ patch -p1 -i ../wxgtk2-fix-webview.patch
+ # fix assert in FileZilla
+ patch -p1 -i ../wxgtk-filezilla-assert.patch
+ # fix infinite loop in webkit
+ patch -p1 -i ../wxgtk-webkit-infinite-loop.patch
+ # fix scrolling in wxgtk3
+ patch -p1 -i ../wxgtk3-scroll.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' '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"
+}
Deleted: make-abicheck-non-fatal.patch
===================================================================
--- make-abicheck-non-fatal.patch 2018-01-21 18:13:51 UTC (rev 315195)
+++ make-abicheck-non-fatal.patch 2018-01-21 18:14:14 UTC (rev 315196)
@@ -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/extra-x86_64/make-abicheck-non-fatal.patch (from rev 315195, wxgtk/trunk/make-abicheck-non-fatal.patch)
===================================================================
--- make-abicheck-non-fatal.patch (rev 0)
+++ make-abicheck-non-fatal.patch 2018-01-21 18:14:14 UTC (rev 315196)
@@ -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: wxgtk-webkit-infinite-loop.patch
===================================================================
--- wxgtk-webkit-infinite-loop.patch 2018-01-21 18:13:51 UTC (rev 315195)
+++ wxgtk-webkit-infinite-loop.patch 2018-01-21 18:14:14 UTC (rev 315196)
@@ -1,36 +0,0 @@
-From 572fe37898f8d4f8664849ec76483dd63ea13a13 Mon Sep 17 00:00:00 2001
-From: Paul Cornett <paulcor at users.noreply.github.com>
-Date: Sat, 6 Jan 2018 11:07:11 -0800
-Subject: [PATCH] Avoid calling default "key-press-event" handler
-
-We have already done everything it does, and doing it again seems to
-cause an infinite loop with WebKitGTK. See #17932
----
- src/gtk/toplevel.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
-index f63fdd3e463..ae825d40396 100644
---- a/src/gtk/toplevel.cpp
-+++ b/src/gtk/toplevel.cpp
-@@ -227,15 +227,15 @@ wxgtk_tlw_key_press_event(GtkWidget *widget, GdkEventKey *event)
- // GTK+ gtk_window_key_press_event() handler.
-
- if ( gtk_window_propagate_key_event(window, event) )
-- return TRUE;
-+ return true;
-
- if ( gtk_window_activate_key(window, event) )
-- return TRUE;
-+ return true;
-
-- if (GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event))
-- return TRUE;
-+ GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event);
-
-- return FALSE;
-+ // Avoid calling the default handler, we have already done everything it does
-+ return true;
- }
- }
-
Copied: wxgtk/repos/extra-x86_64/wxgtk-webkit-infinite-loop.patch (from rev 315195, wxgtk/trunk/wxgtk-webkit-infinite-loop.patch)
===================================================================
--- wxgtk-webkit-infinite-loop.patch (rev 0)
+++ wxgtk-webkit-infinite-loop.patch 2018-01-21 18:14:14 UTC (rev 315196)
@@ -0,0 +1,36 @@
+From 572fe37898f8d4f8664849ec76483dd63ea13a13 Mon Sep 17 00:00:00 2001
+From: Paul Cornett <paulcor at users.noreply.github.com>
+Date: Sat, 6 Jan 2018 11:07:11 -0800
+Subject: [PATCH] Avoid calling default "key-press-event" handler
+
+We have already done everything it does, and doing it again seems to
+cause an infinite loop with WebKitGTK. See #17932
+---
+ src/gtk/toplevel.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
+index f63fdd3e463..ae825d40396 100644
+--- a/src/gtk/toplevel.cpp
++++ b/src/gtk/toplevel.cpp
+@@ -227,15 +227,15 @@ wxgtk_tlw_key_press_event(GtkWidget *widget, GdkEventKey *event)
+ // GTK+ gtk_window_key_press_event() handler.
+
+ if ( gtk_window_propagate_key_event(window, event) )
+- return TRUE;
++ return true;
+
+ if ( gtk_window_activate_key(window, event) )
+- return TRUE;
++ return true;
+
+- if (GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event))
+- return TRUE;
++ GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event);
+
+- return FALSE;
++ // Avoid calling the default handler, we have already done everything it does
++ return true;
+ }
+ }
+
More information about the arch-commits
mailing list