[arch-commits] Commit in gambas3/trunk (PKGBUILD prefer-qt5.patch)

Balló György bgyorgy at archlinux.org
Wed Feb 8 14:50:09 UTC 2017 

    Date: Wednesday, February 8, 2017 @ 14:50:08
  Author: bgyorgy
Revision: 211253

upgpkg: gambas3 3.9.2-2

Prefer Qt5 over Qt4 for the IDE, remove gambas3-gb-qt4-opengl and gambas3-gb-qt4-webkit packages (removes insecure qtwebkit dependency)

Added:
  gambas3/trunk/prefer-qt5.patch
Modified:
  gambas3/trunk/PKGBUILD

------------------+
 PKGBUILD         |   44 +++++++++++-----------------------------
 prefer-qt5.patch |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-08 14:49:00 UTC (rev 211252)
+++ PKGBUILD	2017-02-08 14:50:08 UTC (rev 211253)
@@ -10,13 +10,13 @@
          'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-image' 'gambas3-gb-inotify' 'gambas3-gb-libxml' 'gambas3-gb-logging' 'gambas3-gb-map' 'gambas3-gb-markdown'
          'gambas3-gb-media-form' 'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-mysql' 'gambas3-gb-ncurses' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3'
          'gambas3-gb-net-smtp' 'gambas3-gb-net' 'gambas3-gb-openal' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-opengl-sge' 'gambas3-gb-opengl'
-         'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-qt4'
+         'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4'
          'gambas3-gb-qt5-opengl' 'gambas3-gb-qt5-webkit' 'gambas3-gb-qt5' 'gambas3-gb-openssl' 'gambas3-gb-report' 'gambas3-gb-scanner'
          'gambas3-gb-sdl2-audio' 'gambas3-gb-sdl2' 'gambas3-gb-sdl-sound' 'gambas3-gb-sdl' 'gambas3-gb-settings' 'gambas3-gb-signal' 
          'gambas3-gb-util-web' 'gambas3-gb-util' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml'
          'gambas3-gb-web-form' 'gambas3-gb-web'  'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script')
 pkgver=3.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net/"
@@ -26,12 +26,14 @@
          'zlib' 'mesa' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'gtk3'
          'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg'
          'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'sdl2_mixer' 'sdl2_image' 'sdl2_ttf' 'libxtst'
-         'pcre' 'qtwebkit' 'qt5-webkit' 'qt5-x11extras' 'qt5-svg' 'libxcursor' 'libsm' 'dbus' 'libxml2'
+         'pcre' 'qt4' 'qt5-webkit' 'qt5-x11extras' 'qt5-svg' 'libxcursor' 'libsm' 'dbus' 'libxml2'
          'libxslt' 'libgnome-keyring' 'gsl' 'gst-plugins-base-libs' 'alure' 'gtkglext' 'ncurses'
 	 'gmime')
 options=('!emptydirs' 'libtool')
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('e7775977ed25f944468904553d67b8f1')
+source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
+        'prefer-qt5.patch')
+md5sums=('e7775977ed25f944468904553d67b8f1'
+         '71131eb16bbdf27bf6d329f089602cf7')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -41,6 +43,8 @@
 prepare() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
+  # Prefer Qt5 over Qt4 for the IDE (Qt4 will not work due to the QtWebkit removal)
+  patch -Np1 -i ../prefer-qt5.patch
   ./reconf-all
 }
 
@@ -805,30 +809,6 @@
   mv -v usr/share/gambas3/info/gb.qt4.ext.* ${pkgdir}/usr/share/gambas3/info/
 }
 
-package_gambas3-gb-qt4-opengl() {
-  depends=('gambas3-gb-qt4' 'gambas3-gb-opengl')
-  pkgdesc="Qt4 toolkit OpenGL component"
-
-  cd ${srcdir}/fakeinstall
-  
-  create_dirs
-  
-  mv -v usr/lib/gambas3/gb.qt4.opengl.* ${pkgdir}/usr/lib/gambas3/
-  mv -v usr/share/gambas3/info/gb.qt4.opengl.* ${pkgdir}/usr/share/gambas3/info/
-}
-
-package_gambas3-gb-qt4-webkit() {
-  depends=('gambas3-gb-qt4' 'qtwebkit')
-  pkgdesc="Qt4 toolkit webkit component"
-
-  cd ${srcdir}/fakeinstall
-  
-  create_dirs
-  
-  mv -v usr/lib/gambas3/gb.qt4.webkit.* ${pkgdir}/usr/lib/gambas3/
-  mv -v usr/share/gambas3/info/gb.qt4.webkit.* ${pkgdir}/usr/share/gambas3/info/
-}
-
 package_gambas3-gb-qt4() {
   depends=('gambas3-gb-image' 'qt4')
   pkgdesc="Qt4 toolkit component"
@@ -1131,9 +1111,9 @@
 
 package_gambas3-ide() {
   depends=('gambas3-devel' 'gambas3-gb-clipper' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-desktop-x11'
-           'gambas3-gb-eval-highlight' 'gambas3-gb-form-dialog' 'gambas3-gb-form-stock' 'gambas3-gb-markdown'
-           'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect' 'gambas3-gb-qt4-ext'
-           'gambas3-gb-qt4-webkit' 'gambas3-gb-net-curl' 'gambas3-gb-form-terminal' 'gambas3-gb-util')
+           'gambas3-gb-eval-highlight' 'gambas3-gb-form-dialog' 'gambas3-gb-form-editor' 'gambas3-gb-form-stock'
+           'gambas3-gb-markdown' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect' 'gambas3-gb-qt5'
+           'gambas3-gb-qt5-webkit' 'gambas3-gb-net-curl' 'gambas3-gb-form-terminal' 'gambas3-gb-util')
   pkgdesc="Integrated Development Environment"
   conflicts=('gambas3-examples')
   replaces=('gambas3-examples')

Added: prefer-qt5.patch
===================================================================
--- prefer-qt5.patch	                        (rev 0)
+++ prefer-qt5.patch	2017-02-08 14:50:08 UTC (rev 211253)
@@ -0,0 +1,57 @@
+diff -Naur gambas3-3.9.2.orig/main/lib/gui/main.c gambas3-3.9.2/main/lib/gui/main.c
+--- gambas3-3.9.2.orig/main/lib/gui/main.c	2016-12-17 13:38:03.000000000 +0100
++++ gambas3-3.9.2/main/lib/gui/main.c	2017-02-08 15:20:42.767501760 +0100
+@@ -36,7 +36,7 @@
+   NULL
+ };
+ 
+-char *GB_INCLUDE EXPORT = "gb.qt4";
++char *GB_INCLUDE EXPORT = "gb.qt5";
+ 
+ int EXPORT GB_INIT(void)
+ {
+diff -Naur gambas3-3.9.2.orig/main/lib/gui.opengl/main.c gambas3-3.9.2/main/lib/gui.opengl/main.c
+--- gambas3-3.9.2.orig/main/lib/gui.opengl/main.c	2016-12-17 13:38:04.000000000 +0100
++++ gambas3-3.9.2/main/lib/gui.opengl/main.c	2017-02-08 15:20:42.790835802 +0100
+@@ -32,7 +32,7 @@
+   NULL
+ };
+ 
+-char *GB_INCLUDE EXPORT = "gb.qt4.opengl";
++char *GB_INCLUDE EXPORT = "gb.qt5.opengl";
+ 
+ int EXPORT GB_INIT(void)
+ {
+diff -Naur gambas3-3.9.2.orig/main/lib/gui.qt/main.c gambas3-3.9.2/main/lib/gui.qt/main.c
+--- gambas3-3.9.2.orig/main/lib/gui.qt/main.c	2016-12-17 13:38:04.000000000 +0100
++++ gambas3-3.9.2/main/lib/gui.qt/main.c	2017-02-08 15:20:42.790835802 +0100
+@@ -36,7 +36,7 @@
+   NULL
+ };
+ 
+-char *GB_INCLUDE EXPORT = "gb.qt4";
++char *GB_INCLUDE EXPORT = "gb.qt5";
+ 
+ int EXPORT GB_INIT(void)
+ {
+@@ -58,7 +58,7 @@
+ 	
+ 	if (use == USE_NOTHING)
+ 	{
+-		use = USE_GB_QT4;
++		use = USE_GB_QT5;
+ 		
+ 		env = getenv("KDE_FULL_SESSION");
+ 		
+diff -Naur gambas3-3.9.2.orig/main/lib/gui.qt.webkit/main.c gambas3-3.9.2/main/lib/gui.qt.webkit/main.c
+--- gambas3-3.9.2.orig/main/lib/gui.qt.webkit/main.c	2016-12-17 13:38:04.000000000 +0100
++++ gambas3-3.9.2/main/lib/gui.qt.webkit/main.c	2017-02-08 15:20:42.790835802 +0100
+@@ -32,7 +32,7 @@
+   NULL
+ };
+ 
+-char *GB_INCLUDE EXPORT = "gb.qt4.webkit";
++char *GB_INCLUDE EXPORT = "gb.qt5.webkit";
+ 
+ int EXPORT GB_INIT(void)
+ {

More information about the arch-commits mailing list