From 17ce5ae96d9c3c5b37ce0163371bfca6eef511ac Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 21 Jan 2014 13:13:57 +0400 Subject: [PATCH] Revert "regular.mk: gnustep is broken on x86_64 right now" This reverts commit d160d6100eee5aff419d9a196bdb84d9a6c5af1c: GNUstep reportedly works on x86_64 now. Conflicts: conf.d/regular.mk --- conf.d/regular.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index c036c8b6..2a21aea2 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -57,13 +57,8 @@ distro/regular-wmaker: distro/.regular-sysv-gtk use/x11/wmaker \ @$(call add,LIVE_PACKAGES,xxkb) @$(call add,MAIN_PACKAGES,wmgtemp wmhdaps wmpomme wmxkbru) -ifeq (i586,$(ARCH)) distro/regular-gnustep: distro/regular-wmaker use/x11/gnustep +plymouth @$(call add,THE_BRANDING,graphics) -else -distro/regular-gnustep: - $(error $@ is known buggy on non-i586 at the moment) -endif distro/regular-xfce: distro/.regular-gtk use/x11/xfce +nm; @: