uppkg -> 21.u35-5

Author: noahvogt

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = java-openjdk-xdg
 	pkgver = 21.u35
-	pkgrel = 4
+	pkgrel = 5
 	url = https://openjdk.java.net/
 	arch = x86_64
 	license = custom
@@ -73,7 +73,7 @@ pkgname = jre-openjdk-headless-xdg
 	optdepends = java-rhino: for some JavaScript support
 	provides = java-runtime-headless=21
 	provides = java-runtime-headless-openjdk=21
-	provides = jre21-openjdk-headless=21.u35-4
+	provides = jre21-openjdk-headless=21.u35-5
 	conflicts = jdk-openjdk
 	conflicts = jre-openjdk
 	backup = etc/java-openjdk-xdg/logging.properties
@@ -110,18 +110,16 @@ pkgname = jre-openjdk-xdg
 	depends = gcc-libs
 	depends = giflib
 	depends = libgif.so
-	depends = glibc
-	depends = gcc-libs
 	depends = libpng
 	optdepends = alsa-lib: for basic sound support
 	optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
 	provides = java-runtime=21
 	provides = java-runtime-openjdk=21
-	provides = jre21-openjdk=21.u35-4
+	provides = jre21-openjdk=21.u35-5
 	provides = java-runtime-headless=21
 	provides = java-runtime-headless-openjdk=21
-	provides = jre21-openjdk-headless=21.u35-4
+	provides = jre21-openjdk-headless=21.u35-5
 	conflicts = jdk-openjdk
 	conflicts = jre-openjdk-headless
 	backup = etc/java-openjdk-xdg/logging.properties
@@ -159,8 +157,6 @@ pkgname = jdk-openjdk-xdg
 	depends = java-environment-common=3
 	depends = hicolor-icon-theme
 	depends = libelf
-	depends = glibc
-	depends = gcc-libs
 	depends = libgif.so
 	depends = libpng
 	depends = ca-certificates-utils
@@ -180,13 +176,13 @@ pkgname = jdk-openjdk-xdg
 	optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
 	provides = java-environment=21
 	provides = java-environment-openjdk=21
-	provides = jdk21-openjdk=21.u35-4
+	provides = jdk21-openjdk=21.u35-5
 	provides = java-runtime=21
 	provides = java-runtime-openjdk=21
-	provides = jre21-openjdk=21.u35-4
+	provides = jre21-openjdk=21.u35-5
 	provides = java-runtime-headless=21
 	provides = java-runtime-headless-openjdk=21
-	provides = jre21-openjdk-headless=21.u35-4
+	provides = jre21-openjdk-headless=21.u35-5
 	conflicts = jre-openjdk
 	conflicts = jre-openjdk-headless
 	backup = etc/java-openjdk-xdg/logging.properties
@@ -206,10 +202,10 @@ pkgname = jdk-openjdk-xdg
 
 pkgname = openjdk-src-xdg
 	pkgdesc = OpenJDK Java 21 sources - with improved Support for the XDG Base Directory Specification
-	depends = jdk21-openjdk=21.u35-4
-	provides = openjdk21-src=21.u35-4
+	depends = jdk21-openjdk=21.u35-5
+	provides = openjdk21-src=21.u35-5
 
 pkgname = openjdk-doc-xdg
 	pkgdesc = OpenJDK Java 21 documentation - with improved Support for the XDG Base Directory Specification
-	depends = jdk21-openjdk=21.u35-4
-	provides = openjdk21-doc=21.u35-4
+	depends = jdk21-openjdk=21.u35-5
+	provides = openjdk21-doc=21.u35-5

PKGBUILD

@@ -12,7 +12,7 @@ _securityver=0
 _updatever=35
 # pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
 pkgver=${_majorver}.u${_updatever}
-pkgrel=4
+pkgrel=5
 # _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
 _git_tag=jdk-${_majorver}+${_updatever}
 arch=('x86_64')
@@ -194,7 +194,7 @@ package_jre-openjdk-headless-xdg() {
 
 package_jre-openjdk-xdg() {
   pkgdesc="OpenJDK Java ${_majorver} full runtime environment - with improved Support for the XDG Base Directory Specification"
-  depends=("${_commondeps[@]}" 'giflib' 'libgif.so' 'glibc' 'gcc-libs' 'libpng')
+  depends=("${_commondeps[@]}" 'giflib' 'libgif.so' 'libpng')
   optdepends=('alsa-lib: for basic sound support'
               'gtk2: for the Gtk+ 2 look and feel - desktop usage'
               'gtk3: for the Gtk+ 3 look and feel - desktop usage')
@@ -252,12 +252,19 @@ package_jre-openjdk-xdg() {
   # Link JKS keystore from ca-certificates-utils
   rm -f "${pkgdir}${_jvmdir}/lib/security/cacerts"
   ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
+
+  # Desktop files
+  for f in java; do
+    install -Dm 644 \
+      "${srcdir}/freedesktop-${f}.desktop" \
+      "${pkgdir}/usr/share/applications/${f}-${pkgbase}.desktop"
+  done
 }
 
 package_jdk-openjdk-xdg() {
   pkgdesc="OpenJDK Java ${_majorver} development kit - with improved Support for the XDG Base Directory Specification"
   depends=("${_commondeps[@]}" 'java-environment-common=3'
-           'hicolor-icon-theme' 'libelf' 'glibc' 'gcc-libs' 'libgif.so' 'libpng'
+           'hicolor-icon-theme' 'libelf' 'libgif.so' 'libpng'
            'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'libjpeg.so'
            'lcms2' 'liblcms2.so' 'libnet' 'freetype2' 'libfreetype.so' 'harfbuzz'
            'libharfbuzz.so')
@@ -290,7 +297,7 @@ package_jdk-openjdk-xdg() {
 
   install -dm 755 "${pkgdir}${_jvmdir}"
 
-  cp -a bin demo include jmods lib \
+  cp -a bin demo include jmods lib release \
     "${pkgdir}${_jvmdir}"
 
   rm "${pkgdir}${_jvmdir}/lib/src.zip"