Skip to content

Commit

Permalink
bump(x11/xfce4-session): 4.20.0
Browse files Browse the repository at this point in the history
* Remove unnecessary dont-update-icon-cache.patch file.
* Add required configure options explicitly for strict dependency checking.
  • Loading branch information
termux-pacman-bot committed Dec 19, 2024
1 parent 067a11e commit f71f26b
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 59 deletions.
17 changes: 12 additions & 5 deletions x11-packages/xfce4-session/build.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
TERMUX_PKG_HOMEPAGE=https://www.xfce.org/
TERMUX_PKG_HOMEPAGE=https://docs.xfce.org/xfce/xfce4-session/start
TERMUX_PKG_DESCRIPTION="A session manager for XFCE environment"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="4.18.4"
TERMUX_PKG_VERSION="4.20.0"
TERMUX_PKG_SRCURL=https://archive.xfce.org/src/xfce/xfce4-session/${TERMUX_PKG_VERSION%.*}/xfce4-session-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=9a9c5074c7338b881a5259d3b643619bf84901360c03478e1a697938ece06516
TERMUX_PKG_DEPENDS="atk, gdk-pixbuf, glib, gtk3, libcairo, libice, libsm, libwnck, libx11, libxfce4ui, libxfce4util, pango, xfconf, xorg-iceauth, xorg-xrdb"
TERMUX_PKG_SHA256=5229233fe6ee692361cc28724886c5b08e0216d89f09c42d273191d38fd64f85
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="atk, gdk-pixbuf, glib, gtk3, gtk-layer-shell, libcairo, libice, libsm, libwnck, libx11, libxfce4ui, libxfce4util, libxfce4windowing, pango, xfconf, xorg-iceauth, xorg-xrdb"
TERMUX_PKG_BUILD_DEPENDS="xfce4-dev-tools"
TERMUX_PKG_RECOMMENDS="gnupg, hicolor-icon-theme, xfce4-settings, xfdesktop, xfwm4"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
ac_cv_path_ICEAUTH=${TERMUX_PREFIX}/bin/iceauth
--with-xsession-prefix=$TERMUX_PREFIX
--disable-debug
--enable-gtk-layer-shell
--enable-wayland
--enable-x11
--with-wayland-session-prefix=${TERMUX_PREFIX}
--with-xsession-prefix=${TERMUX_PREFIX}
"

termux_step_create_debscripts() {
Expand Down
37 changes: 18 additions & 19 deletions x11-packages/xfce4-session/disable-xinit-null-display.patch
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
diff -uNr xfce4-session-4.16.0/scripts/startxfce4.in xfce4-session-4.16.0.mod/scripts/startxfce4.in
--- xfce4-session-4.16.0/scripts/startxfce4.in 2016-05-02 21:02:14.000000000 +0000
+++ xfce4-session-4.16.0.mod/scripts/startxfce4.in 2022-04-12 08:25:51.362449242 +0000
@@ -88,14 +88,9 @@
fi
export XDG_CONFIG_DIRS
--- a/scripts/startxfce4.in
+++ b/scripts/startxfce4.in
@@ -114,14 +114,9 @@

-if test "x$DISPLAY" = "x"
-then
- echo "$0: Starting X server"
- prog=xinit
if test "x$XFCE4_SESSION_COMPOSITOR" = "x"
then
- if test "x$DISPLAY" = "x"
- then
- echo "$0: Starting X server"
- prog=xinit
-
- if test ! "x$XDG_VTNR" = "x"; then
- SERVERRC="$SERVERRC vt$XDG_VTNR"
- fi
+if test "x$DISPLAY" = "x"; then
+ echo "$0: Failed to connect to display"
+ exit 2
else
echo "$0: X server already running on display $DISPLAY"
prog=/bin/sh
- if test ! "x$XDG_VTNR" = "x"; then
- SERVERRC="$SERVERRC vt$XDG_VTNR"
- fi
+ if test "x$DISPLAY" = "x"; then
+ echo "$0: Failed to connect to display"
+ exit 2
else
echo "$0: X server already running on display $DISPLAY"
prog=/bin/sh
11 changes: 0 additions & 11 deletions x11-packages/xfce4-session/dont-update-icon-cache.patch

This file was deleted.

37 changes: 13 additions & 24 deletions x11-packages/xfce4-session/xfsm-shutdown-fallback.c.patch
Original file line number Diff line number Diff line change
@@ -1,31 +1,20 @@
--- xfce4-session-4.12.1/xfce4-session/xfsm-shutdown-fallback.c 2014-12-07 13:18:40.000000000 +0530
+++ xfce4-session/xfce4-session/xfsm-shutdown-fallback.c 2019-02-04 11:10:01.104865553 +0530
@@ -172,27 +172,7 @@
--- a/xfce4-session/xfsm-shutdown-fallback.c
+++ b/xfce4-session/xfsm-shutdown-fallback.c
@@ -172,6 +172,7 @@
static gboolean
linux_supports_sleep_state (const gchar *state)
{
- gboolean ret = FALSE;
- gchar *command;
- GError *error = NULL;
- gint exit_status;
-
- /* run script from pm-utils */
- command = g_strdup_printf ("/usr/bin/pm-is-supported --%s", state);
-
- ret = g_spawn_command_line_sync (command, NULL, NULL, &exit_status, &error);
- if (!ret)
- {
- g_warning ("failed to run script: %s", error->message);
- g_error_free (error);
- goto out;
- }
- ret = (WIFEXITED(exit_status) && (WEXITSTATUS(exit_status) == EXIT_SUCCESS));
-
-out:
- g_free (command);
-
- return ret;
+#ifndef __ANDROID__
gboolean ret = FALSE;
gchar *command;
GError *error = NULL;
@@ -193,6 +194,9 @@ out:
g_free (command);

return ret;
+#else
+ return FALSE;
+#endif
}
#endif /* BACKEND_TYPE_LINUX */

0 comments on commit f71f26b

Please sign in to comment.