Fix build with the new gtk+

cleanup

OBS-URL: https://build.opensuse.org/request/show/1295072
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eclipse-swt?expand=0&rev=11

LICENSE

@@ -0,0 +1,277 @@
+Eclipse Public License - v 2.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
+
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free copyright
+  license to reproduce, prepare Derivative Works of, publicly display,
+  publicly perform, Distribute and sublicense the Contribution of such
+  Contributor, if any, and such Derivative Works.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  c) Recipient understands that although each Contributor grants the
+  licenses to its Contributions set forth herein, no assurances are
+  provided by any Contributor that the Program does not infringe the
+  patent or other intellectual property rights of any other entity.
+  Each Contributor disclaims any liability to Recipient for claims
+  brought by any other entity based on infringement of intellectual
+  property rights or otherwise. As a condition to exercising the
+  rights and licenses granted hereunder, each Recipient hereby
+  assumes sole responsibility to secure any other intellectual
+  property rights needed, if any. For example, if a third party
+  patent license is required to allow Recipient to Distribute the
+  Program, it is Recipient's responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
+
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following 
+Secondary Licenses when the conditions for such availability set forth 
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.

NOTICE

@@ -0,0 +1,37 @@
+# Notices for Eclipse Platform
+
+This content is produced and maintained by the Eclipse Platform project.
+
+* Project home: https://projects.eclipse.org/projects/eclipse.platform
+
+## Trademarks
+
+Eclipse Platform is a trademark of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License v. 2.0 which is available at
+http://www.eclipse.org/legal/epl-2.0.
+
+SPDX-License-Identifier: EPL-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* https://github.com/eclipse-platform/eclipse.platform.debug.git
+* https://github.com/eclipse-platform/eclipse.platform.git
+* https://github.com/eclipse-platform/eclipse.platform.releng.aggregator.git
+* https://github.com/eclipse-platform/eclipse.platform.releng.buildtools.git
+* https://github.com/eclipse-platform/eclipse.platform.releng.git
+* https://github.com/eclipse-platform/eclipse.platform.swt.git
+* https://github.com/eclipse-platform/eclipse.platform.swt.binaries.git
+* https://github.com/eclipse-platform/eclipse.platform.ua.git
+* https://github.com/eclipse-platform/eclipse.platform.ui.git

classpath.xls

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:param name="srcDir"/>
+<xsl:param name="outputDir"/>
+<xsl:template match="/">
+<project name="test" default="copy_files" basedir=".">
+<target name="copy_files">
+	<copy>
+	<xsl:attribute name="todir">
+	    <xsl:value-of select="$outputDir" />
+	</xsl:attribute>
+	<xsl:for-each select="classpath/classpathentry">
+	<xsl:if test="@kind = 'src'">
+		<fileset>
+		<xsl:attribute name="dir"><xsl:value-of select="$srcDir"/>/<xsl:value-of select="@path"/></xsl:attribute>
+		      <include name="**/*.java"/>
+		</fileset>
+	</xsl:if>
+	</xsl:for-each>
+	</copy>
+</target>
+</project>
+</xsl:template>
+</xsl:stylesheet>

eclipse-arm32.patch

@@ -1,13 +0,0 @@
---- "eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh"	2018-08-21 14:03:55.000000000 +0200
-+++ "eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh"	2020-03-24 21:41:03.246157639 +0100
-@@ -112,6 +112,10 @@
- 		SWT_ARCH=x86
- 		AWT_ARCH=i386
- 		;;
-+	"arm")
-+		SWT_ARCH=arm
-+		AWT_ARCH=aarch32
-+		;;
- 	*)
- 		SWT_ARCH=$MODEL
- 		AWT_ARCH=$MODEL

eclipse-create-tarball.sh

@@ -1,39 +0,0 @@
-#!/bin/bash
-
-ECLIPSE_DATE=20180906
-ECLIPSE_TIME=0745
-VERSION=4.9
-NAME="eclipse-platform-sources"
-
-tmp_dir=$(mktemp -d)
-
-echo ${tmp_dir}
-
-pushd ${tmp_dir}
-
-wget http://archive.eclipse.org/eclipse/downloads/drops4/R-${VERSION}-${ECLIPSE_DATE}${ECLIPSE_TIME}/${NAME}-${VERSION}.tar.xz
-tar -xf ${NAME}-${VERSION}.tar.xz
-rm ${NAME}-${VERSION}.tar.xz
-
-pushd ${NAME}-I${ECLIPSE_DATE}-${ECLIPSE_TIME}
-
-# Delete pre-built binary artifacts except some test data that cannot be generated
-find . ! -path "*/JCL/*" ! -name "rtstubs*.jar" ! -name "java10api.jar" ! -name "j9stubs.jar" \
-   -type f -name *.jar -delete
-find . -type f -name *.class -delete
-find . -type f -name *.so -delete
-find . -type f -name *.dll -delete
-find . -type f -name *.jnilib -delete
-
-# Remove pre-compiled native launchers
-rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
-
-popd
-
-tar cJf ${NAME}-${VERSION}-clean.tar.xz ${NAME}-I${ECLIPSE_DATE}-${ECLIPSE_TIME}
-
-popd
-
-mv ${tmp_dir}/${NAME}-${VERSION}-clean.tar.xz .
-
-rm -rf ${tmp_dir}

eclipse-is64.patch

@@ -1,20 +0,0 @@
---- eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml	2022-05-26 15:32:50.674679467 +0200
-+++ eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml	2022-05-26 15:51:11.649507086 +0200
-@@ -234,7 +234,7 @@
- 	</target>
- 
- 	<target name="is64">
--		<condition property="is64" value="true">
-+		<condition property="is64" value="true" else="false">
- 			<or>
- 				<equals arg1="${swt.arch}" arg2="x86_64"/>
- 				<equals arg1="${swt.arch}" arg2="ia64"/>
-@@ -247,7 +247,7 @@
- 		<echo>Is64=${is64}</echo>
- 	</target>
- 		
--    <target name="replace64" depends="is64" unless="is64">
-+    <target name="replace64" depends="is64" unless="${is64}">
-     	<echo>Converting java files to 32 bit</echo>
-     	<replace dir="${copy.src.dir}" includes="**/*.java" value="int /*long*/" token="long /*int*/"/>
-     	<replace dir="${copy.src.dir}" includes="**/*.java" value="int[] /*long[]*/" token="long[] /*int[]*/"/>

eclipse-jintlong.patch

@@ -1,55 +0,0 @@
---- "eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java"	2022-05-26 15:32:50.686679543 +0200
-+++ "eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java"	2022-05-27 11:05:09.338042020 +0200
-@@ -1945,9 +1945,9 @@
- }
- 
- /** @method flags=dynamic */
--public static final native void _webkit_web_context_set_web_extensions_initialization_user_data(long /* int */ context, long /* int */ user_data);
--public static final void webkit_web_context_set_web_extensions_initialization_user_data(long /* int */ context,
--		long /* int */ user_data) {
-+public static final native void _webkit_web_context_set_web_extensions_initialization_user_data(long /*int*/ context, long /*int*/ user_data);
-+public static final void webkit_web_context_set_web_extensions_initialization_user_data(long /*int*/ context,
-+		long /*int*/ user_data) {
- 	assert WEBKIT2;
- 	lock.lock();
- 	try {
---- "eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c"	2022-05-26 15:32:50.706679667 +0200
-+++ "eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c"	2022-05-27 11:30:38.463916384 +0200
-@@ -839,7 +839,7 @@
- 	// Call the Java implementation to ensure AccessibleObjects are removed
- 	// from the HashMap on the Java side.
- 	if (private->has_accessible) {
--		returned_value = call_accessible_object_function("gObjectClass_finalize", "(J)J", object);
-+		returned_value = call_accessible_object_function("gObjectClass_finalize", "(" I_J ")" I_J , object);
- 		if (returned_value != 0) g_critical ("Undefined behavior calling gObjectClass_finalize from C\n");
- 	}
- 
-@@ -1872,7 +1872,7 @@
- 
- 	// If the method ID isn't NULL
- 	if (mid == NULL) {
--		g_critical("JNI method ID pointer is NULL for method %s\n", method_name);
-+		g_critical("JNI method ID pointer is NULL for method %s sig: %s\n", method_name, method_signature);
- 		return 0;
- 	} else {
- 		va_start(arg_list, method_signature);
---- "eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c"	2022-05-26 15:32:50.686679543 +0200
-+++ "eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c"	2022-05-27 06:53:08.736787120 +0200
-@@ -2422,7 +2422,7 @@
- 
- #ifndef NO__1webkit_1web_1context_1set_1web_1extensions_1initialization_1user_1data
- JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1web_1extensions_1initialization_1user_1data)
--	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
- {
- 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1set_1web_1extensions_1initialization_1user_1data_FUNC);
- /*
-@@ -2431,7 +2431,7 @@
- 	{
- 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_set_web_extensions_initialization_user_data)
- 		if (fp) {
--			((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1);
-+			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
- 		}
- 	}
- 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1context_1set_1web_1extensions_1initialization_1user_1data_FUNC);

eclipse-platform-sources-4.9-clean.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c6884d5e38744437bc5926914ed811eeb37a77276ef992b6e07a4c99037484b
-size 171176876

eclipse-ppc64.patch

@@ -1,18 +0,0 @@
---- "eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh"	2018-08-21 14:03:55.000000000 +0200
-+++ "eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh"	2019-11-23 18:56:22.469583236 +0100
-@@ -195,13 +195,13 @@
- 
- 
- # For 64-bit CPUs, we have a switch
--if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
-+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'aarch64' ]; then
- 	SWT_PTR_CFLAGS=-DJNI64
- 	if [ -d /lib64 ]; then
- 		XLIB64=-L/usr/X11R6/lib64
- 		export XLIB64
- 	fi
--	if [ ${MODEL} = 'ppc64le' ]; then
-+	if [ ${MODEL} = 'ppc64le'  -o ${MODEL} = 'ppc64']; then
- 		SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
- 		XLIB64="${XLIB64} -L/usr/lib64"
- 		SWT_LFLAGS=-m64

eclipse-secondary-arches.patch

@@ -1,195 +0,0 @@
---- eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	2018-06-13 09:08:26.000000000 +0200
-+++ eclipse-platform-sources-I20180906-0745/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	2019-11-23 19:43:05.635964482 +0100
-@@ -34,3 +34,23 @@
- requires.7.name = org.eclipse.swt.gtk.linux.ppc64le
- requires.7.range = [$version$,$version$]
- requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.8.namespace = org.eclipse.equinox.p2.iu
-+requires.8.name = org.eclipse.swt.gtk.linux.ppc64
-+requires.8.range = [$version$,$version$]
-+requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.9.namespace = org.eclipse.equinox.p2.iu
-+requires.9.name = org.eclipse.swt.gtk.linux.arm
-+requires.9.range = [$version$,$version$]
-+requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.10.namespace = org.eclipse.equinox.p2.iu
-+requires.10.name = org.eclipse.swt.gtk.linux.aarch64
-+requires.10.range = [$version$,$version$]
-+requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
-+
-+requires.11.namespace = org.eclipse.equinox.p2.iu
-+requires.11.name = org.eclipse.swt.gtk.linux.s390x
-+requires.11.range = [$version$,$version$]
-+requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
---- eclipse-platform-sources-I20180906-0745/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2018-09-06 06:27:51.000000000 +0200
-+++ eclipse-platform-sources-I20180906-0745/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2019-11-23 19:44:52.823489642 +0100
-@@ -420,6 +420,46 @@
-          fragment="true"/>
- 
-    <plugin
-+         id="org.eclipse.equinox.launcher.gtk.linux.ppc64"
-+         os="linux"
-+         ws="gtk"
-+         arch="ppc64"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"/>
-+         
-+   <plugin
-+         id="org.eclipse.equinox.launcher.gtk.linux.arm"
-+         os="linux"
-+         ws="gtk"
-+         arch="arm"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"/>
-+
-+   <plugin
-+         id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
-+         os="linux"
-+         ws="gtk"
-+         arch="aarch64"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"/>
-+
-+   <plugin
-+         id="org.eclipse.equinox.launcher.gtk.linux.s390x"
-+         os="linux"
-+         ws="gtk"
-+         arch="s390x"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"/>
-+
-+   <plugin
-          id="org.eclipse.equinox.launcher.gtk.linux.x86"
-          os="linux"
-          ws="gtk"
-@@ -500,6 +540,39 @@
-          unpack="false"/>
- 
-    <plugin
-+         id="org.eclipse.swt.gtk.linux.s390x"
-+         os="linux"
-+         ws="gtk"
-+         arch="s390x"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.eclipse.swt.gtk.linux.arm"
-+         os="linux"
-+         ws="gtk"
-+         arch="arm"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.eclipse.swt.gtk.linux.aarch64"
-+         os="linux"
-+         ws="gtk"
-+         arch="aarch64"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.swt.gtk.linux.ppc64le"
-          os="linux"
-          ws="gtk"
-@@ -507,6 +580,17 @@
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
-+
-+   <plugin
-+         id="org.eclipse.swt.gtk.linux.ppc64"
-+         os="linux"
-+         ws="gtk"
-+         arch="ppc64"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-          fragment="true"
-          unpack="false"/>
- 
---- eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	2018-08-23 02:04:10.000000000 +0200
-+++ eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	2019-11-23 19:43:05.631964499 +0100
-@@ -37,3 +37,15 @@
- 
- root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
- root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
-+
-+root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
-+root.linux.gtk.arm.permissions.755=launcher
-+
-+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
-+root.linux.gtk.aarch64.permissions.755=launcher
-+
-+root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
-+root.linux.gtk.ppc64.permissions.755=launcher
-+
-+root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
-+root.linux.gtk.s390x.permissions.755=launcher
---- eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	2018-08-23 02:04:10.000000000 +0200
-+++ eclipse-platform-sources-I20180906-0745/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	2019-11-23 19:43:05.635964482 +0100
-@@ -109,7 +109,7 @@
- 			"s390x")
- 				defaultOSArch="s390x"
- 				defaultJava=DEFAULT_JAVA_EXEC
--				OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch"
-+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
- 				;;
- 			arm*)
- 				defaultOSArch="arm"
---- eclipse-platform-sources-I20180906-0745/rt.equinox.framework/pom.xml	2018-09-06 13:47:31.000000000 +0200
-+++ eclipse-platform-sources-I20180906-0745/rt.equinox.framework/pom.xml	2019-11-23 19:43:05.635964482 +0100
-@@ -73,6 +73,30 @@
- 	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
-       </modules>
-     </profile>
-+    <profile>
-+      <id>build-native-launchers-gtk.linux.ppc64</id>
-+      <activation>
-+	<property>
-+	  <name>native</name>
-+	  <value>gtk.linux.ppc64</value>
-+        </property>
-+      </activation>
-+      <modules>
-+	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
-+      </modules>
-+    </profile>
-+    <profile>
-+      <id>build-native-launchers-gtk.linux.s390x</id>
-+      <activation>
-+	<property>
-+	  <name>native</name>
-+	  <value>gtk.linux.s390x</value>
-+        </property>
-+      </activation>
-+      <modules>
-+	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
-+      </modules>
-+    </profile>
-   </profiles>
- 
-   <modules>

eclipse-swt-avoid-javascript-at-build-4_29.patch

@@ -0,0 +1,71 @@
+--- a/bundles/org.eclipse.swt/buildSWT.xml	2025-03-28 12:03:20.243895410 +0100
++++ b/bundles/org.eclipse.swt/buildSWT.xml	2025-03-28 12:04:12.860291470 +0100
+@@ -50,6 +50,39 @@
+ 	<property name="file_src_pom" value="bundles/org.eclipse.swt/pom.xml"/>
+ 	<property name="file_bin_parent_pom" value="bundles/binaries-parent/pom.xml"/>
+ 	
++	<target name="check_compilation_all_platforms">
++		<mkdir dir="${tmphome}"/>
++		<!-- <property name="tmpdir" value="${tmphome}/check.compile.${TAG}"/> -->
++		<property name="buildDir" value="${tmpdir}/build"/>
++		<property name="projectDir" value="${repo.src}/bundles/org.eclipse.swt"/>
++
++		<!-- 64 bit -->
++		<antcall target="build_classes">
++			<param name="cp" value=".classpath_gtk"/>
++		</antcall>
++
++		<antcall target="check_preprocessing"/>
++	</target>
++
++	<target name="build_classes">
++		<echo>Building ${cp}</echo>
++		<delete file="${tmpdir}/copy.xml"/>
++		<delete dir="${buildDir}"/>
++
++		<xslt style="${projectDir}/tasks/classpath.xls" in="${projectDir}/${cp}" out="${tmpdir}/copy.xml">
++			<param name="srcDir" expression="${projectDir}"/>
++			<param name="outputDir" expression="${buildDir}"/>
++		</xslt>
++		<ant antfile="${tmpdir}/copy.xml" target="copy_files"/>
++
++		<javac includeantruntime="false" srcdir="${buildDir}" encoding="utf8"></javac>
++		<javadoc destdir="docs/api" author="true" version="true" use="true" windowtitle="Eclipse SWT API" encoding="utf8">
++			<packageset dir="${buildDir}" defaultexcludes="yes">
++				<include name="**/**"/>
++			</packageset>
++		</javadoc>
++	</target>
++
+ 	<target name="init_keyfile">
+ 		<condition property="keyfile" value="C:\BUILD\ssh\swtbuild_dsa_private" else="/var/lib/hudson/.ssh/id_rsa">
+ 			<os family="windows"/>
+@@ -366,27 +399,8 @@
+ 	<!-- Set swt_version, new_version, (and rev, min_ver, maj_ver, new_rev, new_min_ver, new_maj_ver) from the make_common.mak  -->
+ 	<target name="get_version" unless="swt_version">
+ 		<loadproperties srcFile="${repo.src}/${file_make_common}"/>
+-		<script language="javascript">
+-		<![CDATA[
+-			rev = project.getProperty("rev");
+-			min_ver = project.getProperty("min_ver");
+-			maj_ver = project.getProperty("maj_ver");
+-			new_rev = parseInt(rev) + 1;
+-			new_min_ver = min_ver;
+-			new_maj_ver = maj_ver;
+-			one = new_maj_ver;
+-			two = new_min_ver;
+-			three = new_rev;
+-			four = 0;
+-			project.setProperty("new_rev", new_rev);
+-			project.setProperty("new_min_ver", new_min_ver);
+-			project.setProperty("new_maj_ver", new_maj_ver);
+-			project.setProperty("new_comma_ver", one + "," + two + "," + three + "," + four);
+-   	 	]]>
+-		</script>
+ 		<property name="swt_version" value="${maj_ver}${min_ver}r${rev}"/>
+-		<property name="new_version" value="${new_maj_ver}${new_min_ver}r${new_rev}"/>
+-		<echo>Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver}</echo>
++		<echo>Version=${swt_version}</echo>
+ 	</target>
+ 
+ 	<target name="get_new_release_version" unless="min_ver">

eclipse-swt-avoid-javascript-at-build-4_9.patch

@@ -0,0 +1,42 @@
+--- eclipse.platform.swt-R4_9/bundles/org.eclipse.swt/buildSWT.xml	2025-03-28 12:10:40.847944301 +0100
++++ eclipse.platform.swt-R4_9/bundles/org.eclipse.swt/buildSWT.xml	2025-03-28 12:12:29.104620458 +0100
+@@ -298,7 +298,12 @@
+ 
+ 		<antcall target="replace64"></antcall>
+ 
+-		<javac includeantruntime="false" srcdir="${buildDir}"></javac>
++		<javac includeantruntime="false" srcdir="${buildDir}" encoding="utf8"></javac>
++		<javadoc destdir="docs/api" author="true" version="true" use="true" windowtitle="Eclipse SWT API" encoding="utf8">
++			<packageset dir="${buildDir}" defaultexcludes="yes">
++				<include name="**/**"/>
++			</packageset>
++		</javadoc>
+ 	</target>
+ 
+ 	<!-- common build tasks -->
+@@ -413,24 +418,8 @@
+ 	<!-- Set swt_version, new_version, (and min_ver, maj_ver, new_min_ver, new_maj_ver) from the make_common.mak  -->
+ 	<target name="get_version" unless="swt_version">
+ 		<loadproperties srcFile="${repo.src}/${file_make_common}"/>
+-		<script language="javascript">
+-		<![CDATA[
+-			min_ver = project.getProperty("min_ver");
+-			maj_ver = project.getProperty("maj_ver");
+-			new_min_ver = parseInt(min_ver) + 1;
+-			new_maj_ver = maj_ver;
+-			one = new_maj_ver;
+-			two = Math.floor(new_min_ver / 100);
+-			three = Math.floor((new_min_ver - (two * 100)) / 10);
+-			four = Math.floor(new_min_ver - (two * 100) - (three * 10));
+-			project.setProperty("new_min_ver", new_min_ver);
+-			project.setProperty("new_maj_ver", new_maj_ver);
+-			project.setProperty("new_comma_ver", one + "," + two + "," + three + "," + four);
+-   	 	]]>
+-		</script>
+ 		<property name="swt_version" value="${maj_ver}${min_ver}"/>
+-		<property name="new_version" value="${new_maj_ver}${new_min_ver}"/>
+-		<echo>Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver}</echo>
++		<echo>Version=${swt_version}</echo>
+ 	</target>
+ 
+ 	<target name="get_new_release_version" unless="min_ver">

eclipse-swt-build.xml

@@ -1,33 +0,0 @@
-<project name="SWT" default="buildSWTFromSources" basedir=".">
-
-  <macrodef name="build">
-    <attribute name="bundleName"/>
-
-    <sequential>
-      <delete dir="eclipse.platform.swt.binaries/bundles/@{bundleName}/@dot"/>
-      <delete dir="eclipse.platform.swt.binaries/bundles/@{bundleName}/temp.folder"/>
-      <delete file="eclipse.platform.swt.binaries/bundles/@{bundleName}/swt.jar"/>
-
-      <ant antfile="buildSWT.xml" dir="eclipse.platform.swt/bundles/org.eclipse.swt" target="build_libraries">
-        <property name="swt.os" value="linux"/>
-        <property name="swt.ws" value="gtk"/>
-        <property name="swt.arch" value="${swt.arch}"/>
-      </ant>	  
-      <ant dir="eclipse.platform.swt.binaries/bundles/@{bundleName}"/>
-      <property file="eclipse.platform.swt.binaries/bundles/@{bundleName}/build.properties" prefix="@{bundleName}."/>
-      <echo message="bundling ${@{bundleName}.bin.includes}"/>
-      <jar jarfile="@{bundleName}.jar" compress="false">
-        <zipfileset src="eclipse.platform.swt.binaries/bundles/@{bundleName}/swt.jar"/>
-        <fileset dir="eclipse.platform.swt.binaries/bundles/@{bundleName}" includes="${@{bundleName}.bin.includes}"/>
-      </jar>
-
-      <delete dir="eclipse.platform.swt.binaries/bundles/@{bundleName}/@dot"/>
-      <delete dir="eclipse.platform.swt.binaries/bundles/@{bundleName}/temp.folder"/>
-      <delete file="eclipse.platform.swt.binaries/bundles/@{bundleName}/swt.jar"/>
-    </sequential>
-  </macrodef>
-
-  <target name="buildSWTFromSources">
-    <build bundleName="org.eclipse.swt.gtk.linux.${swt.arch}"/>
-  </target>
-</project>

eclipse-swt-fedora-build-native.patch

@@ -0,0 +1,23 @@
+--- "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh"	2025-03-25 13:34:33.358155078 +0100
++++ "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh"	2025-03-25 13:36:47.743298383 +0100
+@@ -74,7 +74,8 @@
+ 
+ MAKE_TYPE=make
+ 
+-export CFLAGS='-O -Wall -fPIC'
++export CFLAGS="$CFLAGS"
++OUTPUT_DIR=../../..
+ 
+ # Determine which OS we are on
+ if [ "${OS}" = "" ]; then
+--- "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak"	2025-03-25 13:34:33.358586549 +0100
++++ "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak"	2025-03-25 13:36:47.742196543 +0100
+@@ -24,7 +24,7 @@
+ #SWT_LIB_DEBUG=1     # to debug glue code in /bundles/org.eclipse.swt/bin/library. E.g os_custom.c:swt_fixed_forall(..)
+ # Can be set via environment like: export SWT_LIB_DEBUG=1
+ ifdef SWT_LIB_DEBUG
+-SWT_DEBUG = -O0 -g3 -ggdb3
++#SWT_DEBUG = -O0 -g3 -ggdb3
+ NO_STRIP=1
+ endif
+ 

eclipse-swt-gcc15-4_29.patch

@@ -0,0 +1,465 @@
+--- "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c"	2025-06-16 18:24:47.573250257 +0200
++++ "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c"	2025-06-16 18:25:46.447714884 +0200
+@@ -333,7 +333,7 @@
+ {
+ 	jlong rc = 0;
+ 	ATK_NATIVE_ENTER(env, that, call__JJ_FUNC);
+-	rc = (jlong)((jlong (*)())arg0)(arg1);
++	rc = (jlong)((jlong (*)(jlong))arg0)(arg1);
+ 	ATK_NATIVE_EXIT(env, that, call__JJ_FUNC);
+ 	return rc;
+ }
+@@ -345,7 +345,7 @@
+ {
+ 	jlong rc = 0;
+ 	ATK_NATIVE_ENTER(env, that, call__JJJ_FUNC);
+-	rc = (jlong)((jlong (*)())arg0)(arg1, arg2);
++	rc = (jlong)((jlong (*)(jlong, jlong))arg0)(arg1, arg2);
+ 	ATK_NATIVE_EXIT(env, that, call__JJJ_FUNC);
+ 	return rc;
+ }
+@@ -357,7 +357,7 @@
+ {
+ 	jlong rc = 0;
+ 	ATK_NATIVE_ENTER(env, that, call__JJJJ_FUNC);
+-	rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3);
++	rc = (jlong)((jlong (*)(jlong, jlong, jlong))arg0)(arg1, arg2, arg3);
+ 	ATK_NATIVE_EXIT(env, that, call__JJJJ_FUNC);
+ 	return rc;
+ }
+@@ -369,7 +369,7 @@
+ {
+ 	jlong rc = 0;
+ 	ATK_NATIVE_ENTER(env, that, call__JJJJJJ_FUNC);
+-	rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4, arg5);
++	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jlong))arg0)(arg1, arg2, arg3, arg4, arg5);
+ 	ATK_NATIVE_EXIT(env, that, call__JJJJJJ_FUNC);
+ 	return rc;
+ }
+--- "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.h"	2025-06-16 18:24:47.573280722 +0200
++++ "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.h"	2025-06-16 18:25:46.447978347 +0200
+@@ -21,5 +21,5 @@
+ #define ATK_LOAD_FUNCTION LOAD_FUNCTION
+ 
+ #define SWT_AtkObjectClass_get_attributes get_attributes
+-#define SWT_AtkObjectClass_get_attributes_cast AtkAttributeSet* (*)()
++#define SWT_AtkObjectClass_get_attributes_cast AtkAttributeSet* (*)(AtkObject *)
+ 
+--- "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c"	2025-06-16 18:24:47.573396277 +0200
++++ "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c"	2025-06-16 18:25:46.448284898 +0200
+@@ -44,12 +44,12 @@
+ AtkActionIface *getAtkActionIfaceFields(JNIEnv *env, jobject lpObject, AtkActionIface *lpStruct)
+ {
+ 	if (!AtkActionIfaceFc.cached) cacheAtkActionIfaceFields(env, lpObject);
+-	lpStruct->do_action = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.do_action);
+-	lpStruct->get_n_actions = (gint (*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_n_actions);
+-	lpStruct->get_description = (const gchar *(*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_description);
+-	lpStruct->get_name = (const gchar *(*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_name);
+-	lpStruct->get_keybinding = (const gchar *(*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_keybinding);
+-	lpStruct->set_description = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.set_description);
++	lpStruct->do_action = (gboolean (*)(AtkAction *, gint))(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.do_action);
++	lpStruct->get_n_actions = (gint (*)(AtkAction *))(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_n_actions);
++	lpStruct->get_description = (const gchar *(*)(AtkAction *, gint))(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_description);
++	lpStruct->get_name = (const gchar *(*)(AtkAction *, gint))(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_name);
++	lpStruct->get_keybinding = (const gchar *(*)(AtkAction *, gint))(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.get_keybinding);
++	lpStruct->set_description = (gboolean (*)(AtkAction *, gint,  const gchar *))(*env)->GetLongField(env, lpObject, AtkActionIfaceFc.set_description);
+ 	return lpStruct;
+ }
+ 
+@@ -131,19 +131,19 @@
+ AtkComponentIface *getAtkComponentIfaceFields(JNIEnv *env, jobject lpObject, AtkComponentIface *lpStruct)
+ {
+ 	if (!AtkComponentIfaceFc.cached) cacheAtkComponentIfaceFields(env, lpObject);
+-	lpStruct->add_focus_handler = (guint (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.add_focus_handler);
+-	lpStruct->contains = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.contains);
+-	lpStruct->ref_accessible_at_point = (AtkObject *(*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point);
+-	lpStruct->get_extents = (void (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_extents);
+-	lpStruct->get_position = (void (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_position);
+-	lpStruct->get_size = (void (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_size);
+-	lpStruct->grab_focus = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.grab_focus);
+-	lpStruct->remove_focus_handler = (void (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler);
+-	lpStruct->set_extents = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.set_extents);
+-	lpStruct->set_position = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.set_position);
+-	lpStruct->set_size = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.set_size);
+-	lpStruct->get_layer = (AtkLayer (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_layer);
+-	lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder);
++	lpStruct->add_focus_handler = (guint (*)(AtkComponent *, void (*)(AtkObject *, gboolean)))(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.add_focus_handler);
++	lpStruct->contains = (gboolean (*)(AtkComponent *, gint,  gint,  AtkCoordType))(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.contains);
++	lpStruct->ref_accessible_at_point = (AtkObject *(*)(AtkComponent *, gint,  gint,  AtkCoordType))(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point);
++	lpStruct->get_extents = (void (*)(AtkComponent *, gint *, gint *, gint *, gint *, AtkCoordType))(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_extents);
++	lpStruct->get_position = (void (*)(AtkComponent *, gint *, gint *, AtkCoordType))(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_position);
++	lpStruct->get_size = (void (*)(AtkComponent *, gint *, gint *))(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_size);
++	lpStruct->grab_focus = (gboolean (*)(AtkComponent *))(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.grab_focus);
++	lpStruct->remove_focus_handler = (void (*)(AtkComponent *, guint))(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler);
++	lpStruct->set_extents = (gboolean (*)(AtkComponent *, gint,  gint,  gint,  gint,  AtkCoordType))(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.set_extents);
++	lpStruct->set_position = (gboolean (*)(AtkComponent *, gint,  gint,  AtkCoordType))(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.set_position);
++	lpStruct->set_size = (gboolean (*)(AtkComponent *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.set_size);
++	lpStruct->get_layer = (AtkLayer (*)(AtkComponent *))(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_layer);
++	lpStruct->get_mdi_zorder = (gint (*)(AtkComponent *))(*env)->GetLongField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder);
+ 	return lpStruct;
+ }
+ 
+@@ -192,13 +192,13 @@
+ AtkEditableTextIface *getAtkEditableTextIfaceFields(JNIEnv *env, jobject lpObject, AtkEditableTextIface *lpStruct)
+ {
+ 	if (!AtkEditableTextIfaceFc.cached) cacheAtkEditableTextIfaceFields(env, lpObject);
+-	lpStruct->set_run_attributes = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.set_run_attributes);
+-	lpStruct->set_text_contents = (void (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.set_text_contents);
+-	lpStruct->insert_text = (void (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.insert_text);
+-	lpStruct->copy_text = (void (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.copy_text);
+-	lpStruct->cut_text = (void (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.cut_text);
+-	lpStruct->delete_text = (void (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.delete_text);
+-	lpStruct->paste_text = (void (*)())(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.paste_text);
++	lpStruct->set_run_attributes = (gboolean (*)(AtkEditableText *, AtkAttributeSet *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.set_run_attributes);
++	lpStruct->set_text_contents = (void (*)(AtkEditableText *, const gchar *))(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.set_text_contents);
++	lpStruct->insert_text = (void (*)(AtkEditableText *, const gchar *, gint,  gint *))(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.insert_text);
++	lpStruct->copy_text = (void (*)(AtkEditableText *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.copy_text);
++	lpStruct->cut_text = (void (*)(AtkEditableText *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.cut_text);
++	lpStruct->delete_text = (void (*)(AtkEditableText *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.delete_text);
++	lpStruct->paste_text = (void (*)(AtkEditableText *, gint))(*env)->GetLongField(env, lpObject, AtkEditableTextIfaceFc.paste_text);
+ 	return lpStruct;
+ }
+ 
+@@ -237,9 +237,9 @@
+ AtkHypertextIface *getAtkHypertextIfaceFields(JNIEnv *env, jobject lpObject, AtkHypertextIface *lpStruct)
+ {
+ 	if (!AtkHypertextIfaceFc.cached) cacheAtkHypertextIfaceFields(env, lpObject);
+-	lpStruct->get_link = (AtkHyperlink *(*)())(*env)->GetLongField(env, lpObject, AtkHypertextIfaceFc.get_link);
+-	lpStruct->get_n_links = (gint (*)())(*env)->GetLongField(env, lpObject, AtkHypertextIfaceFc.get_n_links);
+-	lpStruct->get_link_index = (gint (*)())(*env)->GetLongField(env, lpObject, AtkHypertextIfaceFc.get_link_index);
++	lpStruct->get_link = (AtkHyperlink *(*)(AtkHypertext *, gint))(*env)->GetLongField(env, lpObject, AtkHypertextIfaceFc.get_link);
++	lpStruct->get_n_links = (gint (*)(AtkHypertext *))(*env)->GetLongField(env, lpObject, AtkHypertextIfaceFc.get_n_links);
++	lpStruct->get_link_index = (gint (*)(AtkHypertext *, gint))(*env)->GetLongField(env, lpObject, AtkHypertextIfaceFc.get_link_index);
+ 	return lpStruct;
+ }
+ 
+@@ -295,29 +295,29 @@
+ AtkObjectClass *getAtkObjectClassFields(JNIEnv *env, jobject lpObject, AtkObjectClass *lpStruct)
+ {
+ 	if (!AtkObjectClassFc.cached) cacheAtkObjectClassFields(env, lpObject);
+-	lpStruct->get_name = (const gchar *(*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_name);
+-	lpStruct->get_description = (const gchar *(*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_description);
+-	lpStruct->get_parent = (AtkObject *(*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_parent);
+-	lpStruct->get_n_children = (gint (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_n_children);
+-	lpStruct->ref_child = (AtkObject *(*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.ref_child);
+-	lpStruct->get_index_in_parent = (gint (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_index_in_parent);
+-	lpStruct->ref_relation_set = (AtkRelationSet *(*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.ref_relation_set);
+-	lpStruct->get_role = (AtkRole (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_role);
+-	lpStruct->get_layer = (AtkLayer (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_layer);
+-	lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_mdi_zorder);
+-	lpStruct->ref_state_set = (AtkStateSet *(*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.ref_state_set);
+-	lpStruct->set_name = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.set_name);
+-	lpStruct->set_description = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.set_description);
+-	lpStruct->set_parent = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.set_parent);
+-	lpStruct->set_role = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.set_role);
+-	lpStruct->connect_property_change_handler = (guint (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.connect_property_change_handler);
+-	lpStruct->remove_property_change_handler = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.remove_property_change_handler);
+-	lpStruct->initialize = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.initialize);
+-	lpStruct->children_changed = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.children_changed);
+-	lpStruct->focus_event = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.focus_event);
+-	lpStruct->property_change = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.property_change);
+-	lpStruct->state_change = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.state_change);
+-	lpStruct->visible_data_changed = (void (*)())(*env)->GetLongField(env, lpObject, AtkObjectClassFc.visible_data_changed);
++	lpStruct->get_name = (const gchar *(*)(AtkObject *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_name);
++	lpStruct->get_description = (const gchar *(*)(AtkObject *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_description);
++	lpStruct->get_parent = (AtkObject *(*)(AtkObject *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_parent);
++	lpStruct->get_n_children = (gint (*)(AtkObject *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_n_children);
++	lpStruct->ref_child = (AtkObject *(*)(AtkObject *, gint))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.ref_child);
++	lpStruct->get_index_in_parent = (gint (*)(AtkObject *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_index_in_parent);
++	lpStruct->ref_relation_set = (AtkRelationSet *(*)(AtkObject *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.ref_relation_set);
++	lpStruct->get_role = (AtkRole (*)(AtkObject *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_role);
++	lpStruct->get_layer = (AtkLayer (*)(AtkObject *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_layer);
++	lpStruct->get_mdi_zorder = (gint (*)(AtkObject *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_mdi_zorder);
++	lpStruct->ref_state_set = (AtkStateSet *(*)(AtkObject *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.ref_state_set);
++	lpStruct->set_name = (void (*)(AtkObject *, const gchar *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.set_name);
++	lpStruct->set_description = (void (*)(AtkObject *, const gchar *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.set_description);
++	lpStruct->set_parent = (void (*)(AtkObject *, AtkObject *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.set_parent);
++	lpStruct->set_role = (void (*)(AtkObject *, AtkRole))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.set_role);
++	lpStruct->connect_property_change_handler = (guint (*)(AtkObject *, void (**)(AtkObject *, AtkPropertyValues *)))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.connect_property_change_handler);
++	lpStruct->remove_property_change_handler = (void (*)(AtkObject *, guint))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.remove_property_change_handler);
++	lpStruct->initialize = (void (*)(AtkObject *, void *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.initialize);
++	lpStruct->children_changed = (void (*)(AtkObject *, guint,  void *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.children_changed);
++	lpStruct->focus_event = (void (*)(AtkObject *, gboolean))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.focus_event);
++	lpStruct->property_change = (void (*)(AtkObject *, AtkPropertyValues *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.property_change);
++	lpStruct->state_change = (void (*)(AtkObject *, const gchar *, gboolean))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.state_change);
++	lpStruct->visible_data_changed = (void (*)(AtkObject *))(*env)->GetLongField(env, lpObject, AtkObjectClassFc.visible_data_changed);
+ 	lpStruct->SWT_AtkObjectClass_get_attributes = (SWT_AtkObjectClass_get_attributes_cast)(*env)->GetLongField(env, lpObject, AtkObjectClassFc.get_attributes);
+ 	return lpStruct;
+ }
+@@ -379,14 +379,14 @@
+ AtkSelectionIface *getAtkSelectionIfaceFields(JNIEnv *env, jobject lpObject, AtkSelectionIface *lpStruct)
+ {
+ 	if (!AtkSelectionIfaceFc.cached) cacheAtkSelectionIfaceFields(env, lpObject);
+-	lpStruct->add_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.add_selection);
+-	lpStruct->clear_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.clear_selection);
+-	lpStruct->ref_selection = (AtkObject *(*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.ref_selection);
+-	lpStruct->get_selection_count = (gint (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.get_selection_count);
+-	lpStruct->is_child_selected = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.is_child_selected);
+-	lpStruct->remove_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.remove_selection);
+-	lpStruct->select_all_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.select_all_selection);
+-	lpStruct->selection_changed = (void (*)())(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.selection_changed);
++	lpStruct->add_selection = (gboolean (*)(AtkSelection *, gint))(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.add_selection);
++	lpStruct->clear_selection = (gboolean (*)(AtkSelection *))(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.clear_selection);
++	lpStruct->ref_selection = (AtkObject *(*)(AtkSelection *, gint))(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.ref_selection);
++	lpStruct->get_selection_count = (gint (*)(AtkSelection *))(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.get_selection_count);
++	lpStruct->is_child_selected = (gboolean (*)(AtkSelection *, gint))(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.is_child_selected);
++	lpStruct->remove_selection = (gboolean (*)(AtkSelection *, gint))(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.remove_selection);
++	lpStruct->select_all_selection = (gboolean (*)(AtkSelection *))(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.select_all_selection);
++	lpStruct->selection_changed = (void (*)(AtkSelection *))(*env)->GetLongField(env, lpObject, AtkSelectionIfaceFc.selection_changed);
+ 	return lpStruct;
+ }
+ 
+@@ -459,42 +459,42 @@
+ AtkTableIface *getAtkTableIfaceFields(JNIEnv *env, jobject lpObject, AtkTableIface *lpStruct)
+ {
+ 	if (!AtkTableIfaceFc.cached) cacheAtkTableIfaceFields(env, lpObject);
+-	lpStruct->ref_at = (AtkObject* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.ref_at);
+-	lpStruct->get_index_at = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_index_at);
+-	lpStruct->get_column_at_index = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_column_at_index);
+-	lpStruct->get_row_at_index = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_row_at_index);
+-	lpStruct->get_n_columns = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_n_columns);
+-	lpStruct->get_n_rows = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_n_rows);
+-	lpStruct->get_column_extent_at = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_column_extent_at);
+-	lpStruct->get_row_extent_at = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_row_extent_at);
+-	lpStruct->get_caption = (AtkObject* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_caption);
+-	lpStruct->get_column_description = (const gchar* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_column_description);
+-	lpStruct->get_column_header = (AtkObject* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_column_header);
+-	lpStruct->get_row_description = (const gchar* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_row_description);
+-	lpStruct->get_row_header = (AtkObject* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_row_header);
+-	lpStruct->get_summary = (AtkObject* (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_summary);
+-	lpStruct->set_caption = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_caption);
+-	lpStruct->set_column_description = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_column_description);
+-	lpStruct->set_column_header = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_column_header);
+-	lpStruct->set_row_description = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_row_description);
+-	lpStruct->set_row_header = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_row_header);
+-	lpStruct->set_summary = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_summary);
+-	lpStruct->get_selected_columns = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_selected_columns);
+-	lpStruct->get_selected_rows = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_selected_rows);
+-	lpStruct->is_column_selected = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.is_column_selected);
+-	lpStruct->is_row_selected = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.is_row_selected);
+-	lpStruct->is_selected = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.is_selected);
+-	lpStruct->add_row_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.add_row_selection);
+-	lpStruct->remove_row_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.remove_row_selection);
+-	lpStruct->add_column_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.add_column_selection);
+-	lpStruct->remove_column_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.remove_column_selection);
+-	lpStruct->row_inserted = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.row_inserted);
+-	lpStruct->column_inserted = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.column_inserted);
+-	lpStruct->row_deleted = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.row_deleted);
+-	lpStruct->column_deleted = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.column_deleted);
+-	lpStruct->row_reordered = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.row_reordered);
+-	lpStruct->column_reordered = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.column_reordered);
+-	lpStruct->model_changed = (void (*)())(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.model_changed);
++	lpStruct->ref_at = (AtkObject* (*)(AtkTable *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.ref_at);
++	lpStruct->get_index_at = (gint (*)(AtkTable *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_index_at);
++	lpStruct->get_column_at_index = (gint (*)(AtkTable *, gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_column_at_index);
++	lpStruct->get_row_at_index = (gint (*)(AtkTable *, gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_row_at_index);
++	lpStruct->get_n_columns = (gint (*)(AtkTable *))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_n_columns);
++	lpStruct->get_n_rows = (gint (*)(AtkTable *))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_n_rows);
++	lpStruct->get_column_extent_at = (gint (*)(AtkTable *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_column_extent_at);
++	lpStruct->get_row_extent_at = (gint (*)(AtkTable *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_row_extent_at);
++	lpStruct->get_caption = (AtkObject* (*)(AtkTable *))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_caption);
++	lpStruct->get_column_description = (const gchar* (*)(AtkTable *, gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_column_description);
++	lpStruct->get_column_header = (AtkObject* (*)(AtkTable *, gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_column_header);
++	lpStruct->get_row_description = (const gchar* (*)(AtkTable *, gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_row_description);
++	lpStruct->get_row_header = (AtkObject* (*)(AtkTable *, gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_row_header);
++	lpStruct->get_summary = (AtkObject* (*)(AtkTable *))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_summary);
++	lpStruct->set_caption = (void (*)(AtkTable *, AtkObject *))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_caption);
++	lpStruct->set_column_description = (void (*)(AtkTable *, gint,  const gchar *))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_column_description);
++	lpStruct->set_column_header = (void (*)(AtkTable *, gint,  AtkObject *))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_column_header);
++	lpStruct->set_row_description = (void (*)(AtkTable *, gint,  const gchar *))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_row_description);
++	lpStruct->set_row_header = (void (*)(AtkTable *, gint,  AtkObject *))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_row_header);
++	lpStruct->set_summary = (void (*)(AtkTable *, AtkObject *))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.set_summary);
++	lpStruct->get_selected_columns = (gint (*)(AtkTable *, gint **))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_selected_columns);
++	lpStruct->get_selected_rows = (gint (*)(AtkTable *, gint **))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.get_selected_rows);
++	lpStruct->is_column_selected = (gboolean (*)(AtkTable *, gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.is_column_selected);
++	lpStruct->is_row_selected = (gboolean (*)(AtkTable *, gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.is_row_selected);
++	lpStruct->is_selected = (gboolean (*)(AtkTable *, gint, gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.is_selected);
++	lpStruct->add_row_selection = (gboolean (*)(AtkTable *, gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.add_row_selection);
++	lpStruct->remove_row_selection = (gboolean (*)(AtkTable *, gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.remove_row_selection);
++	lpStruct->add_column_selection = (gboolean (*)(AtkTable *, gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.add_column_selection);
++	lpStruct->remove_column_selection = (gboolean (*)(AtkTable *, gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.remove_column_selection);
++	lpStruct->row_inserted = (void (*)(AtkTable *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.row_inserted);
++	lpStruct->column_inserted = (void (*)(AtkTable *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.column_inserted);
++	lpStruct->row_deleted = (void (*)(AtkTable *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.row_deleted);
++	lpStruct->column_deleted = (void (*)(AtkTable *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.column_deleted);
++	lpStruct->row_reordered = (void (*)(AtkTable *))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.row_reordered);
++	lpStruct->column_reordered = (void (*)(AtkTable *))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.column_reordered);
++	lpStruct->model_changed = (void (*)(AtkTable *))(*env)->GetLongField(env, lpObject, AtkTableIfaceFc.model_changed);
+ 	return lpStruct;
+ }
+ 
+@@ -581,28 +581,28 @@
+ AtkTextIface *getAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface *lpStruct)
+ {
+ 	if (!AtkTextIfaceFc.cached) cacheAtkTextIfaceFields(env, lpObject);
+-	lpStruct->get_text = (gchar *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_text);
+-	lpStruct->get_text_after_offset = (gchar *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_text_after_offset);
+-	lpStruct->get_text_at_offset = (gchar *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_text_at_offset);
+-	lpStruct->get_character_at_offset = (gunichar (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_character_at_offset);
+-	lpStruct->get_text_before_offset = (gchar *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_text_before_offset);
+-	lpStruct->get_caret_offset = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_caret_offset);
+-	lpStruct->get_run_attributes = (AtkAttributeSet *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_run_attributes);
+-	lpStruct->get_default_attributes = (AtkAttributeSet *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_default_attributes);
+-	lpStruct->get_character_extents = (void (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_character_extents);
+-	lpStruct->get_character_count = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_character_count);
+-	lpStruct->get_offset_at_point = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_offset_at_point);
+-	lpStruct->get_n_selections = (gint (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_n_selections);
+-	lpStruct->get_selection = (gchar *(*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_selection);
+-	lpStruct->add_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.add_selection);
+-	lpStruct->remove_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.remove_selection);
+-	lpStruct->set_selection = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.set_selection);
+-	lpStruct->set_caret_offset = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.set_caret_offset);
+-	lpStruct->text_changed = (void (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.text_changed);
+-	lpStruct->text_caret_moved = (void (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.text_caret_moved);
+-	lpStruct->text_selection_changed = (void (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.text_selection_changed);
+-	lpStruct->get_range_extents = (void (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_range_extents);
+-	lpStruct->get_bounded_ranges = (AtkTextRange** (*)())(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_bounded_ranges);
++	lpStruct->get_text = (gchar *(*)(AtkText *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_text);
++	lpStruct->get_text_after_offset = (gchar *(*)(AtkText *, gint,  AtkTextBoundary,  gint *, gint *))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_text_after_offset);
++	lpStruct->get_text_at_offset = (gchar *(*)(AtkText *, gint,  AtkTextBoundary,  gint *, gint *))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_text_at_offset);
++	lpStruct->get_character_at_offset = (gunichar (*)(AtkText *, gint))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_character_at_offset);
++	lpStruct->get_text_before_offset = (gchar *(*)(AtkText *, gint,  AtkTextBoundary,  gint *, gint *))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_text_before_offset);
++	lpStruct->get_caret_offset = (gint (*)(AtkText *))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_caret_offset);
++	lpStruct->get_run_attributes = (AtkAttributeSet *(*)(AtkText *, gint,  gint *, gint *))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_run_attributes);
++	lpStruct->get_default_attributes = (AtkAttributeSet *(*)(AtkText *))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_default_attributes);
++	lpStruct->get_character_extents = (void (*)(AtkText *, gint,  gint *, gint *, gint *, gint *, AtkCoordType))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_character_extents);
++	lpStruct->get_character_count = (gint (*)(AtkText *))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_character_count);
++	lpStruct->get_offset_at_point = (gint (*)(AtkText *, gint,  gint,  AtkCoordType))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_offset_at_point);
++	lpStruct->get_n_selections = (gint (*)(AtkText *))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_n_selections);
++	lpStruct->get_selection = (gchar *(*)(AtkText *, gint,  gint *, gint *))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_selection);
++	lpStruct->add_selection = (gboolean (*)(AtkText *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.add_selection);
++	lpStruct->remove_selection = (gboolean (*)(AtkText *, gint))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.remove_selection);
++	lpStruct->set_selection = (gboolean (*)(AtkText *, gint,  gint,  gint))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.set_selection);
++	lpStruct->set_caret_offset = (gboolean (*)(AtkText *, gint))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.set_caret_offset);
++	lpStruct->text_changed = (void (*)(AtkText *, gint,  gint))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.text_changed);
++	lpStruct->text_caret_moved = (void (*)(AtkText *, gint))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.text_caret_moved);
++	lpStruct->text_selection_changed = (void (*)(AtkText *))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.text_selection_changed);
++	lpStruct->get_range_extents = (void (*)(AtkText *, gint,  gint,  AtkCoordType,  AtkTextRectangle *))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_range_extents);
++	lpStruct->get_bounded_ranges = (AtkTextRange** (*)(AtkText *, AtkTextRectangle *, AtkCoordType,  AtkTextClipType,  AtkTextClipType))(*env)->GetLongField(env, lpObject, AtkTextIfaceFc.get_bounded_ranges);
+ 	return lpStruct;
+ }
+ 
+@@ -743,10 +743,10 @@
+ AtkValueIface *getAtkValueIfaceFields(JNIEnv *env, jobject lpObject, AtkValueIface *lpStruct)
+ {
+ 	if (!AtkValueIfaceFc.cached) cacheAtkValueIfaceFields(env, lpObject);
+-	lpStruct->get_current_value = (void (*)())(*env)->GetLongField(env, lpObject, AtkValueIfaceFc.get_current_value);
+-	lpStruct->get_maximum_value = (void (*)())(*env)->GetLongField(env, lpObject, AtkValueIfaceFc.get_maximum_value);
+-	lpStruct->get_minimum_value = (void (*)())(*env)->GetLongField(env, lpObject, AtkValueIfaceFc.get_minimum_value);
+-	lpStruct->set_current_value = (gboolean (*)())(*env)->GetLongField(env, lpObject, AtkValueIfaceFc.set_current_value);
++	lpStruct->get_current_value = (void (*)(AtkValue *, GValue *))(*env)->GetLongField(env, lpObject, AtkValueIfaceFc.get_current_value);
++	lpStruct->get_maximum_value = (void (*)(AtkValue *, GValue *))(*env)->GetLongField(env, lpObject, AtkValueIfaceFc.get_maximum_value);
++	lpStruct->get_minimum_value = (void (*)(AtkValue *, GValue *))(*env)->GetLongField(env, lpObject, AtkValueIfaceFc.get_minimum_value);
++	lpStruct->set_current_value = (gboolean (*)(AtkValue *, const GValue *))(*env)->GetLongField(env, lpObject, AtkValueIfaceFc.set_current_value);
+ 	return lpStruct;
+ }
+ 
+--- "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c"	2025-06-16 18:24:47.573963265 +0200
++++ "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c"	2025-06-16 18:25:46.450728307 +0200
+@@ -10103,7 +10103,7 @@
+ {
+ 	jint rc = 0;
+ 	OS_NATIVE_ENTER(env, that, Call__JJII_FUNC);
+-	rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3);
++	rc = (jint)((jint (*)(jlong, jint, jint))arg0)(arg1, arg2, arg3);
+ 	OS_NATIVE_EXIT(env, that, Call__JJII_FUNC);
+ 	return rc;
+ }
+@@ -10115,7 +10115,7 @@
+ {
+ 	jint rc = 0;
+ 	OS_NATIVE_ENTER(env, that, Call__JJJ_FUNC);
+-	rc = (jint)((jint (*)())arg0)(arg1, arg2);
++	rc = (jint)((jint (*)(jlong, jlong))arg0)(arg1, arg2);
+ 	OS_NATIVE_EXIT(env, that, Call__JJJ_FUNC);
+ 	return rc;
+ }
+@@ -10509,7 +10509,7 @@
+ {
+ 	jboolean rc = 0;
+ 	OS_NATIVE_ENTER(env, that, XCheckIfEvent_FUNC);
+-	rc = (jboolean)XCheckIfEvent((Display *)arg0, (XEvent *)arg1, (Bool (*)())arg2, (XPointer)arg3);
++	rc = (jboolean)XCheckIfEvent((Display *)arg0, (XEvent *)arg1, (Bool (*)(Display *, XEvent *, char *))arg2, (XPointer)arg3);
+ 	OS_NATIVE_EXIT(env, that, XCheckIfEvent_FUNC);
+ 	return rc;
+ }
+@@ -10721,7 +10721,7 @@
+ {
+ 	jlong rc = 0;
+ 	OS_NATIVE_ENTER(env, that, call__JJJJJ_FUNC);
+-	rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4);
++	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong))arg0)(arg1, arg2, arg3, arg4);
+ 	OS_NATIVE_EXIT(env, that, call__JJJJJ_FUNC);
+ 	return rc;
+ }
+@@ -10733,7 +10733,7 @@
+ {
+ 	jlong rc = 0;
+ 	OS_NATIVE_ENTER(env, that, call__JJJJJJJ_FUNC);
+-	rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6);
++	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jlong, jlong))arg0)(arg1, arg2, arg3, arg4, arg5, arg6);
+ 	OS_NATIVE_EXIT(env, that, call__JJJJJJJ_FUNC);
+ 	return rc;
+ }
+@@ -10745,7 +10745,7 @@
+ {
+ 	jlong rc = 0;
+ 	OS_NATIVE_ENTER(env, that, call__JJJJJJJJ_FUNC);
+-	rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
++	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jlong, jlong, jlong))arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+ 	OS_NATIVE_EXIT(env, that, call__JJJJJJJJ_FUNC);
+ 	return rc;
+ }
+--- "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c"	2025-06-16 18:24:47.574409983 +0200
++++ "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c"	2025-06-16 18:25:46.451728315 +0200
+@@ -42,18 +42,12 @@
+ 	GObjectClassFc.cached = 1;
+ }
+ 
+-GObjectClass *getGObjectClassFields(JNIEnv *env, jobject lpObject, GObjectClass *lpStruct)
+-{
+-	if (!GObjectClassFc.cached) cacheGObjectClassFields(env, lpObject);
+-	lpStruct->constructor = (GObject *(*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.constructor);
+-	lpStruct->set_property = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.set_property);
+-	lpStruct->get_property = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.get_property);
+-	lpStruct->dispose = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.dispose);
+-	lpStruct->finalize = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.finalize);
+-	lpStruct->dispatch_properties_changed = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed);
+-	lpStruct->notify = (void (*)())(*env)->GetLongField(env, lpObject, GObjectClassFc.notify);
+-	return lpStruct;
+-}
++GObjectClass *getGObjectClassFields(JNIEnv *env, jobject lpObject, GObjectClass *lpStruct) { if (!GObjectClassFc.cached) cacheGObjectClassFields(env, lpObject); lpStruct->constructor = (GObject *(*)(GType,  guint, 
++GObjectConstructParam *))(*env)->GetLongField(env, lpObject, GObjectClassFc.constructor); lpStruct->set_property = (void (*)(GObject *, guint,  const GValue *, GParamSpec *))(*env)->GetLongField(env, lpObject,
++GObjectClassFc.set_property); lpStruct->get_property = (void (*)(GObject *, guint,  GValue *, GParamSpec *))(*env)->GetLongField(env, lpObject, GObjectClassFc.get_property); lpStruct->dispose = (void (*)(GObject
++*))(*env)->GetLongField(env, lpObject, GObjectClassFc.dispose); lpStruct->finalize = (void (*)(GObject *))(*env)->GetLongField(env, lpObject, GObjectClassFc.finalize); lpStruct->dispatch_properties_changed = (void
++(*)(GObject *, guint,  GParamSpec **))(*env)->GetLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed); lpStruct->notify = (void (*)(GObject *, GParamSpec *))(*env)->GetLongField(env, lpObject,
++GObjectClassFc.notify); return lpStruct; }
+ 
+ void setGObjectClassFields(JNIEnv *env, jobject lpObject, GObjectClass *lpStruct)
+ {
+@@ -346,12 +340,12 @@
+ {
+ 	if (!GtkCellRendererClassFc.cached) cacheGtkCellRendererClassFields(env, lpObject);
+ #ifndef GTK4
+-	lpStruct->render = (void(*)())(*env)->GetLongField(env, lpObject, GtkCellRendererClassFc.render);
++	lpStruct->render = (void(*)(GtkCellRenderer *, cairo_t *, GtkWidget *, const GdkRectangle *, const GdkRectangle *, GtkCellRendererState))(*env)->GetLongField(env, lpObject, GtkCellRendererClassFc.render);
+ #endif
+ #ifdef GTK4
+ 	lpStruct->snapshot = (void(*)())(*env)->GetLongField(env, lpObject, GtkCellRendererClassFc.snapshot);
+ #endif
+-	lpStruct->get_preferred_width = (void(*)())(*env)->GetLongField(env, lpObject, GtkCellRendererClassFc.get_preferred_width);
++	lpStruct->get_preferred_width = (void(*)(GtkCellRenderer *, GtkWidget *, gint *, gint *))(*env)->GetLongField(env, lpObject, GtkCellRendererClassFc.get_preferred_width);
+ 	return lpStruct;
+ }
+ 
+@@ -426,8 +420,8 @@
+ {
+ 	if (!GtkWidgetClassFc.cached) cacheGtkWidgetClassFields(env, lpObject);
+ 	getGObjectClassFields(env, lpObject, (GObjectClass *)lpStruct);
+-	lpStruct->map = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.map);
+-	lpStruct->size_allocate = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.size_allocate);
++	lpStruct->map = (void(*)(GtkWidget *))(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.map);
++	lpStruct->size_allocate = (void(*)(GtkWidget *, GtkAllocation *))(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.size_allocate);
+ #ifdef GTK4
+ 	lpStruct->snapshot = (void(*)())(*env)->GetLongField(env, lpObject, GtkWidgetClassFc.snapshot);
+ #endif

eclipse-swt-gcc15-4_9.patch

@@ -0,0 +1,488 @@
+diff -urEbwB "eclipse.platform.swt-R4_9.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c" "eclipse.platform.swt-R4_9/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c"
+--- "eclipse.platform.swt-R4_9.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c"	2025-06-16 13:45:47.301771561 +0200
++++ "eclipse.platform.swt-R4_9/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c"	2025-06-16 14:34:34.785600812 +0200
+@@ -475,7 +475,7 @@
+ #else
+ 	ATK_NATIVE_ENTER(env, that, _1call__JJ_FUNC);
+ #endif
+-	rc = (jintLong)((jintLong (*)())arg0)(arg1);
++	rc = (jintLong)((jintLong (*)(jintLong))arg0)(arg1);
+ #ifndef JNI64
+ 	ATK_NATIVE_EXIT(env, that, _1call__II_FUNC);
+ #else
+@@ -498,7 +498,7 @@
+ #else
+ 	ATK_NATIVE_ENTER(env, that, _1call__JJJ_FUNC);
+ #endif
+-	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2);
++	rc = (jintLong)((jintLong (*)(jintLong, jintLong))arg0)(arg1, arg2);
+ #ifndef JNI64
+ 	ATK_NATIVE_EXIT(env, that, _1call__III_FUNC);
+ #else
+@@ -521,7 +521,7 @@
+ #else
+ 	ATK_NATIVE_ENTER(env, that, _1call__JJJJ_FUNC);
+ #endif
+-	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3);
++	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong))arg0)(arg1, arg2, arg3);
+ #ifndef JNI64
+ 	ATK_NATIVE_EXIT(env, that, _1call__IIII_FUNC);
+ #else
+@@ -544,7 +544,7 @@
+ #else
+ 	ATK_NATIVE_ENTER(env, that, _1call__JJJJJJ_FUNC);
+ #endif
+-	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5);
++	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong))arg0)(arg1, arg2, arg3, arg4, arg5);
+ #ifndef JNI64
+ 	ATK_NATIVE_EXIT(env, that, _1call__IIIIII_FUNC);
+ #else
+diff -urEbwB "eclipse.platform.swt-R4_9.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.h" "eclipse.platform.swt-R4_9/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.h"
+--- "eclipse.platform.swt-R4_9.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.h"	2025-06-16 13:45:47.301818916 +0200
++++ "eclipse.platform.swt-R4_9/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.h"	2025-06-16 14:57:04.204810441 +0200
+@@ -21,5 +21,5 @@
+ #define ATK_LOAD_FUNCTION LOAD_FUNCTION
+ 
+ #define SWT_AtkObjectClass_get_attributes get_attributes
+-#define SWT_AtkObjectClass_get_attributes_cast AtkAttributeSet* (*)()
++#define SWT_AtkObjectClass_get_attributes_cast AtkAttributeSet* (*)(AtkObject *)
+ 
+diff -urEbwB "eclipse.platform.swt-R4_9.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c" "eclipse.platform.swt-R4_9/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c"
+--- "eclipse.platform.swt-R4_9.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c"	2025-06-16 13:45:47.302035244 +0200
++++ "eclipse.platform.swt-R4_9/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c"	2025-06-16 16:03:09.157665526 +0200
+@@ -44,12 +44,12 @@
+ AtkActionIface *getAtkActionIfaceFields(JNIEnv *env, jobject lpObject, AtkActionIface *lpStruct)
+ {
+ 	if (!AtkActionIfaceFc.cached) cacheAtkActionIfaceFields(env, lpObject);
+-	lpStruct->do_action = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.do_action);
+-	lpStruct->get_n_actions = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_n_actions);
+-	lpStruct->get_description = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_description);
+-	lpStruct->get_name = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_name);
+-	lpStruct->get_keybinding = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_keybinding);
+-	lpStruct->set_description = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.set_description);
++	lpStruct->do_action = (gboolean (*)(AtkAction*, gint))(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.do_action);
++	lpStruct->get_n_actions = (gint (*)(AtkAction*))(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_n_actions);
++	lpStruct->get_description = (const gchar *(*)(AtkAction*, gint))(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_description);
++	lpStruct->get_name = (const gchar *(*)(AtkAction*, gint))(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_name);
++	lpStruct->get_keybinding = (const gchar *(*)(AtkAction*, gint))(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.get_keybinding);
++	lpStruct->set_description = (gboolean (*)(AtkAction*, gint,  const gchar*))(*env)->GetIntLongField(env, lpObject, AtkActionIfaceFc.set_description);
+ 	return lpStruct;
+ }
+ 
+@@ -131,19 +131,19 @@
+ AtkComponentIface *getAtkComponentIfaceFields(JNIEnv *env, jobject lpObject, AtkComponentIface *lpStruct)
+ {
+ 	if (!AtkComponentIfaceFc.cached) cacheAtkComponentIfaceFields(env, lpObject);
+-	lpStruct->add_focus_handler = (guint (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.add_focus_handler);
+-	lpStruct->contains = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.contains);
+-	lpStruct->ref_accessible_at_point = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point);
+-	lpStruct->get_extents = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_extents);
+-	lpStruct->get_position = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_position);
+-	lpStruct->get_size = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_size);
+-	lpStruct->grab_focus = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.grab_focus);
+-	lpStruct->remove_focus_handler = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler);
+-	lpStruct->set_extents = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.set_extents);
+-	lpStruct->set_position = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.set_position);
+-	lpStruct->set_size = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.set_size);
+-	lpStruct->get_layer = (AtkLayer (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_layer);
+-	lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder);
++	lpStruct->add_focus_handler = (guint (*)(AtkComponent*, void (*)(AtkObject*, gboolean)))(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.add_focus_handler);
++	lpStruct->contains = (gboolean (*)(AtkComponent*, gint,  gint,  AtkCoordType))(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.contains);
++	lpStruct->ref_accessible_at_point = (AtkObject *(*)(AtkComponent*, gint,  gint,  AtkCoordType))(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.ref_accessible_at_point);
++	lpStruct->get_extents = (void (*)(AtkComponent*, gint*, gint*, gint*, gint*, AtkCoordType))(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_extents);
++	lpStruct->get_position = (void (*)(AtkComponent*, gint*, gint*, AtkCoordType))(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_position);
++	lpStruct->get_size = (void (*)(AtkComponent*, gint*, gint*))(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_size);
++	lpStruct->grab_focus = (gboolean (*)(AtkComponent*))(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.grab_focus);
++	lpStruct->remove_focus_handler = (void (*)(AtkComponent*, guint))(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.remove_focus_handler);
++	lpStruct->set_extents = (gboolean (*)(AtkComponent*, gint,  gint,  gint,  gint,  AtkCoordType))(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.set_extents);
++	lpStruct->set_position = (gboolean (*)(AtkComponent*, gint,  gint,  AtkCoordType))(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.set_position);
++	lpStruct->set_size = (gboolean (*)(AtkComponent*, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.set_size);
++	lpStruct->get_layer = (AtkLayer (*)(AtkComponent*))(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_layer);
++	lpStruct->get_mdi_zorder = (gint (*)(AtkComponent*))(*env)->GetIntLongField(env, lpObject, AtkComponentIfaceFc.get_mdi_zorder);
+ 	return lpStruct;
+ }
+ 
+@@ -192,13 +192,13 @@
+ AtkEditableTextIface *getAtkEditableTextIfaceFields(JNIEnv *env, jobject lpObject, AtkEditableTextIface *lpStruct)
+ {
+ 	if (!AtkEditableTextIfaceFc.cached) cacheAtkEditableTextIfaceFields(env, lpObject);
+-	lpStruct->set_run_attributes = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.set_run_attributes);
+-	lpStruct->set_text_contents = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.set_text_contents);
+-	lpStruct->insert_text = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.insert_text);
+-	lpStruct->copy_text = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.copy_text);
+-	lpStruct->cut_text = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.cut_text);
+-	lpStruct->delete_text = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.delete_text);
+-	lpStruct->paste_text = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.paste_text);
++	lpStruct->set_run_attributes = (gboolean (*)(AtkEditableText*, AtkAttributeSet*, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.set_run_attributes);
++	lpStruct->set_text_contents = (void (*)(AtkEditableText*, const gchar*))(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.set_text_contents);
++	lpStruct->insert_text = (void (*)(AtkEditableText*, const gchar*, gint,  gint*))(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.insert_text);
++	lpStruct->copy_text = (void (*)(AtkEditableText*, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.copy_text);
++	lpStruct->cut_text = (void (*)(AtkEditableText*, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.cut_text);
++	lpStruct->delete_text = (void (*)(AtkEditableText*, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.delete_text);
++	lpStruct->paste_text = (void (*)(AtkEditableText*, gint))(*env)->GetIntLongField(env, lpObject, AtkEditableTextIfaceFc.paste_text);
+ 	return lpStruct;
+ }
+ 
+@@ -237,9 +237,9 @@
+ AtkHypertextIface *getAtkHypertextIfaceFields(JNIEnv *env, jobject lpObject, AtkHypertextIface *lpStruct)
+ {
+ 	if (!AtkHypertextIfaceFc.cached) cacheAtkHypertextIfaceFields(env, lpObject);
+-	lpStruct->get_link = (AtkHyperlink *(*)())(*env)->GetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_link);
+-	lpStruct->get_n_links = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_n_links);
+-	lpStruct->get_link_index = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_link_index);
++	lpStruct->get_link = (AtkHyperlink *(*)(AtkHypertext*, gint))(*env)->GetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_link);
++	lpStruct->get_n_links = (gint (*)(AtkHypertext*))(*env)->GetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_n_links);
++	lpStruct->get_link_index = (gint (*)(AtkHypertext*, gint))(*env)->GetIntLongField(env, lpObject, AtkHypertextIfaceFc.get_link_index);
+ 	return lpStruct;
+ }
+ 
+@@ -295,29 +295,29 @@
+ AtkObjectClass *getAtkObjectClassFields(JNIEnv *env, jobject lpObject, AtkObjectClass *lpStruct)
+ {
+ 	if (!AtkObjectClassFc.cached) cacheAtkObjectClassFields(env, lpObject);
+-	lpStruct->get_name = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_name);
+-	lpStruct->get_description = (const gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_description);
+-	lpStruct->get_parent = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_parent);
+-	lpStruct->get_n_children = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_n_children);
+-	lpStruct->ref_child = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.ref_child);
+-	lpStruct->get_index_in_parent = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_index_in_parent);
+-	lpStruct->ref_relation_set = (AtkRelationSet *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.ref_relation_set);
+-	lpStruct->get_role = (AtkRole (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_role);
+-	lpStruct->get_layer = (AtkLayer (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_layer);
+-	lpStruct->get_mdi_zorder = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_mdi_zorder);
+-	lpStruct->ref_state_set = (AtkStateSet *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.ref_state_set);
+-	lpStruct->set_name = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_name);
+-	lpStruct->set_description = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_description);
+-	lpStruct->set_parent = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_parent);
+-	lpStruct->set_role = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_role);
+-	lpStruct->connect_property_change_handler = (guint (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.connect_property_change_handler);
+-	lpStruct->remove_property_change_handler = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.remove_property_change_handler);
+-	lpStruct->initialize = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.initialize);
+-	lpStruct->children_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.children_changed);
+-	lpStruct->focus_event = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.focus_event);
+-	lpStruct->property_change = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.property_change);
+-	lpStruct->state_change = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.state_change);
+-	lpStruct->visible_data_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.visible_data_changed);
++	lpStruct->get_name = (const gchar *(*)(AtkObject*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_name);
++	lpStruct->get_description = (const gchar *(*)(AtkObject*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_description);
++	lpStruct->get_parent = (AtkObject *(*)(AtkObject*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_parent);
++	lpStruct->get_n_children = (gint (*)(AtkObject*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_n_children);
++	lpStruct->ref_child = (AtkObject *(*)(AtkObject*, gint))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.ref_child);
++	lpStruct->get_index_in_parent = (gint (*)(AtkObject*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_index_in_parent);
++	lpStruct->ref_relation_set = (AtkRelationSet *(*)(AtkObject*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.ref_relation_set);
++	lpStruct->get_role = (AtkRole (*)(AtkObject*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_role);
++	lpStruct->get_layer = (AtkLayer (*)(AtkObject*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_layer);
++	lpStruct->get_mdi_zorder = (gint (*)(AtkObject*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_mdi_zorder);
++	lpStruct->ref_state_set = (AtkStateSet *(*)(AtkObject*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.ref_state_set);
++	lpStruct->set_name = (void (*)(AtkObject*, const gchar*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_name);
++	lpStruct->set_description = (void (*)(AtkObject*, const gchar*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_description);
++	lpStruct->set_parent = (void (*)(AtkObject*, AtkObject*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_parent);
++	lpStruct->set_role = (void (*)(AtkObject*, AtkRole))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.set_role);
++	lpStruct->connect_property_change_handler = (guint (*)(AtkObject*, void (**)(AtkObject*, AtkPropertyValues*)))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.connect_property_change_handler);
++	lpStruct->remove_property_change_handler = (void (*)(AtkObject*, guint))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.remove_property_change_handler);
++	lpStruct->initialize = (void (*)(AtkObject*, void*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.initialize);
++	lpStruct->children_changed = (void (*)(AtkObject*, guint,  void*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.children_changed);
++	lpStruct->focus_event = (void (*)(AtkObject*, gboolean))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.focus_event);
++	lpStruct->property_change = (void (*)(AtkObject*, AtkPropertyValues*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.property_change);
++	lpStruct->state_change = (void (*)(AtkObject*, const gchar*, gboolean))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.state_change);
++	lpStruct->visible_data_changed = (void (*)(AtkObject*))(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.visible_data_changed);
+ 	lpStruct->SWT_AtkObjectClass_get_attributes = (SWT_AtkObjectClass_get_attributes_cast)(*env)->GetIntLongField(env, lpObject, AtkObjectClassFc.get_attributes);
+ 	return lpStruct;
+ }
+@@ -374,8 +374,8 @@
+ AtkObjectFactoryClass *getAtkObjectFactoryClassFields(JNIEnv *env, jobject lpObject, AtkObjectFactoryClass *lpStruct)
+ {
+ 	if (!AtkObjectFactoryClassFc.cached) cacheAtkObjectFactoryClassFields(env, lpObject);
+-	lpStruct->create_accessible = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkObjectFactoryClassFc.create_accessible);
+-	lpStruct->invalidate = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectFactoryClassFc.invalidate);
++	lpStruct->create_accessible = (AtkObject *(*)(GObject*))(*env)->GetIntLongField(env, lpObject, AtkObjectFactoryClassFc.create_accessible);
++	lpStruct->invalidate = (void (*)(AtkObjectFactory*))(*env)->GetIntLongField(env, lpObject, AtkObjectFactoryClassFc.invalidate);
+ 	lpStruct->get_accessible_type = (GType (*)())(*env)->GetIntLongField(env, lpObject, AtkObjectFactoryClassFc.get_accessible_type);
+ 	return lpStruct;
+ }
+@@ -416,14 +416,14 @@
+ AtkSelectionIface *getAtkSelectionIfaceFields(JNIEnv *env, jobject lpObject, AtkSelectionIface *lpStruct)
+ {
+ 	if (!AtkSelectionIfaceFc.cached) cacheAtkSelectionIfaceFields(env, lpObject);
+-	lpStruct->add_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.add_selection);
+-	lpStruct->clear_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.clear_selection);
+-	lpStruct->ref_selection = (AtkObject *(*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.ref_selection);
+-	lpStruct->get_selection_count = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.get_selection_count);
+-	lpStruct->is_child_selected = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.is_child_selected);
+-	lpStruct->remove_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.remove_selection);
+-	lpStruct->select_all_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.select_all_selection);
+-	lpStruct->selection_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.selection_changed);
++	lpStruct->add_selection = (gboolean (*)(AtkSelection*, gint))(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.add_selection);
++	lpStruct->clear_selection = (gboolean (*)(AtkSelection*))(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.clear_selection);
++	lpStruct->ref_selection = (AtkObject *(*)(AtkSelection*, gint))(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.ref_selection);
++	lpStruct->get_selection_count = (gint (*)(AtkSelection*))(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.get_selection_count);
++	lpStruct->is_child_selected = (gboolean (*)(AtkSelection*, gint))(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.is_child_selected);
++	lpStruct->remove_selection = (gboolean (*)(AtkSelection*, gint))(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.remove_selection);
++	lpStruct->select_all_selection = (gboolean (*)(AtkSelection*))(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.select_all_selection);
++	lpStruct->selection_changed = (void (*)(AtkSelection*))(*env)->GetIntLongField(env, lpObject, AtkSelectionIfaceFc.selection_changed);
+ 	return lpStruct;
+ }
+ 
+@@ -496,42 +496,42 @@
+ AtkTableIface *getAtkTableIfaceFields(JNIEnv *env, jobject lpObject, AtkTableIface *lpStruct)
+ {
+ 	if (!AtkTableIfaceFc.cached) cacheAtkTableIfaceFields(env, lpObject);
+-	lpStruct->ref_at = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.ref_at);
+-	lpStruct->get_index_at = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_index_at);
+-	lpStruct->get_column_at_index = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_at_index);
+-	lpStruct->get_row_at_index = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_at_index);
+-	lpStruct->get_n_columns = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_n_columns);
+-	lpStruct->get_n_rows = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_n_rows);
+-	lpStruct->get_column_extent_at = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_extent_at);
+-	lpStruct->get_row_extent_at = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_extent_at);
+-	lpStruct->get_caption = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_caption);
+-	lpStruct->get_column_description = (const gchar* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_description);
+-	lpStruct->get_column_header = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_header);
+-	lpStruct->get_row_description = (const gchar* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_description);
+-	lpStruct->get_row_header = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_header);
+-	lpStruct->get_summary = (AtkObject* (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_summary);
+-	lpStruct->set_caption = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_caption);
+-	lpStruct->set_column_description = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_column_description);
+-	lpStruct->set_column_header = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_column_header);
+-	lpStruct->set_row_description = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_row_description);
+-	lpStruct->set_row_header = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_row_header);
+-	lpStruct->set_summary = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_summary);
+-	lpStruct->get_selected_columns = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_selected_columns);
+-	lpStruct->get_selected_rows = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_selected_rows);
+-	lpStruct->is_column_selected = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.is_column_selected);
+-	lpStruct->is_row_selected = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.is_row_selected);
+-	lpStruct->is_selected = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.is_selected);
+-	lpStruct->add_row_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.add_row_selection);
+-	lpStruct->remove_row_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.remove_row_selection);
+-	lpStruct->add_column_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.add_column_selection);
+-	lpStruct->remove_column_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.remove_column_selection);
+-	lpStruct->row_inserted = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.row_inserted);
+-	lpStruct->column_inserted = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.column_inserted);
+-	lpStruct->row_deleted = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.row_deleted);
+-	lpStruct->column_deleted = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.column_deleted);
+-	lpStruct->row_reordered = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.row_reordered);
+-	lpStruct->column_reordered = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.column_reordered);
+-	lpStruct->model_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.model_changed);
++	lpStruct->ref_at = (AtkObject* (*)(AtkTable*, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.ref_at);
++	lpStruct->get_index_at = (gint (*)(AtkTable *, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_index_at);
++	lpStruct->get_column_at_index = (gint (*)(AtkTable *, gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_at_index);
++	lpStruct->get_row_at_index = (gint (*)(AtkTable *, gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_at_index);
++	lpStruct->get_n_columns = (gint (*)(AtkTable *))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_n_columns);
++	lpStruct->get_n_rows = (gint (*)(AtkTable *))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_n_rows);
++	lpStruct->get_column_extent_at = (gint (*)(AtkTable *, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_extent_at);
++	lpStruct->get_row_extent_at = (gint (*)(AtkTable *, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_extent_at);
++	lpStruct->get_caption = (AtkObject* (*)(AtkTable *))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_caption);
++	lpStruct->get_column_description = (const gchar* (*)(AtkTable *, gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_description);
++	lpStruct->get_column_header = (AtkObject* (*)(AtkTable *, gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_column_header);
++	lpStruct->get_row_description = (const gchar* (*)(AtkTable *, gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_description);
++	lpStruct->get_row_header = (AtkObject* (*)(AtkTable *, gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_row_header);
++	lpStruct->get_summary = (AtkObject* (*)(AtkTable *))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_summary);
++	lpStruct->set_caption = (void (*)(AtkTable *, AtkObject *))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_caption);
++	lpStruct->set_column_description = (void (*)(AtkTable *, gint,  const gchar *))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_column_description);
++	lpStruct->set_column_header = (void (*)(AtkTable *, gint,  AtkObject *))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_column_header);
++	lpStruct->set_row_description = (void (*)(AtkTable *, gint,  const gchar *))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_row_description);
++	lpStruct->set_row_header = (void (*)(AtkTable *, gint,  AtkObject *))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_row_header);
++	lpStruct->set_summary = (void (*)(AtkTable *, AtkObject *))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.set_summary);
++	lpStruct->get_selected_columns = (gint (*)(AtkTable *, gint **))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_selected_columns);
++	lpStruct->get_selected_rows = (gint (*)(AtkTable *, gint **))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.get_selected_rows);
++	lpStruct->is_column_selected = (gboolean (*)(AtkTable *, gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.is_column_selected);
++	lpStruct->is_row_selected = (gboolean (*)(AtkTable *, gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.is_row_selected);
++	lpStruct->is_selected = (gboolean (*)(AtkTable *, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.is_selected);
++	lpStruct->add_row_selection = (gboolean (*)(AtkTable *, gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.add_row_selection);
++	lpStruct->remove_row_selection = (gboolean (*)(AtkTable *, gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.remove_row_selection);
++	lpStruct->add_column_selection = (gboolean (*)(AtkTable *, gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.add_column_selection);
++	lpStruct->remove_column_selection = (gboolean (*)(AtkTable *, gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.remove_column_selection);
++	lpStruct->row_inserted = (void (*)(AtkTable *, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.row_inserted);
++	lpStruct->column_inserted = (void (*)(AtkTable *, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.column_inserted);
++	lpStruct->row_deleted = (void (*)(AtkTable *, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.row_deleted);
++	lpStruct->column_deleted = (void (*)(AtkTable *, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.column_deleted);
++	lpStruct->row_reordered = (void (*)(AtkTable *))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.row_reordered);
++	lpStruct->column_reordered = (void (*)(AtkTable *))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.column_reordered);
++	lpStruct->model_changed = (void (*)(AtkTable *))(*env)->GetIntLongField(env, lpObject, AtkTableIfaceFc.model_changed);
+ 	return lpStruct;
+ }
+ 
+@@ -618,28 +618,28 @@
+ AtkTextIface *getAtkTextIfaceFields(JNIEnv *env, jobject lpObject, AtkTextIface *lpStruct)
+ {
+ 	if (!AtkTextIfaceFc.cached) cacheAtkTextIfaceFields(env, lpObject);
+-	lpStruct->get_text = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text);
+-	lpStruct->get_text_after_offset = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_after_offset);
+-	lpStruct->get_text_at_offset = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_at_offset);
+-	lpStruct->get_character_at_offset = (gunichar (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_at_offset);
+-	lpStruct->get_text_before_offset = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_before_offset);
+-	lpStruct->get_caret_offset = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_caret_offset);
+-	lpStruct->get_run_attributes = (AtkAttributeSet *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_run_attributes);
+-	lpStruct->get_default_attributes = (AtkAttributeSet *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_default_attributes);
+-	lpStruct->get_character_extents = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_extents);
+-	lpStruct->get_character_count = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_count);
+-	lpStruct->get_offset_at_point = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_offset_at_point);
+-	lpStruct->get_n_selections = (gint (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_n_selections);
+-	lpStruct->get_selection = (gchar *(*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_selection);
+-	lpStruct->add_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.add_selection);
+-	lpStruct->remove_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.remove_selection);
+-	lpStruct->set_selection = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.set_selection);
+-	lpStruct->set_caret_offset = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.set_caret_offset);
+-	lpStruct->text_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_changed);
+-	lpStruct->text_caret_moved = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_caret_moved);
+-	lpStruct->text_selection_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_selection_changed);
+-	lpStruct->get_range_extents = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_range_extents);
+-	lpStruct->get_bounded_ranges = (AtkTextRange** (*)())(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_bounded_ranges);
++	lpStruct->get_text = (gchar *(*)(AtkText *, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text);
++	lpStruct->get_text_after_offset = (gchar *(*)(AtkText *, gint,  AtkTextBoundary,  gint *, gint *))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_after_offset);
++	lpStruct->get_text_at_offset = (gchar *(*)(AtkText *, gint,  AtkTextBoundary,  gint *, gint *))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_at_offset);
++	lpStruct->get_character_at_offset = (gunichar (*)(AtkText *, gint))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_at_offset);
++	lpStruct->get_text_before_offset = (gchar *(*)(AtkText *, gint,  AtkTextBoundary,  gint *, gint *))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_text_before_offset);
++	lpStruct->get_caret_offset = (gint (*)(AtkText *))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_caret_offset);
++	lpStruct->get_run_attributes = (AtkAttributeSet *(*)(AtkText *, gint,  gint *, gint *))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_run_attributes);
++	lpStruct->get_default_attributes = (AtkAttributeSet *(*)(AtkText *))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_default_attributes);
++	lpStruct->get_character_extents = (void (*)(AtkText *, gint,  gint *, gint *, gint *, gint *, AtkCoordType))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_extents);
++	lpStruct->get_character_count = (gint (*)(AtkText *))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_character_count);
++	lpStruct->get_offset_at_point = (gint (*)(AtkText *, gint,  gint,  AtkCoordType))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_offset_at_point);
++	lpStruct->get_n_selections = (gint (*)(AtkText *))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_n_selections);
++	lpStruct->get_selection = (gchar *(*)(AtkText *, gint,  gint *, gint *))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_selection);
++	lpStruct->add_selection = (gboolean (*)(AtkText *, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.add_selection);
++	lpStruct->remove_selection = (gboolean (*)(AtkText *, gint))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.remove_selection);
++	lpStruct->set_selection = (gboolean (*)(AtkText *, gint,  gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.set_selection);
++	lpStruct->set_caret_offset = (gboolean (*)(AtkText *, gint))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.set_caret_offset);
++	lpStruct->text_changed = (void (*)(AtkText *, gint,  gint))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_changed);
++	lpStruct->text_caret_moved = (void (*)(AtkText *, gint))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_caret_moved);
++	lpStruct->text_selection_changed = (void (*)(AtkText *))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.text_selection_changed);
++	lpStruct->get_range_extents = (void (*)(AtkText *, gint,  gint,  AtkCoordType,  AtkTextRectangle *))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_range_extents);
++	lpStruct->get_bounded_ranges = (AtkTextRange** (*)(AtkText *, AtkTextRectangle *, AtkCoordType,  AtkTextClipType,  AtkTextClipType))(*env)->GetIntLongField(env, lpObject, AtkTextIfaceFc.get_bounded_ranges);
+ 	return lpStruct;
+ }
+ 
+@@ -780,10 +780,10 @@
+ AtkValueIface *getAtkValueIfaceFields(JNIEnv *env, jobject lpObject, AtkValueIface *lpStruct)
+ {
+ 	if (!AtkValueIfaceFc.cached) cacheAtkValueIfaceFields(env, lpObject);
+-	lpStruct->get_current_value = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.get_current_value);
+-	lpStruct->get_maximum_value = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.get_maximum_value);
+-	lpStruct->get_minimum_value = (void (*)())(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.get_minimum_value);
+-	lpStruct->set_current_value = (gboolean (*)())(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.set_current_value);
++	lpStruct->get_current_value = (void (*)(AtkValue *, GValue *))(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.get_current_value);
++	lpStruct->get_maximum_value = (void (*)(AtkValue *, GValue *))(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.get_maximum_value);
++	lpStruct->get_minimum_value = (void (*)(AtkValue *, GValue *))(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.get_minimum_value);
++	lpStruct->set_current_value = (gboolean (*)(AtkValue *, const GValue *))(*env)->GetIntLongField(env, lpObject, AtkValueIfaceFc.set_current_value);
+ 	return lpStruct;
+ }
+ 
+diff -urEbwB "eclipse.platform.swt-R4_9.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c" "eclipse.platform.swt-R4_9/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c"
+--- "eclipse.platform.swt-R4_9.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c"	2025-06-16 13:45:47.302265099 +0200
++++ "eclipse.platform.swt-R4_9/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c"	2025-06-16 14:20:23.087407896 +0200
+@@ -15091,7 +15091,7 @@
+ #else
+ 	OS_NATIVE_ENTER(env, that, Call__JJII_FUNC);
+ #endif
+-	rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3);
++	rc = (jint)((jint (*)(jintLong, jint, jint))arg0)(arg1, arg2, arg3);
+ #ifndef JNI64
+ 	OS_NATIVE_EXIT(env, that, Call__IIII_FUNC);
+ #else
+@@ -15114,7 +15114,7 @@
+ #else
+ 	OS_NATIVE_ENTER(env, that, Call__JJIJ_FUNC);
+ #endif
+-	rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3);
++	rc = (jlong)((jlong (*)(jintLong, jint, jlong))arg0)(arg1, arg2, arg3);
+ #ifndef JNI64
+ 	OS_NATIVE_EXIT(env, that, Call__IIIJ_FUNC);
+ #else
+@@ -15476,7 +15476,7 @@
+ {
+ 	jint rc = 0;
+ 	OS_NATIVE_ENTER(env, that, _1Call_FUNC);
+-	rc = (jint)((jint (*)())arg0)(arg1, arg2);
++	rc = (jint)((jint (*)(jintLong, jintLong))arg0)(arg1, arg2);
+ 	OS_NATIVE_EXIT(env, that, _1Call_FUNC);
+ 	return rc;
+ }
+@@ -15668,7 +15668,7 @@
+ {
+ 	jboolean rc = 0;
+ 	OS_NATIVE_ENTER(env, that, _1XCheckIfEvent_FUNC);
+-	rc = (jboolean)XCheckIfEvent((Display *)arg0, (XEvent *)arg1, (Bool (*)())arg2, (XPointer)arg3);
++	rc = (jboolean)XCheckIfEvent((Display *)arg0, (XEvent *)arg1, (Bool (*)(Display *, XEvent *, char *))arg2, (XPointer)arg3);
+ 	OS_NATIVE_EXIT(env, that, _1XCheckIfEvent_FUNC);
+ 	return rc;
+ }
+@@ -15831,7 +15831,7 @@
+ #else
+ 	OS_NATIVE_ENTER(env, that, _1call__JJJJJ_FUNC);
+ #endif
+-	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4);
++	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong))arg0)(arg1, arg2, arg3, arg4);
+ #ifndef JNI64
+ 	OS_NATIVE_EXIT(env, that, _1call__IIIII_FUNC);
+ #else
+@@ -15854,7 +15854,7 @@
+ #else
+ 	OS_NATIVE_ENTER(env, that, _1call__JJJJJJJ_FUNC);
+ #endif
+-	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6);
++	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))arg0)(arg1, arg2, arg3, arg4, arg5, arg6);
+ #ifndef JNI64
+ 	OS_NATIVE_EXIT(env, that, _1call__IIIIIII_FUNC);
+ #else
+@@ -15877,7 +15877,7 @@
+ #else
+ 	OS_NATIVE_ENTER(env, that, _1call__JJJJJJJJ_FUNC);
+ #endif
+-	rc = (jintLong)((jintLong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
++	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+ #ifndef JNI64
+ 	OS_NATIVE_EXIT(env, that, _1call__IIIIIIII_FUNC);
+ #else
+diff -urEbwB "eclipse.platform.swt-R4_9.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c" "eclipse.platform.swt-R4_9/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c"
+--- "eclipse.platform.swt-R4_9.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c"	2025-06-16 13:45:47.302899712 +0200
++++ "eclipse.platform.swt-R4_9/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c"	2025-06-16 16:14:21.932511268 +0200
+@@ -82,13 +82,13 @@
+ GObjectClass *getGObjectClassFields(JNIEnv *env, jobject lpObject, GObjectClass *lpStruct)
+ {
+ 	if (!GObjectClassFc.cached) cacheGObjectClassFields(env, lpObject);
+-	lpStruct->constructor = (GObject *(*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.constructor);
+-	lpStruct->set_property = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.set_property);
+-	lpStruct->get_property = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.get_property);
+-	lpStruct->dispose = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.dispose);
+-	lpStruct->finalize = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.finalize);
+-	lpStruct->dispatch_properties_changed = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed);
+-	lpStruct->notify = (void (*)())(*env)->GetIntLongField(env, lpObject, GObjectClassFc.notify);
++	lpStruct->constructor = (GObject *(*)(GType,  guint,  GObjectConstructParam *))(*env)->GetIntLongField(env, lpObject, GObjectClassFc.constructor);
++	lpStruct->set_property = (void (*)(GObject *, guint,  const GValue *, GParamSpec *))(*env)->GetIntLongField(env, lpObject, GObjectClassFc.set_property);
++	lpStruct->get_property = (void (*)(GObject *, guint,  GValue *, GParamSpec *))(*env)->GetIntLongField(env, lpObject, GObjectClassFc.get_property);
++	lpStruct->dispose = (void (*)(GObject *))(*env)->GetIntLongField(env, lpObject, GObjectClassFc.dispose);
++	lpStruct->finalize = (void (*)(GObject *))(*env)->GetIntLongField(env, lpObject, GObjectClassFc.finalize);
++	lpStruct->dispatch_properties_changed = (void (*)(GObject *, guint,  GParamSpec **))(*env)->GetIntLongField(env, lpObject, GObjectClassFc.dispatch_properties_changed);
++	lpStruct->notify = (void (*)(GObject *, GParamSpec *))(*env)->GetIntLongField(env, lpObject, GObjectClassFc.notify);
+ 	return lpStruct;
+ }
+ 
+@@ -1282,12 +1282,13 @@
+ GtkCellRendererClass *getGtkCellRendererClassFields(JNIEnv *env, jobject lpObject, GtkCellRendererClass *lpStruct)
+ {
+ 	if (!GtkCellRendererClassFc.cached) cacheGtkCellRendererClassFields(env, lpObject);
+-	lpStruct->render = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.render);
+ #ifndef GTK3
+-	lpStruct->get_size = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.get_size);
++	lpStruct->render = (void(*)(GtkCellRenderer *, GdkDrawable *, GtkWidget *, GdkRectangle *, GdkRectangle *, GdkRectangle *, GtkCellRendererState))(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.render);
++	lpStruct->get_size = (void(*)(GtkCellRenderer *, GtkWidget *, GdkRectangle *, gint *, gint *, gint *, gint *))(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.get_size);
+ #endif
+ #ifdef GTK3
+-	lpStruct->get_preferred_width = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.get_preferred_width);
++	lpStruct->render = (void(*)(GtkCellRenderer *, cairo_t *, GtkWidget *, const GdkRectangle *, const GdkRectangle *, GtkCellRendererState))(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.render);
++	lpStruct->get_preferred_width = (void(*)(GtkCellRenderer *, GtkWidget *, gint *, gint *))(*env)->GetIntLongField(env, lpObject, GtkCellRendererClassFc.get_preferred_width);
+ #endif
+ 	return lpStruct;
+ }
+@@ -1430,8 +1431,8 @@
+ {
+ 	if (!GtkWidgetClassFc.cached) cacheGtkWidgetClassFields(env, lpObject);
+ 	getGObjectClassFields(env, lpObject, (GObjectClass *)lpStruct);
+-	lpStruct->map = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.map);
+-	lpStruct->size_allocate = (void(*)())(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.size_allocate);
++	lpStruct->map = (void(*)(GtkWidget *))(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.map);
++	lpStruct->size_allocate = (void(*)(GtkWidget *, GtkAllocation *))(*env)->GetIntLongField(env, lpObject, GtkWidgetClassFc.size_allocate);
+ 	return lpStruct;
+ }
+ 

eclipse-swt-no-werror.patch

@@ -0,0 +1,13 @@
+--- "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak"	2025-09-24 21:11:37.566539301 +0200
++++ "eclipse.platform.swt-R4_29/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak"	2025-09-24 21:21:23.142923302 +0200
+@@ -109,10 +109,6 @@
+ 		${SWT_PTR_CFLAGS}
+ LFLAGS = -shared -fPIC ${SWT_LFLAGS}
+ 
+-# Treat all warnings as errors. If your new code produces a warning, please
+-# take time to properly understand and fix/silence it as necessary.
+-CFLAGS += -Werror
+-
+ ifndef NO_STRIP
+ 	# -s = Remove all symbol table and relocation information from the executable.
+ 	#      i.e, more efficent code, but removes debug information. Should not be used if you want to debug.

eclipse-swt-optflags.patch

@@ -1,22 +0,0 @@
---- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig	2018-08-19 12:37:52.764590467 +0100
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2018-08-19 12:38:15.032503913 +0100
-@@ -75,7 +75,7 @@
- 
- MAKE_TYPE=make
- 
--export CFLAGS='-O -Wall -fPIC'
-+export CFLAGS='$(RPM_OPT_FLAGS) -Wall -fPIC'
- 
- # Determine which OS we are on
- if [ "${OS}" = "" ]; then
---- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig	2014-03-12 14:47:37.513191381 +0000
-+++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak	2014-03-12 14:47:45.672200015 +0000
-@@ -94,7 +94,7 @@
-  -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \
-  -DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\""
- LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic 
--CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\
-+CFLAGS = ${M_CFLAGS} ${M_ARCH} $(RPM_OPT_FLAGS) -Wall\
- 	-fpic \
- 	-DLINUX \
- 	-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \

eclipse-swt-rm-eclipse-tasks-and-customize-build.patch

@@ -0,0 +1,58 @@
+--- a/bundles/org.eclipse.swt/build.xml
++++ b/bundles/org.eclipse.swt/build.xml
+@@ -26,6 +26,17 @@
+ 		<condition property="p2.publish.parts" value="true">
+ 			<istrue value="${p2.gathering}" />
+ 		</condition>
++		<property name="repo.src" value="../.."/>
++		<property name="file_make_common" value="bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak"/>
++	</target>
++	
++	<!-- Set swt_version, new_version, (and rev, min_ver, maj_ver, new_rev, new_min_ver, new_maj_ver) from the make_common.mak  -->
++	<target name="get_version"  depends="init" unless="swt_version">
++		<loadproperties srcFile="${repo.src}/${file_make_common}"/>
++		<condition property="swt_version" value="${maj_ver}${min_ver}r${rev}" else="${maj_ver}${min_ver}">
++		    <isset property="rev"/>
++		</condition>
++		<echo>Version=${swt_version}</echo>
+ 	</target>
+ 
+ 	<target name="build.update.jar" depends="init">
+@@ -42,15 +51,24 @@
+ 		<antcall target="gather.bin.parts">
+ 			<param name="destination.temp.folder" value="${build.result.folder}" />
+ 		</antcall>
+-		<eclipse.gatherBundle metadataRepository="${p2.build.repo}" artifactRepository="${p2.build.repo}" buildResultFolder="${build.result.folder}" targetFolder="${build.result.folder}/${full.name}" />
+ 	</target>
+ 
+-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
++	<target name="gather.bin.parts" depends="get_version" if="destination.temp.folder">
+ 		<mkdir dir="${destination.temp.folder}/${full.name}" />
+ 		<copy todir="${destination.temp.folder}/${full.name}">
+-			<fileset dir="${basedir}" includes="plugin.properties,about.html,about_files/,META-INF/" />
++			<fileset dir="${basedir}" includes="plugin.properties,about.html,about_files/,META-INF/,version.txt" />
++			<fileset dir="../../../tmp/check.compile.master/build" includes="**/*.class"/>
++			<fileset dir="Eclipse SWT PI/gtk/library" includes="**/*.so" excludes="libswt-webkit2extension-*.so"/>
+ 		</copy>
+-		<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}" />
++		<copy todir="${destination.temp.folder}/${full.name}/webkitextensions${swt_version}">
++			<fileset dir="Eclipse SWT PI/gtk/library" includes="libswt-webkit2extension-*.so"/>
++		</copy>
++		<copy todir="${destination.temp.folder}/${full.name}/org/eclipse/swt/internal">
++			<fileset dir="Eclipse SWT/common/org/eclipse/swt/internal" includes="**/SWTMessages.properties"/>
++		</copy>
++		<copy todir="${destination.temp.folder}/${full.name}/org/eclipse/swt/internal/gtk">
++			<fileset dir="Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk" includes="**/*.css"/>
++		</copy>
+ 	</target>
+ 
+ 	<target name="build.jars" />
+@@ -60,7 +78,6 @@
+ 
+ 	<target name="copy.classpath" unless="haveclasspath">
+ 		<copy file=".classpath_${osgi.ws}" tofile=".classpath" />
+-		<eclipse.refreshLocal resource="." depth="infinite" />
+ 	</target>
+ 
+ 	<target name="setup.classpath">
+

eclipse-swt.changes

@@ -1,3 +1,63 @@
+-------------------------------------------------------------------
+Wed Sep 24 19:26:15 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * eclipse-swt-no-werror.patch
+    + disable the default -Werror for the 4.29 version
+    + fixes build with some deprecated glib/gtk+ functions
+
+-------------------------------------------------------------------
+Tue Jul 22 11:36:43 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Use the existing %%{__isa_bits} macro instead of crafting one
+
+-------------------------------------------------------------------
+Wed Jun 18 07:22:27 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Extend the architectures to build to all the 64-bit ones
+  * use the 4.29 version for them
+- Added patches:
+  * eclipse-swt-avoid-javascript-at-build-4_29.patch
+  * eclipse-swt-gcc15-4_29.patch
+    + the 4.29 version of the 4.9 patches
+
+-------------------------------------------------------------------
+Mon Jun 16 16:59:10 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * eclipse-swt-gcc15-4_9.patch
+    + fix build with gcc15
+
+-------------------------------------------------------------------
+Thu Jun 12 18:00:48 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Clean the spec file and avoid fetching and modifying sources by
+  script. It is now possible to download from github tarballs of
+  submodules without having to fetch all eclipse sources.
+- Removed patches:
+  * eclipse-arm32.patch
+  * eclipse-is64.patch
+  * eclipse-jintlong.patch
+  * eclipse-ppc64.patch
+  * eclipse-secondary-arches.patch
+  * eclipse-swt-optflags.patch
+    + not needed after the cleanup
+- Added patches:
+  * eclipse-swt-fedora-build-native.patch
+    + patch from Fedora to avoid hardcoding of CFLAGS for the native
+      Build
+  * eclipse-swt-rm-eclipse-tasks-and-customize-build.patch
+    + remove from build the eclipse tasks that we cannot run and
+      that we don't need
+  * eclipse-swt-avoid-javascript-at-build-4_9.patch
+    + avoid using javascript to determine versions that we don't
+      need to know
+
+-------------------------------------------------------------------
+Fri Mar 28 06:15:35 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Do not require xmvn-tools for building
+
 -------------------------------------------------------------------
 Wed Feb 21 10:42:27 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
 

eclipse-swt.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package eclipse-swt
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,114 +16,138 @@
 #
 
 
-%global eb_commit       44643cbda3dfd6f00fbf1b346dae7068df2a9ef9
-%global eclipse_date    20180906
-%global eclipse_time    0745
-%global short_version   4.9
-%global eclipse_tag     I%{eclipse_date}-%{eclipse_time}
-%define __requires_exclude .*SUNWprivate_1\\.1.*
-%ifarch %{ix86}
-    %global eclipse_arch x86
+%global major_version   4
+%if %{__isa_bits} == 32
+%global minor_version   9
+%global other_minor_version 29
 %else
-%ifarch %{arm}
-    %global eclipse_arch arm
-%else
-%ifarch ppc64 ppc64p7
-    %global eclipse_arch ppc64
-%else
-    %global eclipse_arch %{_arch}
-%endif
-%endif
+%global minor_version   29
+%global other_minor_version 9
 %endif
+%global tag R%{major_version}_%{minor_version}
+%global other_tag R%{major_version}_%{other_minor_version}
+%global swtsrcdir       bundles/org.eclipse.swt
 Name:           eclipse-swt
-Version:        %{short_version}.0
+Version:        %{major_version}.%{minor_version}
 Release:        0
-Summary:        SWT Library for GTK+
+Summary:        Eclipse SWT: The Standard Widget Toolkit for GTK+
 License:        EPL-2.0
 Group:          Development/Libraries/Java
-URL:            https://www.eclipse.org/
-# eclipse-create-tarball.sh
-Source0:        eclipse-platform-sources-%{short_version}-clean.tar.xz
-Source1:        http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-%{eb_commit}.tar.xz
-Source10:       eclipse-swt-build.xml
-Source100:      eclipse-create-tarball.sh
-Patch4:         eclipse-secondary-arches.patch
-Patch5:         eclipse-swt-optflags.patch
-Patch33:        eclipse-ppc64.patch
-Patch35:        eclipse-arm32.patch
-Patch37:        eclipse-is64.patch
-Patch38:        eclipse-jintlong.patch
-Patch39:        eclipse-gcc10.patch
-BuildRequires:  ant >= 1.10.5
+URL:            https://github.com/eclipse-platform/eclipse.platform.swt
+Source0:        https://codeload.github.com/eclipse-platform/eclipse.platform.swt/tar.gz/refs/tags/%{tag}#/eclipse.platform.swt-%{tag}.tar.gz
+Source1:        classpath.xls
+Source2:        https://github.com/eclipse-platform/eclipse.platform.swt/raw/refs/tags/R4_29/LICENSE
+Source3:        https://github.com/eclipse-platform/eclipse.platform.swt/raw/refs/tags/R4_29/NOTICE
+# These two are the other sources, listed here to appease bots
+Source100:      https://codeload.github.com/eclipse-platform/eclipse.platform.swt/tar.gz/refs/tags/%{other_tag}#/eclipse.platform.swt-%{other_tag}.tar.gz
+Source101:      eclipse-swt-avoid-javascript-at-build-%{major_version}_%{other_minor_version}.patch
+Source102:      eclipse-swt-gcc15-%{major_version}_%{other_minor_version}.patch
+Patch0:         eclipse-swt-avoid-javascript-at-build-%{major_version}_%{minor_version}.patch
+Patch1:         eclipse-swt-rm-eclipse-tasks-and-customize-build.patch
+Patch2:         eclipse-swt-fedora-build-native.patch
+Patch3:         eclipse-gcc10.patch
+Patch4:         eclipse-swt-no-werror.patch
+Patch5:         eclipse-swt-gcc15-%{major_version}_%{minor_version}.patch
+BuildRequires:  ant
+BuildRequires:  fdupes
 BuildRequires:  gcc
+BuildRequires:  java-devel
 BuildRequires:  javapackages-local
 BuildRequires:  make
 BuildRequires:  pkgconfig
-BuildRequires:  rhino
-BuildRequires:  xmvn-install
-BuildRequires:  xmvn-resolve
+BuildRequires:  webkit2gtk3-devel
 BuildRequires:  pkgconfig(cairo)
-BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(glu)
-BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(webkit2gtk-web-extension-4.0)
 BuildRequires:  pkgconfig(xt)
-BuildConflicts: java-devel >= 9
-Requires:       atk
-Requires:       cairo
-Requires:       gtk2
-Requires:       libglvnd
-# Fake provide to make packages that require it installable.
-# But, since on the architectures where this package is present,
-# full eclipse does not exist, nothing will ever try to resolve
-# the bundle itself.
-Provides:       osgi(org.eclipse.swt)
 Obsoletes:      %{name}-bootstrap
-# Upstream Eclipse no longer supports non-64bit arches
-ExclusiveArch:  s390 %{arm} %{ix86}
 
 %description
-SWT is the software component that delivers native widget functionality
-for the Eclipse platform in an operating system independent manner.  It
-is analogous to AWT/Swing in Java with a difference - SWT uses a rich
-set of native widgets.
+SWT is an open source widget toolkit for Java designed to provide
+efficient, portable access to the user-interface facilities of the
+operating systems on which it is implemented.
+
+%package javadoc
+Summary:        Javadocs for %{name}
+Group:          Documentation/HTML
+BuildArch:      noarch
+
+%description javadoc
+This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n eclipse-platform-sources-%{eclipse_tag}
-
-# Extract linuxtools/eclipse-build sources
-tar --strip-components=1 -xf %{SOURCE1}
-
-cp %{SOURCE10} build.xml
-
+%setup -q -n eclipse.platform.swt-%{tag}
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%if %{__isa_bits} == 32
+%patch -P 3 -p2
+%else
 %patch -P 4 -p1
-%patch -P 5
-%patch -P 33 -p1
-%patch -P 35 -p1
-%patch -P 37 -p1
-%patch -P 38 -p1
-%patch -P 39 -p1
+%endif
+%patch -P 5 -p1
+mkdir -p %{swtsrcdir}/tasks
+cp %{SOURCE1} %{swtsrcdir}/tasks
+cp %{SOURCE2} %{SOURCE3} .
 
-# This part generates secondary fragments using primary fragments
-utils/ensure_arch.sh eclipse.platform.swt.binaries/bundles x86 arm
-utils/ensure_arch.sh eclipse.platform.swt.binaries/bundles x86_64 aarch64 ppc64
-
-%{mvn_alias} "org.eclipse.swt:org.eclipse.swt" "org.eclipse.swt:swt"
-%{mvn_file} "org.eclipse.swt:org.eclipse.swt" swt
-%{mvn_file} :{*} eclipse/@1
+cp %{swtsrcdir}/Eclipse\ SWT/common/library/* %{swtsrcdir}/Eclipse\ SWT\ PI/gtk/library/
+cp %{swtsrcdir}/Eclipse\ SWT/common/version.txt %{swtsrcdir}/
+cp %{swtsrcdir}/Eclipse\ SWT\ PI/{common,cairo}/library/* %{swtsrcdir}/Eclipse\ SWT\ PI/gtk/library/
+cp %{swtsrcdir}/Eclipse\ SWT\ OpenGL/glx/library/* %{swtsrcdir}/Eclipse\ SWT\ PI/gtk/library/
+cp %{swtsrcdir}/Eclipse\ SWT\ WebKit/gtk/library/* %{swtsrcdir}/Eclipse\ SWT\ PI/gtk/library/
+cp %{swtsrcdir}/Eclipse\ SWT\ AWT/gtk/library/* %{swtsrcdir}/Eclipse\ SWT\ PI/gtk/library/
 
 %build
-export CLASSPATH=$(build-classpath js)
-ant -Dmachine_gtk3=1 -DBUILD_WEBKIT2EXTENSION=yes -Dswt.arch=%{eclipse_arch}
 
-%{mvn_artifact} eclipse.platform.swt/bundles/org.eclipse.swt/pom.xml org.eclipse.swt.gtk.linux.%{eclipse_arch}.jar
+cd %{swtsrcdir}
+
+# Build native part
+export SWT_LIB_DEBUG=1
+export CFLAGS="%{optflags} -fPIC"
+export LFLAGS="${RPM_LD_FLAGS}"
+ant -f buildSWT.xml build_local \
+    -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
+    -Dbuild_dir=Eclipse\ SWT\ PI/gtk/library \
+    -Dtargets="-gtk3 install" -Dclean= -Dcflags="%{optflags}" \
+    -Dlflags="${RPM_LD_FLAGS}" -Dswt.arch=%{_arch}
+
+# Build Java part
+ant -f buildSWT.xml check_compilation_all_platforms \
+    -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
+    -Drepo.src=../../
+
+# Build Jar file
+ant -f build.xml \
+    -Dant.build.javac.source=8 -Dant.build.javac.target=8
 
 %install
-%mvn_install
+# Install Maven metadata for SWT
+# jar
+JAR=%{swtsrcdir}/org.eclipse.swt_*.jar
+VER=$(echo $JAR | sed -e "s/.*_\(.*\)\.jar/\1/")
+install -dm 0755 %{buildroot}%{_jnidir}/eclipse
+install -pm 0644 %{swtsrcdir}/org.eclipse.swt_*.jar %{buildroot}%{_jnidir}/swt.jar
+ln -s -f ../swt.jar %{buildroot}%{_jnidir}/eclipse/swt.jar
+%add_maven_depmap "org.eclipse.swt:org.eclipse.swt:jar:$VER" swt.jar -a "org.eclipse.swt:swt"
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}
+cp -r %{swtsrcdir}/docs/api %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}
+
+# fix so permissions
+find %{swtsrcdir}/*.so -name *.so -exec chmod a+x {} \;
+
+install -d 755 %{buildroot}/%{_libdir}/%{name}
+cp -a %{swtsrcdir}/*.so %{buildroot}/%{_libdir}/%{name}
 
 %files -f .mfiles
+%{_libdir}/%{name}
+%{_jnidir}/eclipse
+%license LICENSE NOTICE
+
+%files javadoc
+%{_javadocdir}/%{name}
+%license LICENSE NOTICE
 
 %changelog

eclipse.platform.swt-R4_29.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1388232b1068dd465d1ba76d904e803b211b9e70eb6e9afbf378378e3507c5af
+size 8995599

eclipse.platform.swt-R4_9.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0912988b8df29813a45c61f1a208400c098c22aff5cad6f6dd0736ac103b6ede
+size 6010731

org.eclipse.linuxtools.eclipse-build-44643cbda3dfd6f00fbf1b346dae7068df2a9ef9.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86c2eac8c0f6c321f1c9c38e251378bfe9169cef6c60a2464473ceb4efe94692
-size 157732