Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
614a5e38f6 | ||
|
79cda581f7 | ||
|
8ff797b370 | ||
|
c0fe94991d | ||
|
d4fa4a4205 | ||
|
083f941b67 |
4
.gitignore
vendored
4
.gitignore
vendored
@ -31,3 +31,7 @@
|
|||||||
/mate-settings-daemon-1.15.0.tar.xz
|
/mate-settings-daemon-1.15.0.tar.xz
|
||||||
/mate-settings-daemon-1.15.1.tar.xz
|
/mate-settings-daemon-1.15.1.tar.xz
|
||||||
/mate-settings-daemon-1.16.0.tar.xz
|
/mate-settings-daemon-1.16.0.tar.xz
|
||||||
|
/mate-settings-daemon-1.16.1.tar.xz
|
||||||
|
/mate-settings-daemon-1.16.2.tar.xz
|
||||||
|
/mate-settings-daemon-1.18.1.tar.xz
|
||||||
|
/mate-settings-daemon-1.18.2.tar.xz
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
%global rel_build 1
|
%global rel_build 1
|
||||||
|
|
||||||
# This is needed, because src-url contains branched part of versioning-scheme.
|
# This is needed, because src-url contains branched part of versioning-scheme.
|
||||||
%global branch 1.16
|
%global branch 1.18
|
||||||
|
|
||||||
# Settings used for build from snapshots.
|
# Settings used for build from snapshots.
|
||||||
%{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921}
|
%{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921}
|
||||||
@ -13,7 +13,7 @@
|
|||||||
%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
|
%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
|
||||||
|
|
||||||
Name: mate-settings-daemon
|
Name: mate-settings-daemon
|
||||||
Version: %{branch}.0
|
Version: %{branch}.2
|
||||||
%if 0%{?rel_build}
|
%if 0%{?rel_build}
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
%else
|
%else
|
||||||
@ -29,6 +29,9 @@ URL: http://mate-desktop.org
|
|||||||
# Source for snapshot-builds.
|
# Source for snapshot-builds.
|
||||||
%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
|
%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
|
||||||
|
|
||||||
|
# fix rhbz (#1140329)
|
||||||
|
Patch0: mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch
|
||||||
|
|
||||||
BuildRequires: dbus-glib-devel
|
BuildRequires: dbus-glib-devel
|
||||||
BuildRequires: dconf-devel
|
BuildRequires: dconf-devel
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
@ -66,6 +69,10 @@ under it.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q%{!?rel_build:n %{name}-%{commit}}
|
%setup -q%{!?rel_build:n %{name}-%{commit}}
|
||||||
|
|
||||||
|
%if 0%{?rhel}
|
||||||
|
%patch0 -p1 -b .xrdb
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?rel_build}
|
%if 0%{?rel_build}
|
||||||
#NOCONFIGURE=1 ./autogen.sh
|
#NOCONFIGURE=1 ./autogen.sh
|
||||||
%else # 0%{?rel_build}
|
%else # 0%{?rel_build}
|
||||||
@ -81,8 +88,7 @@ NOCONFIGURE=1 ./autogen.sh
|
|||||||
--disable-schemas-compile \
|
--disable-schemas-compile \
|
||||||
--enable-polkit \
|
--enable-polkit \
|
||||||
--with-x \
|
--with-x \
|
||||||
--with-nssdb \
|
--with-nssdb
|
||||||
--with-gtk=3.0
|
|
||||||
|
|
||||||
make %{?_smp_mflags} V=1
|
make %{?_smp_mflags} V=1
|
||||||
|
|
||||||
@ -142,6 +148,25 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 24 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.18.2-1
|
||||||
|
-update to 1.18.2
|
||||||
|
|
||||||
|
* Sat Jun 17 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.18.1-1
|
||||||
|
- update to 1.18.1 release
|
||||||
|
|
||||||
|
* Sun Mar 26 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.2-1
|
||||||
|
- update to 1.16.2 release
|
||||||
|
- fixes rhbz (#1420709, #1383272)
|
||||||
|
|
||||||
|
* Sun Feb 05 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.1-1
|
||||||
|
- update to 1.16.1 release
|
||||||
|
|
||||||
|
* Mon Jan 09 2017 Dan Horák <dan[at]danny.cz> - 1.16.0-3
|
||||||
|
- don't require Xorg drivers on s390(x)
|
||||||
|
|
||||||
|
* Sat Dec 10 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.0-2
|
||||||
|
- add priority symlinks for synaptics and evdev driver
|
||||||
|
|
||||||
* Sat Sep 17 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.0-1
|
* Sat Sep 17 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.0-1
|
||||||
- test 1.16.0 release
|
- test 1.16.0 release
|
||||||
|
|
||||||
|
@ -0,0 +1,33 @@
|
|||||||
|
From e4e8236cc8605f03284444b5c63c234740cde0d3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: raveit65 <mate@raveit.de>
|
||||||
|
Date: Tue, 25 Apr 2017 22:19:06 +0200
|
||||||
|
Subject: [PATCH 1/2] ldsm-dialog: set max width chars for labels
|
||||||
|
|
||||||
|
This reduce the width of the dialog
|
||||||
|
---
|
||||||
|
plugins/housekeeping/msd-ldsm-dialog.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/plugins/housekeeping/msd-ldsm-dialog.c b/plugins/housekeeping/msd-ldsm-dialog.c
|
||||||
|
index 190daf4..ec72ebd 100644
|
||||||
|
--- a/plugins/housekeeping/msd-ldsm-dialog.c
|
||||||
|
+++ b/plugins/housekeeping/msd-ldsm-dialog.c
|
||||||
|
@@ -222,6 +222,7 @@ msd_ldsm_dialog_init (MsdLdsmDialog *dialog)
|
||||||
|
dialog->priv->primary_label = gtk_label_new (NULL);
|
||||||
|
gtk_label_set_line_wrap (GTK_LABEL (dialog->priv->primary_label), TRUE);
|
||||||
|
gtk_label_set_single_line_mode (GTK_LABEL (dialog->priv->primary_label), FALSE);
|
||||||
|
+ gtk_label_set_max_width_chars (GTK_LABEL (dialog->priv->primary_label), 70);
|
||||||
|
#if GTK_CHECK_VERSION (3, 16, 0)
|
||||||
|
gtk_label_set_xalign (GTK_LABEL (dialog->priv->primary_label), 0.0);
|
||||||
|
gtk_label_set_yalign (GTK_LABEL (dialog->priv->primary_label), 0.0);
|
||||||
|
@@ -232,6 +233,7 @@ msd_ldsm_dialog_init (MsdLdsmDialog *dialog)
|
||||||
|
dialog->priv->secondary_label = gtk_label_new (NULL);
|
||||||
|
gtk_label_set_line_wrap (GTK_LABEL (dialog->priv->secondary_label), TRUE);
|
||||||
|
gtk_label_set_single_line_mode (GTK_LABEL (dialog->priv->secondary_label), FALSE);
|
||||||
|
+ gtk_label_set_max_width_chars (GTK_LABEL (dialog->priv->secondary_label), 70);
|
||||||
|
#if GTK_CHECK_VERSION (3, 16, 0)
|
||||||
|
gtk_label_set_xalign (GTK_LABEL (dialog->priv->secondary_label), 0.0);
|
||||||
|
gtk_label_set_yalign (GTK_LABEL (dialog->priv->secondary_label), 0.0);
|
||||||
|
--
|
||||||
|
2.12.2
|
||||||
|
|
12
mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch
Normal file
12
mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -upr mate-settings-daemon-make-dist-orig/plugins/xrdb/msd-xrdb-manager.c mate-settings-daemon-make-dist/plugins/xrdb/msd-xrdb-manager.c
|
||||||
|
--- mate-settings-daemon-make-dist-orig/plugins/xrdb/msd-xrdb-manager.c 2014-11-12 23:17:45.461271000 +0100
|
||||||
|
+++ mate-settings-daemon-make-dist/plugins/xrdb/msd-xrdb-manager.c 2014-11-12 23:18:28.705704971 +0100
|
||||||
|
@@ -430,7 +430,7 @@ apply_settings (MsdXrdbManager *manager,
|
||||||
|
|
||||||
|
mate_settings_profile_start (NULL);
|
||||||
|
|
||||||
|
- command = "xrdb -merge -quiet";
|
||||||
|
+ command = "xrdb -cpp /bin/cpp -merge -quiet";
|
||||||
|
|
||||||
|
string = g_string_sized_new (256);
|
||||||
|
append_theme_colors (style, string);
|
Loading…
Reference in New Issue
Block a user