git » gnuplot.git » commit 50e079b

upgpkg: 6.0.0-1: Update to 6.0.0

author Antonio Rojas
2024-01-05 21:16:56 UTC
committer Antonio Rojas
2024-01-05 21:16:56 UTC
parent 220eb81f3e6a5321d0d84433d43600c939ec615d

upgpkg: 6.0.0-1: Update to 6.0.0

.SRCINFO +8 -6
PKGBUILD +7 -12

diff --git a/.SRCINFO b/.SRCINFO
index 44ff761..1d5eb88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = gnuplot
 	pkgdesc = Plotting package which outputs to X11, PostScript, PNG, GIF, and others
-	pkgver = 5.4.10
+	pkgver = 6.0.0
 	pkgrel = 1
 	url = http://www.gnuplot.info
 	arch = x86_64
 	license = custom
 	makedepends = emacs
-	makedepends = qt5-tools
+	makedepends = qt6-tools
 	makedepends = texlive-latexextra
 	depends = cairo
 	depends = gcc-libs
@@ -16,17 +16,19 @@ pkgbase = gnuplot
 	depends = gtk3
 	depends = libcaca
 	depends = libcerf
+	depends = libwebp
 	depends = libx11
 	depends = lua
 	depends = pango
-	depends = qt5-base
-	depends = qt5-svg
+	depends = qt6-5compat
+	depends = qt6-base
+	depends = qt6-svg
 	depends = readline
 	depends = wxwidgets-common
 	depends = wxwidgets-gtk3
-	source = https://downloads.sourceforge.net/sourceforge/gnuplot/gnuplot-5.4.10.tar.gz
+	source = https://downloads.sourceforge.net/sourceforge/gnuplot/gnuplot-6.0.0.tar.gz
 	source = lua53_compat.patch
-	sha256sums = 975d8c1cc2c41c7cedc4e323aff035d977feb9a97f0296dd2a8a66d197a5b27c
+	sha256sums = 635a28f0993f6ab0d1179e072ad39b8139d07f51237f841d93c6c2ff4b1758ec
 	sha256sums = bfd8a61abbf4491c74225cb9fd252619d4fc29751838bcb4c0639ffe05a00695
 
 pkgname = gnuplot
diff --git a/PKGBUILD b/PKGBUILD
index 121403a..3ac90b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=gnuplot
 pkgname=(gnuplot
          gnuplot-demos)
-pkgver=5.4.10
+pkgver=6.0.0
 pkgrel=1
 pkgdesc='Plotting package which outputs to X11, PostScript, PNG, GIF, and others' 
 arch=(x86_64)
@@ -20,32 +20,27 @@ depends=(cairo
          gtk3
          libcaca
          libcerf
+         libwebp
          libx11
          lua
          pango
-         qt5-base
-         qt5-svg
+         qt6-5compat
+         qt6-base
+         qt6-svg
          readline
          wxwidgets-common
          wxwidgets-gtk3) 
 makedepends=(emacs
-             qt5-tools
+             qt6-tools
              texlive-latexextra)
 source=(https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
         lua53_compat.patch)
-sha256sums=('975d8c1cc2c41c7cedc4e323aff035d977feb9a97f0296dd2a8a66d197a5b27c'
+sha256sums=('635a28f0993f6ab0d1179e072ad39b8139d07f51237f841d93c6c2ff4b1758ec'
             'bfd8a61abbf4491c74225cb9fd252619d4fc29751838bcb4c0639ffe05a00695')
 
 prepare() {
   cd $pkgname-$pkgver
 
-  # fix default source location; use the GDFONTPATH variable to modify at runtime
-  sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c
-
-  sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \
-  -e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
-  src/variable.c
-
   patch -p1 < "$srcdir"/lua53_compat.patch
 }