Skip to content

Commit 8550290

Browse files
committed
Build GTK 4 binaries
Currently the GTK4 binaries are not build as part of the build, this has several drawbacks: 1) If anything is adjusted for GTK4 part it might break without notice 2) We have no GTK4 binaries by default This enables *compilation* of the gtk4 parts to see at laest everything can be compiled.
1 parent 32b31fb commit 8550290

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Install Linux requirements
4444
run: |
4545
sudo apt-get update -qq
46-
sudo apt-get install -qq -y libgtk-3-dev freeglut3-dev webkit2gtk-driver
46+
sudo apt-get install -qq -y libgtk-3-dev libgtk-4-dev freeglut3-dev webkit2gtk-driver
4747
if: ${{ matrix.config.native == 'gtk.linux.x86_64'}}
4848
- name: Pull large static Windows binaries
4949
run: |

binaries/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,10 @@
135135
</exec>
136136
</then>
137137
<else>
138-
<property name="gtk_version" value="3.0" />
139138
<exec dir="${build_dir}" executable="sh" failonerror="true">
140139
<arg line="build.sh"/>
141140
<env key="SWT_JAVA_HOME" value="${SWT_JAVA_HOME}"/>
142141
<env key="OUTPUT_DIR" value="${project.basedir}"/>
143-
<env key="GTK_VERSION" value="${gtk_version}"/>
144142
<env key="MODEL" value="${arch}"/>
145143
<arg line="install clean"/>
146144
</exec>

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -273,22 +273,22 @@ func_build_gtk3 () {
273273
fi
274274
}
275275

276-
if [ "$1" = "-gtk-all" ]; then
277-
shift
278-
func_echo_plus "Note: When building multiple GTK versions, a cleanup is required (and automatically performed) between them."
279-
func_clean_up
280-
func_build_gtk4 "$@"
281-
func_clean_up
282-
func_build_gtk3 "$@"
283-
elif [ "$1" = "-gtk4" ]; then
276+
if [ "$1" = "-gtk4" ]; then
284277
shift
285278
func_build_gtk4 "$@"
286279
elif [ "$1" = "-gtk3" ]; then
287280
shift
288281
func_build_gtk3 "$@"
289282
elif [ "${GTK_VERSION}" = "4.0" ]; then
290283
func_build_gtk4 "$@"
291-
elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then
292-
export GTK_VERSION="3.0"
284+
elif [ "${GTK_VERSION}" = "3.0" ]; then
285+
func_build_gtk3 "$@"
286+
else
287+
func_build_gtk3 "$@"
288+
shift
289+
func_echo_plus "Note: When building multiple GTK versions, a cleanup is required (and automatically performed) between them."
290+
func_clean_up
291+
func_build_gtk4 "$@"
292+
func_clean_up
293293
func_build_gtk3 "$@"
294294
fi

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk3.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* Contributors:
1212
* Syntevo - initial API and implementation
13+
* DUMMY CHANGE
1314
*******************************************************************************/
1415

1516
#ifndef INC_gtk3_H

0 commit comments

Comments
 (0)