From 8f53b4cfa75e42515c077673ff0764cc06155ec5 Mon Sep 17 00:00:00 2001
From: joborun <joborun@disroot.org>
Date: Tue, 26 Dec 2023 12:29:58 +0200
Subject: [PATCH] upg gtk3 doxygen

---
 doxygen/PKGBUILD      | 15 ++++++---------
 doxygen/PKGBUILD-arch | 15 +++++++--------
 doxygen/deps          |  5 +++--
 gtk3/PKGBUILD         |  8 ++++++--
 gtk3/PKGBUILD-arch    |  6 +++++-
 5 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/doxygen/PKGBUILD b/doxygen/PKGBUILD
index ae54f05..aba0e17 100644
--- a/doxygen/PKGBUILD
+++ b/doxygen/PKGBUILD
@@ -8,12 +8,12 @@
 #pkgbase=doxygen
 #pkgname=('doxygen' 'doxygen-docs')
 pkgname=doxygen
-pkgver=1.9.8
+pkgver=1.10.0
 pkgrel=01
 pkgdesc='Documentation system for C++, C, Java, IDL and PHP'
 url='http://www.doxygen.nl'
-makedepends=('cmake' 'gcc-libs' 'flex' 'qt5-base' 'ghostscript'
-             'texlive-latexextra' 'graphviz' 'python' 'git'
+makedepends=('cmake' 'gcc-libs' 'flex' 'qt6-base' 'ghostscript'
+             'texlive-latexextra' 'graphviz' 'python'
 	'texlive-fontutils' 'texlive-fontsrecommended' 'texlive-plaingeneric')
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/doxygen/doxygen/archive/Release_${pkgver//./_}.tar.gz)
 
@@ -30,7 +30,6 @@ build() {
   cmake -B build \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DDOC_INSTALL_DIR:PATH=share/doc/doxygen \
-    -DPYTHON_EXECUTABLE:FILE=/usr/bin/python \
     -Dbuild_doc:BOOL=OFF \
     -Dbuild_wizard:BOOL=ON
   make -C build
@@ -49,7 +48,7 @@ package() {
   pkgdesc='Documentation system for C++, C, Java, IDL and PHP'
   depends=('gcc-libs')
   optdepends=('graphviz: for caller/callee graph generation'
-              'qt5-base: for doxywizard')
+              'qt6-base: for doxywizard')
 
   cd ${pkgname}-Release_${pkgver//./_}
   make -C build DESTDIR="${pkgdir}" install
@@ -73,9 +72,7 @@ arch=(x86_64)
 
 license=('GPL')
 
-sha256sums=(77371e8a58d22d5e03c52729844d1043e9cbf8d0005ec5112ffa4c8f509ddde8) # doxygen-1.9.8.tar.gz
-sha512sums=('028788a4c4daba895d5c4b20ad99a7bfe61aa9ddd39dfa220eafc3f56563881ad682fa528ebfb49ac04493f974cb0b503f9b0e7edd7ff860c3b2d2991d25705d')
-b2sums=('4ff9264374db959936105301097d02d25c1cf57aabf336350767b97ae73c4f8d94f2f954b1baae2166fc29a5056f67fb4e6cbb6baa8a0c42cbbf51e631b3a9a8')
+sha256sums=(795692a53136ca9bb9a6cd72656968af7858a78be7d6d011e12ab1dce6b9533c)  # doxygen-1.10.0.tar.gz
 
+##  a8c266d87cfc35eca01d2aa104591f9b6da17e32316f66a8ce5c8b38d33943dd  doxygen-1.10.0-01-x86_64.pkg.tar.lz
 
-##  c798e9d39e7f04d3d9f63448e6c824f19ecf1cfde8dde21cc9b3c8b19811c8f4  doxygen-1.9.8-01-x86_64.pkg.tar.lz
diff --git a/doxygen/PKGBUILD-arch b/doxygen/PKGBUILD-arch
index aa63c27..957739d 100644
--- a/doxygen/PKGBUILD-arch
+++ b/doxygen/PKGBUILD-arch
@@ -3,19 +3,19 @@
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.9.8
+pkgver=1.10.0
 pkgrel=1
 pkgdesc='Documentation system for C++, C, Java, IDL and PHP'
 url='http://www.doxygen.nl'
 arch=('x86_64')
 license=('GPL')
-makedepends=('cmake' 'gcc-libs' 'flex' 'qt5-base' 'ghostscript'
+makedepends=('cmake' 'gcc-libs' 'flex' 'qt6-base' 'ghostscript'
              'texlive-latexextra' 'texlive-fontutils' 'texlive-fontsrecommended' 'texlive-plaingeneric'
-             'graphviz' 'python' 'git')
+             'graphviz' 'python')
 source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/doxygen/doxygen/archive/Release_${pkgver//./_}.tar.gz)
-sha256sums=('77371e8a58d22d5e03c52729844d1043e9cbf8d0005ec5112ffa4c8f509ddde8')
-sha512sums=('028788a4c4daba895d5c4b20ad99a7bfe61aa9ddd39dfa220eafc3f56563881ad682fa528ebfb49ac04493f974cb0b503f9b0e7edd7ff860c3b2d2991d25705d')
-b2sums=('4ff9264374db959936105301097d02d25c1cf57aabf336350767b97ae73c4f8d94f2f954b1baae2166fc29a5056f67fb4e6cbb6baa8a0c42cbbf51e631b3a9a8')
+sha256sums=('795692a53136ca9bb9a6cd72656968af7858a78be7d6d011e12ab1dce6b9533c')
+sha512sums=('d8731796d5513ff5939c234f32f7f31aabc45f5557947741a330b3d33b368fb5ad770ef1d3d7384a402d98229eafeb1f955ef76e9932310b83c1d35a2eef500f')
+b2sums=('e9eaf70e106aa022bb0edc99082e6bccd5c6879c41be40ce69d2d5e4eb7d1c5ff078fd8f9132206bf546fa78aab7f8bef4584fd1f2d6e1e84b01d2e65933375e')
 
 prepare() {
   cd ${pkgbase}-Release_${pkgver//./_}
@@ -30,7 +30,6 @@ build() {
   cmake -B build \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DDOC_INSTALL_DIR:PATH=share/doc/doxygen \
-    -DPYTHON_EXECUTABLE:FILE=/usr/bin/python \
     -Dbuild_doc:BOOL=ON \
     -Dbuild_wizard:BOOL=ON
   make -C build
@@ -47,7 +46,7 @@ package_doxygen() {
   pkgdesc='Documentation system for C++, C, Java, IDL and PHP'
   depends=('gcc-libs')
   optdepends=('graphviz: for caller/callee graph generation'
-              'qt5-base: for doxywizard')
+              'qt6-base: for doxywizard')
 
   cd ${pkgbase}-Release_${pkgver//./_}
   make -C build DESTDIR="${pkgdir}" install
diff --git a/doxygen/deps b/doxygen/deps
index 6103f77..8ef887e 100644
--- a/doxygen/deps
+++ b/doxygen/deps
@@ -1,13 +1,14 @@
 cmake
-qt5-base
+qt6-base
 ghostscript
 texlive-latexextra
 graphviz
 python
-git
 texlive-fontutils
 texlive-fontsrecommended
 texlive-plaingeneric
 bison
 libgit2
+libglvnd
+
 
diff --git a/gtk3/PKGBUILD b/gtk3/PKGBUILD
index b85e591..dc727ea 100644
--- a/gtk3/PKGBUILD
+++ b/gtk3/PKGBUILD
@@ -8,7 +8,7 @@
 #pkgbase=gtk3
 pkgname=gtk3 # gtk3-docs gtk3-demos)
 pkgver=3.24.39
-pkgrel=01
+pkgrel=02
 epoch=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
 url="https://www.gtk.org/"
@@ -32,6 +32,10 @@ source=(
 pkgver() {
   cd gtk
   git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+
+  # Fix Hebrew
+  # https://gitlab.archlinux.org/archlinux/packaging/packages/gtk3/-/issues/4
+  git cherry-pick -n 26336c401a39cbd8a7b8128fac7029077c6e1dd0
 }
 
 
@@ -137,5 +141,5 @@ sha256sums=(SKIP
 #echo "you must rename this package to meet SF naming before you move to the repo"
 #mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log
 
-##  4bd173ba45099fb3bf5c965c99a1e3c47d852dc2472ce6e2638df4aa216b283b  gtk3-1_3.24.39-01-x86_64.pkg.tar.lz
+##  5bc990f2b49d7f2912a0f17a0810eb72cc2346ffa0101b98fee375533ef28a21  gtk3-1_3.24.39-02-x86_64.pkg.tar.lz
 
diff --git a/gtk3/PKGBUILD-arch b/gtk3/PKGBUILD-arch
index 326111c..0d840a2 100644
--- a/gtk3/PKGBUILD-arch
+++ b/gtk3/PKGBUILD-arch
@@ -8,7 +8,7 @@ pkgname=(
   gtk3-docs
 )
 pkgver=3.24.39
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
 url="https://www.gtk.org/"
@@ -74,6 +74,10 @@ pkgver() {
 
 prepare() {
   cd gtk
+
+  # Fix Hebrew
+  # https://gitlab.archlinux.org/archlinux/packaging/packages/gtk3/-/issues/4
+  git cherry-pick -n 26336c401a39cbd8a7b8128fac7029077c6e1dd0
 }
 
 build() {