-
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Remove unnecessary dont-update-icon-cache.patch file. * Add required configure options explicitly for strict dependency checking.
- Loading branch information
1 parent
067a11e
commit f71f26b
Showing
4 changed files
with
43 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 18 additions & 19 deletions
37
x11-packages/xfce4-session/disable-xinit-null-display.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file was deleted.
Oops, something went wrong.
37 changes: 13 additions & 24 deletions
37
x11-packages/xfce4-session/xfsm-shutdown-fallback.c.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 */ | ||
|