[arch-commits] Commit in gambas3/trunk (PKGBUILD gtk3-fix-gl-linking.patch)

Laurent Carlier lcarlier at gemini.archlinux.org
Sun Mar 13 12:42:36 UTC 2022


    Date: Sunday, March 13, 2022 @ 12:42:36
  Author: lcarlier
Revision: 1150909

upgpkg: gambas3 3.17.0-1: upstream update 3.17.0

Added:
  gambas3/trunk/gtk3-fix-gl-linking.patch
Modified:
  gambas3/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   36 ++++++++++++++++++++++++++++++------
 gtk3-fix-gl-linking.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-13 12:42:35 UTC (rev 1150908)
+++ PKGBUILD	2022-03-13 12:42:36 UTC (rev 1150909)
@@ -8,8 +8,8 @@
          'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite3' 'gambas3-gb-db'
          'gambas3-gb-desktop-gnome' 'gambas3-gb-desktop-x11' 'gambas3-gb-desktop'
          'gambas3-gb-eval-highlight' 'gambas3-gb-httpd'
-         'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-terminal' 'gambas3-gb-form-stock' 'gambas3-gb-form-editor' 'gambas3-gb-form'
-         'gambas3-gb-gmp' 'gambas3-gb-gsl' 'gambas3-gb-gtk3'
+         'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-terminal' 'gambas3-gb-form-stock' 'gambas3-gb-form-editor' 'gambas3-gb-form-htmlview' 'gambas3-gb-form'
+         'gambas3-gb-gmp' 'gambas3-gb-gsl' 'gambas3-gb-gtk3-opengl' 'gambas3-gb-gtk3'
          'gambas3-gb-image-effect' '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'
@@ -26,8 +26,8 @@
          'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml'
          'gambas3-gb-web-feed' 'gambas3-gb-web-form' 'gambas3-gb-web-gui' 'gambas3-gb-web'
          'gambas3-runtime' 'gambas3-dev-tools' 'gambas3-ide' 'gambas3-script')
-pkgver=3.16.3
-pkgrel=8
+pkgver=3.17.0
+pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('x86_64')
 url="http://gambas.sourceforge.net/"
@@ -41,12 +41,16 @@
          'libxslt' 'libgnome-keyring' 'gsl' 'gst-plugins-base-libs' 'alure' 'ncurses'
          'gmime3' 'libxcrypt')
 options=('!emptydirs' 'libtool')
-source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2")
-sha512sums=('151e53dd7023e919d82487ed782a627ebe65b3006ac225047f154eccfb910baa2124e8ed64866cf7a2871bc3ceb19b65fcafb26f0508bcdb3ce357e822cf8003')
+source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2"
+        gtk3-fix-gl-linking.patch)
+sha512sums=('0b35dcc9c1dec691ed8f816c65a340e651ee7e8d0f9c7425c917f26911516dcc059747467e1436fe502ffa400da72c25220f66c897fc7fc6a34777675a3783b0'
+            '388f0e58a1811c79baf3e9eb169f54aa8e6057c7c41ff6f72d1aa70a971b50145118a9a40631e2fd2a62468516e32d40bd82b7db61b81757706ee24bbcf8f180')
 
 prepare() {
   cd ${srcdir}/gambas-${pkgver}
 
+  patch -Np1 -i ../gtk3-fix-gl-linking.patch
+
   ./reconf-all
 }
 
@@ -262,6 +266,7 @@
 
   _install fakeinstall/usr/lib/gambas3/gb.form.editor.*
   _install fakeinstall/usr/share/gambas3/info/gb.form.editor.*
+  _install fakeinstall/usr/share/gambas3/control/gb.form.editor/*
 }
 
 package_gambas3-gb-form-terminal() {
@@ -270,8 +275,19 @@
 
   _install fakeinstall/usr/lib/gambas3/gb.form.terminal.*
   _install fakeinstall/usr/share/gambas3/info/gb.form.terminal.*
+  _install fakeinstall/usr/share/gambas3/control/gb.form.terminal/*
+
 }
 
+package_gambas3-gb-form-htmlview() {
+  depends=('gambas3-gb-form')
+  pkgdesc="Htmlview component"
+
+  _install fakeinstall/usr/lib/gambas3/gb.form.htmlview*
+  _install fakeinstall/usr/share/gambas3/info/gb.form.htmlview*
+  _install fakeinstall/usr/share/gambas3/control/gb.form.htmlview/*
+}
+
 package_gambas3-gb-form() {
   depends=('gambas3-runtime' 'gambas3-gui')
   pkgdesc="Form component"
@@ -297,6 +313,14 @@
   _install fakeinstall/usr/share/gambas3/info/gb.gsl.*
 }
 
+package_gambas3-gb-gtk3-opengl() {
+  depends=('gambas3-gb-gtk3' 'gambas3-gb-opengl')
+  pkgdesc="GTK3 toolkit OpenGL component"
+
+  _install fakeinstall/usr/lib/gambas3/gb.gtk3.opengl.*
+  _install fakeinstall/usr/share/gambas3/info/gb.gtk3.opengl.*
+}
+
 package_gambas3-gb-gtk3() {
   depends=('gambas3-gb-image' 'gtk3' 'webkit2gtk')
   pkgdesc="GTK3 toolkit component"

Added: gtk3-fix-gl-linking.patch
===================================================================
--- gtk3-fix-gl-linking.patch	                        (rev 0)
+++ gtk3-fix-gl-linking.patch	2022-03-13 12:42:36 UTC (rev 1150909)
@@ -0,0 +1,28 @@
+diff -Nur gambas-3.17.0/gb.gtk3/configure.ac gambas-3.17.0a/gb.gtk3/configure.ac
+--- gambas-3.17.0/gb.gtk3/configure.ac	2022-03-09 14:28:18.000000000 +0100
++++ gambas-3.17.0a/gb.gtk3/configure.ac	2022-03-13 12:57:36.551478184 +0100
+@@ -36,7 +36,7 @@
+ 
+ GB_COMPONENT_PKG_CONFIG(
+   gtk3opengl, GTK3OPENGL, gb.gtk3.opengl, [opengl],
+-  'gtk+-3.0 >= 3.16'
++  'gtk+-3.0 >= 3.16' gl
+ )
+ 
+ AC_OUTPUT( \
+diff -Nur gambas-3.17.0/gb.gtk3/src/opengl/Makefile.am gambas-3.17.0a/gb.gtk3/src/opengl/Makefile.am
+--- gambas-3.17.0/gb.gtk3/src/opengl/Makefile.am	2022-03-09 14:28:18.000000000 +0100
++++ gambas-3.17.0a/gb.gtk3/src/opengl/Makefile.am	2022-03-13 12:58:11.352346960 +0100
+@@ -3,9 +3,9 @@
+ 
+ gblib_LTLIBRARIES = gb.gtk3.opengl.la
+ 
+-gb_gtk3_opengl_la_LIBADD = @GTK3_LIB@
+-gb_gtk3_opengl_la_LDFLAGS = -module @LD_FLAGS@ @GTK3_LDFLAGS@
+-gb_gtk3_opengl_la_CPPFLAGS = @GTK3_INC@
++gb_gtk3_opengl_la_LIBADD = @GTK3OPENGL_LIB@
++gb_gtk3_opengl_la_LDFLAGS = -module @LD_FLAGS@ @GTK3OPENGL_LDFLAGS@
++gb_gtk3_opengl_la_CPPFLAGS = @GTK3OPENGL_INC@
+ 
+ gb_gtk3_opengl_la_SOURCES = \
+  main.h main.c \



More information about the arch-commits mailing list