From 39b1ee1dbeca2c91a20f7e7cc48009230db3f0ed Mon Sep 17 00:00:00 2001 From: Arjan Bouter Date: Mon, 9 Oct 2006 15:57:19 +0200 Subject: qingy: fixed shutdown in DirectFB mode and really removed config.patch this time --- display/qingy/DETAILS | 2 +- display/qingy/HISTORY | 5 +++ display/qingy/config.patch | 89 -------------------------------------------- display/qingy/shutdown.patch | 21 +++++++++++ 4 files changed, 27 insertions(+), 90 deletions(-) delete mode 100644 display/qingy/config.patch (limited to 'display/qingy') diff --git a/display/qingy/DETAILS b/display/qingy/DETAILS index b7d264c7a9..e7908b46c8 100755 --- a/display/qingy/DETAILS +++ b/display/qingy/DETAILS @@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_HASH=sha512:e74de5e8a49a2c1f9d5bfd1d83d837fae9fcd6372d5905f2d07cea85f13fea90325f52cac8cecd7538df80b0ebc7fe8af3d596c6372886af4dbfa40707f2b1ca WEB_SITE=http://qingy.sourceforge.net ENTERED=20040913 - PATCHLEVEL=2 + PATCHLEVEL=3 LICENSE[0]=GPL KEYWORDS="login framebuffer display" SHORT="A login manager for DirectFB" diff --git a/display/qingy/HISTORY b/display/qingy/HISTORY index 41676ed04c..1c62def58e 100644 --- a/display/qingy/HISTORY +++ b/display/qingy/HISTORY @@ -1,3 +1,8 @@ +2006-10-09 Arjan Bouter + * config.patch: really removed + * shutdown.patch: fixed shutdown in DirectFB mode + * DETAILS: patchlevel=3 + 2006-10-06 Arjan Bouter * config.patch: removed * shutdown.patch: updated for 0.9.1 diff --git a/display/qingy/config.patch b/display/qingy/config.patch deleted file mode 100644 index 5f1024fc03..0000000000 --- a/display/qingy/config.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -Naur qingy-0.6.0.orig/media/Makefile.in qingy-0.6.0/media/Makefile.in ---- qingy-0.6.0.orig/media/Makefile.in 2005-06-11 09:45:28.085391488 -0700 -+++ qingy-0.6.0/media/Makefile.in 2005-06-11 09:45:59.110674928 -0700 -@@ -257,42 +257,6 @@ - - clean-lisp: - -rm -f elc-stamp $(ELCFILES) --dist_settingsdataDATA_INSTALL = $(INSTALL_DATA) --install-dist_settingsdataDATA: $(dist_settingsdata_DATA) -- @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(settingsdatadir) -- @list='$(dist_settingsdata_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(dist_settingsdataDATA_INSTALL) $$d$$p $(DESTDIR)$(settingsdatadir)/$$f"; \ -- $(dist_settingsdataDATA_INSTALL) $$d$$p $(DESTDIR)$(settingsdatadir)/$$f; \ -- done -- --uninstall-dist_settingsdataDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(dist_settingsdata_DATA)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(settingsdatadir)/$$f"; \ -- rm -f $(DESTDIR)$(settingsdatadir)/$$f; \ -- done --nodist_settingsdataDATA_INSTALL = $(INSTALL_DATA) --install-nodist_settingsdataDATA: $(nodist_settingsdata_DATA) -- @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(settingsdatadir) -- @list='$(nodist_settingsdata_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(nodist_settingsdataDATA_INSTALL) $$d$$p $(DESTDIR)$(settingsdatadir)/$$f"; \ -- $(nodist_settingsdataDATA_INSTALL) $$d$$p $(DESTDIR)$(settingsdatadir)/$$f; \ -- done -- --uninstall-nodist_settingsdataDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(nodist_settingsdata_DATA)'; for p in $$list; do \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(settingsdatadir)/$$f"; \ -- rm -f $(DESTDIR)$(settingsdatadir)/$$f; \ -- done - - # This directory's subdirectories are mostly independent; you can cd - # into them and run `make' without going through this Makefile. -@@ -510,8 +474,7 @@ - - info-am: - --install-data-am: install-dist_settingsdataDATA install-lispLISP \ -- install-nodist_settingsdataDATA -+install-data-am: install-lispLISP - - install-exec-am: - -@@ -537,8 +500,7 @@ - - ps-am: - --uninstall-am: uninstall-dist_settingsdataDATA uninstall-info-am \ -- uninstall-lispLISP uninstall-nodist_settingsdataDATA -+uninstall-am: uninstall-info-am uninstall-lispLISP - - uninstall-info: uninstall-info-recursive - -@@ -548,18 +510,18 @@ - distclean-recursive distclean-tags distdir dvi dvi-am \ - dvi-recursive info info-am info-recursive install install-am \ - install-data install-data-am install-data-recursive \ -- install-dist_settingsdataDATA install-exec install-exec-am \ -+ install-exec install-exec-am \ - install-exec-recursive install-info install-info-am \ - install-info-recursive install-lispLISP install-man \ -- install-nodist_settingsdataDATA install-recursive install-strip \ -+ install-recursive install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - installdirs-recursive maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ - pdf-recursive ps ps-am ps-recursive tags tags-recursive \ -- uninstall uninstall-am uninstall-dist_settingsdataDATA \ -+ uninstall uninstall-am \ - uninstall-info-am uninstall-info-recursive uninstall-lispLISP \ -- uninstall-nodist_settingsdataDATA uninstall-recursive -+ uninstall-recursive - - - settings: Makefile diff --git a/display/qingy/shutdown.patch b/display/qingy/shutdown.patch index 6e5c3b6e00..5a92f2eaa5 100644 --- a/display/qingy/shutdown.patch +++ b/display/qingy/shutdown.patch @@ -1,3 +1,24 @@ +diff -Naur qingy-0.9.1/src/DirectFB/directfb_mode.c qingy-0.9.1-fixed/src/DirectFB/directfb_mode.c +--- qingy-0.9.1/src/DirectFB/directfb_mode.c 2006-08-21 19:06:39.000000000 +0200 ++++ qingy-0.9.1-fixed/src/DirectFB/directfb_mode.c 2006-10-09 15:49:16.000000000 +0200 +@@ -438,7 +438,7 @@ + primary->DrawString (primary, "shutting down system...", -1, screen_width / 2, screen_height / 2, DSTF_CENTER); + primary->Flip (primary, NULL, 0); + } +- execl ("/sbin/shutdown", "/sbin/shutdown", "-h", "now", (char*)NULL); ++ execl ("/sbin/shutdown", "/sbin/shutdown", "-qh", "now", (char*)NULL); + } + if (action == DO_REBOOT) + { +@@ -447,7 +447,7 @@ + primary->DrawString (primary, "rebooting system...", -1, screen_width / 2, screen_height / 2, DSTF_CENTER); + primary->Flip (primary, NULL, 0); + } +- execl ("/sbin/shutdown", "/sbin/shutdown", "-r", "now", (char*)NULL); ++ execl ("/sbin/shutdown", "/sbin/shutdown", "-qr", "now", (char*)NULL); + } + + /* we should never get here unless call to /sbin/shutdown fails */ diff -Naur qingy-0.9.1/src/main.c qingy-0.9.1-fixed/src/main.c --- qingy-0.9.1/src/main.c 2006-08-04 07:52:17.000000000 +0200 +++ qingy-0.9.1-fixed/src/main.c 2006-10-06 11:09:06.000000000 +0200 -- cgit v1.2.3