update to 4.18.1
This commit is contained in:
dillon_chen
parent
e13aa63e08
commit
feea493545
@ -1,71 +0,0 @@
|
||||
diff -up xfce4-settings-4.16.0/dialogs/mime-settings/xfce-mime-helper.c.BAK xfce4-settings-4.16.0/dialogs/mime-settings/xfce-mime-helper.c
|
||||
--- xfce4-settings-4.16.0/dialogs/mime-settings/xfce-mime-helper.c.BAK 2022-11-10 14:46:34.496823705 +0800
|
||||
+++ xfce4-settings-4.16.0/dialogs/mime-settings/xfce-mime-helper.c 2022-11-10 14:51:50.390633576 +0800
|
||||
@@ -375,7 +375,7 @@ xfce_mime_helper_execute (XfceMimeHelper
|
||||
gint status;
|
||||
gint result;
|
||||
gint pid;
|
||||
- const gchar *real_parameter = parameter;
|
||||
+ gchar *real_parameter = NULL;
|
||||
|
||||
// FIXME: startup-notification
|
||||
|
||||
@@ -387,23 +387,44 @@ xfce_mime_helper_execute (XfceMimeHelper
|
||||
if (G_UNLIKELY (screen == NULL))
|
||||
screen = gdk_screen_get_default ();
|
||||
|
||||
- /* strip the mailto part if needed */
|
||||
- if (real_parameter != NULL && g_str_has_prefix (real_parameter, "mailto:"))
|
||||
- real_parameter = parameter + 7;
|
||||
+ if (parameter != NULL)
|
||||
+ {
|
||||
+ if (helper->category == XFCE_MIME_HELPER_WEBBROWSER || helper->category == XFCE_MIME_HELPER_FILEMANAGER)
|
||||
+ {
|
||||
+ /* escape characters which do not belong into an URI/URL */
|
||||
+ real_parameter = g_uri_escape_string (parameter, ":/?#[]@!$&'()*+,;=%", TRUE);
|
||||
+ }
|
||||
+ else if (g_str_has_prefix (real_parameter, "mailto:"))
|
||||
+ {
|
||||
+ /* strip the mailto part if needed */
|
||||
+ real_parameter = g_strdup (parameter + 7);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ real_parameter = g_strdup (parameter);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
/* determine the command set to use */
|
||||
- if (exo_str_is_flag (real_parameter)) {
|
||||
+ if (exo_str_is_flag (real_parameter))
|
||||
+ {
|
||||
commands = helper->commands_with_flag;
|
||||
- } else if (exo_str_is_empty (real_parameter)) {
|
||||
+ }
|
||||
+ else if (exo_str_is_empty (real_parameter))
|
||||
+ {
|
||||
commands = helper->commands;
|
||||
- } else {
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
commands = helper->commands_with_parameter;
|
||||
}
|
||||
|
||||
+
|
||||
/* verify that we have atleast one command */
|
||||
if (G_UNLIKELY (*commands == NULL))
|
||||
{
|
||||
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_INVAL, _("No command specified"));
|
||||
+ g_free (real_parameter);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -493,6 +514,7 @@ xfce_mime_helper_execute (XfceMimeHelper
|
||||
if (G_UNLIKELY (!succeed))
|
||||
g_propagate_error (error, err);
|
||||
|
||||
+ g_free (real_parameter);
|
||||
return succeed;
|
||||
}
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
--- xfsettingsd/xsettings.xml.orig 2015-02-23 19:33:11.000000000 -0600
|
||||
+++ xfsettingsd/xsettings.xml 2015-02-28 18:30:51.863719465 -0600
|
||||
@@ -6,8 +6,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<channel name="xsettings" version="1.0">
|
||||
<property name="Net" type="empty">
|
||||
- <property name="ThemeName" type="empty"/>
|
||||
- <property name="IconThemeName" type="empty"/>
|
||||
+ <property name="ThemeName" type="string" value="Adwaita"/>
|
||||
+ <property name="IconThemeName" type="string" value="Adwaita"/>
|
||||
<property name="DoubleClickTime" type="int" value="400"/>
|
||||
<property name="DoubleClickDistance" type="int" value="5"/>
|
||||
<property name="DndDragThreshold" type="int" value="8"/>
|
||||
@@ -19,9 +19,9 @@
|
||||
</property>
|
||||
<property name="Xft" type="empty">
|
||||
<property name="DPI" type="empty"/>
|
||||
- <property name="Antialias" type="int" value="-1"/>
|
||||
+ <property name="Antialias" type="int" value="1"/>
|
||||
<property name="Hinting" type="int" value="-1"/>
|
||||
- <property name="HintStyle" type="string" value="hintnone"/>
|
||||
+ <property name="HintStyle" type="string" value="hintfull"/>
|
||||
<property name="RGBA" type="string" value="none"/>
|
||||
<!-- <property name="Lcdfilter" type="string" value="none"/> -->
|
||||
</property>
|
||||
Binary file not shown.
BIN
xfce4-settings-4.18.1.tar.bz2
Normal file
BIN
xfce4-settings-4.18.1.tar.bz2
Normal file
Binary file not shown.
@ -1,15 +1,13 @@
|
||||
%global xfceversion 4.16
|
||||
%global xfceversion 4.18
|
||||
|
||||
Name: xfce4-settings
|
||||
Version: 4.16.2
|
||||
Release: 2
|
||||
Version: 4.18.1
|
||||
Release: 1
|
||||
Summary: Settings Manager for Xfce
|
||||
License: GPLv2+
|
||||
URL: http://www.xfce.org/
|
||||
Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
|
||||
# theme and font settings
|
||||
Patch10: xfce4-settings-4.14.patch
|
||||
Patch11: fix_CVE-2022-45062.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc-c++
|
||||
@ -34,8 +32,6 @@ This package includes the settings manager applications for the Xfce desktop.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch10
|
||||
%patch11 -p1
|
||||
|
||||
%build
|
||||
%configure --enable-sound-settings --enable-pluggable-dialogs --enable-maintainer-mode --enable-xorg-libinput
|
||||
@ -74,6 +70,9 @@ done
|
||||
%{_datadir}/xfce4/helpers/*.desktop
|
||||
|
||||
%changelog
|
||||
* Wed Jan 4 2023 Dillon Chen <dillon.chen@gmail.com> - 4.18.1-1
|
||||
- Update to 4.18.1
|
||||
|
||||
* Thu Nov 10 2022 Wenlong Ding <wenlong.ding@turbolinux.com.cn> - 4.16.2-2
|
||||
- Fix CVE-2022-45062
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user