Sun, 07 Dec 2025 15:51:22 +0100
remove gtk2legacy option
| configure | file | annotate | diff | comparison | revisions | |
| make/project.xml | file | annotate | diff | comparison | revisions |
--- a/configure Sun Dec 07 15:50:20 2025 +0100 +++ b/configure Sun Dec 07 15:51:22 2025 +0100 @@ -93,7 +93,7 @@ --release add extra compile flags for release builds Options: - --toolkit=(libadwaita|gtk4|gtk3|gtk2|gtk2legacy|qt5|qt4|cocoa|motif|server) + --toolkit=(libadwaita|gtk4|gtk3|gtk2|qt5|qt4|cocoa|motif|server) Optional Features: --enable-client @@ -130,7 +130,7 @@ "--debug") BUILD_TYPE="debug" ;; "--release") BUILD_TYPE="release" ;; "--toolkit="*) OPT_TOOLKIT=${ARG#--toolkit=} ;; - "--toolkit") echo "option '$ARG' needs a value:"; echo " $ARG=(libadwaita|gtk4|gtk3|gtk2|gtk2legacy|qt5|qt4|cocoa|motif|server)"; abort_configure ;; + "--toolkit") echo "option '$ARG' needs a value:"; echo " $ARG=(libadwaita|gtk4|gtk3|gtk2|qt5|qt4|cocoa|motif|server)"; abort_configure ;; "--enable-client") FEATURE_CLIENT=on ;; "--disable-client") unset FEATURE_CLIENT ;; "-"*) echo "unknown option: $ARG"; abort_configure ;; @@ -831,21 +831,6 @@ __EOF__ return 0 } -checkopt_toolkit_gtk2legacy() -{ - VERR=0 - if dependency_error_gtk2legacy ; then - VERR=1 - fi - if [ $VERR -ne 0 ]; then - return 1 - fi - cat >> "$TEMP_DIR/make.mk" << __EOF__ -TOOLKIT = gtk -GTKOBJ = draw_gdk.o -__EOF__ - return 0 -} checkopt_toolkit_qt5() { VERR=0 @@ -1024,14 +1009,6 @@ ERROR=1 DEPENDENCIES_FAILED="option 'toolkit' $DEPENDENCIES_FAILED" fi - elif [ "$OPT_TOOLKIT" = "gtk2legacy" ]; then - echo " toolkit: $OPT_TOOLKIT" >> $TEMP_DIR/options - if checkopt_toolkit_gtk2legacy ; then - : - else - ERROR=1 - DEPENDENCIES_FAILED="option 'toolkit' $DEPENDENCIES_FAILED" - fi elif [ "$OPT_TOOLKIT" = "qt5" ]; then echo " toolkit: $OPT_TOOLKIT" >> $TEMP_DIR/options if checkopt_toolkit_qt5 ; then @@ -1075,7 +1052,7 @@ else echo echo "Invalid option value - usage:" - echo " --toolkit=(libadwaita|gtk4|gtk3|gtk2|gtk2legacy|qt5|qt4|cocoa|motif|server)" + echo " --toolkit=(libadwaita|gtk4|gtk3|gtk2|qt5|qt4|cocoa|motif|server)" abort_configure fi fi
--- a/make/project.xml Sun Dec 07 15:50:20 2025 +0100 +++ b/make/project.xml Sun Dec 07 15:51:22 2025 +0100 @@ -146,11 +146,6 @@ <make>TOOLKIT = gtk</make> <make>GTKOBJ = draw_cairo.o</make> </value> - <value str="gtk2legacy"> - <dependencies>gtk2legacy</dependencies> - <make>TOOLKIT = gtk</make> - <make>GTKOBJ = draw_gdk.o</make> - </value> <value str="qt5"> <dependencies>qt5</dependencies> <make>TOOLKIT = qt</make>