!3 .提交源码和spec
From: @xzyangha Reviewed-by: @hostfj Signed-off-by: @hostfj
This commit is contained in:
commit
955d8578d8
BIN
mate-control-center-1.22.2.tar.xz
Normal file
BIN
mate-control-center-1.22.2.tar.xz
Normal file
Binary file not shown.
496
mate-control-center.spec
Normal file
496
mate-control-center.spec
Normal file
@ -0,0 +1,496 @@
|
||||
# Conditional for release and snapshot builds. Uncomment for release-builds.
|
||||
%global rel_build 1
|
||||
|
||||
# This is needed, because src-url contains branched part of versioning-scheme.
|
||||
%global branch 1.22
|
||||
|
||||
# Settings used for build from snapshots.
|
||||
%{!?rel_build:%global commit 922d0e0219b1bedcece8624e4b5fd7e15e7a9bd5}
|
||||
%{!?rel_build:%global commit_date 20131113}
|
||||
%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})}
|
||||
%{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}}
|
||||
%{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}}
|
||||
%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
|
||||
|
||||
Name: mate-control-center
|
||||
Version: %{branch}.2
|
||||
%if 0%{?rel_build}
|
||||
Release: 2%{?dist}
|
||||
%else
|
||||
Release: 0.13%{?git_rel}%{?dist}
|
||||
%endif
|
||||
Summary: MATE Desktop control-center
|
||||
License: LGPLv2+ and GPLv2+
|
||||
URL: http://mate-desktop.org
|
||||
|
||||
# for downloading the tarball use 'spectool -g -R mate-control-center.spec'
|
||||
# Source for release-builds.
|
||||
%{?rel_build:Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz}
|
||||
# Source for snapshot-builds.
|
||||
%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
|
||||
|
||||
# https://github.com/mate-desktop/mate-control-center/commit/3e4ccaf
|
||||
Patch1: mate-control-center_0001-icons-Force-uniform-size-on-icons-505.patch
|
||||
|
||||
BuildRequires: accountsservice-devel
|
||||
BuildRequires: dconf-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: libcanberra-devel
|
||||
BuildRequires: libmatekbd-devel
|
||||
BuildRequires: librsvg2-devel
|
||||
BuildRequires: libSM-devel
|
||||
BuildRequires: libXScrnSaver-devel
|
||||
BuildRequires: mate-common
|
||||
BuildRequires: mate-desktop-devel
|
||||
BuildRequires: mate-menus-devel
|
||||
BuildRequires: mate-settings-daemon-devel
|
||||
BuildRequires: marco-devel
|
||||
|
||||
Requires: gsettings-desktop-schemas
|
||||
# rhbz (#1234438)
|
||||
Requires: mate-settings-daemon
|
||||
# keyring support
|
||||
Requires: gnome-keyring
|
||||
Requires: %{name}-filesystem%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
||||
%description
|
||||
MATE Control Center configures system settings such as themes,
|
||||
keyboards shortcuts, etc.
|
||||
|
||||
%package filesystem
|
||||
Summary: MATE Control Center directories
|
||||
# NOTE: this is an "inverse dep" subpackage. It gets pulled in
|
||||
# NOTE: by the main package an MUST not depend on the main package
|
||||
|
||||
%description filesystem
|
||||
The MATE control-center provides a number of extension points
|
||||
for applications. This package contains directories where applications
|
||||
can install configuration files that are picked up by the control-center
|
||||
utilities.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for mate-settings-daemon
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Development files for mate-control-center
|
||||
|
||||
|
||||
%prep
|
||||
%if 0%{?rel_build}
|
||||
%autosetup -p1
|
||||
%else
|
||||
%autosetup -n %{name}-%{commit} -p1
|
||||
%endif
|
||||
|
||||
%if 0%{?rel_build}
|
||||
#NOCONFIGURE=1 ./autogen.sh
|
||||
%else # 0%{?rel_build}
|
||||
# needed for git snapshots
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
%endif # 0%{?rel_build}
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--disable-static \
|
||||
--disable-schemas-compile \
|
||||
--disable-update-mimedb
|
||||
|
||||
# remove unused-direct-shlib-dependency
|
||||
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
|
||||
|
||||
make %{?_smp_mflags} V=1
|
||||
|
||||
|
||||
%install
|
||||
%{make_install}
|
||||
|
||||
find %{buildroot} -name '*.la' -exec rm -rf {} ';'
|
||||
find %{buildroot} -name '*.a' -exec rm -rf {} ';'
|
||||
|
||||
desktop-file-install \
|
||||
--delete-original \
|
||||
--dir=%{buildroot}%{_datadir}/applications \
|
||||
%{buildroot}%{_datadir}/applications/*.desktop
|
||||
|
||||
# delete mime cache
|
||||
rm %{buildroot}%{_datadir}/applications/mimeinfo.cache
|
||||
|
||||
%find_lang %{name} --with-gnome --all-name
|
||||
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc AUTHORS COPYING README
|
||||
%config %{_sysconfdir}/xdg/menus/matecc.menu
|
||||
%{_bindir}/mate-*
|
||||
%{_libdir}/libmate-window-settings.so.*
|
||||
%{_libdir}/window-manager-settings/
|
||||
%{_libdir}/libmate-slab.so.*
|
||||
%{_sbindir}/mate-display-properties-install-systemwide
|
||||
%{_datadir}/applications/*.desktop
|
||||
%{_datadir}/desktop-directories/matecc.directory
|
||||
%{_datadir}/icons/hicolor/*/apps/*.png
|
||||
%{_datadir}/icons/hicolor/scalable/apps/mate-*.svg
|
||||
%{_datadir}/glib-2.0/schemas/org.mate.*.xml
|
||||
%{_datadir}/mate-control-center/*
|
||||
%{_datadir}/mime/packages/mate-theme-package.xml
|
||||
%{_datadir}/thumbnailers/mate-font-viewer.thumbnailer
|
||||
%{_datadir}/polkit-1/actions/org.mate.randr.policy
|
||||
%{_mandir}/man1/*.1.*
|
||||
|
||||
%files filesystem
|
||||
%dir %{_datadir}/mate-control-center/
|
||||
%dir %{_datadir}/mate-control-center/keybindings/
|
||||
|
||||
%files devel
|
||||
%{_includedir}/mate-window-settings-2.0/
|
||||
%{_includedir}/libmate-slab/
|
||||
%{_libdir}/pkgconfig/mate-window-settings-2.0.pc
|
||||
%{_libdir}/pkgconfig/mate-default-applications.pc
|
||||
%{_libdir}/pkgconfig/mate-keybindings.pc
|
||||
%{_libdir}/pkgconfig/mate-slab.pc
|
||||
%{_libdir}/libmate-window-settings.so
|
||||
%{_libdir}/libmate-slab.so
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Oct 02 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.2-2
|
||||
- use https://github.com/mate-desktop/mate-control-center/commit/3e4ccaf
|
||||
- force uniform size of icons in shell
|
||||
|
||||
* Fri Sep 20 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.2-1
|
||||
- update 1.22.2 release
|
||||
|
||||
* Sun Jul 28 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.1-4
|
||||
- fix building for f31 mass-rebuild
|
||||
- add some upstream patches
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Jun 17 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.1-2
|
||||
- rebuild because of soname bump of marco
|
||||
|
||||
* Fri Apr 26 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.1-1
|
||||
- update to 1.22.1
|
||||
|
||||
* Mon Mar 04 2019 Wolfgang Ulbrich <fedora@raveit.de> - 1.22.0-1
|
||||
- update to 1.22.0
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Dec 20 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.4-1
|
||||
- update to 1.20.4
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Jun 15 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.3-1
|
||||
- update to 1.20.3
|
||||
|
||||
* Wed Apr 25 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.2-2
|
||||
- Change default cursor size to 24px,
|
||||
- better for modern HIDIPI displays
|
||||
|
||||
* Tue Mar 27 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.2-1
|
||||
- update to 1.20.2
|
||||
|
||||
* Mon Feb 12 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.20.0-1
|
||||
- uppdate to 1.20.0
|
||||
- drop mimeinfo rpm scriptlet
|
||||
- drop desktop-database rpm scriptlet
|
||||
- drop GSettings Schema rpm scriptlet
|
||||
- drop IconCache rpm scriptlet
|
||||
- switch to using autosetup
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Feb 02 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.3-2
|
||||
- probably fix for rhbz (#1540878)
|
||||
|
||||
* Thu Jan 25 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.3-1
|
||||
- update to 1.19.3
|
||||
|
||||
* Mon Jan 01 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.2-1
|
||||
- update to 1.19.2
|
||||
|
||||
* Mon Dec 04 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.1-2
|
||||
- use https://github.com/mate-desktop/mate-control-center/pull/312 to
|
||||
- fix rhbz (#1517547)
|
||||
|
||||
* Tue Aug 15 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.1-1
|
||||
- update to 1.19.1 release
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue Jul 04 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.19.0-2
|
||||
- use https://github.com/mate-desktop/mate-control-center/pull/289
|
||||
- warn about enabling multi-finger emulation, libinput may disables
|
||||
- software buttons when clickfinger is enabled.
|
||||
|
||||
* Fri Jun 16 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.19.0-1
|
||||
- update to 1.19.0
|
||||
|
||||
* Wed Apr 05 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.18.1-1
|
||||
- update to 1.18.1
|
||||
|
||||
* Tue Mar 14 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.18.0-1
|
||||
- update to 1.18.0 release
|
||||
|
||||
* Sun Feb 19 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.17.3-1
|
||||
- update to 1.17.3
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Jan 25 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.17.2-1
|
||||
- update 1.17.2 to release with libinput support
|
||||
|
||||
* Tue Dec 06 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.17.0-1
|
||||
- update 1.17.0 release
|
||||
|
||||
* Thu Sep 22 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.0-1
|
||||
- update to 1.16.0 release
|
||||
|
||||
* Fri Sep 09 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.15.2-1
|
||||
- update to 1.15.2 release
|
||||
|
||||
* Sat Jul 02 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.15.1-1
|
||||
- update to 1.15.1 release
|
||||
|
||||
* Mon Jun 27 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.15.0-2
|
||||
- don't show broken elements
|
||||
|
||||
* Thu Jun 09 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.15.0-1
|
||||
- update to 1.15.0 release
|
||||
- switch to gtk+3
|
||||
|
||||
* Wed Apr 06 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.14.0-1
|
||||
- update to 1.14.0 release
|
||||
|
||||
* Mon Feb 22 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.13.2-1
|
||||
- update to 1.13.2 release
|
||||
|
||||
* Sun Feb 07 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.13.1-1
|
||||
- update to 1.13.1
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Sun Dec 27 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.12.1-2
|
||||
- move mate-menus-preferences-category-menu to mate-menus
|
||||
|
||||
* Mon Dec 14 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.12.1-1
|
||||
- update to 1.12.1 release
|
||||
- remove a upstreamed patch
|
||||
|
||||
* Wed Dec 02 2015 Rex Dieter <rdieter@fedoraproject.org> 1.12.0-3
|
||||
- Obsoletes/Provides: mate-menus-preferences-category-menu (#1287845)
|
||||
|
||||
* Fri Nov 13 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.12.0-2
|
||||
- fix crash with display-properties
|
||||
|
||||
* Fri Nov 06 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.12.0-1
|
||||
- update to 1.12.0 release
|
||||
- include mate-preferences-categories.menu from mate-menus
|
||||
|
||||
* Wed Oct 21 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.11.0-1
|
||||
- update to 1.11.0 release
|
||||
|
||||
* Tue Oct 06 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.2.1
|
||||
- update to 1.10.2 release
|
||||
|
||||
* Mon Jul 13 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.1-1
|
||||
- update to 1.10.1 release
|
||||
|
||||
* Wed Jun 24 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.0-3
|
||||
- add runtime requires mate-settings-daemon
|
||||
- fix rhbz (#1234438)
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Tue May 05 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.10.0-1
|
||||
- update to 1.10.0-1 release
|
||||
|
||||
* Thu Mar 05 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.90.2
|
||||
- fix pkexec issue with mate-control-center, rhbz (#972534)
|
||||
|
||||
* Thu Mar 05 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.90.1
|
||||
- update to 1.9.90 release
|
||||
|
||||
* Tue Jan 20 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.1-1
|
||||
- update to 1.9.1 release
|
||||
|
||||
* Sun Oct 26 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.9.0-1
|
||||
- update to 1.9.0 release
|
||||
- windows: Add option to configure titlebar buttons layout
|
||||
- appearance: Add support for metacity-theme-2.xml
|
||||
- default-applications: Add support for office applications
|
||||
|
||||
* Wed Oct 01 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.3-1
|
||||
- update to 1.8.3 release
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Tue Aug 12 2014 Rex Dieter <rdieter@fedoraproject.org> 1.8.2-2
|
||||
- update mime scriptlet
|
||||
|
||||
* Sat Jul 12 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.2-1
|
||||
- update to 1.8.2 release
|
||||
- removeed upstreamed typo-in-gsettings-key.patch
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sat Apr 19 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.1-2
|
||||
- typo in gsettings key, rhbz (#1089461)
|
||||
|
||||
* Sun Mar 16 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.1-1
|
||||
- update to 1.8.1 release
|
||||
- use wildcards for man files extensions
|
||||
- remove --disable-scrollkeeper configure flag
|
||||
|
||||
* Wed Mar 05 2014 Dan Mashal <dan.mashal@fedoraproject.org> - 1.8.0-1
|
||||
- Update to 1.8.0
|
||||
|
||||
* Wed Feb 19 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.90-1
|
||||
- update to 1.7.90
|
||||
- repair usage of git snapshots
|
||||
- improve find language command for yelp-tools
|
||||
- move autoreconf to the right place
|
||||
|
||||
* Thu Feb 13 2014 Dan Mashal <dan.mashal@fedoraproject.org> 1.7.0-2
|
||||
- Add autoreconf to work around rpath.
|
||||
|
||||
* Sun Feb 09 2014 Dan Mashal <dan.mashal@fedoraproject.org> 1.7.0-1
|
||||
- Update to 1.7.0 release.
|
||||
|
||||
* Sat Dec 21 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.0-0.2.git20131113.922d0e0
|
||||
- make Maintainers life easier and use better git snapshot usage, Thanks to Björn Esser
|
||||
- use BR marco-devel
|
||||
- remove Obsoletes: libslab line, no need anymore
|
||||
- fix mixed usage of tabs and spaces
|
||||
- use modern 'make install' macro
|
||||
- make configure command better readable
|
||||
|
||||
* Fri Dec 06 2013 Dan Mashal <dan.mashal@fedoraproject.org> 1.7.0-1.1.git922d0e0
|
||||
- Update to 1.7.0
|
||||
|
||||
* Sat Oct 19 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.1-3
|
||||
- switch to gnome-keyring for > f19
|
||||
|
||||
* Wed Jul 31 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.1-2
|
||||
- add mate-control-center-file-system subpackage
|
||||
- add requires hicolor-icon-theme
|
||||
|
||||
* Tue Jul 30 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.1-1
|
||||
- update to 1.6.1 release
|
||||
- remove NOCONFIGURE=1 ./autogen.sh
|
||||
- update file section
|
||||
- remove old remnants from spec file
|
||||
|
||||
* Sat Jun 29 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.0-2
|
||||
- add runtime require gsettings-desktop-schemas to have proxy support
|
||||
- from gnome gsettings schema
|
||||
- remove needless mate-control-center.convert file
|
||||
- remove unused-direct-shlib-dependency to avoid rpmlint warnings
|
||||
- cleanup BR's
|
||||
|
||||
* Wed Apr 03 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.6.0-1
|
||||
- Update to latest 1.6.0 stable release.
|
||||
|
||||
* Mon Mar 25 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.5-3
|
||||
- Readd desktop file install and remove desktop file validate
|
||||
- Own proper dirs
|
||||
- Use buildroot macro instead of rpm_build_root
|
||||
|
||||
* Mon Mar 25 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.5.5-2
|
||||
- bump version in spec file
|
||||
|
||||
* Sun Mar 24 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.5.5-1
|
||||
- update to new upstream release
|
||||
- remove desktop-file-install command
|
||||
- add desktop-file-validate command
|
||||
- fix icon cache rpm scriptlet
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Thu Jan 17 2013 Rex Dieter <rdieter@fedoraproject.org> 1.5.3-3
|
||||
- fix obsoletes
|
||||
- sort BuildRequires
|
||||
|
||||
* Wed Jan 16 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.3-2
|
||||
- Fix conflicts
|
||||
|
||||
* Tue Jan 15 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.3-1
|
||||
- Update to latest upstream release.
|
||||
|
||||
* Fri Jan 11 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.2-2
|
||||
- Switch back to old BR scheme.
|
||||
- Drop unneeded BR's
|
||||
- Add upstream patch to fix tielbar actions
|
||||
|
||||
* Fri Dec 21 2012 Nelson Marques <nmarques@fedoraproject.org> - 1.5.2-1
|
||||
- Update to version 1.5.2 so we can receive mate-panel 1.5.3
|
||||
- Remove dropped BRs: MateCORBA-2.0
|
||||
- Split out libslab (now distributed)
|
||||
- Minor rework for readibility and ordered BuildRequires
|
||||
|
||||
* Sun Nov 25 2012 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.1-1
|
||||
- Bump to 1.5.1 release
|
||||
|
||||
* Thu Nov 08 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.5.0-2
|
||||
- patch with latest upstream fixes
|
||||
|
||||
* Mon Oct 29 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.5.0-1
|
||||
- update to 1.5.0 release
|
||||
- change build requires and change style
|
||||
- add requires gsettings-desktop-schemas
|
||||
- add build requires gsettings-desktop-schemas-devel
|
||||
- add schema scriptlets
|
||||
- add build requires dconf-devel
|
||||
|
||||
* Tue Oct 16 2012 Leigh Scott <leigh123linux@googlemail.com> - 1.4.0-9
|
||||
- move unversioned .so back to main package
|
||||
- fix directory ownership
|
||||
- fix scriplets
|
||||
- add missing build requires
|
||||
|
||||
* Wed Oct 03 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.0-8
|
||||
- Add disable-update-mimedb to configure flag and update files section
|
||||
|
||||
* Wed Oct 03 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.0-7
|
||||
- Remove noreplace bit for schemas
|
||||
- Remove ownership of XMLnamespaces and aliases folders
|
||||
- Remove desktop-file-utils from post and postun requires field
|
||||
- Add mate-conf to post requires field
|
||||
|
||||
* Tue Oct 02 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.0-6
|
||||
- Remove unnecessary explicit libexecdir configure flag, remove explicit requires field
|
||||
|
||||
* Tue Oct 02 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.0-5
|
||||
- Fix spelling error on schema install.
|
||||
|
||||
* Sun Sep 30 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.0-4
|
||||
- Update BR and remove about-me
|
||||
|
||||
* Wed Sep 26 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.0-3
|
||||
- Add excludes to files section as per package review.
|
||||
|
||||
* Tue Sep 25 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.0-2
|
||||
- Update files section as per review, update build requires.
|
||||
|
||||
* Sat Sep 01 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.0-1
|
||||
- Initial build
|
||||
|
||||
@ -0,0 +1,80 @@
|
||||
From 3e4ccaf000449b52670a9ac11af5c9f1ade96016 Mon Sep 17 00:00:00 2001
|
||||
From: Victor Kareh <vkareh@redhat.com>
|
||||
Date: Tue, 1 Oct 2019 04:11:14 -0400
|
||||
Subject: [PATCH] icons: Force uniform size on icons (#505)
|
||||
|
||||
Also scale properly for HiDPI displays
|
||||
---
|
||||
libslab/mate-utils.c | 26 ++++++++++++++++++--------
|
||||
1 file changed, 18 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/libslab/mate-utils.c b/libslab/mate-utils.c
|
||||
index 8dafe11..e42d02c 100644
|
||||
--- a/libslab/mate-utils.c
|
||||
+++ b/libslab/mate-utils.c
|
||||
@@ -3,11 +3,12 @@
|
||||
#include <string.h>
|
||||
|
||||
gboolean
|
||||
-load_image_by_id (GtkImage * image, GtkIconSize size, const gchar * image_id)
|
||||
+load_image_by_id (GtkImage *image, GtkIconSize size, const gchar *image_id)
|
||||
{
|
||||
- GdkPixbuf *pixbuf;
|
||||
+ cairo_surface_t *surface;
|
||||
gint width;
|
||||
gint height;
|
||||
+ gint scale_factor;
|
||||
|
||||
GtkIconTheme *icon_theme;
|
||||
|
||||
@@ -19,20 +20,25 @@ load_image_by_id (GtkImage * image, GtkIconSize size, const gchar * image_id)
|
||||
return FALSE;
|
||||
|
||||
id = g_strdup (image_id);
|
||||
+ scale_factor = gtk_widget_get_scale_factor (GTK_WIDGET (image));
|
||||
|
||||
gtk_icon_size_lookup (size, &width, &height);
|
||||
gtk_image_set_pixel_size (image, width);
|
||||
|
||||
if (g_path_is_absolute (id))
|
||||
{
|
||||
- pixbuf = gdk_pixbuf_new_from_file_at_size (id, width, height, NULL);
|
||||
+ GdkPixbuf *pixbuf;
|
||||
+
|
||||
+ pixbuf = gdk_pixbuf_new_from_file_at_size (id, width * scale_factor, height * scale_factor, NULL);
|
||||
|
||||
icon_exists = (pixbuf != NULL);
|
||||
|
||||
if (icon_exists)
|
||||
{
|
||||
- gtk_image_set_from_pixbuf (image, pixbuf);
|
||||
+ surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale_factor, NULL);
|
||||
+ gtk_image_set_from_surface (image, surface);
|
||||
|
||||
+ cairo_surface_destroy (surface);
|
||||
g_object_unref (pixbuf);
|
||||
}
|
||||
else
|
||||
@@ -55,11 +61,15 @@ load_image_by_id (GtkImage * image, GtkIconSize size, const gchar * image_id)
|
||||
else
|
||||
icon_theme = gtk_icon_theme_get_default ();
|
||||
|
||||
- pixbuf = gtk_icon_theme_load_icon (icon_theme, id, width, 0, NULL);
|
||||
- icon_exists = (pixbuf != NULL);
|
||||
+ surface = gtk_icon_theme_load_surface (icon_theme, id,
|
||||
+ width, scale_factor,
|
||||
+ NULL,
|
||||
+ GTK_ICON_LOOKUP_FORCE_SIZE,
|
||||
+ NULL);
|
||||
+ icon_exists = (surface != NULL);
|
||||
if (icon_exists) {
|
||||
- gtk_image_set_from_pixbuf (image, pixbuf);
|
||||
- g_object_unref (pixbuf);
|
||||
+ gtk_image_set_from_surface (image, surface);
|
||||
+ cairo_surface_destroy (surface);
|
||||
}
|
||||
else
|
||||
gtk_image_set_from_icon_name (image, "image-missing", size);
|
||||
--
|
||||
2.21.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user