diff --git a/gxo-299.patch b/gxo-299.patch deleted file mode 100644 index 799113c..0000000 --- a/gxo-299.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup a/terminal/terminal-screen.c b/terminal/terminal-screen.c ---- a/terminal/terminal-screen.c 2024-01-29 14:34:45.000000000 +0100 -+++ b/terminal/terminal-screen.c 2024-02-07 12:40:58.232372739 +0100 -@@ -1892,7 +1892,7 @@ terminal_screen_paste_unsafe_text (Termi - { - GtkWidget *dialog; - -- g_return_if_fail (original_clipboard != GDK_SELECTION_CLIPBOARD && original_clipboard != GDK_SELECTION_PRIMARY); -+ g_return_if_fail (original_clipboard == GDK_SELECTION_CLIPBOARD || original_clipboard == GDK_SELECTION_PRIMARY); - - dialog = terminal_screen_unsafe_paste_dialog_new (screen, text); - gtk_widget_show_all (dialog); diff --git a/xfce4-terminal-1.1.2.tar.bz2 b/xfce4-terminal-1.1.2.tar.bz2 deleted file mode 100644 index 95815b6..0000000 --- a/xfce4-terminal-1.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79a85ee216502c7248e04d560adf8fef86b9d0e047f81e9ea4fe26fbda34d810 -size 1042199 diff --git a/xfce4-terminal-1.1.3.tar.bz2 b/xfce4-terminal-1.1.3.tar.bz2 new file mode 100644 index 0000000..34bfa10 --- /dev/null +++ b/xfce4-terminal-1.1.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:214dd588d441b69f816009682a3bb4652cc19bed7ea64b612a12f097417b3d45 +size 1042732 diff --git a/xfce4-terminal-relax-x11-version.patch b/xfce4-terminal-relax-x11-version.patch new file mode 100644 index 0000000..886c790 --- /dev/null +++ b/xfce4-terminal-relax-x11-version.patch @@ -0,0 +1,125 @@ +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." diff --git a/xfce4-terminal.changes b/xfce4-terminal.changes index 86af9c2..37cb3ba 100644 --- a/xfce4-terminal.changes +++ b/xfce4-terminal.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Mar 1 17:59:41 UTC 2024 - Manfred Hollstein + +- Update to version 1.1.3 + * prefs-dialog: Fix wrong assert + * screen: Fix wrong assert + * Translation Updates +- Remove gxo-299.patch +- Add xfce4-terminal-relax-x11-version.patch + ------------------------------------------------------------------- Wed Feb 7 11:42:17 UTC 2024 - Manfred Hollstein diff --git a/xfce4-terminal.spec b/xfce4-terminal.spec index 6b1390f..ce8d622 100644 --- a/xfce4-terminal.spec +++ b/xfce4-terminal.spec @@ -19,7 +19,7 @@ %bcond_with git Name: xfce4-terminal -Version: 1.1.2 +Version: 1.1.3 Release: 0 Summary: Terminal Emulator for the Xfce Desktop Environment License: GPL-2.0-or-later @@ -28,8 +28,8 @@ URL: https://docs.xfce.org/apps/terminal/start Source0: https://archive.xfce.org/src/apps/xfce4-terminal/1.1/%{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE: backport fix for crash on window close Patch0: gxo-282.patch -# PATCH-FIX-UPSTREAM: backport fix for "paste unsafe text" dialog not popping up -Patch1: gxo-299.patch +# PATCH-FIX-OPENSUSE xfce4-terminal-relax-x11-version.patch lower required X11 version to allow building for Leap which only has 1.6.5, which is enough, though +Patch1: xfce4-terminal-relax-x11-version.patch BuildRequires: intltool BuildRequires: pkgconfig BuildRequires: update-desktop-files @@ -43,6 +43,7 @@ BuildRequires: pkgconfig(libxfce4kbd-private-3) >= 4.16.0 BuildRequires: pkgconfig(libxfce4ui-2) >= 4.17.5 BuildRequires: pkgconfig(libxfconf-0) >= 4.16.0 BuildRequires: pkgconfig(vte-2.91) >= 0.51.3 +BuildRequires: pkgconfig(x11) >= 1.6.5 Recommends: %{name}-lang %description