diff --git a/desktop/toolkit/wxGTK/actions.py b/desktop/toolkit/wxGTK/actions.py
index 83be6cb062..6d1c7cb5e1 100644
--- a/desktop/toolkit/wxGTK/actions.py
+++ b/desktop/toolkit/wxGTK/actions.py
@@ -9,6 +9,8 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
+ shelltools.copytree("../wxWidgets-%s" % (get.srcVERSION().replace("_", "~")), "../wxWidgets-%s-gtk3" % get.srcVERSION())
+
pisitools.flags.add("-fno-strict-aliasing")
autotools.configure("--enable-gtk2 \
@@ -43,13 +45,61 @@ def setup():
--with-regex=builtin \
--with-zlib=sys \
--with-expat=sys")
+
+ #shelltools.cd("%s" % get.workDIR())
+ shelltools.cd("../wxWidgets-%s-gtk3" % get.srcVERSION())
+
+ pisitools.flags.add("-fno-strict-aliasing")
+ autotools.configure("--enable-gtk3 \
+ --enable-shared \
+ --disable-optimise \
+ --disable-debug \
+ --enable-no_deps \
+ --disable-rpath \
+ --enable-intl \
+ --enable-geometry \
+ --enable-timer \
+ --enable-unicode \
+ --enable-sound \
+ --enable-mediactrl \
+ --enable-xrc \
+ --enable-graphics_ctx \
+ --enable-display \
+ --enable-joystick \
+ --disable-gtktest \
+ --disable-sdltest \
+ --disable-precomp-headers \
+ --with-gtk=3 \
+ --with-libpng=sys \
+ --with-libjpeg=sys \
+ --with-libtiff=sys \
+ --with-libxpm=sys \
+ --with-sdl \
+ --without-gnomeprint \
+ --without-gnomevfs \
+ --without-odbc \
+ --with-opengl \
+ --with-regex=builtin \
+ --with-zlib=sys \
+ --with-expat=sys")
+
def build():
autotools.make()
autotools.make("-C locale allmo")
+
+ shelltools.cd("../wxWidgets-%s-gtk3" % get.srcVERSION())
+ autotools.make()
def install():
+ shelltools.cd("../wxWidgets-%s-gtk3" % get.srcVERSION())
+ autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+ pisitools.rename("/usr/bin/wx-config","wx-config-gtk3")
+
+ shelltools.cd("../wxWidgets-%s" % get.srcVERSION())
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
#autotools.install()
- pisitools.dodoc("docs/*.txt", "docs/*.htm")
\ No newline at end of file
+ pisitools.dodoc("docs/*.txt", "docs/*.htm")
+
+
diff --git a/desktop/toolkit/wxGTK/pspec.xml b/desktop/toolkit/wxGTK/pspec.xml
index c771479dd2..de6adba05b 100644
--- a/desktop/toolkit/wxGTK/pspec.xml
+++ b/desktop/toolkit/wxGTK/pspec.xml
@@ -21,15 +21,17 @@
zlib-devel
tiff-devel
gtk2-devel
+ gtk3-devel
expat-devel
libSM-devel
libpng-devel
+ libnotify-devel
+ libsdl2-devel
mesa-glu-devel
- webkit-gtk2-devel
+ webkit2gtk-devel
libjpeg-turbo-devel
gconf-devel
gst-plugins-base-devel
- gst-plugins-base-devel
make-abicheck-non-fatal.patch
@@ -42,36 +44,82 @@
wxGTK
gtk2
- mesa
tiff
- zlib
cairo
- expat
glib2
pango
libSM
- libsdl
+ libsdl2
libX11
libgcc
libpng
+ libglvnd
+ libnotify
gstreamer
- fontconfig
gdk-pixbuf
libXxf86vm
- webkit-gtk2
+ webkit2gtk
libjpeg-turbo
libjpeg-turbo
gstreamer
gst-plugins-base
+ wxGTK-common
- /usr/lib/
- /usr/bin
- /usr/share/doc/
+ /usr/lib/libwx_gtk2u*
+ /usr/lib/wx/include/gtk2-unicode-3.0/wx/setup.h
+ /usr/bin/wx-config
+ /usr/lib/wx/config/gtk2-unicode-3.0
+
+
+
+
+ wxGTK3
+
+ wxGTK-common
+ gtk3
+ tiff
+ cairo
+ glib2
+ libSM
+ pango
+ libX11
+ libgcc
+ libpng
+ libsdl2
+ libnotify
+ libglvnd
+ gstreamer
+ gdk-pixbuf
+ libXxf86vm
+ webkit2gtk
+ libjpeg-turbo
+ gst-plugins-base
+
+
+ /usr/lib/libwx_gtk3u*
+ /usr/lib/wx/include/gtk3-unicode-3.0/wx/setup.h
+ /usr/bin/wx-config-gtk3
+ /usr/lib/wx/config/gtk3-unicode-3.0
+ /usr/lib/wx/3.0/web-extensions/webkit2_extu-3.0.so
+
+
+
+
+ wxGTK-common
+
+ zlib
+ expat
+ libgcc
+
+
+ /usr/bin/wxrc
+ /usr/bin/wxrc-3.0
+ /usr/lib/libwx_baseu*
/usr/share/aclocal/
/usr/share/bakefile/
- /usr/lib/wx/config
/usr/share/locale/
+ /usr/share/doc/
@@ -87,6 +135,13 @@
+
+ 2020-01-28
+ 3.0.4
+ Rebuild.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2018-08-12
3.0.4