diff --git a/cross/cups/Makefile b/cross/cups/Makefile index a4ff09d7007..b85dfe02b47 100644 --- a/cross/cups/Makefile +++ b/cross/cups/Makefile @@ -2,11 +2,11 @@ PKG_NAME = cups PKG_VERS = 2.3.3 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-source.$(PKG_EXT) -PKG_DIST_SITE = https://github.com/apple/$(PKG_NAME)/releases/download/v$(PKG_VERS) +PKG_DIST_SITE = https://github.com/apple/cups/releases/download/v$(PKG_VERS) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) HOMEPAGE = https://www.cups.org/ -COMMENT = CUPS printing system +COMMENT = CUPS printing system. LICENSE = GPLv2 PRE_CONFIGURE_TARGET = cups_pre_configure @@ -36,5 +36,5 @@ include ../../mk/spksrc.cross-cc.mk .PHONY: cups_pre_configure cups_pre_configure: - $(RUN) aclocal -I config-scripts - $(RUN) autoconf -f -I config-scripts + @$(RUN) aclocal -I config-scripts + @$(RUN) autoconf -f -I config-scripts diff --git a/cross/cups/PLIST b/cross/cups/PLIST index 7a066b5be8f..a43c90b7a20 100644 --- a/cross/cups/PLIST +++ b/cross/cups/PLIST @@ -1,35 +1,8 @@ -rsc:bin/cups-config bin:bin/ippeveprinter bin:bin/ipptool -rsc:include/cups/adminutil.h -rsc:include/cups/array.h -rsc:include/cups/backend.h -rsc:include/cups/cups.h -rsc:include/cups/dir.h -rsc:include/cups/file.h -rsc:include/cups/http.h -rsc:include/cups/ipp.h -rsc:include/cups/language.h -rsc:include/cups/ppd.h -rsc:include/cups/pwg.h -rsc:include/cups/raster.h -rsc:include/cups/sidechannel.h -rsc:include/cups/transcode.h -rsc:include/cups/versioning.h lib:lib/cups/command/ippevepcl lib:lib/cups/command/ippeveps lnk:lib/libcupsimage.so lib:lib/libcupsimage.so.2 lnk:lib/libcups.so lib:lib/libcups.so.2 -rsc:share/locale/ca/cups_ca.po -rsc:share/locale/cs/cups_cs.po -rsc:share/locale/de/cups_de.po -rsc:share/locale/en/cups_en.po -rsc:share/locale/es/cups_es.po -rsc:share/locale/fr/cups_fr.po -rsc:share/locale/it/cups_it.po -rsc:share/locale/ja/cups_ja.po -rsc:share/locale/pt_BR/cups_pt_BR.po -rsc:share/locale/ru/cups_ru.po -rsc:share/locale/zh_CN/cups_zh_CN.po diff --git a/cross/java-21-openjdk/Makefile b/cross/java-21-openjdk/Makefile new file mode 100644 index 00000000000..f8f9e389631 --- /dev/null +++ b/cross/java-21-openjdk/Makefile @@ -0,0 +1,136 @@ +PKG_NAME = java-21-openjdk +JAVA_REPO_NAME = jdk21u +JAVA_NAME = jdk +JAVA_RELEASE = 11 +JAVA_VERSION = 21.0.5 +PKG_VERS = $(JAVA_VERSION).$(JAVA_RELEASE) +PKG_EXT = tar.gz +PKG_DIST_NAME = $(JAVA_NAME)-$(JAVA_VERSION)+$(JAVA_RELEASE).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/openjdk/jdk21u/archive +PKG_DIR = $(JAVA_REPO_NAME)-$(JAVA_NAME)-$(JAVA_VERSION)-$(JAVA_RELEASE) + +# build instructions: +# https://openjdk.java.net/groups/build/doc/building.html + +BUILD_DEPENDS = native/openjdk-21 +# Dependencies required at build time only: +BUILD_DEPENDS += cross/cups +BUILD_DEPENDS += cross/alsa-lib +BUILD_DEPENDS += cross/libX11 +BUILD_DEPENDS += cross/libXrender +BUILD_DEPENDS += cross/libXrandr +BUILD_DEPENDS += cross/libXtst +BUILD_DEPENDS += cross/libXt + +# REMARKS: +# for a (currently) unknown reason, building in the cross folder fails +# - it does not find system libraries like libjpeg, libpng, ... +# but building as package dependency in the spk folder works. + +# Dependencies used as system dependencies: +DEPENDS = cross/alsa-lib +DEPENDS += cross/fontconfig +DEPENDS += cross/zlib +DEPENDS += cross/libpng +DEPENDS += cross/libjpeg +DEPENDS += cross/giflib +DEPENDS += cross/lcms2 + +HOMEPAGE = https://openjdk.org/projects/jdk/21/ +COMMENT = OpenJDK 21 is the open-source reference implementation of version 21 of the Java SE Platform as specified by JSR 396 in the Java Community Process. +LICENSE = GPLv2 with the Classpath Exception + +PRE_CONFIGURE_TARGET = java-21-openjdk_pre_configure +PRE_COMPILE_TARGET = java-21-openjdk_pre_compile +POST_INSTALL_TARGET = java-21-openjdk_post_install + +CONFIGURE_ARGS = --openjdk-target=$(TC_TARGET) +CONFIGURE_ARGS += --with-boot-jdk=$(WORK_DIR)/../../../native/openjdk-21/work-native/jdk-21 +CONFIGURE_ARGS += --with-version-build=$(JAVA_RELEASE) +CONFIGURE_ARGS += --with-version-pre= +CONFIGURE_ARGS += --with-version-opt=LTS +CONFIGURE_ARGS += --with-native-debug-symbols=none +CONFIGURE_ARGS += --prefix=$(INSTALL_PREFIX) +CONFIGURE_ARGS += --with-zlib=system +CONFIGURE_ARGS += --with-libjpeg=system +CONFIGURE_ARGS += --with-giflib=system +CONFIGURE_ARGS += --with-libpng=system +CONFIGURE_ARGS += --with-lcms=system +CONFIGURE_ARGS += --with-alsa=$(INSTALL_DIR)/$(INSTALL_PREFIX) +CONFIGURE_ARGS += --with-stdc++lib=dynamic +CONFIGURE_ARGS += --disable-javac-server +CONFIGURE_ARGS += --disable-warnings-as-errors +CONFIGURE_ARGS += --with-cups=$(INSTALL_DIR)/$(INSTALL_PREFIX) +CONFIGURE_ARGS += --with-fontconfig=$(INSTALL_DIR)/$(INSTALL_PREFIX) +CONFIGURE_ARGS += --with-freetype=system +CONFIGURE_ARGS += --with-freetype-include=$(INSTALL_DIR)/$(INSTALL_PREFIX)/include/freetype2 +CONFIGURE_ARGS += --with-freetype-lib=$(INSTALL_DIR)/$(INSTALL_PREFIX)/lib +CONFIGURE_ARGS += --with-extra-cflags="$(CFLAGS) -fno-stack-protector -Wno-deprecated-declarations" +CONFIGURE_ARGS += --with-extra-cxxflags="$(CPPFLAGS) -fno-stack-protector -Wno-deprecated-declarations" +CONFIGURE_ARGS += --with-extra-ldflags="$(LDFLAGS) -Xlinker -z -Xlinker relro -Xlinker -Bsymbolic-functions" +CONFIGURE_ARGS += --disable-manpages +CONFIGURE_ARGS += --with-cacerts-file=/etc/ssl/certs/ca-certificates.crt +CONFIGURE_ARGS += --with-cacerts-src=/etc/ssl/certs +# Disable all GUI related +CONFIGURE_ARGS += --enable-headless-only +# customize for SynoCommunity +CONFIGURE_ARGS += --with-vendor-name=SynoCommunity +CONFIGURE_ARGS += --with-vendor-url=https://synocommunity.com/package/java-21-openjdk +CONFIGURE_ARGS += --with-vendor-bug-url=https://github.com/SynoCommunity/spksrc/issues +CONFIGURE_ARGS += --with-vendor-vm-bug-url=https://github.com/SynoCommunity/spksrc/issues + +# arguments not taken from environment +CONFIGURE_ARGS += READELF=$(READELF) +CONFIGURE_ARGS += AR=$(AR) +CONFIGURE_ARGS += STRIP=$(STRIP) +CONFIGURE_ARGS += NM=$(TC_PATH)/$(TC_PREFIX)nm +CONFIGURE_ARGS += OBJCOPY=$(OBJCOPY) +CONFIGURE_ARGS += OBJDUMP=$(OBJDUMP) + +# Build images twice, second time with newly built JDK +COMPILE_MAKE_OPTIONS += product-images + +# debian patches +# https://udd.debian.org/patches.cgi?src=openjdk-21&version=21.0.5%2B11-1 +PATCHES_LEVEL = 1 + +# Filter out any -jN since java's configure will autodetect number of CPU's +# Use make JOBS=N to set number of CPU's in this package +DISABLE_PARALLEL_MAKE = 1 +COMPILE_MAKE_OPTIONS += JOBS=$(NCPUS) + +include ../../mk/spksrc.cross-cc.mk + +ifeq ($(findstring $(ARCH),$(i686_ARCHS)),$(ARCH)) +# force cross compilation +CONFIGURE_ARGS += --build=x86_64-pc-linux-gnu +PLIST_TRANSFORM = sed -e '/lib\/libjsvml/d' -e '/lib\/server\/classes/d' -e '/jmods\/jdk.internal.vm/d' + +# ABI profile for ARM builds: +# arm-vfp-sflt, arm-vfp-hflt, arm-sflt, armv5-vfp-sflt, armv6-vfp-hflt, aarch64 +else ifeq ($(findstring $(ARCH),$(ARMv8_ARCHS)),$(ARCH)) +CONFIGURE_ARGS += --with-abi-profile=aarch64 +PLIST_TRANSFORM = sed -e '/lib\/libjsvml/d' -e '/lib\/server\/classes/d' +else ifeq ($(findstring $(ARCH),$(ARMv7_ARCHS)),$(ARCH)) +CONFIGURE_ARGS += --with-abi-profile=arm-vfp-hflt +PLIST_TRANSFORM = sed -e '/lib\/libjsvml/d' -e '/lib\/server\/classes/d' -e '/jmods\/jdk.internal.vm/d' +endif + +.PHONY: java-21-openjdk_pre_configure +java-21-openjdk_pre_configure: + @$(MSG) "- Make configure script executable" + @cd $(WORK_DIR)/$(PKG_DIR) && chmod +x ./configure + +.PHONY: java-21-openjdk_pre_compile +java-21-openjdk_pre_compile: + @$(MSG) "- Force openjdk to install into the package install folder" + @sed -i -e "s|\$$(INSTALL_PREFIX)|$(STAGING_INSTALL_PREFIX)|g" $(WORK_DIR)/$(PKG_DIR)/make/Install.gmk + +.PHONY: java-21-openjdk_post_install +java-21-openjdk_post_install: + @$(MSG) "- Link binaries into bin folder" + @cd $(STAGING_INSTALL_PREFIX)/bin && ln -sf ../jvm/openjdk-$(JAVA_VERSION)/bin/* . + @$(MSG) "- Add license files" + @cp -pf $(WORK_DIR)/$(PKG_DIR)/LICENSE $(STAGING_INSTALL_PREFIX)/jvm/openjdk-$(JAVA_VERSION)/ + @cp -pf $(WORK_DIR)/$(PKG_DIR)/ADDITIONAL_LICENSE_INFO $(STAGING_INSTALL_PREFIX)/jvm/openjdk-$(JAVA_VERSION)/ + @cp -pf $(WORK_DIR)/$(PKG_DIR)/ASSEMBLY_EXCEPTION $(STAGING_INSTALL_PREFIX)/jvm/openjdk-$(JAVA_VERSION)/ diff --git a/cross/java-21-openjdk/PLIST b/cross/java-21-openjdk/PLIST new file mode 100644 index 00000000000..f566576f0e9 --- /dev/null +++ b/cross/java-21-openjdk/PLIST @@ -0,0 +1,168 @@ +lnk:bin/jar +lnk:bin/jarsigner +lnk:bin/java +lnk:bin/javac +lnk:bin/javadoc +lnk:bin/javap +lnk:bin/jcmd +lnk:bin/jconsole +lnk:bin/jdb +lnk:bin/jdeprscan +lnk:bin/jdeps +lnk:bin/jfr +lnk:bin/jhsdb +lnk:bin/jimage +lnk:bin/jinfo +lnk:bin/jlink +lnk:bin/jmap +lnk:bin/jmod +lnk:bin/jpackage +lnk:bin/jps +lnk:bin/jrunscript +lnk:bin/jshell +lnk:bin/jstack +lnk:bin/jstat +lnk:bin/jstatd +lnk:bin/jwebserver +lnk:bin/keytool +lnk:bin/rmiregistry +lnk:bin/serialver +bin:jvm/openjdk-21.0.5/bin/* +rsc:jvm/openjdk-21.0.5/conf/ +rsc:jvm/openjdk-21.0.5/include/classfile_constants.h +rsc:jvm/openjdk-21.0.5/include/jawt.h +rsc:jvm/openjdk-21.0.5/include/jdwpTransport.h +rsc:jvm/openjdk-21.0.5/include/jni.h +rsc:jvm/openjdk-21.0.5/include/jvmti.h +rsc:jvm/openjdk-21.0.5/include/jvmticmlr.h +rsc:jvm/openjdk-21.0.5/include/linux/jawt_md.h +rsc:jvm/openjdk-21.0.5/include/linux/jni_md.h +rsc:jvm/openjdk-21.0.5/jmods/java.base.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.compiler.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.datatransfer.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.desktop.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.instrument.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.logging.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.management.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.management.rmi.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.naming.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.net.http.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.prefs.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.rmi.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.scripting.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.se.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.security.jgss.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.security.sasl.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.smartcardio.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.sql.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.sql.rowset.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.transaction.xa.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.xml.crypto.jmod +rsc:jvm/openjdk-21.0.5/jmods/java.xml.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.accessibility.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.attach.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.charsets.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.compiler.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.crypto.cryptoki.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.crypto.ec.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.dynalink.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.editpad.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.hotspot.agent.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.httpserver.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.incubator.vector.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.internal.ed.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.internal.jvmstat.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.internal.le.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.internal.opt.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.internal.vm.ci.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.internal.vm.compiler.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.internal.vm.compiler.management.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.jartool.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.javadoc.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.jcmd.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.jconsole.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.jdeps.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.jdi.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.jdwp.agent.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.jfr.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.jlink.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.jpackage.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.jshell.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.jsobject.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.jstatd.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.localedata.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.management.agent.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.management.jfr.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.management.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.naming.dns.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.naming.rmi.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.net.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.nio.mapmode.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.random.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.sctp.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.security.auth.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.security.jgss.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.unsupported.desktop.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.unsupported.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.xml.dom.jmod +rsc:jvm/openjdk-21.0.5/jmods/jdk.zipfs.jmod +rsc:jvm/openjdk-21.0.5/legal/ +rsc:jvm/openjdk-21.0.5/lib/classlist +rsc:jvm/openjdk-21.0.5/lib/ct.sym +bin:jvm/openjdk-21.0.5/lib/jexec +rsc:jvm/openjdk-21.0.5/lib/jfr/default.jfc +rsc:jvm/openjdk-21.0.5/lib/jfr/profile.jfc +rsc:jvm/openjdk-21.0.5/lib/jrt-fs.jar +bin:jvm/openjdk-21.0.5/lib/jspawnhelper +rsc:jvm/openjdk-21.0.5/lib/jvm.cfg +lib:jvm/openjdk-21.0.5/lib/libattach.so +lib:jvm/openjdk-21.0.5/lib/libawt.so +lib:jvm/openjdk-21.0.5/lib/libawt_headless.so +lib:jvm/openjdk-21.0.5/lib/libdt_socket.so +lib:jvm/openjdk-21.0.5/lib/libextnet.so +lib:jvm/openjdk-21.0.5/lib/libfontmanager.so +lib:jvm/openjdk-21.0.5/lib/libinstrument.so +lib:jvm/openjdk-21.0.5/lib/libj2gss.so +lib:jvm/openjdk-21.0.5/lib/libj2pcsc.so +lib:jvm/openjdk-21.0.5/lib/libj2pkcs11.so +lib:jvm/openjdk-21.0.5/lib/libjaas.so +lib:jvm/openjdk-21.0.5/lib/libjava.so +lib:jvm/openjdk-21.0.5/lib/libjavajpeg.so +lib:jvm/openjdk-21.0.5/lib/libjawt.so +lib:jvm/openjdk-21.0.5/lib/libjdwp.so +lib:jvm/openjdk-21.0.5/lib/libjimage.so +lib:jvm/openjdk-21.0.5/lib/libjli.so +lib:jvm/openjdk-21.0.5/lib/libjsig.so +lib:jvm/openjdk-21.0.5/lib/libjsound.so +lib:jvm/openjdk-21.0.5/lib/libjsvml.so +lib:jvm/openjdk-21.0.5/lib/liblcms.so +lib:jvm/openjdk-21.0.5/lib/lible.so +lib:jvm/openjdk-21.0.5/lib/libmanagement.so +lib:jvm/openjdk-21.0.5/lib/libmanagement_agent.so +lib:jvm/openjdk-21.0.5/lib/libmanagement_ext.so +lib:jvm/openjdk-21.0.5/lib/libmlib_image.so +lib:jvm/openjdk-21.0.5/lib/libnet.so +lib:jvm/openjdk-21.0.5/lib/libnio.so +lib:jvm/openjdk-21.0.5/lib/libprefs.so +lib:jvm/openjdk-21.0.5/lib/librmi.so +lib:jvm/openjdk-21.0.5/lib/libsaproc.so +lib:jvm/openjdk-21.0.5/lib/libsctp.so +lib:jvm/openjdk-21.0.5/lib/libsyslookup.so +lib:jvm/openjdk-21.0.5/lib/libverify.so +lib:jvm/openjdk-21.0.5/lib/libzip.so +rsc:jvm/openjdk-21.0.5/lib/modules +rsc:jvm/openjdk-21.0.5/lib/psfont.properties.ja +rsc:jvm/openjdk-21.0.5/lib/psfontj2d.properties +rsc:jvm/openjdk-21.0.5/lib/security/blocked.certs +rsc:jvm/openjdk-21.0.5/lib/security/cacerts +rsc:jvm/openjdk-21.0.5/lib/security/default.policy +rsc:jvm/openjdk-21.0.5/lib/security/public_suffix_list.dat +rsc:jvm/openjdk-21.0.5/lib/server/classes.jsa +rsc:jvm/openjdk-21.0.5/lib/server/classes_nocoops.jsa +lib:jvm/openjdk-21.0.5/lib/server/libjsig.so +lib:jvm/openjdk-21.0.5/lib/server/libjvm.so +rsc:jvm/openjdk-21.0.5/lib/tzdb.dat +rsc:jvm/openjdk-21.0.5/release +rsc:jvm/openjdk-21.0.5/LICENSE +rsc:jvm/openjdk-21.0.5/ADDITIONAL_LICENSE_INFO +rsc:jvm/openjdk-21.0.5/ASSEMBLY_EXCEPTION diff --git a/cross/java-21-openjdk/digests b/cross/java-21-openjdk/digests new file mode 100644 index 00000000000..882c333b7db --- /dev/null +++ b/cross/java-21-openjdk/digests @@ -0,0 +1,3 @@ +jdk-21.0.5+11.tar.gz SHA1 180c48bf33a50944d3978c0af57bdd7f5448d498 +jdk-21.0.5+11.tar.gz SHA256 8d57ea0ba57310fffb9257d8018e54a264d940c472228eb04d37a21b584885ac +jdk-21.0.5+11.tar.gz MD5 e8ff61ad5d077c6c78e99df42b609169 diff --git a/cross/java-21-openjdk/patches/101-jdk-8307977-proposed.patch b/cross/java-21-openjdk/patches/101-jdk-8307977-proposed.patch new file mode 100644 index 00000000000..4d70dca8fb9 --- /dev/null +++ b/cross/java-21-openjdk/patches/101-jdk-8307977-proposed.patch @@ -0,0 +1,83 @@ +https://sources.debian.org/src/openjdk-21/21.0.5+11-1/debian/patches/jdk-8307977-proposed.patch + +Description: attach in linux hangs due to permission denied accessing /proc/pid/root + The attach API uses /proc/pid/root in order to support containers. + Dereferencing this symlink is governed by ptrace access mode PTRACE_MODE_READ_FSCREDS + which may not succeed when running as the user running the JRE. + This breaks running jcmd and jmap as the same user the JVM is running as. + Use tmpdir when pid matches ns_pid. +Author: Sebastian Lövdahl +Bug: https://bugs.openjdk.org/browse/JDK-8307977 +Bug: https://bugs.openjdk.org/browse/JDK-8226919 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1034601 +Last-Update: 2023-04-18 + +From 36b554e2de46d77898be4d0feae0ee2171b445bc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20L=C3=B6vdahl?= +Date: Tue, 18 Apr 2023 12:50:32 +0300 +Subject: [PATCH] 8226919: Fix dynamic attach in Linux for non-container + environments + +--- + .../sun/tools/attach/VirtualMachineImpl.java | 37 ++++++++++++------- + 1 file changed, 23 insertions(+), 14 deletions(-) + +--- a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java ++++ b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java +@@ -210,11 +210,8 @@ public class VirtualMachineImpl extends + } + + // Return the socket file for the given process. +- private File findSocketFile(int pid, int ns_pid) { +- // A process may not exist in the same mount namespace as the caller. +- // Instead, attach relative to the target root filesystem as exposed by +- // procfs regardless of namespaces. +- String root = "/proc/" + pid + "/root/" + tmpdir; ++ private File findSocketFile(int pid, int ns_pid) throws IOException { ++ String root = findTargetProcessTmpDirectory(pid, ns_pid); + return new File(root, ".java_pid" + ns_pid); + } + +@@ -230,21 +227,33 @@ public class VirtualMachineImpl extends + // Do not canonicalize the file path, or we will fail to attach to a VM in a container. + f.createNewFile(); + } catch (IOException x) { +- String root; +- if (pid != ns_pid) { +- // A process may not exist in the same mount namespace as the caller. +- // Instead, attach relative to the target root filesystem as exposed by +- // procfs regardless of namespaces. +- root = "/proc/" + pid + "/root/" + tmpdir; +- } else { +- root = tmpdir; +- } ++ String root = findTargetProcessTmpDirectory(pid, ns_pid); + f = new File(root, fn); + f.createNewFile(); + } + return f; + } + ++ private String findTargetProcessTmpDirectory(int pid, int ns_pid) throws IOException { ++ String root; ++ if (pid != ns_pid) { ++ // A process may not exist in the same mount namespace as the caller. ++ // Instead, attach relative to the target root filesystem as exposed by ++ // procfs regardless of namespaces. ++ String procRootDirectory = "/proc/" + pid + "/root"; ++ if (!Files.isReadable(Path.of(procRootDirectory))) { ++ throw new IOException( ++ String.format("Unable to access root directory %s " + ++ "of target process %d", procRootDirectory, pid)); ++ } ++ ++ root = procRootDirectory + "/" + tmpdir; ++ } else { ++ root = tmpdir; ++ } ++ return root; ++ } ++ + /* + * Write/sends the given to the target VM. String is transmitted in + * UTF-8 encoding. diff --git a/cross/java-21-openjdk/patches/102-jdk-8318418.patch b/cross/java-21-openjdk/patches/102-jdk-8318418.patch new file mode 100644 index 00000000000..01ee40c1f71 --- /dev/null +++ b/cross/java-21-openjdk/patches/102-jdk-8318418.patch @@ -0,0 +1,49 @@ +https://sources.debian.org/src/openjdk-21/21.0.5+11-1/debian/patches/jdk-8318418.patch + +Description: 8318418: hsdis build fails with system binutils on Ubuntu + Ubuntu does not need libiberty.h include for the build. +Origin: upstream, https://github.com/openjdk/jdk/commit/3c70f2c1e9fb91cd5d7a66ef1e2a39672230208c +Author: Daniel Jeliński +Bug: https://bugs.openjdk.org/browse/JDK-8318418 +Last-Update: 2024-03-12 + +diff --git a/make/autoconf/lib-hsdis.m4 b/make/autoconf/lib-hsdis.m4 +index 470a0ae8358..974d0e8b793 100644 +--- a/make/autoconf/lib-hsdis.m4 ++++ b/make/autoconf/lib-hsdis.m4 +@@ -1,5 +1,5 @@ + # +-# Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + # + # This code is free software; you can redistribute it and/or modify it +@@ -236,7 +236,8 @@ AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS], + if test "x$BINUTILS_DIR" = xsystem; then + AC_CHECK_LIB(bfd, bfd_openr, [ HSDIS_LIBS="-lbfd" ], [ binutils_system_error="libbfd not found" ]) + AC_CHECK_LIB(opcodes, disassembler, [ HSDIS_LIBS="$HSDIS_LIBS -lopcodes" ], [ binutils_system_error="libopcodes not found" ]) +- AC_CHECK_LIB(iberty, xmalloc, [ HSDIS_LIBS="$HSDIS_LIBS -liberty" ], [ binutils_system_error="libiberty not found" ]) ++ # libiberty is not required on Ubuntu ++ AC_CHECK_LIB(iberty, xmalloc, [ HSDIS_LIBS="$HSDIS_LIBS -liberty" ]) + AC_CHECK_LIB(z, deflate, [ HSDIS_LIBS="$HSDIS_LIBS -lz" ], [ binutils_system_error="libz not found" ]) + HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB" + elif test "x$BINUTILS_DIR" != x; then +diff --git a/src/utils/hsdis/binutils/hsdis-binutils.c b/src/utils/hsdis/binutils/hsdis-binutils.c +index 279ed53ba5d..28e374e05fc 100644 +--- a/src/utils/hsdis/binutils/hsdis-binutils.c ++++ b/src/utils/hsdis/binutils/hsdis-binutils.c +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * The Universal Permissive License (UPL), Version 1.0 +@@ -57,7 +57,6 @@ + #include + #include + +-#include + #include + #include + diff --git a/cross/java-21-openjdk/patches/103-jdk-8329983.patch b/cross/java-21-openjdk/patches/103-jdk-8329983.patch new file mode 100644 index 00000000000..8063627e548 --- /dev/null +++ b/cross/java-21-openjdk/patches/103-jdk-8329983.patch @@ -0,0 +1,22 @@ +https://sources.debian.org/src/openjdk-21/21.0.5+11-1/debian/patches/jdk-8329983.patch + +Description: remove declaration of _Copy_conjoint_bytes + JDK-8142362 removed implementation of _Copy_conjoint_bytes + but left the symbol declaration in for armhf. + This causes link failure against libjvm.so. +Author: Vladimir Petko +Bug: https://bugs.openjdk.org/browse/JDK-8329983 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/collectd/+bug/2058966 +Last-Update: 2024-04-10 + +--- a/src/hotspot/os_cpu/linux_arm/linux_arm_32.S ++++ b/src/hotspot/os_cpu/linux_arm/linux_arm_32.S +@@ -28,8 +28,6 @@ + # point or use it in the same manner as does the server + # compiler. + +- .globl _Copy_conjoint_bytes +- .type _Copy_conjoint_bytes, %function + .globl _Copy_arrayof_conjoint_bytes + .type _Copy_arrayof_conjoint_bytes, %function + .globl _Copy_disjoint_words diff --git a/cross/java-21-openjdk/patches/104-jdk-8331541.patch b/cross/java-21-openjdk/patches/104-jdk-8331541.patch new file mode 100644 index 00000000000..04311147311 --- /dev/null +++ b/cross/java-21-openjdk/patches/104-jdk-8331541.patch @@ -0,0 +1,34 @@ +https://sources.debian.org/src/openjdk-21/21.0.5+11-1/debian/patches/jdk-8331541.patch + +Description: 8331541: [i386] linking with libjvm.so fails after JDK-8283326 + i386 declaration of _SafeFetch32_impl contains an underscore + that causes an undefined symbol in libjvm.so. + Disable -Wl,--allow-shlib-undefined link flag that allowed the + build to succeed. +Author: Vladimir Petko +Origin: https://github.com/openjdk/jdk/pull/19048 +Bug: https://bugs.openjdk.org/browse/JDK-8331541 +Applied-Upstream: commit:2d622152b07bba0aba8fd5b1e24293e28d6e69f5 +Last-Update: 2024-05-02 + +--- a/make/autoconf/flags-ldflags.m4 ++++ b/make/autoconf/flags-ldflags.m4 +@@ -133,7 +133,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER], + + # Setup LDFLAGS for linking executables + if test "x$TOOLCHAIN_TYPE" = xgcc; then +- EXECUTABLE_LDFLAGS="$EXECUTABLE_LDFLAGS -Wl,--allow-shlib-undefined" + # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous + # java heap. + if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then +--- a/src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S ++++ b/src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S +@@ -32,7 +32,7 @@ + # 8(%esp) : default value + # 4(%esp) : crash address + # 0(%esp) : return pc +- .type _SafeFetch32_impl,@function ++ .type SafeFetch32_impl,@function + SafeFetch32_impl: + movl 4(%esp),%ecx # load address from stack + _SafeFetch32_fault: diff --git a/cross/java-21-openjdk/patches/105-jdk-8334502-proposed.patch b/cross/java-21-openjdk/patches/105-jdk-8334502-proposed.patch new file mode 100644 index 00000000000..e26a1f4bbfe --- /dev/null +++ b/cross/java-21-openjdk/patches/105-jdk-8334502-proposed.patch @@ -0,0 +1,21 @@ +https://sources.debian.org/src/openjdk-21/21.0.5+11-1/debian/patches/jdk-8334502-proposed.patch + +Description: use int instead of time_t to print timezone info + printf() call uses %02d format specifier that requires an int parameter. +Author: Vladimir Petko +Bug: https://bugs.openjdk.org/browse/JDK-8334502 +Last-Update: 2024-06-19 + +--- a/src/hotspot/share/runtime/os.cpp ++++ b/src/hotspot/share/runtime/os.cpp +@@ -197,8 +197,8 @@ char* os::iso8601_time(jlong millisecond + abs_local_to_UTC = -(abs_local_to_UTC); + } + // Convert time zone offset seconds to hours and minutes. +- const time_t zone_hours = (abs_local_to_UTC / seconds_per_hour); +- const time_t zone_min = ++ const int zone_hours = (abs_local_to_UTC / seconds_per_hour); ++ const int zone_min = + ((abs_local_to_UTC % seconds_per_hour) / seconds_per_minute); + + // Print an ISO 8601 date and time stamp into the buffer diff --git a/cross/java-21-openjdk/patches/106-jdk-8334895-proposed.patch b/cross/java-21-openjdk/patches/106-jdk-8334895-proposed.patch new file mode 100644 index 00000000000..cf3c2884637 --- /dev/null +++ b/cross/java-21-openjdk/patches/106-jdk-8334895-proposed.patch @@ -0,0 +1,22 @@ +https://sources.debian.org/src/openjdk-21/21.0.5+11-1/debian/patches/jdk-8334895-proposed.patch + +Description: set default compatible cds alignment to auto for arm64 + ARM64 requires cds alignment option to be enabled if CDS is enabled. + Setting it to true will enable the option even if CDS is disabled + causing a configuration error. Setting option to auto allows one to + enable it only when CDS is enabled. +Author: Vladimir Petko +Bug: https://bugs.openjdk.org/browse/JDK-8334895 +Last-Update: 2024-06-25 + +--- a/make/autoconf/jdk-options.m4 ++++ b/make/autoconf/jdk-options.m4 +@@ -197,7 +197,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS] + # three different page sizes: 4K, 64K, and if run on Mac m1 hardware, 16K. + COMPATIBLE_CDS_ALIGNMENT_DEFAULT=false + if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then +- COMPATIBLE_CDS_ALIGNMENT_DEFAULT=true ++ COMPATIBLE_CDS_ALIGNMENT_DEFAULT=auto + fi + AC_SUBST(COMPATIBLE_CDS_ALIGNMENT_DEFAULT) + diff --git a/cross/java-21-openjdk/patches/107-jdk-8336529-proposed.patch b/cross/java-21-openjdk/patches/107-jdk-8336529-proposed.patch new file mode 100644 index 00000000000..aa9118942fc --- /dev/null +++ b/cross/java-21-openjdk/patches/107-jdk-8336529-proposed.patch @@ -0,0 +1,57 @@ +https://sources.debian.org/src/openjdk-21/21.0.5+11-1/debian/patches/jdk-8336529-proposed.patch + +Description: (fs) UnixFileAttributeViews setTimes() failing on armhf, Ubuntu noble + time_t transition in Debian/Ubuntu left 32 bit time_t symbols in glibc. + Looking up 'futimens' via dlsym returns 32 bit version of the function. + This is causing failure to set last modified time + (e.g. instead of year 2017 we get 1976 in the test). + Using the function directly correctly calls 64 bit versions. + When we lookup functions with time_t arguments through dlsym() + calls we should use 64 bit versions. +Author: Vladimir Petko +Origin: upstream, https://github.com/openjdk/jdk/pull/20208 +Bug: https://bugs.openjdk.org/browse/JDK-8336529 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openjdk-23/+bug/2073335 +Last-Update: 2024-07-17 +--- + +--- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c ++++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +@@ -281,6 +281,20 @@ static int fstatat64_wrapper(int dfd, co + } + #endif + ++/** ++ * Lookup time functions symbols, trying 64 bit version first ++ */ ++static void* lookup_time_function(const char* symbol64, const char* symbol) { ++ void* ret = NULL; ++ if (sizeof(time_t) > 4) { ++ ret = dlsym(RTLD_DEFAULT, symbol64); ++ } ++ if (ret == NULL) { ++ ret = dlsym(RTLD_DEFAULT, symbol); ++ } ++ return ret; ++} ++ + #if defined(__linux__) + static int statx_wrapper(int dirfd, const char *restrict pathname, int flags, + unsigned int mask, struct my_statx *restrict statxbuf) { +@@ -385,10 +399,13 @@ Java_sun_nio_fs_UnixNativeDispatcher_ini + my_unlinkat_func = (unlinkat_func*) dlsym(RTLD_DEFAULT, "unlinkat"); + my_renameat_func = (renameat_func*) dlsym(RTLD_DEFAULT, "renameat"); + #ifndef _ALLBSD_SOURCE +- my_futimesat_func = (futimesat_func*) dlsym(RTLD_DEFAULT, "futimesat"); +- my_lutimes_func = (lutimes_func*) dlsym(RTLD_DEFAULT, "lutimes"); ++ my_futimesat_func = (futimesat_func*) lookup_time_function("__futimesat64", ++ "futimesat"); ++ my_lutimes_func = (lutimes_func*) lookup_time_function("__lutimes64", ++ "lutimes"); + #endif +- my_futimens_func = (futimens_func*) dlsym(RTLD_DEFAULT, "futimens"); ++ my_futimens_func = (futimens_func*) lookup_time_function("__futimens64", ++ "futimens"); + #if defined(_AIX) + my_fdopendir_func = (fdopendir_func*) dlsym(RTLD_DEFAULT, "fdopendir64"); + #else diff --git a/cross/java-21-openjdk/patches/108-jdk-8312488.patch b/cross/java-21-openjdk/patches/108-jdk-8312488.patch new file mode 100644 index 00000000000..270f9ad83c0 --- /dev/null +++ b/cross/java-21-openjdk/patches/108-jdk-8312488.patch @@ -0,0 +1,58 @@ +https://sources.debian.org/src/openjdk-21/21.0.5+11-1/debian/patches/jdk-8312488.patch + +Description: tools/jpackage/share/AppLauncherEnvTest.java fails with dynamically linked libstdc++ + The generated image contains libjpackageapplauncheraux.so that + contains a destructor function dcon(). It calls already disposed + logger, causing a crash. +Author: Vladimir Petko +Origin: upstream, https://github.com/openjdk/jdk/commit/78a8a99d990dcc0b77c096bb2ca2c1bb86462e3f +Bug: https://bugs.openjdk.org/browse/JDK-8312488 +Reviewed-By: asemenyuk, almatvee +Last-Update: 2024-07-18 +--- + +--- a/src/jdk.jpackage/share/native/common/app.cpp ++++ b/src/jdk.jpackage/share/native/common/app.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -35,7 +35,7 @@ + namespace { + const std::string* theLastErrorMsg = 0; + +-NopLogAppender nopLogAppender; ++char nopLogAppenderMemory[sizeof(NopLogAppender)] = {}; + + class StandardLogAppender : public LogAppender { + public: +@@ -46,7 +46,9 @@ + << ": " << v.message + << std::endl; + } +-} standardLogAppender; ++}; ++ ++char standardLogAppenderMemory[sizeof(StandardLogAppender)] = {}; + + class LastErrorLogAppender : public LogAppender { + public: +@@ -114,10 +116,13 @@ + + int launch(const std::nothrow_t&, + LauncherFunc func, LogAppender* lastErrorLogAppender) { ++ // The log appender is set for the lifetime of the application. ++ // Use in-place new to avoid accessing destroyed instance ++ // when the shared object destructor logs something. + if (isWithLogging()) { +- Logger::defaultLogger().setAppender(standardLogAppender); ++ Logger::defaultLogger().setAppender(*new (standardLogAppenderMemory) StandardLogAppender()); + } else { +- Logger::defaultLogger().setAppender(nopLogAppender); ++ Logger::defaultLogger().setAppender(*new (nopLogAppenderMemory) NopLogAppender()); + } + + LOG_TRACE_FUNCTION(); diff --git a/cross/libICE/Makefile b/cross/libICE/Makefile index 42944913307..92377005537 100644 --- a/cross/libICE/Makefile +++ b/cross/libICE/Makefile @@ -1,6 +1,6 @@ PKG_NAME = libICE -PKG_VERS = 1.0.10 -PKG_EXT = tar.bz2 +PKG_VERS = 1.1.2 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/lib PKG_DIR = $(PKG_NAME)-$(PKG_VERS) @@ -8,18 +8,13 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/xorg-x11-util-macros cross/xorgproto cross/xtrans HOMEPAGE = https://www.x.org -COMMENT = X.Org X11 ICE runtime library +COMMENT = X.Org X11 ICE runtime library. LICENSE = GPLv2/GPLv3 -PRE_CONFIGURE_TARGET = $(PKG_NAME)_pre_configure GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib CONFIGURE_ARGS += --without-fop CONFIGURE_ARGS += --without-xmlto -PRE_CONFIGURE_TARGET = libICE_pre_configure +CONFIGURE_ARGS += --disable-static include ../../mk/spksrc.cross-cc.mk - -.PHONY: $(PKG_NAME)_pre_configure -$(PKG_NAME)_pre_configure: - $(RUN) autoreconf -i -f -v -I $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/aclocal diff --git a/cross/libICE/PLIST b/cross/libICE/PLIST index 930b13c80ca..ed7b9fd93a4 100644 --- a/cross/libICE/PLIST +++ b/cross/libICE/PLIST @@ -1,10 +1,3 @@ -rsc:include/X11/ICE/ICEconn.h -rsc:include/X11/ICE/ICE.h -rsc:include/X11/ICE/ICElib.h -rsc:include/X11/ICE/ICEmsg.h -rsc:include/X11/ICE/ICEproto.h -rsc:include/X11/ICE/ICEutil.h lnk:lib/libICE.so lnk:lib/libICE.so.6 lib:lib/libICE.so.6.3.0 -rsc:lib/pkgconfig/ice.pc diff --git a/cross/libICE/digests b/cross/libICE/digests index 87ac4b8bd21..03f7e41b0fa 100644 --- a/cross/libICE/digests +++ b/cross/libICE/digests @@ -1,3 +1,3 @@ -libICE-1.0.10.tar.bz2 SHA1 5b5eb125d4f43a3ab8153b0f850963ee6c982c24 -libICE-1.0.10.tar.bz2 SHA256 6f86dce12cf4bcaf5c37dddd8b1b64ed2ddf1ef7b218f22b9942595fb747c348 -libICE-1.0.10.tar.bz2 MD5 76d77499ee7120a56566891ca2c0dbcf +libICE-1.1.2.tar.xz SHA1 99687d0adca149a06b021f16df1c5eb0f1f90c21 +libICE-1.1.2.tar.xz SHA256 974e4ed414225eb3c716985df9709f4da8d22a67a2890066bc6dfc89ad298625 +libICE-1.1.2.tar.xz MD5 d1ffde0a07709654b20bada3f9abdd16 diff --git a/cross/libSM/Makefile b/cross/libSM/Makefile index a94c3f52d6c..9e2bf6c5e73 100644 --- a/cross/libSM/Makefile +++ b/cross/libSM/Makefile @@ -1,6 +1,6 @@ PKG_NAME = libSM -PKG_VERS = 1.2.3 -PKG_EXT = tar.bz2 +PKG_VERS = 1.2.4 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/lib PKG_DIR = $(PKG_NAME)-$(PKG_VERS) @@ -8,20 +8,14 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/xorg-x11-util-macros cross/xorgproto cross/xtrans cross/libICE cross/libuuid HOMEPAGE = https://www.x.org -COMMENT = X.Org X11 SM runtime library +COMMENT = X.Org X11 SM runtime library. LICENSE = GPLv2/GPLv3 -PRE_CONFIGURE_TARGET = $(PKG_NAME)_pre_configure GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib CONFIGURE_ARGS += --with-libuuid CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --without-xmlto CONFIGURE_ARGS += --without-fop include ../../mk/spksrc.cross-cc.mk - -.PHONY: $(PKG_NAME)_pre_configure -$(PKG_NAME)_pre_configure: - $(RUN) autoreconf -i -f -v -I $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/aclocal - diff --git a/cross/libSM/PLIST b/cross/libSM/PLIST index 08fc5a7601d..dc63afc56b0 100644 --- a/cross/libSM/PLIST +++ b/cross/libSM/PLIST @@ -1,7 +1,3 @@ -rsc:include/X11/SM/SM.h -rsc:include/X11/SM/SMlib.h -rsc:include/X11/SM/SMproto.h lnk:lib/libSM.so lnk:lib/libSM.so.6 lib:lib/libSM.so.6.0.1 -rsc:lib/pkgconfig/sm.pc diff --git a/cross/libSM/digests b/cross/libSM/digests index 53c71d38a19..0398aea3cca 100644 --- a/cross/libSM/digests +++ b/cross/libSM/digests @@ -1,3 +1,3 @@ -libSM-1.2.3.tar.bz2 SHA1 437d7b13fa2eba325df3a106f177df46ccec6546 -libSM-1.2.3.tar.bz2 SHA256 2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb -libSM-1.2.3.tar.bz2 MD5 87c7fad1c1813517979184c8ccd76628 +libSM-1.2.4.tar.xz SHA1 656d799e99eafb48899a392763ce9e8118de87b7 +libSM-1.2.4.tar.xz SHA256 fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84 +libSM-1.2.4.tar.xz MD5 ffa434ed96ccae45533b3d653300730e diff --git a/cross/libX11/Makefile b/cross/libX11/Makefile index 3fc0c26c9a2..370a9fbd995 100644 --- a/cross/libX11/Makefile +++ b/cross/libX11/Makefile @@ -1,30 +1,23 @@ PKG_NAME = libX11 -PKG_VERS = 1.7.2 -PKG_EXT = tar.bz2 +PKG_VERS = 1.8.10 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://xorg.freedesktop.org/archive/individual/lib PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = cross/xorgproto cross/xcb-proto cross/libxcb cross/xtrans cross/xorg-sgml-doctools cross/libICE cross/libSM +DEPENDS = cross/xorgproto cross/libxcb cross/xtrans cross/xorg-sgml-doctools cross/libICE cross/libSM HOMEPAGE = https://www.x.org -COMMENT = Development files for libX11 +COMMENT = Development files for libX11. LICENSE = GPLv2/GPLv3 -PRE_CONFIGURE_TARGET = $(PKG_NAME)_pre_configure GNU_CONFIGURE = 1 CONFIGURE_ARGS = --enable-malloc0returnsnull CONFIGURE_ARGS += --disable-silent-rules CONFIGURE_ARGS += --without-xmlto CONFIGURE_ARGS += --without-fop CONFIGURE_ARGS += --disable-static -PATCHES_LEVEL = 1 ADDITIONAL_CFLAGS = -Os include ../../mk/spksrc.cross-cc.mk - -.PHONY: $(PKG_NAME)_pre_configure -$(PKG_NAME)_pre_configure: - $(RUN) autoreconf -i -f -v -I $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/aclocal - diff --git a/cross/libX11/PLIST b/cross/libX11/PLIST index 991af797fa4..66ddb474692 100644 --- a/cross/libX11/PLIST +++ b/cross/libX11/PLIST @@ -1,36 +1,24 @@ -rsc:include/X11/cursorfont.h -rsc:include/X11/ImUtil.h -rsc:include/X11/Xcms.h -rsc:include/X11/XKBlib.h -rsc:include/X11/XlibConf.h -rsc:include/X11/Xlib.h -rsc:include/X11/Xlibint.h -rsc:include/X11/Xlib-xcb.h -rsc:include/X11/Xlocale.h -rsc:include/X11/Xregion.h -rsc:include/X11/Xresource.h -rsc:include/X11/Xutil.h -lnk:lib/libX11.so -lnk:lib/libX11.so.6 -lib:lib/libX11.so.6.4.0 lnk:lib/libX11-xcb.so lnk:lib/libX11-xcb.so.1 lib:lib/libX11-xcb.so.1.0.0 -rsc:lib/pkgconfig/x11.pc -rsc:lib/pkgconfig/x11-xcb.pc +lnk:lib/libX11.so +lnk:lib/libX11.so.6 +lib:lib/libX11.so.6.4.0 +rsc:share/X11/XErrorDB +rsc:share/X11/Xcms.txt +rsc:share/X11/locale/C/Compose +rsc:share/X11/locale/C/XI18N_OBJS +rsc:share/X11/locale/C/XLC_LOCALE rsc:share/X11/locale/am_ET.UTF-8/Compose rsc:share/X11/locale/am_ET.UTF-8/XI18N_OBJS rsc:share/X11/locale/am_ET.UTF-8/XLC_LOCALE rsc:share/X11/locale/armscii-8/Compose rsc:share/X11/locale/armscii-8/XI18N_OBJS rsc:share/X11/locale/armscii-8/XLC_LOCALE -rsc:share/X11/locale/C/Compose rsc:share/X11/locale/compose.dir rsc:share/X11/locale/cs_CZ.UTF-8/Compose rsc:share/X11/locale/cs_CZ.UTF-8/XI18N_OBJS rsc:share/X11/locale/cs_CZ.UTF-8/XLC_LOCALE -rsc:share/X11/locale/C/XI18N_OBJS -rsc:share/X11/locale/C/XLC_LOCALE rsc:share/X11/locale/el_GR.UTF-8/Compose rsc:share/X11/locale/el_GR.UTF-8/XI18N_OBJS rsc:share/X11/locale/el_GR.UTF-8/XLC_LOCALE @@ -55,6 +43,9 @@ rsc:share/X11/locale/iscii-dev/XLC_LOCALE rsc:share/X11/locale/isiri-3342/Compose rsc:share/X11/locale/isiri-3342/XI18N_OBJS rsc:share/X11/locale/isiri-3342/XLC_LOCALE +rsc:share/X11/locale/iso8859-1/Compose +rsc:share/X11/locale/iso8859-1/XI18N_OBJS +rsc:share/X11/locale/iso8859-1/XLC_LOCALE rsc:share/X11/locale/iso8859-10/Compose rsc:share/X11/locale/iso8859-10/XI18N_OBJS rsc:share/X11/locale/iso8859-10/XLC_LOCALE @@ -70,9 +61,6 @@ rsc:share/X11/locale/iso8859-14/XLC_LOCALE rsc:share/X11/locale/iso8859-15/Compose rsc:share/X11/locale/iso8859-15/XI18N_OBJS rsc:share/X11/locale/iso8859-15/XLC_LOCALE -rsc:share/X11/locale/iso8859-1/Compose -rsc:share/X11/locale/iso8859-1/XI18N_OBJS -rsc:share/X11/locale/iso8859-1/XLC_LOCALE rsc:share/X11/locale/iso8859-2/Compose rsc:share/X11/locale/iso8859-2/XI18N_OBJS rsc:share/X11/locale/iso8859-2/XLC_LOCALE @@ -95,27 +83,32 @@ rsc:share/X11/locale/iso8859-8/Compose rsc:share/X11/locale/iso8859-8/XI18N_OBJS rsc:share/X11/locale/iso8859-8/XLC_LOCALE rsc:share/X11/locale/iso8859-9/Compose +rsc:share/X11/locale/iso8859-9/XI18N_OBJS +rsc:share/X11/locale/iso8859-9/XLC_LOCALE rsc:share/X11/locale/iso8859-9e/Compose rsc:share/X11/locale/iso8859-9e/XI18N_OBJS rsc:share/X11/locale/iso8859-9e/XLC_LOCALE -rsc:share/X11/locale/iso8859-9/XI18N_OBJS -rsc:share/X11/locale/iso8859-9/XLC_LOCALE -rsc:share/X11/locale/ja/Compose rsc:share/X11/locale/ja.JIS/Compose rsc:share/X11/locale/ja.JIS/XI18N_OBJS rsc:share/X11/locale/ja.JIS/XLC_LOCALE -rsc:share/X11/locale/ja_JP.UTF-8/Compose -rsc:share/X11/locale/ja_JP.UTF-8/XI18N_OBJS -rsc:share/X11/locale/ja_JP.UTF-8/XLC_LOCALE rsc:share/X11/locale/ja.SJIS/Compose rsc:share/X11/locale/ja.SJIS/XI18N_OBJS rsc:share/X11/locale/ja.SJIS/XLC_LOCALE +rsc:share/X11/locale/ja/Compose rsc:share/X11/locale/ja/XI18N_OBJS rsc:share/X11/locale/ja/XLC_LOCALE +rsc:share/X11/locale/ja_JP.UTF-8/Compose +rsc:share/X11/locale/ja_JP.UTF-8/XI18N_OBJS +rsc:share/X11/locale/ja_JP.UTF-8/XLC_LOCALE rsc:share/X11/locale/km_KH.UTF-8/Compose rsc:share/X11/locale/km_KH.UTF-8/XI18N_OBJS rsc:share/X11/locale/km_KH.UTF-8/XLC_LOCALE rsc:share/X11/locale/ko/Compose +rsc:share/X11/locale/ko/XI18N_OBJS +rsc:share/X11/locale/ko/XLC_LOCALE +rsc:share/X11/locale/ko_KR.UTF-8/Compose +rsc:share/X11/locale/ko_KR.UTF-8/XI18N_OBJS +rsc:share/X11/locale/ko_KR.UTF-8/XLC_LOCALE rsc:share/X11/locale/koi8-c/Compose rsc:share/X11/locale/koi8-c/XI18N_OBJS rsc:share/X11/locale/koi8-c/XLC_LOCALE @@ -125,11 +118,6 @@ rsc:share/X11/locale/koi8-r/XLC_LOCALE rsc:share/X11/locale/koi8-u/Compose rsc:share/X11/locale/koi8-u/XI18N_OBJS rsc:share/X11/locale/koi8-u/XLC_LOCALE -rsc:share/X11/locale/ko_KR.UTF-8/Compose -rsc:share/X11/locale/ko_KR.UTF-8/XI18N_OBJS -rsc:share/X11/locale/ko_KR.UTF-8/XLC_LOCALE -rsc:share/X11/locale/ko/XI18N_OBJS -rsc:share/X11/locale/ko/XLC_LOCALE rsc:share/X11/locale/locale.alias rsc:share/X11/locale/locale.dir rsc:share/X11/locale/microsoft-cp1251/Compose @@ -162,10 +150,10 @@ rsc:share/X11/locale/sr_RS.UTF-8/XLC_LOCALE rsc:share/X11/locale/tatar-cyr/Compose rsc:share/X11/locale/tatar-cyr/XI18N_OBJS rsc:share/X11/locale/tatar-cyr/XLC_LOCALE -rsc:share/X11/locale/th_TH/Compose rsc:share/X11/locale/th_TH.UTF-8/Compose rsc:share/X11/locale/th_TH.UTF-8/XI18N_OBJS rsc:share/X11/locale/th_TH.UTF-8/XLC_LOCALE +rsc:share/X11/locale/th_TH/Compose rsc:share/X11/locale/th_TH/XI18N_OBJS rsc:share/X11/locale/th_TH/XLC_LOCALE rsc:share/X11/locale/tscii-0/Compose @@ -177,35 +165,33 @@ rsc:share/X11/locale/vi_VN.tcvn/XLC_LOCALE rsc:share/X11/locale/vi_VN.viscii/Compose rsc:share/X11/locale/vi_VN.viscii/XI18N_OBJS rsc:share/X11/locale/vi_VN.viscii/XLC_LOCALE -rsc:share/X11/locale/zh_CN/Compose +rsc:share/X11/locale/zh_CN.UTF-8/Compose +rsc:share/X11/locale/zh_CN.UTF-8/XI18N_OBJS +rsc:share/X11/locale/zh_CN.UTF-8/XLC_LOCALE rsc:share/X11/locale/zh_CN.gb18030/Compose rsc:share/X11/locale/zh_CN.gb18030/XI18N_OBJS rsc:share/X11/locale/zh_CN.gb18030/XLC_LOCALE rsc:share/X11/locale/zh_CN.gbk/Compose rsc:share/X11/locale/zh_CN.gbk/XI18N_OBJS rsc:share/X11/locale/zh_CN.gbk/XLC_LOCALE -rsc:share/X11/locale/zh_CN.UTF-8/Compose -rsc:share/X11/locale/zh_CN.UTF-8/XI18N_OBJS -rsc:share/X11/locale/zh_CN.UTF-8/XLC_LOCALE +rsc:share/X11/locale/zh_CN/Compose rsc:share/X11/locale/zh_CN/XI18N_OBJS rsc:share/X11/locale/zh_CN/XLC_LOCALE +rsc:share/X11/locale/zh_HK.UTF-8/Compose +rsc:share/X11/locale/zh_HK.UTF-8/XI18N_OBJS +rsc:share/X11/locale/zh_HK.UTF-8/XLC_LOCALE rsc:share/X11/locale/zh_HK.big5/Compose +rsc:share/X11/locale/zh_HK.big5/XI18N_OBJS +rsc:share/X11/locale/zh_HK.big5/XLC_LOCALE rsc:share/X11/locale/zh_HK.big5hkscs/Compose rsc:share/X11/locale/zh_HK.big5hkscs/XI18N_OBJS rsc:share/X11/locale/zh_HK.big5hkscs/XLC_LOCALE -rsc:share/X11/locale/zh_HK.big5/XI18N_OBJS -rsc:share/X11/locale/zh_HK.big5/XLC_LOCALE -rsc:share/X11/locale/zh_HK.UTF-8/Compose -rsc:share/X11/locale/zh_HK.UTF-8/XI18N_OBJS -rsc:share/X11/locale/zh_HK.UTF-8/XLC_LOCALE +rsc:share/X11/locale/zh_TW.UTF-8/Compose +rsc:share/X11/locale/zh_TW.UTF-8/XI18N_OBJS +rsc:share/X11/locale/zh_TW.UTF-8/XLC_LOCALE rsc:share/X11/locale/zh_TW.big5/Compose rsc:share/X11/locale/zh_TW.big5/XI18N_OBJS rsc:share/X11/locale/zh_TW.big5/XLC_LOCALE rsc:share/X11/locale/zh_TW/Compose -rsc:share/X11/locale/zh_TW.UTF-8/Compose -rsc:share/X11/locale/zh_TW.UTF-8/XI18N_OBJS -rsc:share/X11/locale/zh_TW.UTF-8/XLC_LOCALE rsc:share/X11/locale/zh_TW/XI18N_OBJS rsc:share/X11/locale/zh_TW/XLC_LOCALE -rsc:share/X11/Xcms.txt -rsc:share/X11/XErrorDB diff --git a/cross/libX11/digests b/cross/libX11/digests index ec23feefd64..287fc3f6765 100644 --- a/cross/libX11/digests +++ b/cross/libX11/digests @@ -1,3 +1,3 @@ -libX11-1.7.2.tar.bz2 SHA1 ff503c816f1e812070ac0e1841bc3634c3b370b6 -libX11-1.7.2.tar.bz2 SHA256 1cfa35e37aaabbe4792e9bb690468efefbfbf6b147d9c69d6f90d13c3092ea6c -libX11-1.7.2.tar.bz2 MD5 a9a24be62503d5e34df6b28204956a7b +libX11-1.8.10.tar.xz SHA1 eb8261d11dd0113ee1699c51bad44da27689350a +libX11-1.8.10.tar.xz SHA256 2b3b3dad9347db41dca56beb7db5878f283bde1142f04d9f8e478af435dfdc53 +libX11-1.8.10.tar.xz MD5 5b8fa54e0ef94136b56f887a5e6cf6c9 diff --git a/cross/libX11/patches/001.dont-forward-keycode-0.patch b/cross/libX11/patches/001.dont-forward-keycode-0.patch deleted file mode 100644 index c16d8749912..00000000000 --- a/cross/libX11/patches/001.dont-forward-keycode-0.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -up libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx libX11-1.6.3/modules/im/ximcp/imDefFlt.c ---- libX11-1.6.3/modules/im/ximcp/imDefFlt.c.jx 2015-03-09 18:28:45.000000000 -0400 -+++ libX11-1.6.3/modules/im/ximcp/imDefFlt.c 2015-03-10 12:32:31.912149644 -0400 -@@ -142,7 +142,7 @@ _XimProtoKeypressFilter( - { - Xim im = (Xim)ic->core.im; - -- if (IS_FABRICATED(im)) { -+ if ((ev->keycode == 0) || IS_FABRICATED(im)) { - _XimPendingFilter(ic); - UNMARK_FABRICATED(im); - return NOTFILTERD; -diff -up libX11-1.6.3/modules/im/ximcp/imDefLkup.c.jx libX11-1.6.3/modules/im/ximcp/imDefLkup.c ---- libX11-1.6.3/modules/im/ximcp/imDefLkup.c.jx 2015-03-09 18:28:45.000000000 -0400 -+++ libX11-1.6.3/modules/im/ximcp/imDefLkup.c 2015-03-10 12:32:31.911149637 -0400 -@@ -332,6 +332,17 @@ _XimForwardEvent( - XEvent *ev, - Bool sync) - { -+ /* -+ * Don't forward a key event which has keycode=0. -+ * keycode=0 is reserved for special purpose to let Xmb/wcLookupString() -+ * functions know that there is a commited string available from IM. -+ */ -+ if (((ev->type == KeyPress) || (ev->type == KeyRelease))) { -+ if (((XKeyEvent *)ev)->keycode == 0) { -+ return True; -+ } -+ } -+ - #ifdef EXT_FORWARD - if (((ev->type == KeyPress) || (ev->type == KeyRelease))) - if (_XimExtForwardKeyEvent(ic, (XKeyEvent *)ev, sync)) -@@ -604,6 +615,19 @@ _XimUnregCommitInfo( - Xfree(info->keysym); - ic->private.proto.commit_info = info->next; - Xfree(info); -+ -+ /* -+ * "Commit" uses fabricated flag to process a commited string -+ * from IM engine. -+ * Turn off the fabricated flag here (unregister the commited -+ * information function). Otherwise, next regular key press -+ * event will be ignored at _XimProtoKeypressFilter() and it -+ * will not be passed to IM engine. -+ */ -+ if (IS_FABRICATED(ic)) { -+ UNMARK_FABRICATED(ic); -+ } -+ - return; - } - diff --git a/cross/libX11/patches/002.0001-makekeys-handle-the-new-_EVDEVK-xorgproto-symbols.patch b/cross/libX11/patches/002.0001-makekeys-handle-the-new-_EVDEVK-xorgproto-symbols.patch deleted file mode 100644 index 55adaaecb97..00000000000 --- a/cross/libX11/patches/002.0001-makekeys-handle-the-new-_EVDEVK-xorgproto-symbols.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 27 Jul 2021 11:46:19 +1000 -Subject: [PATCH libX11] makekeys: handle the new _EVDEVK xorgproto symbols - -These keys are all defined through a macro in the form: - #define XF86XK_BrightnessAuto _EVDEVK(0x0F4) - -The _EVDEVK macro is simply an offset of 0x10081000. -Let's parse these lines correctly so those keysyms end up in our -hashtables. - -Signed-off-by: Peter Hutterer ---- - src/util/makekeys.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/util/makekeys.c b/src/util/makekeys.c -index e847ef4c..4896cc53 100644 ---- a/src/util/makekeys.c -+++ b/src/util/makekeys.c -@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix) - return 1; - } - -+ /* See if we can parse one of the _EVDEVK symbols */ -+ i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val); -+ if (i == 2 && (tmp = strstr(key, "XK_"))) { -+ memcpy(prefix, key, (size_t)(tmp - key)); -+ prefix[tmp - key] = '\0'; -+ tmp += 3; -+ memmove(key, tmp, strlen(tmp) + 1); -+ -+ *val += 0x10081000; -+ return 1; -+ } -+ - /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them - * immediately: if the target is in the form XF86XK_foo, we need to - * canonicalise this to XF86foo before we do the lookup. */ --- -2.31.1 - diff --git a/cross/libX11/patches/ppc853x/001.remove_pragma_GCC_diagnostic.patch b/cross/libX11/patches/ppc853x/001.remove_pragma_GCC_diagnostic.patch index a976e09d1cb..d10f6e5b559 100644 --- a/cross/libX11/patches/ppc853x/001.remove_pragma_GCC_diagnostic.patch +++ b/cross/libX11/patches/ppc853x/001.remove_pragma_GCC_diagnostic.patch @@ -1,9 +1,9 @@ # remove #pragma GCC diagnostic # for outdated gcc compiler of ppc arch toolchain # ---- libX11-1.6.3/src/xkb/XKBBind.orig.c 2021-06-06 18:48:53.000000000 +0200 -+++ libX11-1.6.3/src/xkb/XKBBind.c 2021-08-20 23:31:52.117734400 +0200 -@@ -226,15 +226,10 @@ +--- src/xkb/XKBBind.c.orig 2024-07-28 17:53:09.000000000 +0000 ++++ src/xkb/XKBBind.c 2025-01-15 21:12:35.024973949 +0000 +@@ -205,9 +205,6 @@ #ifdef __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" @@ -11,11 +11,14 @@ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif - return XKeycodeToKeysym(dpy, event->keycode, col); + + KeySym +@@ -224,8 +221,6 @@ + #ifdef __clang__ #pragma clang diagnostic pop -#elif defined(__GNUC__) -#pragma GCC diagnostic pop #endif - } + /* diff --git a/cross/libXau/Makefile b/cross/libXau/Makefile index e8da53800c6..71322de469f 100644 --- a/cross/libXau/Makefile +++ b/cross/libXau/Makefile @@ -1,6 +1,6 @@ PKG_NAME = libXau -PKG_VERS = 1.0.9 -PKG_EXT = tar.bz2 +PKG_VERS = 1.0.12 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/lib PKG_DIR = $(PKG_NAME)-$(PKG_VERS) @@ -8,19 +8,13 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/xorg-x11-util-macros cross/xorgproto HOMEPAGE = https://www.x.org -COMMENT = Sample Authorization Protocol for X +COMMENT = Sample Authorization Protocol for X. LICENSE = GPLv2/GPLv3 -PRE_CONFIGURE_TARGET = $(PKG_NAME)_pre_configure GNU_CONFIGURE = 1 CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib CONFIGURE_ARGS += --disable-static ADDITIONAL_CFLAGS = -Os - include ../../mk/spksrc.cross-cc.mk - -.PHONY: $(PKG_NAME)_pre_configure -$(PKG_NAME)_pre_configure: - $(RUN) autoreconf -i -f -v -I $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/aclocal diff --git a/cross/libXau/PLIST b/cross/libXau/PLIST index 61a54cd53f1..ad124314e20 100644 --- a/cross/libXau/PLIST +++ b/cross/libXau/PLIST @@ -1,5 +1,3 @@ -rsc:include/X11/Xauth.h lnk:lib/libXau.so lnk:lib/libXau.so.6 lib:lib/libXau.so.6.0.0 -rsc:lib/pkgconfig/xau.pc diff --git a/cross/libXau/digests b/cross/libXau/digests index 09a23a9ab5e..5aef1b4b653 100644 --- a/cross/libXau/digests +++ b/cross/libXau/digests @@ -1,3 +1,3 @@ -libXau-1.0.9.tar.bz2 SHA1 ef9b1ad00f958c8b6e30a1bbc11fdfac311c9733 -libXau-1.0.9.tar.bz2 SHA256 ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec -libXau-1.0.9.tar.bz2 MD5 c5f16288f2da9f071b29111d68797480 +libXau-1.0.12.tar.xz SHA1 5ab09f1f7cfc1962ab9b83b78faad2236989dcad +libXau-1.0.12.tar.xz SHA256 74d0e4dfa3d39ad8939e99bda37f5967aba528211076828464d2777d477fc0fb +libXau-1.0.12.tar.xz MD5 4c9f81acf00b62e5de56a912691bd737 diff --git a/cross/libXext/Makefile b/cross/libXext/Makefile index a873ead3394..c222dcd0e29 100644 --- a/cross/libXext/Makefile +++ b/cross/libXext/Makefile @@ -1,6 +1,6 @@ PKG_NAME = libXext -PKG_VERS = 1.3.4 -PKG_EXT = tar.bz2 +PKG_VERS = 1.3.6 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/lib PKG_DIR = $(PKG_NAME)-$(PKG_VERS) @@ -8,20 +8,14 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/xorg-x11-util-macros cross/libX11 cross/xorgproto cross/libXau HOMEPAGE = https://www.x.org -COMMENT = X.Org X11 libXext runtime library +COMMENT = X.Org X11 libXext runtime library. LICENSE = GPLv2/GPLv3 -PRE_CONFIGURE_TARGET = $(PKG_NAME)_pre_configure GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib CONFIGURE_ARGS += --enable-malloc0returnsnull CONFIGURE_ARGS += --without-xmlto CONFIGURE_ARGS += --without-fop CONFIGURE_ARGS += --disable-static include ../../mk/spksrc.cross-cc.mk - -.PHONY: $(PKG_NAME)_pre_configure -$(PKG_NAME)_pre_configure: - $(RUN) autoreconf -i -f -v -I $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/aclocal - diff --git a/cross/libXext/PLIST b/cross/libXext/PLIST index a86347fcdd4..c7cbb922e87 100644 --- a/cross/libXext/PLIST +++ b/cross/libXext/PLIST @@ -1,20 +1,3 @@ -rsc:include/X11/extensions/dpms.h -rsc:include/X11/extensions/extutil.h -rsc:include/X11/extensions/MITMisc.h -rsc:include/X11/extensions/multibuf.h -rsc:include/X11/extensions/security.h -rsc:include/X11/extensions/shape.h -rsc:include/X11/extensions/sync.h -rsc:include/X11/extensions/Xag.h -rsc:include/X11/extensions/Xcup.h -rsc:include/X11/extensions/Xdbe.h -rsc:include/X11/extensions/XEVI.h -rsc:include/X11/extensions/Xext.h -rsc:include/X11/extensions/Xge.h -rsc:include/X11/extensions/XLbx.h -rsc:include/X11/extensions/XShm.h -rsc:include/X11/extensions/xtestext1.h lnk:lib/libXext.so lnk:lib/libXext.so.6 lib:lib/libXext.so.6.4.0 -rsc:lib/pkgconfig/xext.pc diff --git a/cross/libXext/digests b/cross/libXext/digests index 0ba34df3468..11764a9acc1 100644 --- a/cross/libXext/digests +++ b/cross/libXext/digests @@ -1,3 +1,3 @@ -libXext-1.3.4.tar.bz2 SHA1 14e2451162e8766173b5b14c73e94a22b1fcab55 -libXext-1.3.4.tar.bz2 SHA256 59ad6fcce98deaecc14d39a672cf218ca37aba617c9a0f691cac3bcd28edf82b -libXext-1.3.4.tar.bz2 MD5 f5b48bb76ba327cd2a8dc7a383532a95 +libXext-1.3.6.tar.xz SHA1 ff55954630974681a08c6d5f75bcbaadc1e508bd +libXext-1.3.6.tar.xz SHA256 edb59fa23994e405fdc5b400afdf5820ae6160b94f35e3dc3da4457a16e89753 +libXext-1.3.6.tar.xz MD5 e59476db179e48c1fb4487c12d0105d1 diff --git a/cross/libXfixes/Makefile b/cross/libXfixes/Makefile index f56a50208b4..7f2511abfa3 100644 --- a/cross/libXfixes/Makefile +++ b/cross/libXfixes/Makefile @@ -1,6 +1,6 @@ PKG_NAME = libXfixes -PKG_VERS = 6.0.0 -PKG_EXT = tar.bz2 +PKG_VERS = 6.0.1 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/lib PKG_DIR = $(PKG_NAME)-$(PKG_VERS) @@ -8,19 +8,11 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/xorg-x11-util-macros cross/libX11 HOMEPAGE = https://www.x.org -COMMENT = X Fixes library +COMMENT = X Fixes library. LICENSE = GPLv2/GPLv3 -PRE_CONFIGURE_TARGET = $(PKG_NAME)_pre_configure GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib -CONFIGURE_ARGS += --without-xmlto -CONFIGURE_ARGS += --without-fop +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib CONFIGURE_ARGS += --disable-static include ../../mk/spksrc.cross-cc.mk - -.PHONY: $(PKG_NAME)_pre_configure -$(PKG_NAME)_pre_configure: - $(RUN) autoreconf -i -f -v -I $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/aclocal - diff --git a/cross/libXfixes/PLIST b/cross/libXfixes/PLIST index a58e578bd21..2b45b157c4f 100644 --- a/cross/libXfixes/PLIST +++ b/cross/libXfixes/PLIST @@ -1,5 +1,3 @@ -rsc:include/X11/extensions/Xfixes.h lnk:lib/libXfixes.so lnk:lib/libXfixes.so.3 lib:lib/libXfixes.so.3.1.0 -rsc:lib/pkgconfig/xfixes.pc diff --git a/cross/libXfixes/digests b/cross/libXfixes/digests index 63442cf78c6..f76d4727523 100644 --- a/cross/libXfixes/digests +++ b/cross/libXfixes/digests @@ -1,3 +1,3 @@ -libXfixes-6.0.0.tar.bz2 SHA1 5b114fc4def6ef3a516f1c06741a595c16f668e1 -libXfixes-6.0.0.tar.bz2 SHA256 a7c1a24da53e0b46cac5aea79094b4b2257321c621b258729bc3139149245b4c -libXfixes-6.0.0.tar.bz2 MD5 86f182f487f4f54684ef6b142096bb0f +libXfixes-6.0.1.tar.xz SHA1 41aa2c630da0a2cbbb42a740aaf19370800ee972 +libXfixes-6.0.1.tar.xz SHA256 b695f93cd2499421ab02d22744458e650ccc88c1d4c8130d60200213abc02d58 +libXfixes-6.0.1.tar.xz MD5 65b9ba1e9ff3d16c4fa72915d4bb585a diff --git a/cross/libXi/Makefile b/cross/libXi/Makefile index 26c17eea35d..e8869a2f8cc 100644 --- a/cross/libXi/Makefile +++ b/cross/libXi/Makefile @@ -1,6 +1,6 @@ PKG_NAME = libXi -PKG_VERS = 1.7.10 -PKG_EXT = tar.bz2 +PKG_VERS = 1.8.2 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/lib PKG_DIR = $(PKG_NAME)-$(PKG_VERS) @@ -8,12 +8,11 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/xorg-x11-util-macros cross/libX11 cross/libXext cross/libXfixes cross/xorgproto HOMEPAGE = https://www.x.org -COMMENT = X.Org X11 libXi runtime library +COMMENT = X.Org X11 libXi runtime library. LICENSE = GPLv2/GPLv3 -PRE_CONFIGURE_TARGET = $(PKG_NAME)_pre_configure GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib CONFIGURE_ARGS += --enable-malloc0returnsnull CONFIGURE_ARGS += --disable-specs CONFIGURE_ARGS += --without-xmlto @@ -21,8 +20,3 @@ CONFIGURE_ARGS += --without-fop CONFIGURE_ARGS += --disable-static include ../../mk/spksrc.cross-cc.mk - -.PHONY: $(PKG_NAME)_pre_configure -$(PKG_NAME)_pre_configure: - $(RUN) autoreconf -i -f -v -I $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/aclocal - diff --git a/cross/libXi/PLIST b/cross/libXi/PLIST index 5e826d0b828..c76b5696849 100644 --- a/cross/libXi/PLIST +++ b/cross/libXi/PLIST @@ -1,6 +1,3 @@ -rsc:include/X11/extensions/XInput2.h -rsc:include/X11/extensions/XInput.h lnk:lib/libXi.so lnk:lib/libXi.so.6 lib:lib/libXi.so.6.1.0 -rsc:lib/pkgconfig/xi.pc diff --git a/cross/libXi/digests b/cross/libXi/digests index c6db4be77cb..49efed195ad 100644 --- a/cross/libXi/digests +++ b/cross/libXi/digests @@ -1,3 +1,3 @@ -libXi-1.7.10.tar.bz2 SHA1 79052e50ea07ce2431f8988a60553d9091d46207 -libXi-1.7.10.tar.bz2 SHA256 36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061 -libXi-1.7.10.tar.bz2 MD5 62c4af0839072024b4b1c8cbe84216c7 +libXi-1.8.2.tar.xz SHA1 2cbad5609569f879dadfebfb82243be1ea9badf6 +libXi-1.8.2.tar.xz SHA256 d0e0555e53d6e2114eabfa44226ba162d2708501a25e18d99cfb35c094c6c104 +libXi-1.8.2.tar.xz MD5 95a960c1692a83cc551979f7ffe28cf4 diff --git a/cross/libXrandr/Makefile b/cross/libXrandr/Makefile index 166a7755cb7..a8abbffa139 100644 --- a/cross/libXrandr/Makefile +++ b/cross/libXrandr/Makefile @@ -1,25 +1,19 @@ PKG_NAME = libXrandr -PKG_VERS = 1.5.2 -PKG_EXT = tar.bz2 +PKG_VERS = 1.5.4 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/lib PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = cross/xorg-x11-util-macros cross/libX11 cross/libXext cross/libXrender cross/xorgproto +DEPENDS = cross/libX11 cross/libXext cross/libXrender cross/xorgproto HOMEPAGE = https://www.x.org -COMMENT = X.Org X11 libXrandr runtime library +COMMENT = X.Org X11 libXrandr runtime library. LICENSE = GPLv2/GPLv3 -PRE_CONFIGURE_TARGET = $(PKG_NAME)_pre_configure GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib CONFIGURE_ARGS += --enable-malloc0returnsnull CONFIGURE_ARGS += --disable-static include ../../mk/spksrc.cross-cc.mk - -.PHONY: $(PKG_NAME)_pre_configure -$(PKG_NAME)_pre_configure: - $(RUN) autoreconf -i -f -v -I $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/aclocal - diff --git a/cross/libXrandr/PLIST b/cross/libXrandr/PLIST index 0a859bbf1b4..7171042bf76 100644 --- a/cross/libXrandr/PLIST +++ b/cross/libXrandr/PLIST @@ -1,5 +1,3 @@ -rsc:include/X11/extensions/Xrandr.h lnk:lib/libXrandr.so lnk:lib/libXrandr.so.2 lib:lib/libXrandr.so.2.2.0 -rsc:lib/pkgconfig/xrandr.pc diff --git a/cross/libXrandr/digests b/cross/libXrandr/digests index f96e9c71ce1..9d9da648d58 100644 --- a/cross/libXrandr/digests +++ b/cross/libXrandr/digests @@ -1,3 +1,3 @@ -libXrandr-1.5.2.tar.bz2 SHA1 7a1f6df239341b76fd59ebbe101d6f180adb43bb -libXrandr-1.5.2.tar.bz2 SHA256 8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023 -libXrandr-1.5.2.tar.bz2 MD5 18f3b20d522f45e4dadd34afb5bea048 +libXrandr-1.5.4.tar.xz SHA1 c604459d94f7d51475d2a4534e7723f24794d8bb +libXrandr-1.5.4.tar.xz SHA256 1ad5b065375f4a85915aa60611cc6407c060492a214d7f9daf214be752c3b4d3 +libXrandr-1.5.4.tar.xz MD5 24e0b72abe16efce9bf10579beaffc27 diff --git a/cross/libXrender/Makefile b/cross/libXrender/Makefile index e6ba623ba23..c743e4bca2e 100644 --- a/cross/libXrender/Makefile +++ b/cross/libXrender/Makefile @@ -1,24 +1,19 @@ PKG_NAME = libXrender -PKG_VERS = 0.9.10 -PKG_EXT = tar.bz2 +PKG_VERS = 0.9.12 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/lib PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = cross/xorg-x11-util-macros cross/libX11 +DEPENDS = cross/libX11 HOMEPAGE = https://www.x.org -COMMENT = X.Org X11 libXrender runtime library +COMMENT = X.Org X11 libXrender runtime library. LICENSE = GPLv2/GPLv3 -PRE_CONFIGURE_TARGET = $(PKG_NAME)_pre_configure GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib CONFIGURE_ARGS += --enable-malloc0returnsnull CONFIGURE_ARGS += --disable-static include ../../mk/spksrc.cross-cc.mk - -.PHONY: $(PKG_NAME)_pre_configure -$(PKG_NAME)_pre_configure: - $(RUN) autoreconf -i -f -v -I $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/aclocal diff --git a/cross/libXrender/PLIST b/cross/libXrender/PLIST index bdf772cb45b..5c23f89ba1b 100644 --- a/cross/libXrender/PLIST +++ b/cross/libXrender/PLIST @@ -1,5 +1,3 @@ -rsc:include/X11/extensions/Xrender.h lnk:lib/libXrender.so lnk:lib/libXrender.so.1 lib:lib/libXrender.so.1.3.0 -rsc:lib/pkgconfig/xrender.pc diff --git a/cross/libXrender/digests b/cross/libXrender/digests index fcd44f3f7df..c55a2bf596d 100644 --- a/cross/libXrender/digests +++ b/cross/libXrender/digests @@ -1,3 +1,3 @@ -libXrender-0.9.10.tar.bz2 SHA1 d55106de9260c2377c19d271d9b677744a6c7e81 -libXrender-0.9.10.tar.bz2 SHA256 c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949 -libXrender-0.9.10.tar.bz2 MD5 802179a76bded0b658f4e9ec5e1830a4 +libXrender-0.9.12.tar.xz SHA1 76f58d75bd341a3c7e7f5a125fba76ac3128186c +libXrender-0.9.12.tar.xz SHA256 b832128da48b39c8d608224481743403ad1691bf4e554e4be9c174df171d1b97 +libXrender-0.9.12.tar.xz MD5 4c54dce455d96e3bdee90823b0869f89 diff --git a/cross/libXt/Makefile b/cross/libXt/Makefile index c37d8f4fb2f..541b5452745 100644 --- a/cross/libXt/Makefile +++ b/cross/libXt/Makefile @@ -1,33 +1,28 @@ PKG_NAME = libXt -PKG_VERS = 1.2.0 -PKG_EXT = tar.bz2 +PKG_VERS = 1.3.1 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/lib PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = cross/xorg-x11-util-macros cross/libX11 cross/libSM +DEPENDS = cross/libX11 HOMEPAGE = https://www.x.org -COMMENT = X.Org X11 libXt runtime library +COMMENT = X.Org X11 libXt runtime library. LICENSE = GPLv2/GPLv3 -PRE_CONFIGURE_TARGET = $(PKG_NAME)_pre_configure -POST_CONFIGURE_TARGET = $(PKG_NAME)_post_configure_target +POST_CONFIGURE_TARGET = libXt_post_configure_target + GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib CONFIGURE_ARGS += --enable-malloc0returnsnull CONFIGURE_ARGS += --without-xmlto CONFIGURE_ARGS += --without-fop CONFIGURE_ARGS += --disable-static -PATCHES_LEVEL = 1 include ../../mk/spksrc.cross-cc.mk -.PHONY: $(PKG_NAME)_pre_configure -$(PKG_NAME)_pre_configure: - $(RUN) autoreconf -i -f -v -I $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/aclocal - -.PHONY: $(PKG_NAME)_post_configure_target -$(PKG_NAME)_post_configure_target: - $(RUN) sed -i 's,^CFLAGS =.*,CFLAGS =,g' util/Makefile - $(RUN) sed -i 's,^CPPFLAGS =.*,CPPFLAGS =,g' util/Makefile +.PHONY: libXt_post_configure_target +libXt_post_configure_target: + @$(MSG) "Avoid invalid CPPFLAGS (for 32-bit ARM archs) in util folder" + @$(RUN) sed -e 's,^CPPFLAGS =.*,CPPFLAGS =,g' -i.bak util/Makefile diff --git a/cross/libXt/PLIST b/cross/libXt/PLIST index ba7fb24231c..405255ce21e 100644 --- a/cross/libXt/PLIST +++ b/cross/libXt/PLIST @@ -1,37 +1,3 @@ -rsc:include/X11/CallbackI.h -rsc:include/X11/Composite.h -rsc:include/X11/CompositeP.h -rsc:include/X11/ConstrainP.h -rsc:include/X11/Constraint.h -rsc:include/X11/ConvertI.h -rsc:include/X11/Core.h -rsc:include/X11/CoreP.h -rsc:include/X11/CreateI.h -rsc:include/X11/EventI.h -rsc:include/X11/HookObjI.h -rsc:include/X11/InitialI.h -rsc:include/X11/Intrinsic.h -rsc:include/X11/IntrinsicI.h -rsc:include/X11/IntrinsicP.h -rsc:include/X11/Object.h -rsc:include/X11/ObjectP.h -rsc:include/X11/PassivGraI.h -rsc:include/X11/RectObj.h -rsc:include/X11/RectObjP.h -rsc:include/X11/ResConfigP.h -rsc:include/X11/ResourceI.h -rsc:include/X11/SelectionI.h -rsc:include/X11/Shell.h -rsc:include/X11/ShellI.h -rsc:include/X11/ShellP.h -rsc:include/X11/StringDefs.h -rsc:include/X11/ThreadsI.h -rsc:include/X11/TranslateI.h -rsc:include/X11/VarargsI.h -rsc:include/X11/Vendor.h -rsc:include/X11/VendorP.h -rsc:include/X11/Xtos.h lnk:lib/libXt.so lnk:lib/libXt.so.6 lib:lib/libXt.so.6.0.0 -rsc:lib/pkgconfig/xt.pc diff --git a/cross/libXt/digests b/cross/libXt/digests index 173726f368b..b025883dcac 100644 --- a/cross/libXt/digests +++ b/cross/libXt/digests @@ -1,3 +1,3 @@ -libXt-1.2.0.tar.bz2 SHA1 f6b5ed799bc2e8d721e5407a09c2a8f570963f1b -libXt-1.2.0.tar.bz2 SHA256 b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831 -libXt-1.2.0.tar.bz2 MD5 a9019421d3ee8b4937b6afd9025f018a +libXt-1.3.1.tar.xz SHA1 c3eabc99ba7da28ce2d034623d93f8bcdc5d6467 +libXt-1.3.1.tar.xz SHA256 e0a774b33324f4d4c05b199ea45050f87206586d81655f8bef4dba434d931288 +libXt-1.3.1.tar.xz MD5 9acd189c68750b5028cf120e53c68009 diff --git a/cross/libXt/patches/0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch b/cross/libXt/patches/0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch deleted file mode 100644 index ac9295dc6a5..00000000000 --- a/cross/libXt/patches/0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch +++ /dev/null @@ -1,100 +0,0 @@ -From f3079e509c5cf60042ae2261499ee13b6b02498a Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 6 Feb 2020 13:45:35 -0500 -Subject: [PATCH] xt: Work around a compiler issue with gcc 10 - -GRABEXT() is used to look up a pointer that sometimes lives just past -the end of an XtServerGrabRec. Whether it's really there or not depends -on XtServerGrabRec::hasExt. In a couple of places, we build those -structs on the stack and pass them to other functions; such structs -always have hasExt == 0, so GRABEXT would never get called in practice. -However, there exists a bug in gcc 10 - more or less difficult to hit, -depending on your compiler options and architecture - where it would not -notice that the dereference after GRABEXT is dead code, at which point -it looks like you're dereferencing one past the end of the array, which -is illegal, and you you get: - - PassivGrab.c:292:35: error: array subscript 0 is outside array bounds - of 'XtServerGrabRec[1]' {aka 'struct _XtServerGrabRec[1]'} - [-Werror=array-bounds] - -As a completely stupid workaround, build those on-stack structs as -arrays of two, so that the (dead) dereference looks like it's pointing -into the dummy member of the array. This is almost certainly a compiler -bug and I don't encourage merging this patch upstream, but if you need -to build libXt with gcc 10 absolutely right this second, here it is. - -For details on the gcc issue, see: - -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93582 ---- - src/PassivGrab.c | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/src/PassivGrab.c b/src/PassivGrab.c -index bece0d9..b174d40 100644 ---- a/src/PassivGrab.c -+++ b/src/PassivGrab.c -@@ -553,7 +553,7 @@ XtServerGrabPtr _XtCheckServerGrabsOnWidget ( - _XtBoolean isKeyboard) - { - register XtServerGrabPtr grab; -- XtServerGrabRec tempGrab; -+ XtServerGrabRec tempGrab[2]; - XtServerGrabPtr *passiveListPtr; - XtPerWidgetInput pwi; - -@@ -577,13 +577,13 @@ XtServerGrabPtr _XtCheckServerGrabsOnWidget ( - /* Take only the lower thirteen bits as modifier state. The X Keyboard - * Extension may be representing keyboard group state in two upper bits. - */ -- tempGrab.widget = widget; -- tempGrab.keybut = (KeyCode) event->xkey.keycode; /* also xbutton.button */ -- tempGrab.modifiers = event->xkey.state & 0x1FFF; /*also xbutton.state*/ -- tempGrab.hasExt = False; -+ tempGrab[0].widget = widget; -+ tempGrab[0].keybut = (KeyCode) event->xkey.keycode; /* also xbutton.button */ -+ tempGrab[0].modifiers = event->xkey.state & 0x1FFF; /*also xbutton.state*/ -+ tempGrab[0].hasExt = False; - - for (grab = *passiveListPtr; grab; grab = grab->next) { -- if (GrabMatchesSecond(&tempGrab, grab)) -+ if (GrabMatchesSecond(tempGrab, grab)) - return (grab); - } - return (XtServerGrabPtr)NULL; -@@ -775,17 +775,17 @@ void UngrabKeyOrButton ( - Modifiers modifiers, - Boolean isKeyboard) - { -- XtServerGrabRec tempGrab; -+ XtServerGrabRec tempGrab[2]; - XtPerWidgetInput pwi; - - XtCheckSubclass(widget, coreWidgetClass, - "in XtUngrabKey or XtUngrabButton"); - - /* Build a temporary grab list entry */ -- tempGrab.widget = widget; -- tempGrab.modifiers = (unsigned short) modifiers; -- tempGrab.keybut = (KeyCode) keyOrButton; -- tempGrab.hasExt = False; -+ tempGrab[0].widget = widget; -+ tempGrab[0].modifiers = (unsigned short) modifiers; -+ tempGrab[0].keybut = (KeyCode) keyOrButton; -+ tempGrab[0].hasExt = False; - - LOCK_PROCESS; - pwi = _XtGetPerWidgetInput(widget, FALSE); -@@ -817,7 +817,7 @@ void UngrabKeyOrButton ( - - /* Delete all entries which are encompassed by the specified grab. */ - DeleteServerGrabFromList(isKeyboard ? &pwi->keyList : &pwi->ptrList, -- &tempGrab); -+ tempGrab); - } - - void XtGrabKey ( --- -2.23.0 - diff --git a/cross/libXt/patches/001-fix-xtos_h.patch b/cross/libXt/patches/001-fix-xtos_h.patch new file mode 100644 index 00000000000..aebaa2c8ed2 --- /dev/null +++ b/cross/libXt/patches/001-fix-xtos_h.patch @@ -0,0 +1,14 @@ +# There is a syntax error affecting gcc < 5 (i.e. DSM 6 builds) +# mismatched parentheses in definition of LONG64 +# +--- include/X11/Xtos.h.orig 2024-11-17 04:44:07.000000000 +0000 ++++ include/X11/Xtos.h 2025-01-16 06:07:21.651837413 +0000 +@@ -64,7 +64,7 @@ + defined(__s390x__) || \ + (defined(__hppa__) && defined(__LP64__)) || \ + defined(__amd64__) || defined(amd64) || \ +- defined(__powerpc64__)) ++ defined(__powerpc64__) + #define LONG64 + #endif + diff --git a/cross/libXtst/Makefile b/cross/libXtst/Makefile index 4d0602212b8..60c9b7d54b2 100644 --- a/cross/libXtst/Makefile +++ b/cross/libXtst/Makefile @@ -1,25 +1,20 @@ PKG_NAME = libXtst -PKG_VERS = 1.2.3 -PKG_EXT = tar.bz2 +PKG_VERS = 1.2.5 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/lib PKG_DIR = $(PKG_NAME)-$(PKG_VERS) -DEPENDS = cross/xorg-x11-util-macros cross/xorgproto cross/libX11 cross/libXext cross/libXi +DEPENDS = cross/libX11 cross/libXi HOMEPAGE = https://www.x.org -COMMENT = X.Org X11 libXtst runtime library +COMMENT = X.Org X11 libXtst runtime library. LICENSE = GPLv2/GPLv3 -PRE_CONFIGURE_TARGET = $(PKG_NAME)_pre_configure GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib CONFIGURE_ARGS += --without-xmlto CONFIGURE_ARGS += --without-fop CONFIGURE_ARGS += --disable-static include ../../mk/spksrc.cross-cc.mk - -.PHONY: $(PKG_NAME)_pre_configure -$(PKG_NAME)_pre_configure: - $(RUN) autoreconf -i -f -v -I $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/aclocal diff --git a/cross/libXtst/PLIST b/cross/libXtst/PLIST index 678d5e30922..9eefb536e3d 100644 --- a/cross/libXtst/PLIST +++ b/cross/libXtst/PLIST @@ -1,6 +1,3 @@ -rsc:include/X11/extensions/record.h -rsc;include/X11/extensions/XTest.h lnk:lib/libXtst.so lnk:lib/libXtst.so.6 lib:lib/libXtst.so.6.1.0 -rsc:lib/pkgconfig/xtst.pc diff --git a/cross/libXtst/digests b/cross/libXtst/digests index 43c8bcb8b01..a9a8722b23b 100644 --- a/cross/libXtst/digests +++ b/cross/libXtst/digests @@ -1,3 +1,3 @@ -libXtst-1.2.3.tar.bz2 SHA1 27d004db631bee3a82155d3caf961d9584207d36 -libXtst-1.2.3.tar.bz2 SHA256 4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204 -libXtst-1.2.3.tar.bz2 MD5 ef8c2c1d16a00bd95b9fdcef63b8a2ca +libXtst-1.2.5.tar.xz SHA1 8633c077c22744679e43b23dfd58f76820867a1c +libXtst-1.2.5.tar.xz SHA256 b50d4c25b97009a744706c1039c598f4d8e64910c9fde381994e1cae235d9242 +libXtst-1.2.5.tar.xz MD5 b62dc44d8e63a67bb10230d54c44dcb7 diff --git a/cross/libxcb/Makefile b/cross/libxcb/Makefile index 7ea14a81c26..3c20a8dab6f 100644 --- a/cross/libxcb/Makefile +++ b/cross/libxcb/Makefile @@ -1,5 +1,5 @@ PKG_NAME = libxcb -PKG_VERS = 1.14 +PKG_VERS = 1.17.0 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/lib @@ -8,20 +8,14 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/xorg-x11-util-macros cross/xcb-proto cross/libXau HOMEPAGE = https://www.x.org -COMMENT = A C binding to the X11 protocol +COMMENT = A C binding to the X11 protocol. LICENSE = GPLv2/GPLv3 -PRE_CONFIGURE_TARGET = $(PKG_NAME)_pre_configure GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-xinput CONFIGURE_ARGS += --enable-xkb -CONFIGURE_ARGS += --enable-sendfds CONFIGURE_ARGS += --without-doxygen include ../../mk/spksrc.cross-cc.mk - -.PHONY: $(PKG_NAME)_pre_configure -$(PKG_NAME)_pre_configure: - $(RUN) autoreconf -i -f -v -I $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/aclocal diff --git a/cross/libxcb/PLIST b/cross/libxcb/PLIST index 402854272d1..cf57b0af843 100644 --- a/cross/libxcb/PLIST +++ b/cross/libxcb/PLIST @@ -1,41 +1,12 @@ -rsc:include/xcb/bigreq.h -rsc:include/xcb/composite.h -rsc:include/xcb/damage.h -rsc:include/xcb/dpms.h -rsc:include/xcb/dri2.h -rsc:include/xcb/dri3.h -rsc:include/xcb/ge.h -rsc:include/xcb/glx.h -rsc:include/xcb/present.h -rsc:include/xcb/randr.h -rsc:include/xcb/record.h -rsc:include/xcb/render.h -rsc:include/xcb/res.h -rsc:include/xcb/screensaver.h -rsc:include/xcb/shape.h -rsc:include/xcb/shm.h -rsc:include/xcb/sync.h -rsc:include/xcb/xcbext.h -rsc:include/xcb/xcb.h -rsc:include/xcb/xc_misc.h -rsc:include/xcb/xevie.h -rsc:include/xcb/xf86dri.h -rsc:include/xcb/xfixes.h -rsc:include/xcb/xinerama.h -rsc:include/xcb/xinput.h -rsc:include/xcb/xkb.h -rsc:include/xcb/xprint.h -rsc:include/xcb/xproto.h -rsc:include/xcb/xselinux.h -rsc:include/xcb/xtest.h -rsc:include/xcb/xv.h -rsc:include/xcb/xvmc.h lnk:lib/libxcb-composite.so lnk:lib/libxcb-composite.so.0 lib:lib/libxcb-composite.so.0.0.0 lnk:lib/libxcb-damage.so lnk:lib/libxcb-damage.so.0 lib:lib/libxcb-damage.so.0.0.0 +lnk:lib/libxcb-dbe.so +lnk:lib/libxcb-dbe.so.0 +lib:lib/libxcb-dbe.so.0.0.0 lnk:lib/libxcb-dpms.so lnk:lib/libxcb-dpms.so.0 lib:lib/libxcb-dpms.so.0.0.0 @@ -44,7 +15,7 @@ lnk:lib/libxcb-dri2.so.0 lib:lib/libxcb-dri2.so.0.0.0 lnk:lib/libxcb-dri3.so lnk:lib/libxcb-dri3.so.0 -lib:lib/libxcb-dri3.so.0.0.0 +lib:lib/libxcb-dri3.so.0.1.0 lnk:lib/libxcb-glx.so lnk:lib/libxcb-glx.so.0 lib:lib/libxcb-glx.so.0.0.0 @@ -72,9 +43,6 @@ lib:lib/libxcb-shape.so.0.0.0 lnk:lib/libxcb-shm.so lnk::lib/libxcb-shm.so.0 lib:lib/libxcb-shm.so.0.0.0 -lnk:lib/libxcb.so -lnk:lib/libxcb.so.1 -lib:lib/libxcb.so.1.1.0 lnk:lib/libxcb-sync.so lnk:lib/libxcb-sync.so.1 lib:lib/libxcb-sync.so.1.0.0 @@ -96,33 +64,12 @@ lib:lib/libxcb-xkb.so.1.0.0 lnk:lib/libxcb-xtest.so lnk:lib/libxcb-xtest.so.0 lib:lib/libxcb-xtest.so.0.0.0 -lnk:lib/libxcb-xvmc.so -lnk:lib/libxcb-xvmc.so.0 -lib:lib/libxcb-xvmc.so.0.0.0 lnk:lib/libxcb-xv.so lnk:lib/libxcb-xv.so.0 lib:lib/libxcb-xv.so.0.0.0 -rsc:lib/pkgconfig/xcb-composite.pc -rsc:lib/pkgconfig/xcb-damage.pc -rsc:lib/pkgconfig/xcb-dpms.pc -rsc:lib/pkgconfig/xcb-dri2.pc -rsc:lib/pkgconfig/xcb-dri3.pc -rsc:lib/pkgconfig/xcb-glx.pc -rsc:lib/pkgconfig/xcb.pc -rsc:lib/pkgconfig/xcb-present.pc -rsc:lib/pkgconfig/xcb-randr.pc -rsc:lib/pkgconfig/xcb-record.pc -rsc:lib/pkgconfig/xcb-render.pc -rsc:lib/pkgconfig/xcb-res.pc -rsc:lib/pkgconfig/xcb-screensaver.pc -rsc:lib/pkgconfig/xcb-shape.pc -rsc:lib/pkgconfig/xcb-shm.pc -rsc:lib/pkgconfig/xcb-sync.pc -rsc:lib/pkgconfig/xcb-xf86dri.pc -rsc:lib/pkgconfig/xcb-xfixes.pc -rsc:lib/pkgconfig/xcb-xinerama.pc -rsc:lib/pkgconfig/xcb-xinput.pc -rsc:lib/pkgconfig/xcb-xkb.pc -rsc:lib/pkgconfig/xcb-xtest.pc -rsc:lib/pkgconfig/xcb-xvmc.pc -rsc:lib/pkgconfig/xcb-xv.pc +lnk:lib/libxcb-xvmc.so +lnk:lib/libxcb-xvmc.so.0 +lib:lib/libxcb-xvmc.so.0.0.0 +lnk:lib/libxcb.so +lnk:lib/libxcb.so.1 +lib:lib/libxcb.so.1.1.0 diff --git a/cross/libxcb/digests b/cross/libxcb/digests index dbe4bb9c4d7..c9a26887ed7 100644 --- a/cross/libxcb/digests +++ b/cross/libxcb/digests @@ -1,3 +1,3 @@ -libxcb-1.14.tar.xz SHA1 e218be6043162d2f758643dbda8caccd53107388 -libxcb-1.14.tar.xz SHA256 a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34 -libxcb-1.14.tar.xz MD5 f90b6e4541e9518b4c373b734f475ae7 +libxcb-1.17.0.tar.xz SHA1 ebb3197ac4c75c51c4e7e3278e8406d9441a4d47 +libxcb-1.17.0.tar.xz SHA256 599ebf9996710fea71622e6e184f3a8ad5b43d0e5fa8c4e407123c88a59a6d55 +libxcb-1.17.0.tar.xz MD5 96565523e9f9b701fcb35d31f1d4086e diff --git a/cross/xcb-proto/Makefile b/cross/xcb-proto/Makefile index 1194699fd12..98857d0d418 100644 --- a/cross/xcb-proto/Makefile +++ b/cross/xcb-proto/Makefile @@ -1,6 +1,6 @@ PKG_NAME = xcb-proto -PKG_VERS = 1.14.1 -PKG_EXT = tar.gz +PKG_VERS = 1.17.0 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/proto PKG_DIR = $(PKG_NAME)-$(PKG_VERS) @@ -8,12 +8,10 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = HOMEPAGE = https://www.x.org -COMMENT = XCB protocol descriptions +COMMENT = XCB protocol descriptions. LICENSE = GPLv2/GPLv3 GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib - -ADDITIONAL_CFLAGS = -Os +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib include ../../mk/spksrc.cross-cc.mk diff --git a/cross/xcb-proto/PLIST b/cross/xcb-proto/PLIST index 6ed1b38f635..e69de29bb2d 100644 --- a/cross/xcb-proto/PLIST +++ b/cross/xcb-proto/PLIST @@ -1,54 +0,0 @@ -rsc:lib/pkgconfig/xcb-proto.pc -rsc:lib/python2.7/site-packages/xcbgen/align.py -rsc:lib/python2.7/site-packages/xcbgen/align.pyc -rsc:lib/python2.7/site-packages/xcbgen/align.pyo -rsc:lib/python2.7/site-packages/xcbgen/error.py -rsc:lib/python2.7/site-packages/xcbgen/error.pyc -rsc:lib/python2.7/site-packages/xcbgen/error.pyo -rsc:lib/python2.7/site-packages/xcbgen/expr.py -rsc:lib/python2.7/site-packages/xcbgen/expr.pyc -rsc:lib/python2.7/site-packages/xcbgen/expr.pyo -rsc:lib/python2.7/site-packages/xcbgen/__init__.py -rsc:lib/python2.7/site-packages/xcbgen/__init__.pyc -rsc:lib/python2.7/site-packages/xcbgen/__init__.pyo -rsc:lib/python2.7/site-packages/xcbgen/matcher.py -rsc:lib/python2.7/site-packages/xcbgen/matcher.pyc -rsc:lib/python2.7/site-packages/xcbgen/matcher.pyo -rsc:lib/python2.7/site-packages/xcbgen/state.py -rsc:lib/python2.7/site-packages/xcbgen/state.pyc -rsc:lib/python2.7/site-packages/xcbgen/state.pyo -rsc:lib/python2.7/site-packages/xcbgen/xtypes.py -rsc:lib/python2.7/site-packages/xcbgen/xtypes.pyc -rsc:lib/python2.7/site-packages/xcbgen/xtypes.pyo -rsc:lib/xcb/bigreq.xml -rsc:lib/xcb/composite.xml -rsc:lib/xcb/damage.xml -rsc:lib/xcb/dpms.xml -rsc:lib/xcb/dri2.xml -rsc:lib/xcb/dri3.xml -rsc:lib/xcb/ge.xml -rsc:lib/xcb/glx.xml -rsc:lib/xcb/present.xml -rsc:lib/xcb/randr.xml -rsc:lib/xcb/record.xml -rsc:lib/xcb/render.xml -rsc:lib/xcb/res.xml -rsc:lib/xcb/screensaver.xml -rsc:lib/xcb/shape.xml -rsc:lib/xcb/shm.xml -rsc:lib/xcb/sync.xml -rsc:lib/xcb/xcb.xsd -rsc:lib/xcb/xc_misc.xml -rsc:lib/xcb/xevie.xml -rsc:lib/xcb/xf86dri.xml -rsc:lib/xcb/xf86vidmode.xml -rsc:lib/xcb/xfixes.xml -rsc:lib/xcb/xinerama.xml -rsc:lib/xcb/xinput.xml -rsc:lib/xcb/xkb.xml -rsc:lib/xcb/xprint.xml -rsc:lib/xcb/xproto.xml -rsc:lib/xcb/xselinux.xml -rsc:lib/xcb/xtest.xml -rsc:lib/xcb/xvmc.xml -rsc:lib/xcb/xv.xml diff --git a/cross/xcb-proto/digests b/cross/xcb-proto/digests index 5f033ea45a4..693fd7b7772 100644 --- a/cross/xcb-proto/digests +++ b/cross/xcb-proto/digests @@ -1,3 +1,3 @@ -xcb-proto-1.14.1.tar.gz SHA1 1bb307b09c25c42058cc36e565a29ec86d7a4b91 -xcb-proto-1.14.1.tar.gz SHA256 85cd21e9d9fbc341d0dbf11eace98d55d7db89fda724b0e598855fcddf0944fd -xcb-proto-1.14.1.tar.gz MD5 5e9e22d4dfd5b9d499fb5e2f384fbe26 +xcb-proto-1.17.0.tar.xz SHA1 75159dcd0668f76d87c8def84e9e6e4df92444e5 +xcb-proto-1.17.0.tar.xz SHA256 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c +xcb-proto-1.17.0.tar.xz MD5 c415553d2ee1a8cea43c3234a079b53f diff --git a/cross/xorg-sgml-doctools/Makefile b/cross/xorg-sgml-doctools/Makefile index 2832f3e6782..a164f597428 100644 --- a/cross/xorg-sgml-doctools/Makefile +++ b/cross/xorg-sgml-doctools/Makefile @@ -1,6 +1,6 @@ PKG_NAME = xorg-sgml-doctools -PKG_VERS = 1.11 -PKG_EXT = tar.bz2 +PKG_VERS = 1.12.1 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/doc PKG_DIR = $(PKG_NAME)-$(PKG_VERS) @@ -8,10 +8,10 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = HOMEPAGE = https://www.x.org -COMMENT = X.Org SGML documentation generation tools +COMMENT = X.Org SGML documentation generation tools. LICENSE = GPLv2/GPLv3 GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib include ../../mk/spksrc.cross-cc.mk diff --git a/cross/xorg-sgml-doctools/PLIST b/cross/xorg-sgml-doctools/PLIST index fbf94d191a4..9d0544968d9 100644 --- a/cross/xorg-sgml-doctools/PLIST +++ b/cross/xorg-sgml-doctools/PLIST @@ -1,9 +1,8 @@ -rsc:lib/pkgconfig/xorg-sgml-doctools.pc rsc:lib/sgml/X11/dbs/masterdb.html.xml rsc:lib/sgml/X11/dbs/masterdb.pdf.xml rsc:lib/sgml/X11/defs.ent rsc:lib/sgml/X11/xorg-chunk.xsl -rsc:lib/sgml/X11/xorg.css rsc:lib/sgml/X11/xorg-fo.xsl rsc:lib/sgml/X11/xorg-xhtml.xsl +rsc:lib/sgml/X11/xorg.css rsc:lib/sgml/X11/xorg.xsl diff --git a/cross/xorg-sgml-doctools/digests b/cross/xorg-sgml-doctools/digests index 2e85e912a24..6af8c289565 100644 --- a/cross/xorg-sgml-doctools/digests +++ b/cross/xorg-sgml-doctools/digests @@ -1,3 +1,3 @@ -xorg-sgml-doctools-1.11.tar.bz2 SHA1 56acde359072d7ffc6627ffde5e2c698eb415ddc -xorg-sgml-doctools-1.11.tar.bz2 SHA256 e71ce1df82dcc51eb14be6f42171dcc6bdd11ef46c0c605d6da8af12bd73b74c -xorg-sgml-doctools-1.11.tar.bz2 MD5 ee6dc0a8a693a908857af328b2462661 +xorg-sgml-doctools-1.12.1.tar.xz SHA1 7861e20c177a04307e12c032eaafc5d8733b602e +xorg-sgml-doctools-1.12.1.tar.xz SHA256 0a5d54c0706b4e89d5acd4d455db3745ab4ad26be627cce015b90ad403b56d6f +xorg-sgml-doctools-1.12.1.tar.xz MD5 e68e4ed704fc21bd791e6fda37483f7d diff --git a/cross/xorg-x11-util-macros/Makefile b/cross/xorg-x11-util-macros/Makefile index a2a3e7d8f13..16086d61269 100644 --- a/cross/xorg-x11-util-macros/Makefile +++ b/cross/xorg-x11-util-macros/Makefile @@ -1,6 +1,6 @@ PKG_NAME = util-macros -PKG_VERS = 1.19.3 -PKG_EXT = tar.bz2 +PKG_VERS = 1.20.2 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/util PKG_DIR = $(PKG_NAME)-$(PKG_VERS) @@ -8,10 +8,10 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = HOMEPAGE = https://www.x.org -COMMENT = X.Org X11 Autotools macros +COMMENT = X.Org X11 Autotools macros. LICENSE = GPLv2/GPLv3 GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib include ../../mk/spksrc.cross-cc.mk diff --git a/cross/xorg-x11-util-macros/PLIST b/cross/xorg-x11-util-macros/PLIST index 18b51c832ff..e69de29bb2d 100644 --- a/cross/xorg-x11-util-macros/PLIST +++ b/cross/xorg-x11-util-macros/PLIST @@ -1,3 +0,0 @@ -rsc:lib/aclocal/xorg-macros.m4 -rsc:lib/pkgconfig/xorg-macros.pc -rsc:lib/util-macros/INSTALL diff --git a/cross/xorg-x11-util-macros/digests b/cross/xorg-x11-util-macros/digests index 80da22d457c..41769dc56e8 100644 --- a/cross/xorg-x11-util-macros/digests +++ b/cross/xorg-x11-util-macros/digests @@ -1,3 +1,3 @@ -util-macros-1.19.3.tar.bz2 SHA1 4097f75e327b9579d1bd657fa8b01b55238ad8f5 -util-macros-1.19.3.tar.bz2 SHA256 0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971 -util-macros-1.19.3.tar.bz2 MD5 4be6df7e6af52e28e13dc533244eb9d7 +util-macros-1.20.2.tar.xz SHA1 3331065b8ce992ab30b0011147cb080e62368e80 +util-macros-1.20.2.tar.xz SHA256 9ac269eba24f672d7d7b3574e4be5f333d13f04a7712303b1821b2a51ac82e8e +util-macros-1.20.2.tar.xz MD5 5f683a1966834b0a6ae07b3680bcb863 diff --git a/cross/xorgproto/Makefile b/cross/xorgproto/Makefile index 89623d8b999..976e585ea5f 100644 --- a/cross/xorgproto/Makefile +++ b/cross/xorgproto/Makefile @@ -1,6 +1,6 @@ PKG_NAME = xorgproto -PKG_VERS = 2021.4 -PKG_EXT = tar.bz2 +PKG_VERS = 2024.1 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/proto PKG_DIR = $(PKG_NAME)-$(PKG_VERS) @@ -8,18 +8,14 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/xorg-x11-util-macros cross/xorg-sgml-doctools HOMEPAGE = https://www.x.org -COMMENT = X.Org X11 Protocol headers +COMMENT = X.Org X11 Protocol headers. LICENSE = GPLv2/GPLv3 -PRE_CONFIGURE_TARGET = $(PKG_NAME)_pre_configure GNU_CONFIGURE = 1 PKG_CONFIG_PATH = install/usr/local/xorgproto/share/pkgconfig -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib + +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib CONFIGURE_ARGS += --without-xmlto CONFIGURE_ARGS += --disable-specs include ../../mk/spksrc.cross-cc.mk - -.PHONY: $(PKG_NAME)_pre_configure -$(PKG_NAME)_pre_configure: - $(RUN) autoreconf -i -f -v -I $(INSTALL_DIR)$(INSTALL_PREFIX)/lib/aclocal diff --git a/cross/xorgproto/PLIST b/cross/xorgproto/PLIST index 1bca73b5073..e69de29bb2d 100644 --- a/cross/xorgproto/PLIST +++ b/cross/xorgproto/PLIST @@ -1,156 +0,0 @@ -rsc:include/GL/glxint.h -rsc:include/GL/glxmd.h -rsc:include/GL/glxproto.h -rsc:include/GL/glxtokens.h -rsc:include/GL/internal/glcore.h -rsc:include/X11/ap_keysym.h -rsc:include/X11/DECkeysym.h -rsc:include/X11/dri/xf86dri.h -rsc:include/X11/dri/xf86driproto.h -rsc:include/X11/dri/xf86dristr.h -rsc:include/X11/extensions/ag.h -rsc:include/X11/extensions/agproto.h -rsc:include/X11/extensions/applewmconst.h -rsc:include/X11/extensions/applewmproto.h -rsc:include/X11/extensions/bigreqsproto.h -rsc:include/X11/extensions/bigreqstr.h -rsc:include/X11/extensions/composite.h -rsc:include/X11/extensions/compositeproto.h -rsc:include/X11/extensions/cup.h -rsc:include/X11/extensions/cupproto.h -rsc:include/X11/extensions/damageproto.h -rsc:include/X11/extensions/damagewire.h -rsc:include/X11/extensions/dbe.h -rsc:include/X11/extensions/dbeproto.h -rsc:include/X11/extensions/dmx.h -rsc:include/X11/extensions/dmxproto.h -rsc:include/X11/extensions/dpmsconst.h -rsc:include/X11/extensions/dpmsproto.h -rsc:include/X11/extensions/dri2proto.h -rsc:include/X11/extensions/dri2tokens.h -rsc:include/X11/extensions/dri3proto.h -rsc:include/X11/extensions/EVI.h -rsc:include/X11/extensions/EVIproto.h -rsc:include/X11/extensions/ge.h -rsc:include/X11/extensions/geproto.h -rsc:include/X11/extensions/lbx.h -rsc:include/X11/extensions/lbxproto.h -rsc:include/X11/extensions/mitmiscconst.h -rsc:include/X11/extensions/mitmiscproto.h -rsc:include/X11/extensions/multibufconst.h -rsc:include/X11/extensions/multibufproto.h -rsc:include/X11/extensions/panoramiXproto.h -rsc:include/X11/extensions/presentproto.h -rsc:include/X11/extensions/presenttokens.h -rsc:include/X11/extensions/randr.h -rsc:include/X11/extensions/randrproto.h -rsc:include/X11/extensions/recordconst.h -rsc:include/X11/extensions/recordproto.h -rsc:include/X11/extensions/recordstr.h -rsc:include/X11/extensions/render.h -rsc:include/X11/extensions/renderproto.h -rsc:include/X11/extensions/saver.h -rsc:include/X11/extensions/saverproto.h -rsc:include/X11/extensions/secur.h -rsc:include/X11/extensions/securproto.h -rsc:include/X11/extensions/shapeconst.h -rsc:include/X11/extensions/shapeproto.h -rsc:include/X11/extensions/shapestr.h -rsc:include/X11/extensions/shm.h -rsc:include/X11/extensions/shmproto.h -rsc:include/X11/extensions/shmstr.h -rsc:include/X11/extensions/syncconst.h -rsc:include/X11/extensions/syncproto.h -rsc:include/X11/extensions/syncstr.h -rsc:include/X11/extensions/xcmiscproto.h -rsc:include/X11/extensions/xcmiscstr.h -rsc:include/X11/extensions/xf86bigfont.h -rsc:include/X11/extensions/xf86bigfproto.h -rsc:include/X11/extensions/xf86bigfstr.h -rsc:include/X11/extensions/xf86dga1const.h -rsc:include/X11/extensions/xf86dga1proto.h -rsc:include/X11/extensions/xf86dga1str.h -rsc:include/X11/extensions/xf86dgaconst.h -rsc:include/X11/extensions/xf86dga.h -rsc:include/X11/extensions/xf86dgaproto.h -rsc:include/X11/extensions/xf86dgastr.h -rsc:include/X11/extensions/xf86vm.h -rsc:include/X11/extensions/xf86vmproto.h -rsc:include/X11/extensions/xf86vmstr.h -rsc:include/X11/extensions/xfixesproto.h -rsc:include/X11/extensions/xfixeswire.h -rsc:include/X11/extensions/XI2.h -rsc:include/X11/extensions/XI2proto.h -rsc:include/X11/extensions/XI.h -rsc:include/X11/extensions/XIproto.h -rsc:include/X11/extensions/XKB.h -rsc:include/X11/extensions/XKBproto.h -rsc:include/X11/extensions/XKBsrv.h -rsc:include/X11/extensions/XKBstr.h -rsc:include/X11/extensions/XResproto.h -rsc:include/X11/extensions/xtestconst.h -rsc:include/X11/extensions/xtestext1const.h -rsc:include/X11/extensions/xtestext1proto.h -rsc:include/X11/extensions/xtestproto.h -rsc:include/X11/extensions/Xv.h -rsc:include/X11/extensions/XvMC.h -rsc:include/X11/extensions/XvMCproto.h -rsc:include/X11/extensions/Xvproto.h -rsc:include/X11/fonts/font.h -rsc:include/X11/fonts/fontproto.h -rsc:include/X11/fonts/fontstruct.h -rsc:include/X11/fonts/FS.h -rsc:include/X11/fonts/fsmasks.h -rsc:include/X11/fonts/FSproto.h -rsc:include/X11/HPkeysym.h -rsc:include/X11/keysymdef.h -rsc:include/X11/keysym.h -rsc:include/X11/Sunkeysym.h -rsc:include/X11/Xalloca.h -rsc:include/X11/Xarch.h -rsc:include/X11/Xatom.h -rsc:include/X11/Xdefs.h -rsc:include/X11/XF86keysym.h -rsc:include/X11/Xfuncproto.h -rsc:include/X11/Xfuncs.h -rsc:include/X11/X.h -rsc:include/X11/Xmd.h -rsc:include/X11/Xosdefs.h -rsc:include/X11/Xos.h -rsc:include/X11/Xos_r.h -rsc:include/X11/Xpoll.h -rsc:include/X11/Xproto.h -rsc:include/X11/Xprotostr.h -rsc:include/X11/Xthreads.h -rsc:include/X11/Xw32defs.h -rsc:include/X11/XWDFile.h -rsc:include/X11/Xwindows.h -rsc:include/X11/Xwinsock.h -rsc:lib/pkgconfig/applewmproto.pc -rsc:lib/pkgconfig/bigreqsproto.pc -rsc:lib/pkgconfig/compositeproto.pc -rsc:lib/pkgconfig/damageproto.pc -rsc:lib/pkgconfig/dmxproto.pc -rsc:lib/pkgconfig/dpmsproto.pc -rsc:lib/pkgconfig/dri2proto.pc -rsc:lib/pkgconfig/dri3proto.pc -rsc:lib/pkgconfig/fixesproto.pc -rsc:lib/pkgconfig/fontsproto.pc -rsc:lib/pkgconfig/glproto.pc -rsc:lib/pkgconfig/inputproto.pc -rsc:lib/pkgconfig/kbproto.pc -rsc:lib/pkgconfig/presentproto.pc -rsc:lib/pkgconfig/randrproto.pc -rsc:lib/pkgconfig/recordproto.pc -rsc:lib/pkgconfig/renderproto.pc -rsc:lib/pkgconfig/resourceproto.pc -rsc:lib/pkgconfig/scrnsaverproto.pc -rsc:lib/pkgconfig/videoproto.pc -rsc:lib/pkgconfig/xcmiscproto.pc -rsc:lib/pkgconfig/xextproto.pc -rsc:lib/pkgconfig/xf86bigfontproto.pc -rsc:lib/pkgconfig/xf86dgaproto.pc -rsc:lib/pkgconfig/xf86driproto.pc -rsc:lib/pkgconfig/xf86vidmodeproto.pc -rsc:lib/pkgconfig/xineramaproto.pc -rsc:lib/pkgconfig/xproto.pc diff --git a/cross/xorgproto/digests b/cross/xorgproto/digests index 086fc630ac1..f41f6085006 100644 --- a/cross/xorgproto/digests +++ b/cross/xorgproto/digests @@ -1,3 +1,3 @@ -xorgproto-2021.4.tar.bz2 SHA1 dec30f11deefa1e1655db24f4dc42fbafad368fd -xorgproto-2021.4.tar.bz2 SHA256 0f5157030162844b398e7ce69b8bb967c2edb8064b0a9c9bb5517eb621459fbf -xorgproto-2021.4.tar.bz2 MD5 fb7593911f90727adc03d731e286c685 +xorgproto-2024.1.tar.xz SHA1 49a078b1150463d0b633c6c75becf291b318a8c8 +xorgproto-2024.1.tar.xz SHA256 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59 +xorgproto-2024.1.tar.xz MD5 12374d29fb5ae642cfa872035e401640 diff --git a/cross/xtrans/Makefile b/cross/xtrans/Makefile index 9d1acad083d..2b728e6560a 100644 --- a/cross/xtrans/Makefile +++ b/cross/xtrans/Makefile @@ -1,6 +1,6 @@ PKG_NAME = xtrans -PKG_VERS = 1.4.0 -PKG_EXT = tar.bz2 +PKG_VERS = 1.5.2 +PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.x.org/archive/individual/lib PKG_DIR = $(PKG_NAME)-$(PKG_VERS) @@ -8,11 +8,11 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS) DEPENDS = cross/xorg-x11-util-macros HOMEPAGE = https://www.x.org -COMMENT = X.Org X11 developmental X transport library +COMMENT = X.Org X11 developmental X transport library. LICENSE = GPLv2/GPLv3 GNU_CONFIGURE = 1 -CONFIGURE_ARGS = --datarootdir=$$INSTALL_PREFIX/lib +CONFIGURE_ARGS = --datarootdir=$(INSTALL_PREFIX)/lib CONFIGURE_ARGS += --disable-docs PATCHES_LEVEL = 1 diff --git a/cross/xtrans/PLIST b/cross/xtrans/PLIST index f4fc2b1faa5..e69de29bb2d 100644 --- a/cross/xtrans/PLIST +++ b/cross/xtrans/PLIST @@ -1,9 +0,0 @@ -rsc:include/X11/Xtrans/transport.c -rsc:include/X11/Xtrans/Xtrans.c -rsc:include/X11/Xtrans/Xtrans.h -rsc:include/X11/Xtrans/Xtransint.h -rsc:include/X11/Xtrans/Xtranslcl.c -rsc:include/X11/Xtrans/Xtranssock.c -rsc:include/X11/Xtrans/Xtransutil.c -rsc:lib/aclocal/xtrans.m4 -rsc:lib/pkgconfig/xtrans.pc diff --git a/cross/xtrans/digests b/cross/xtrans/digests index 2b2bacf9e12..f21816a5d62 100644 --- a/cross/xtrans/digests +++ b/cross/xtrans/digests @@ -1,3 +1,3 @@ -xtrans-1.4.0.tar.bz2 SHA1 7c490026efb450798e02b040c05eba5212291c08 -xtrans-1.4.0.tar.bz2 SHA256 377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773 -xtrans-1.4.0.tar.bz2 MD5 ce2fb8100c6647ee81451ebe388b17ad +xtrans-1.5.2.tar.xz SHA1 492987aa3385dcdb2c6a325b276298e4613a63f2 +xtrans-1.5.2.tar.xz SHA256 5c5cbfe34764a9131d048f03c31c19e57fb4c682d67713eab6a65541b4dff86c +xtrans-1.5.2.tar.xz MD5 1155b410c778f805659baf4373db2b92 diff --git a/cross/xtrans/patches/xtrans-1.0.3-avoid-gethostname.patch b/cross/xtrans/patches/001-xtrans-avoid-gethostname.patch similarity index 100% rename from cross/xtrans/patches/xtrans-1.0.3-avoid-gethostname.patch rename to cross/xtrans/patches/001-xtrans-avoid-gethostname.patch diff --git a/native/openjdk-21/Makefile b/native/openjdk-21/Makefile new file mode 100644 index 00000000000..e9d4cc08a48 --- /dev/null +++ b/native/openjdk-21/Makefile @@ -0,0 +1,16 @@ +PKG_NAME = openjdk-21 +PKG_VERS = 35 +PKG_EXT = tar.gz +PKG_DIST_NAME = $(PKG_NAME)+$(PKG_VERS)_linux-x64_bin.$(PKG_EXT) +PKG_DIST_SITE = https://download.java.net/openjdk/jdk21/ri +PKG_DIR = jdk-21 + +HOMEPAGE = https://jdk.java.net/java-se-ri/21 +COMMENT = The official Reference Implementation for Java SE 17 (JSR 392). +# openjdk.java.net/legal/gplv2+ce.html +LICENSE = GPL v2 with Classpath Exception + +# use the jdk-21 folder (i.e. PKG_DIR) +INSTALL_TARGET = nop + +include ../../mk/spksrc.native-install.mk diff --git a/native/openjdk-21/digests b/native/openjdk-21/digests new file mode 100644 index 00000000000..58d3eb87714 --- /dev/null +++ b/native/openjdk-21/digests @@ -0,0 +1,3 @@ +openjdk-21+35_linux-x64_bin.tar.gz SHA1 e02f120dfe2a7d4aa288d657b25353c0e9e2d1f0 +openjdk-21+35_linux-x64_bin.tar.gz SHA256 a30c454a9bef8f46d5f1bf3122830014a8fbe7ac03b5f8729bc3add4b92a1d0a +openjdk-21+35_linux-x64_bin.tar.gz MD5 f57c4f6c0081be1e2f69f3d2e339ffb9 diff --git a/spk/java-11-openjdk/Makefile b/spk/java-11-openjdk/Makefile index 581a343acc7..09930dba76a 100644 --- a/spk/java-11-openjdk/Makefile +++ b/spk/java-11-openjdk/Makefile @@ -5,9 +5,9 @@ JAVA_RELEASE = 7 JAVA_VERSION = 11.0.12 SPK_VERS = $(JAVA_VERSION).$(JAVA_RELEASE) SPK_REV = 1 -SPK_ICON = src/$(SPK_NAME).png +SPK_ICON = src/java-11-openjdk.png -DEPENDS = cross/$(SPK_NAME) +DEPENDS = cross/java-11-openjdk MAINTAINER = SynoCommunity DESCRIPTION = OpenJDK version $(JAVA_VERSION)+$(JAVA_RELEASE). OpenJDK 11 is the open-source reference implementation of version 11 of the Java SE Platform as specified by by JSR 384 in the Java Community Process. diff --git a/spk/java-21-openjdk/Makefile b/spk/java-21-openjdk/Makefile new file mode 100644 index 00000000000..5aa1c0efd3d --- /dev/null +++ b/spk/java-21-openjdk/Makefile @@ -0,0 +1,54 @@ +SPK_NAME = java-21-openjdk +JAVA_RELEASE = 11 +JAVA_VERSION = 21.0.5 +SPK_VERS = $(JAVA_VERSION).$(JAVA_RELEASE) +SPK_REV = 1 +SPK_ICON = src/java-openjdk.png + +DEPENDS = cross/java-21-openjdk + +# gcc >= 5.0 required +REQUIRED_MIN_DSM = 7.0 +UNSUPPORTED_ARCHS = comcerto2k + +MAINTAINER = SynoCommunity +DESCRIPTION = OpenJDK version $(JAVA_VERSION)+$(JAVA_RELEASE). OpenJDK 21 is the open-source reference implementation of version 21 of the Java SE Platform as specified by JSR 396 in the Java Community Process. + +STARTABLE = no +DISPLAY_NAME = Java 21 OpenJDK +CHANGELOG = "Initial Java 21 package release." + +HOMEPAGE = https://openjdk.org/projects/jdk/21/ +LICENSE_FILE = src/LICENSE + +SPK_COMMANDS += bin/jar +SPK_COMMANDS += bin/jarsigner +SPK_COMMANDS += bin/java +SPK_COMMANDS += bin/javac +SPK_COMMANDS += bin/javadoc +SPK_COMMANDS += bin/javap +SPK_COMMANDS += bin/jcmd +SPK_COMMANDS += bin/jconsole +SPK_COMMANDS += bin/jdb +SPK_COMMANDS += bin/jdeprscan +SPK_COMMANDS += bin/jdeps +SPK_COMMANDS += bin/jfr +SPK_COMMANDS += bin/jhsdb +SPK_COMMANDS += bin/jimage +SPK_COMMANDS += bin/jinfo +SPK_COMMANDS += bin/jlink +SPK_COMMANDS += bin/jmap +SPK_COMMANDS += bin/jmod +SPK_COMMANDS += bin/jpackage +SPK_COMMANDS += bin/jps +SPK_COMMANDS += bin/jrunscript +SPK_COMMANDS += bin/jshell +SPK_COMMANDS += bin/jstack +SPK_COMMANDS += bin/jstat +SPK_COMMANDS += bin/jstatd +SPK_COMMANDS += bin/jwebserver +SPK_COMMANDS += bin/keytool +SPK_COMMANDS += bin/rmiregistry +SPK_COMMANDS += bin/serialver + +include ../../mk/spksrc.spk.mk diff --git a/spk/java-21-openjdk/src/LICENSE b/spk/java-21-openjdk/src/LICENSE new file mode 100644 index 00000000000..8b400c7ab81 --- /dev/null +++ b/spk/java-21-openjdk/src/LICENSE @@ -0,0 +1,347 @@ +The GNU General Public License (GPL) + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to +most of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Library General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for this service if you wish), +that you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs; and that you know you +can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny +you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must give the recipients all the rights that you have. You must +make sure that they, too, receive or can get the source code. And you must +show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced +by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will +individually obtain patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must be licensed for +everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms of +this General Public License. The "Program", below, refers to any such program +or work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each licensee is addressed as +"you". + +Activities other than copying, distribution and modification are not covered by +this License; they are outside its scope. The act of running the Program is +not restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made by +running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as +you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the +Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may +at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus +forming a work based on the Program, and copy and distribute such modifications +or work under the terms of Section 1 above, provided that you also meet all of +these conditions: + + a) You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole or + in part contains or is derived from the Program or any part thereof, to be + licensed as a whole at no charge to all third parties under the terms of + this License. + + c) If the modified program normally reads commands interactively when run, + you must cause it, when started running for such interactive use in the + most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to view a copy + of this License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the Program is + not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, and +its terms, do not apply to those sections when you distribute them as separate +works. But when you distribute the same sections as part of a whole which is a +work based on the Program, the distribution of the whole must be on the terms +of this License, whose permissions for other licensees extend to the entire +whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based on +the Program. + +In addition, mere aggregation of another work not based on the Program with the +Program (or with a work based on the Program) on a volume of a storage or +distribution medium does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 and +2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 above + on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of Sections 1 + and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only + for noncommercial distribution and only if you received the program in + object code or executable form with such an offer, in accord with + Subsection b above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all +the source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code +distributed need not include anything that is normally distributed (in either +source or binary form) with the major components (compiler, kernel, and so on) +of the operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the source +code from the same place counts as distribution of the source code, even though +third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, or +rights, from you under this License will not have their licenses terminated so +long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. +However, nothing else grants you permission to modify or distribute the Program +or its derivative works. These actions are prohibited by law if you do not +accept this License. Therefore, by modifying or distributing the Program (or +any work based on the Program), you indicate your acceptance of this License to +do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), +the recipient automatically receives a license from the original licensor to +copy, distribute or modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the recipients' exercise of the +rights granted herein. You are not responsible for enforcing compliance by +third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution +of the Program by all those who receive copies directly or indirectly through +you, then the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose that +choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original +copyright holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In +such case, this License incorporates the limitation as if written in the body +of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the +General Public License from time to time. Such new versions will be similar in +spirit to the present version, but may differ in detail to address new problems +or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any later +version", you have the option of following the terms and conditions either of +that version or of any later version published by the Free Software Foundation. +If the Program does not specify a version number of this License, you may +choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status of +all derivatives of our free software and of promoting the sharing and reuse of +software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE +PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, +YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL +ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE +PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA +BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER +OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible +use to the public, the best way to achieve this is to make it free software +which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach +them to the start of each source file to most effectively convey the exclusion +of warranty; and each file should have at least the "copyright" line and a +pointer to where the full notice is found. + + One line to give the program's name and a brief idea of what it does. + + Copyright (C) + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it +starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes + with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free + software, and you are welcome to redistribute it under certain conditions; + type 'show c' for details. + +The hypothetical commands 'show w' and 'show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may be +called something other than 'show w' and 'show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, +if any, to sign a "copyright disclaimer" for the program, if necessary. Here +is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + 'Gnomovision' (which makes passes at compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General Public +License instead of this License. + + +"CLASSPATH" EXCEPTION TO THE GPL + +Certain source files distributed by Oracle America and/or its affiliates are +subject to the following clarification and special exception to the GPL, but +only where Oracle has expressly included in the particular source file's header +the words "Oracle designates this particular file as subject to the "Classpath" +exception as provided by Oracle in the LICENSE file that accompanied this code." + + Linking this library statically or dynamically with other modules is making + a combined work based on this library. Thus, the terms and conditions of + the GNU General Public License cover the whole combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules, + and to copy and distribute the resulting executable under terms of your + choice, provided that you also meet, for each linked independent module, + the terms and conditions of the license of that module. An independent + module is a module which is not derived from or based on this library. If + you modify this library, you may extend this exception to your version of + the library, but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. diff --git a/spk/java-21-openjdk/src/java-openjdk.png b/spk/java-21-openjdk/src/java-openjdk.png new file mode 100644 index 00000000000..f3d68c09522 Binary files /dev/null and b/spk/java-21-openjdk/src/java-openjdk.png differ