8ed94f67f1
* window: Ensure tabs_menu != NULL when updating * screen: Ensure working dir is not NULL * Do not resize the window on zoom * docs: added documentation and cli parsing for --class option * Use TerminalWindow's screen to test for windowing system * Use dropdown's display rather than default display * Avoid warning when widget display is not the default display * Fix segfault when there are both Wayland and X11 displays * screen: Avoid type check on released variable * preferences: Initialize GdkRGBA variable * screen: Cancel async spawn of child in finalize() * Improve error message for empty custom command * Check for screen pointers equality before destroying last screen * screen: Fix gtk_container_get_children leaks * screen: Fix string leak in terminal_screen_paste_unsafe_text * window: Fix leak in terminal_window_get_working_directory * window: Fix leak in terminal_window_menu_add_section * main: Fix string array leak * terminal: Fix spelling error * prefs-dialog: Fix AtkRelationSet leak * Fix gtk-layer-shell includes * preferences: Add missing sanity check * Preferences: maximize new windows * Fix running a command as a login shell * scan-build: Fix core.NullDereference and core.CallAndMessage * build: clang: Silence -Wcast-align * Update `.gitignore` * Rename theme file to desktop for gettext detection * I18n: Update po/LINGUAS list * build: Use XDT_VERSION_INIT and get rid of configure.ac.in * build: Switch from intltool to gettext * Cancel by default in unsafe past dialog * Restore "Text blinks" tooltip * Revert "fix typo" * Translation Updates - Remove obsolote gxo-282.patch - Rename xfce4-terminal-relax-x11-version.patch to relax-x11-version.patch and refresh it. OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-terminal?expand=0&rev=70
126 lines
5.4 KiB
Diff
126 lines
5.4 KiB
Diff
diff -rup a/configure.ac b/configure.ac
|
|
--- a/configure.ac 2024-02-29 15:18:10.000000000 +0100
|
|
+++ b/configure.ac 2024-03-01 19:43:50.596639307 +0100
|
|
@@ -30,7 +30,7 @@ m4_define([pcre2_min_version], [10.00])
|
|
m4_define([libxfce4ui_min_version], [4.17.5])
|
|
m4_define([xfconf_min_version], [4.16.0])
|
|
|
|
-m4_define([libx11_min_version], [1.6.7])
|
|
+m4_define([libx11_min_version], [1.6.5])
|
|
m4_define([gtk_layer_shell_min_version], [0.7.0])
|
|
|
|
dnl *******************************************
|
|
diff -rup a/configure b/configure
|
|
--- a/configure 2024-02-29 15:19:42.000000000 +0100
|
|
+++ b/configure 2024-03-01 19:44:11.309962158 +0100
|
|
@@ -15127,11 +15127,11 @@ fi
|
|
|
|
|
|
if test x"$xdt_feature_deps_check_only" = x"yes"; then
|
|
- if ! $PKG_CONFIG --exists "x11 >= 1.6.7" >/dev/null 2>&1; then
|
|
+ if ! $PKG_CONFIG --exists "x11 >= 1.6.5" >/dev/null 2>&1; then
|
|
if test x"$xdt_feature_deps_missing" = x""; then
|
|
- xdt_feature_deps_missing="x11 >= 1.6.7"
|
|
+ xdt_feature_deps_missing="x11 >= 1.6.5"
|
|
else
|
|
- xdt_feature_deps_missing="$xdt_feature_deps_missing, x11 >= 1.6.7"
|
|
+ xdt_feature_deps_missing="$xdt_feature_deps_missing, x11 >= 1.6.5"
|
|
fi
|
|
fi
|
|
else
|
|
@@ -15287,9 +15287,9 @@ fi
|
|
|
|
|
|
|
|
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 >= 1.6.7" >&5
|
|
-printf %s "checking for x11 >= 1.6.7... " >&6; }
|
|
- if $PKG_CONFIG "--atleast-version=1.6.7" "x11" >/dev/null 2>&1; then
|
|
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 >= 1.6.5" >&5
|
|
+printf %s "checking for x11 >= 1.6.5... " >&6; }
|
|
+ if $PKG_CONFIG "--atleast-version=1.6.5" "x11" >/dev/null 2>&1; then
|
|
LIBX11_VERSION=`$PKG_CONFIG --modversion "x11"`
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBX11_VERSION" >&5
|
|
printf "%s\n" "$LIBX11_VERSION" >&6; }
|
|
@@ -15306,7 +15306,7 @@ printf %s "checking LIBX11_LIBS... " >&6
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBX11_LIBS" >&5
|
|
printf "%s\n" "$LIBX11_LIBS" >&6; }
|
|
|
|
- LIBX11_REQUIRED_VERSION=1.6.7
|
|
+ LIBX11_REQUIRED_VERSION=1.6.5
|
|
|
|
|
|
|
|
@@ -15335,7 +15335,7 @@ printf "%s\n" "found, but $xdt_cv_versio
|
|
|
|
echo "*** The required package x11 was found on your system,"
|
|
echo "*** but the installed version ($xdt_cv_version) is too old."
|
|
- echo "*** Please upgrade x11 to atleast version 1.6.7, or adjust"
|
|
+ echo "*** Please upgrade x11 to atleast version 1.6.5, or adjust"
|
|
echo "*** the PKG_CONFIG_PATH environment variable if you installed"
|
|
echo "*** the new version of the package in a nonstandard prefix so"
|
|
echo "*** pkg-config is able to find it."
|
|
@@ -15347,7 +15347,7 @@ printf "%s\n" "not found" >&6; }
|
|
|
|
|
|
echo "*** The required package x11 was not found on your system."
|
|
- echo "*** Please install x11 (atleast version 1.6.7) or adjust"
|
|
+ echo "*** Please install x11 (atleast version 1.6.5) or adjust"
|
|
echo "*** the PKG_CONFIG_PATH environment variable if you"
|
|
echo "*** installed the package in a nonstandard prefix so that"
|
|
echo "*** pkg-config is able to find it."
|
|
@@ -15599,11 +15599,11 @@ printf "%s\n" "not found" >&6; }
|
|
|
|
|
|
if test x"$xdt_feature_deps_check_only" = x"yes"; then
|
|
- if ! $PKG_CONFIG --exists "x11 >= 1.6.7" >/dev/null 2>&1; then
|
|
+ if ! $PKG_CONFIG --exists "x11 >= 1.6.5" >/dev/null 2>&1; then
|
|
if test x"$xdt_feature_deps_missing" = x""; then
|
|
- xdt_feature_deps_missing="x11 >= 1.6.7"
|
|
+ xdt_feature_deps_missing="x11 >= 1.6.5"
|
|
else
|
|
- xdt_feature_deps_missing="$xdt_feature_deps_missing, x11 >= 1.6.7"
|
|
+ xdt_feature_deps_missing="$xdt_feature_deps_missing, x11 >= 1.6.5"
|
|
fi
|
|
fi
|
|
else
|
|
@@ -15759,9 +15759,9 @@ fi
|
|
|
|
|
|
|
|
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 >= 1.6.7" >&5
|
|
-printf %s "checking for x11 >= 1.6.7... " >&6; }
|
|
- if $PKG_CONFIG "--atleast-version=1.6.7" "x11" >/dev/null 2>&1; then
|
|
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 >= 1.6.5" >&5
|
|
+printf %s "checking for x11 >= 1.6.5... " >&6; }
|
|
+ if $PKG_CONFIG "--atleast-version=1.6.5" "x11" >/dev/null 2>&1; then
|
|
LIBX11_VERSION=`$PKG_CONFIG --modversion "x11"`
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBX11_VERSION" >&5
|
|
printf "%s\n" "$LIBX11_VERSION" >&6; }
|
|
@@ -15778,7 +15778,7 @@ printf %s "checking LIBX11_LIBS... " >&6
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBX11_LIBS" >&5
|
|
printf "%s\n" "$LIBX11_LIBS" >&6; }
|
|
|
|
- LIBX11_REQUIRED_VERSION=1.6.7
|
|
+ LIBX11_REQUIRED_VERSION=1.6.5
|
|
|
|
|
|
|
|
@@ -15807,7 +15807,7 @@ printf "%s\n" "found, but $xdt_cv_versio
|
|
|
|
echo "*** The required package x11 was found on your system,"
|
|
echo "*** but the installed version ($xdt_cv_version) is too old."
|
|
- echo "*** Please upgrade x11 to atleast version 1.6.7, or adjust"
|
|
+ echo "*** Please upgrade x11 to atleast version 1.6.5, or adjust"
|
|
echo "*** the PKG_CONFIG_PATH environment variable if you installed"
|
|
echo "*** the new version of the package in a nonstandard prefix so"
|
|
echo "*** pkg-config is able to find it."
|
|
@@ -15819,7 +15819,7 @@ printf "%s\n" "not found" >&6; }
|
|
|
|
|
|
echo "*** The required package x11 was not found on your system."
|
|
- echo "*** Please install x11 (atleast version 1.6.7) or adjust"
|
|
+ echo "*** Please install x11 (atleast version 1.6.5) or adjust"
|
|
echo "*** the PKG_CONFIG_PATH environment variable if you"
|
|
echo "*** installed the package in a nonstandard prefix so that"
|
|
echo "*** pkg-config is able to find it."
|