Compare commits
No commits in common. "32974bf9d4d2b4b52491d420767639218046efa8" and "acfc19c97c551a1885443485cf743f102fd4fd76" have entirely different histories.
32974bf9d4
...
acfc19c97c
@ -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.
@ -1,89 +0,0 @@
|
|||||||
%global xfceversion 4.16
|
|
||||||
|
|
||||||
Name: xfce4-settings
|
|
||||||
Version: 4.16.0
|
|
||||||
Release: 2
|
|
||||||
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++
|
|
||||||
BuildRequires: gettext
|
|
||||||
BuildRequires: intltool
|
|
||||||
BuildRequires: exo-devel >= 0.5.0
|
|
||||||
BuildRequires: libxfce4ui-devel >= %{xfceversion}
|
|
||||||
BuildRequires: libxfce4util-devel >= %{xfceversion}
|
|
||||||
BuildRequires: xfconf-devel >= %{xfceversion}
|
|
||||||
BuildRequires: desktop-file-utils >= 0.7
|
|
||||||
BuildRequires: libnotify-devel
|
|
||||||
BuildRequires: colord-devel
|
|
||||||
BuildRequires: libcanberra-devel
|
|
||||||
BuildRequires: libxklavier-devel
|
|
||||||
BuildRequires: xorg-x11-drv-libinput-devel
|
|
||||||
BuildRequires: libXrandr-devel
|
|
||||||
BuildRequires: garcon-devel >= 0.1.10
|
|
||||||
Requires: xfconf
|
|
||||||
|
|
||||||
%description
|
|
||||||
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
|
|
||||||
%make_build
|
|
||||||
|
|
||||||
%install
|
|
||||||
%make_install
|
|
||||||
|
|
||||||
for file in %{buildroot}%{_datadir}/applications/*.desktop ; do
|
|
||||||
desktop-file-install \
|
|
||||||
--add-category="X-XFCE" \
|
|
||||||
--remove-category="XFCE" \
|
|
||||||
--delete-original \
|
|
||||||
--dir=%{buildroot}%{_datadir}/applications \
|
|
||||||
$file
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
%find_lang %{name}
|
|
||||||
|
|
||||||
%files -f %{name}.lang
|
|
||||||
%license COPYING
|
|
||||||
%doc AUTHORS ChangeLog NEWS TODO
|
|
||||||
%config(noreplace) %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
|
|
||||||
%config(noreplace) %{_sysconfdir}/xdg/autostart/xfsettingsd.desktop
|
|
||||||
%config(noreplace) %{_sysconfdir}/xdg/menus/xfce-settings-manager.menu
|
|
||||||
%config(noreplace) %{_sysconfdir}/xdg/xfce4/helpers.rc
|
|
||||||
%{_bindir}/xfce4-mime-helper
|
|
||||||
%{_bindir}/xfce4-*-settings
|
|
||||||
%{_bindir}/xfce4-settings-editor
|
|
||||||
%{_bindir}/xfce4-settings-manager
|
|
||||||
%{_bindir}/xfsettingsd
|
|
||||||
%{_bindir}/xfce4-find-cursor
|
|
||||||
%{_datadir}/applications/xfce*.desktop
|
|
||||||
%{_libdir}/xfce4
|
|
||||||
%{_libdir}/xfce4/xfce4-compose-mail
|
|
||||||
%{_libdir}/xfce4/settings
|
|
||||||
%{_datadir}/icons/hicolor/*/*/*xfce*
|
|
||||||
%{_datadir}/xfce4/helpers/*.desktop
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Thu Nov 10 2022 Wenlong Ding <wenlong.ding@turbolinux.com.cn> - 4.16.0-2
|
|
||||||
- Fix CVE-2022-45062
|
|
||||||
|
|
||||||
* Fri Jun 18 2021 zhanglin <lin.zhang@turbolinux.com.cn> - 4.16.0-1
|
|
||||||
- Update to 4.16.0
|
|
||||||
|
|
||||||
* Sun Jul 12 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 4.14.3-1
|
|
||||||
- Init package
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
version_control: git
|
|
||||||
src_repo: https://gitlab.xfce.org/xfce/xfce4-settings.git
|
|
||||||
tag_prefix: "xfce4-settings-"
|
|
||||||
seperator: "."
|
|
||||||
Loading…
x
Reference in New Issue
Block a user