From d8ac32fc4a00024e48b5639f9eb213a53b204c68 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Mar 11 2020 14:21:44 +0000 Subject: Import Fedora lightdm-gtk package --- diff --git a/lightdm-gtk/60-lightdm-gtk-greeter.conf b/lightdm-gtk/60-lightdm-gtk-greeter.conf new file mode 100644 index 0000000..6711faf --- /dev/null +++ b/lightdm-gtk/60-lightdm-gtk-greeter.conf @@ -0,0 +1,2 @@ +[Seat:*] +greeter-session=lightdm-gtk-greeter diff --git a/lightdm-gtk/fix_arm_compile.patch b/lightdm-gtk/fix_arm_compile.patch new file mode 100644 index 0000000..c590849 --- /dev/null +++ b/lightdm-gtk/fix_arm_compile.patch @@ -0,0 +1,20 @@ +--- a/src/greeterbackground.c ++++ b/src/greeterbackground.c +@@ -1603,6 +1603,8 @@ + return surface; + } + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wcast-align" + /* Sets the "ESETROOT_PMAP_ID" property to later be used to free the pixmap */ + static void + set_root_pixmap_id(GdkScreen* screen, +@@ -1669,6 +1671,7 @@ + XChangeProperty (display, xroot, atoms[1], XA_PIXMAP, 32, + PropModeReplace, (unsigned char *) &xpixmap, 1); + } ++#pragma GCC diagnostic pop + + /** + * set_surface_as_root: + diff --git a/lightdm-gtk/lightdm-gtk-greeter-1.8.5-add-cinnamon-badges.patch b/lightdm-gtk/lightdm-gtk-greeter-1.8.5-add-cinnamon-badges.patch new file mode 100644 index 0000000..ad8c6b7 --- /dev/null +++ b/lightdm-gtk/lightdm-gtk-greeter-1.8.5-add-cinnamon-badges.patch @@ -0,0 +1,158 @@ +diff -uprN lightdm-gtk-greeter-1.8.5-orig/data/badges/cinnamon2d_badge-symbolic.svg lightdm-gtk-greeter-1.8.5/data/badges/cinnamon2d_badge-symbolic.svg +--- lightdm-gtk-greeter-1.8.5-orig/data/badges/cinnamon2d_badge-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 ++++ lightdm-gtk-greeter-1.8.5/data/badges/cinnamon2d_badge-symbolic.svg 2015-02-01 17:53:38.897011000 +0100 +@@ -0,0 +1,75 @@ ++ ++ ++ ++ ++ ++ ++ ++ image/svg+xml ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff -uprN lightdm-gtk-greeter-1.8.5-orig/data/badges/cinnamon_badge-symbolic.svg lightdm-gtk-greeter-1.8.5/data/badges/cinnamon_badge-symbolic.svg +--- lightdm-gtk-greeter-1.8.5-orig/data/badges/cinnamon_badge-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 ++++ lightdm-gtk-greeter-1.8.5/data/badges/cinnamon_badge-symbolic.svg 2015-02-01 17:53:38.897011000 +0100 +@@ -0,0 +1,75 @@ ++ ++ ++ ++ ++ ++ ++ ++ image/svg+xml ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --git a/lightdm-gtk/lightdm-gtk-greeter-2.0.6.tar.gz b/lightdm-gtk/lightdm-gtk-greeter-2.0.6.tar.gz new file mode 100644 index 0000000..483b978 Binary files /dev/null and b/lightdm-gtk/lightdm-gtk-greeter-2.0.6.tar.gz differ diff --git a/lightdm-gtk/lightdm-gtk.spec b/lightdm-gtk/lightdm-gtk.spec new file mode 100644 index 0000000..a98d4fb --- /dev/null +++ b/lightdm-gtk/lightdm-gtk.spec @@ -0,0 +1,344 @@ + +Summary: LightDM GTK Greeter +Name: lightdm-gtk +Version: 2.0.6 +Release: 3%{?dist} + +License: GPLv3+ +URL: https://launchpad.net/lightdm-gtk-greeter +Source0: %url/2.0/%{version}/+download/lightdm-gtk-greeter-%{version}.tar.gz + +Source1: 60-lightdm-gtk-greeter.conf +Patch0: fix_arm_compile.patch +Patch1: lightdm-gtk_add-language-button-to-layout.patch + +# tweak default config + +## upstreamable patches +# https://bugzilla.redhat.com/show_bug.cgi?id=1178498 +# (lookaside cache) +Patch2: lightdm-gtk-greeter-1.8.5-add-cinnamon-badges.patch + +BuildRequires: gettext +BuildRequires: intltool +# exo-csource +BuildRequires: exo-devel +BuildRequires: pkgconfig(liblightdm-gobject-1) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: gobject-introspection-devel + +Obsoletes: lightdm-gtk2 < 1.8.5-15 + +Obsoletes: lightdm-gtk-common < 2.0 +Obsoletes: lightdm-gtk-greeter < 1.1.5-4 +Provides: lightdm-gtk-greeter = %{version}-%{release} +Provides: lightdm-greeter = 1.2 + +Requires: lightdm%{?_isa} + +# for default background/wallpaper +%if 0%{?fedora} +%global background %{_datadir}/backgrounds/default.png +Requires: desktop-backgrounds-compat +%endif +%if 0%{?rhel} +%global background %{_datadir}/backgrounds/day.jpg +Requires: system-logos +%endif +# owner of HighContrast gtk/icon themes +Requires: gnome-themes-standard + +# Fix issue with lightdm-autologin-greeter pulled in basic-desktop netinstall. +# See: https://bugzilla.redhat.com/show_bug.cgi?id=1481192 +Supplements: (lightdm%{?_isa} and lightdm-autologin-greeter) + +%description +A LightDM greeter that uses the GTK3 toolkit. + + +%prep +%autosetup -n lightdm-gtk-greeter-%{version} -p1 + +%if 0%{?background:1} +sed -i.background -e "s|#background=.*|background=%{background}|" \ + data/lightdm-gtk-greeter.conf +%endif + + +%build +%configure \ + --disable-silent-rules \ + --disable-static \ + --disable-libindicator \ + --enable-at-spi-command="%{_libexecdir}/at-spi-bus-launcher --launch-immediately" \ + --enable-kill-on-sigterm + +%make_build + + +%install +%make_install + +install -m644 -p -D %{SOURCE1} \ + %{buildroot}%{_datadir}/lightdm/lightdm.conf.d/60-lightdm-gtk-greeter.conf + +%find_lang lightdm-gtk-greeter + +# create/own GREETER_DATA_DIR +mkdir -p %{buildroot}%{_datadir}/lightdm-gtk-greeter/ + +## unpackaged files +rm -fv %{buildroot}%{_docdir}/lightdm-gtk-greeter/sample-lightdm-gtk-greeter.css + + +%pre +%{_sbindir}/update-alternatives \ + --remove lightdm-greeter \ + %{_datadir}/xgreeters/lightdm-gtk-greeter.desktop 2> /dev/null ||: + + +%files -f lightdm-gtk-greeter.lang +%license COPYING +%doc ChangeLog NEWS README +%doc data/sample-lightdm-gtk-greeter.css +%config(noreplace) %{_sysconfdir}/lightdm/lightdm-gtk-greeter.conf +%{_sbindir}/lightdm-gtk-greeter +%{_datadir}/xgreeters/lightdm-gtk-greeter.desktop +%dir %{_datadir}/lightdm-gtk-greeter/ +%{_datadir}/icons/hicolor/scalable/places/*badge-symbolic.svg +%{_datadir}/lightdm/lightdm.conf.d/60-lightdm-gtk-greeter.conf + + +%changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 2.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 04 2019 Gerd Pokorra - 2.0.6-1 +- Update to 2.0.6 +- remove BuildRequires gnome-common + +* Fri Feb 01 2019 Fedora Release Engineering - 2.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 2.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Mar 26 2018 Wolfgang Ulbrich - 2.0.5-1 +- update to 2.0.5 +- drop lightdm-gtk-greeter_readd-power.patch +- use lightdm-gtk_add-language-button-to-layout.patch +- drop lightdm-gtk-greeter_remove-atspi-spawn-code.patch + +* Tue Mar 06 2018 Wolfgang Ulbrich - 2.0.4-1 +- update to 2.0.4 +- drop obsolete IconCache scriptlets +- add configure option --enable-kill-on-sigterm rhbz (#1545317) + +* Fri Feb 09 2018 Igor Gnatenko - 2.0.3-6 +- Escape macros in %%changelog + +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Nov 04 2017 Wolfgang Ulbrich - 2.0.3-4 +- add language menu again + +* Thu Oct 26 2017 Wolfgang Ulbrich - 2.0.3-3 +- restore old order of indicators (#1506505) + +* Thu Oct 26 2017 Leigh Scott - 2.0.3-2 +- readd missing power indicator (#1506505) + +* Fri Oct 13 2017 Leigh Scott - 2.0.3-1 +- lightdm-gtk-2.0.3 (#1494823) + +* Tue Aug 22 2017 Björn Esser - 2.0.2-8 +- Add Supplements: (lightdm%%{?_isa} and lightdm-autologin-greeter), + fixing rhbz#1481192 + +* Thu Aug 03 2017 Wolfgang Ulbrich - 2.0.2-7 +- remove atspi spawn code, rhbz (#1477879) + +* Thu Aug 03 2017 Fedora Release Engineering - 2.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Nov 28 2016 Rex Dieter 2.0.2-3 +- restore add-cinnamon-badgets.patch + +* Wed Nov 16 2016 Rex Dieter 2.0.2-2 +- %%build: fix typo in --enable-at-spi-command target + +* Thu Oct 27 2016 Rex Dieter - 2.0.2-1 +- lightdm-gtk-2.0.2 (#1382947) + +* Sat Apr 02 2016 Rex Dieter - 2.0.1-1 +- lightdm-gtk-2.0.1 (#1132844) +- use conf.d snippets (#1096216) +- drop -common subpkg + +* Thu Feb 04 2016 Fedora Release Engineering - 1.8.5-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jul 13 2015 Rex Dieter 1.8.5-19 +- use patch instead of sed (for previous commit) + +* Fri Jul 10 2015 Wolfgang Ulbrich - 1.8.5-18 +- fix wrong path to at-spi-bus-launcher + +* Wed Jun 17 2015 Fedora Release Engineering - 1.8.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed May 20 2015 Rex Dieter 1.8.5-16 +- unset_AT_SPI_BUS.patch (#1175026) + +* Tue Mar 24 2015 Rex Dieter 1.8.5-15 +- drop (temporary) -gtk2 subpkg support + +* Fri Feb 20 2015 Rex Dieter - 1.8.5-14 +- merge epel branch mods +- (fedora) drop Requires: system-logos (not used anymore) + +* Thu Feb 19 2015 Wolfgang Ulbrich - 1.8.5-13 +- fix build of cinnamon badge + +* Tue Feb 17 2015 Wolfgang Ulbrich - 1.8.5-12 +- add cinnamon badge + +* Sat Jan 31 2015 Wolfgang Ulbrich - 1.8.5-11 +- add badges for Mate and Window Maker (#1178498) + +* Fri Nov 07 2014 Rex Dieter 1.8.5-10 +- revert +Requires: gnome-icon-theme, adwaita reportedly good enough now (#1128697) + +* Mon Oct 06 2014 Rex Dieter 1.8.5-9 +- cursor theme doesn't change (#989152) + +* Sun Oct 05 2014 Rex Dieter - 1.8.5-8 +- create/own %%{_datadir}/lightdm-gtk-greeter/ +- -gtk2: own lightdm-greeter.desktop alternatives target + +* Sun Oct 05 2014 Rex Dieter 1.8.5-7 +- -gtk2: fix alternatives, omit dup'd translations +- -common: fix %%posttrans icon scriptlet + +* Sat Oct 04 2014 Rex Dieter 1.8.5-6 +- lightdm-gtk2: support alternatives (for default lightdm greeter) + +* Sat Oct 04 2014 Rex Dieter 1.8.5-5 +- lightdm-gtk2, -common subpkgs + +* Sun Aug 17 2014 Fedora Release Engineering - 1.8.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Aug 11 2014 Rex Dieter 1.8.5-3 +- missing icons, +Requires: gnome-icon-theme (#1128697) + +* Sat Jun 07 2014 Fedora Release Engineering - 1.8.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 05 2014 Rex Dieter 1.8.5-1 +- 1.8.5 (#1094437) + +* Mon Mar 31 2014 Rex Dieter 1.8.4-1 +- 1.8.4 (#1076529) + +* Tue Mar 04 2014 Rex Dieter 1.8.2-1 +- 1.8.2 (#1047209) + +* Thu Feb 20 2014 Rex Dieter 1.8.1-1 +- 1.8.1 + +* Mon Jan 27 2014 Rex Dieter 1.6.1-3 +- CVE-2014-0979 (#149420,1049422) + +* Tue Oct 08 2013 Rex Dieter 1.6.1-2 +- lightdm-gtk-greeter segfaults if session last used is uninstalled (#1002782) + +* Thu Sep 19 2013 Rex Dieter 1.6.1-1 +- lightdm-gtk-1.6.1 (#1009531) + +* Sun Aug 18 2013 Rex Dieter 1.6.0-3 +- rebuild (lightdm) + +* Sat Aug 03 2013 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jun 03 2013 Christoph Wickert - 1.6.0-1 +- Update to 1.6.0 (#962765) + +* Tue May 14 2013 Rex Dieter 1.5.2-1 +- lightdm-gtk-1.5.2 is available (#962765) + +* Mon May 06 2013 Rex Dieter 1.5.1-3 +- avoid crash in gdk_cairo_set_source_pixbuf with bogus geometry values (#915986) + +* Thu Apr 25 2013 Rex Dieter 1.5.1-2 +- lightdm package should be built with PIE flags (#955147) + +* Mon Feb 11 2013 Rex Dieter 1.5.1-1 +- 1.5.1 + +* Mon Jan 28 2013 Gregor Tätzner - 1.5.0-1 +- 1.5.0 + +* Fri Dec 07 2012 Rex Dieter 1.3.1-3 +- missing icons in high-contrast mode (#881352) + +* Wed Nov 28 2012 Rex Dieter 1.3.1-2 +- Requires: system-logos + +* Wed Oct 03 2012 Christoph Wickert - 1.3.1-1 +- Update to 1.3.1 +- Make lightdm requirement arch specific + +* Thu Jul 19 2012 Fedora Release Engineering - 1.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jun 15 2012 Rex Dieter 1.1.6-3 +- try using alternatives + +* Tue Jun 12 2012 Rex Dieter 1.1.6-2 +- Provides: lightdm-greeter = 1.2 + +* Mon Jun 11 2012 Rex Dieter 1.1.6-1 +- lightdm-gtk-greeter-1.1.6 +- fix Source Url +- add %%doc's +- License: GPLv3+ + +* Thu Apr 26 2012 Rex Dieter 1.1.5-4 +- lightdm-gtk-greeter => lightdm-gtk rename + +* Wed Apr 25 2012 Rex Dieter 1.1.5-3 +- Requires: lightdm +- use /usr/share/backgrounds/default.png by default + +* Tue Apr 24 2012 Rex Dieter 1.1.5-2 +- adapt for fedora + +* Sat Apr 07 2012 Tomasz Pawel Gajc 1.1.5-1 ++ Revision: 789754 +- update to new version 1.1.5 + +* Mon Mar 26 2012 Tomasz Pawel Gajc 1.1.4-3 ++ Revision: 787060 +- drop requires on gnome-themes-standard (quite bloated) + +* Sun Mar 25 2012 Tomasz Pawel Gajc 1.1.4-2 ++ Revision: 786642 +- spec file clean +- rebuild for new lightdm + +* Fri Mar 02 2012 Matthew Dawkins 1.1.4-1 ++ Revision: 781826 +- imported package lightdm-gtk-greeter + diff --git a/lightdm-gtk/lightdm-gtk_add-language-button-to-layout.patch b/lightdm-gtk/lightdm-gtk_add-language-button-to-layout.patch new file mode 100644 index 0000000..131980d --- /dev/null +++ b/lightdm-gtk/lightdm-gtk_add-language-button-to-layout.patch @@ -0,0 +1,14 @@ +diff -uprN lightdm-gtk-greeter-2.0.5-orig/src/lightdm-gtk-greeter.c lightdm-gtk-greeter-2.0.5/src/lightdm-gtk-greeter.c +--- lightdm-gtk-greeter-2.0.5-orig/src/lightdm-gtk-greeter.c 2018-03-15 01:23:15.000000000 +0100 ++++ lightdm-gtk-greeter-2.0.5/src/lightdm-gtk-greeter.c 2018-03-26 18:46:48.859193117 +0200 +@@ -99,8 +99,8 @@ static GtkButton *power_ok_button, *p + static GtkLabel *power_title, *power_text; + static GtkImage *power_icon; + +-static const gchar *DEFAULT_LAYOUT[] = {"~spacer", "~spacer", "~host", "~spacer", +- "~session", "~a11y", "~clock", "~power", NULL}; ++static const gchar *DEFAULT_LAYOUT[] = {"~host", "~spacer", "~clock", "~spacer", ++ "~session", "~language", "~a11y", "~power", NULL}; + + static const gchar *POWER_WINDOW_DATA_LOOP = "power-window-loop"; /* */ + static const gchar *POWER_WINDOW_DATA_RESPONSE = "power-window-response"; /* */