Merge pull request #7758 from Rmys/master

wxGTK rebuild gtk3

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")
+    pisitools.dodoc("docs/*.txt", "docs/*.htm")
+    
+    

desktop/toolkit/wxGTK/pspec.xml

@@ -21,15 +21,17 @@
             <Dependency>zlib-devel</Dependency>
             <Dependency>tiff-devel</Dependency>
             <Dependency>gtk2-devel</Dependency>
+            <Dependency>gtk3-devel</Dependency>
             <Dependency>expat-devel</Dependency>
             <Dependency>libSM-devel</Dependency>
             <Dependency>libpng-devel</Dependency>
+            <Dependency>libnotify-devel</Dependency>
+            <Dependency>libsdl2-devel</Dependency>
             <Dependency>mesa-glu-devel</Dependency>
-            <Dependency>webkit-gtk2-devel</Dependency>
+            <Dependency>webkit2gtk-devel</Dependency>
             <Dependency>libjpeg-turbo-devel</Dependency>
             <Dependency>gconf-devel</Dependency>
             <Dependency>gst-plugins-base-devel</Dependency>
-            <Dependency>gst-plugins-base-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch level="1">make-abicheck-non-fatal.patch</Patch>
@@ -42,36 +44,82 @@
         <Name>wxGTK</Name>
         <RuntimeDependencies>
             <Dependency>gtk2</Dependency>
-            <Dependency>mesa</Dependency>
             <Dependency>tiff</Dependency>
-            <Dependency>zlib</Dependency>
             <Dependency>cairo</Dependency>
-            <Dependency>expat</Dependency>
             <Dependency>glib2</Dependency>
             <Dependency>pango</Dependency>
             <Dependency>libSM</Dependency>
-            <Dependency>libsdl</Dependency>
+            <Dependency>libsdl2</Dependency>
             <Dependency>libX11</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>libpng</Dependency>
+            <Dependency>libglvnd</Dependency>
+            <Dependency>libnotify</Dependency>
             <Dependency>gstreamer</Dependency>
-            <Dependency>fontconfig</Dependency>
             <Dependency>gdk-pixbuf</Dependency>
             <Dependency>libXxf86vm</Dependency>
-            <Dependency>webkit-gtk2</Dependency>
+            <Dependency>webkit2gtk</Dependency>
             <Dependency>libjpeg-turbo</Dependency>
             <Dependency>libjpeg-turbo</Dependency>
             <Dependency>gstreamer</Dependency>
             <Dependency>gst-plugins-base</Dependency>
+            <Dependency release="current">wxGTK-common</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="library">/usr/lib/</Path>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="doc">/usr/share/doc/</Path>
+            <Path fileType="library">/usr/lib/libwx_gtk2u*</Path>
+            <Path fileType="library">/usr/lib/wx/include/gtk2-unicode-3.0/wx/setup.h</Path>
+            <Path fileType="executable">/usr/bin/wx-config</Path>
+            <Path fileType="library">/usr/lib/wx/config/gtk2-unicode-3.0</Path>
+        </Files>
+    </Package>
+    
+    <Package>
+        <Name>wxGTK3</Name>
+        <RuntimeDependencies>
+            <Dependency release="current">wxGTK-common</Dependency>
+            <Dependency>gtk3</Dependency>
+            <Dependency>tiff</Dependency>
+            <Dependency>cairo</Dependency>
+            <Dependency>glib2</Dependency>
+            <Dependency>libSM</Dependency>
+            <Dependency>pango</Dependency>
+            <Dependency>libX11</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libpng</Dependency>
+            <Dependency>libsdl2</Dependency>
+            <Dependency>libnotify</Dependency>
+            <Dependency>libglvnd</Dependency>
+            <Dependency>gstreamer</Dependency>
+            <Dependency>gdk-pixbuf</Dependency>
+            <Dependency>libXxf86vm</Dependency>
+            <Dependency>webkit2gtk</Dependency>
+            <Dependency>libjpeg-turbo</Dependency>
+            <Dependency>gst-plugins-base</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib/libwx_gtk3u*</Path>
+            <Path fileType="library">/usr/lib/wx/include/gtk3-unicode-3.0/wx/setup.h</Path>
+            <Path fileType="executable">/usr/bin/wx-config-gtk3</Path>
+            <Path fileType="library">/usr/lib/wx/config/gtk3-unicode-3.0</Path>
+            <Path fileType="library">/usr/lib/wx/3.0/web-extensions/webkit2_extu-3.0.so</Path>
+        </Files>
+    </Package>
+    
+    <Package>
+        <Name>wxGTK-common</Name>
+        <RuntimeDependencies>
+            <Dependency>zlib</Dependency>
+            <Dependency>expat</Dependency>
+            <Dependency>libgcc</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="executable">/usr/bin/wxrc</Path>
+            <Path fileType="executable">/usr/bin/wxrc-3.0</Path>
+            <Path fileType="library">/usr/lib/libwx_baseu*</Path>
             <Path fileType="data">/usr/share/aclocal/</Path>
             <Path fileType="data">/usr/share/bakefile/</Path>
-            <Path fileType="library">/usr/lib/wx/config</Path>
             <Path fileType="localedata">/usr/share/locale/</Path>
+            <Path fileType="doc">/usr/share/doc/</Path>
         </Files>
     </Package>
 
@@ -87,6 +135,13 @@
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2020-01-28</Date>
+            <Version>3.0.4</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2018-08-12</Date>
             <Version>3.0.4</Version>