[Packages-Desktop] fix gcc pkg conflict in multilib

- see also https://github.com/manjaro/iso-profiles/issues/65
2017-05-31 18:07:27 +02:00 · 2017-05-31 18:07:27 +02:00 · b55145146e
parent 543ebadd6f
commit b55145146e
10 changed files with 11 additions and 1 deletions
--- a/community/budgie/Packages-Desktop
+++ b/community/budgie/Packages-Desktop
@ -172,6 +172,7 @@ yelp
 >extra fakeroot
 >extra flex
 >extra gcc
+>extra >multilib gcc-libs-multilib
 >extra >multilib gcc-multilib
 >extra libtool
 >extra m4
--- a/community/deepin/Packages-Desktop
+++ b/community/deepin/Packages-Desktop
@ -28,6 +28,8 @@ dmidecode
 >extra flex
 >extra galculator
 >extra gcc
+>extra >multilib gcc-libs-multilib
+>extra >multilib gcc-multilib
 gedit
 >extra gimp
 gksu
--- a/community/i3/Packages-Desktop
+++ b/community/i3/Packages-Desktop
@ -27,6 +27,7 @@ flac
 # >extra flashplugin
 flex
 gcc
+>multilib gcc-libs-multilib
 >multilib gcc-multilib
 gcolor2
 gconf
--- a/community/lxde/Packages-Desktop
+++ b/community/lxde/Packages-Desktop
@ -52,6 +52,7 @@ bison
 fakeroot
 flex
 gcc
+>multilib gcc-libs-multilib
 >multilib gcc-multilib
 libtool
 m4
--- a/community/mate/Packages-Desktop
+++ b/community/mate/Packages-Desktop
@ -145,6 +145,7 @@ yelp
 >extra fakeroot
 >extra flex
 >extra gcc
+>extra >multilib gcc-libs-multilib
 >extra >multilib gcc-multilib
 >extra libtool
 >extra m4
--- a/manjaro/gnome/Packages-Desktop
+++ b/manjaro/gnome/Packages-Desktop
@ -153,6 +153,7 @@ gnome-getting-started-docs
 >extra fakeroot
 >extra flex
 >extra gcc
+>extra >multilib gcc-libs-multilib
 >extra >multilib gcc-multilib
 >extra libtool
 >extra m4
--- a/manjaro/kde/Packages-Desktop
+++ b/manjaro/kde/Packages-Desktop
@ -65,6 +65,7 @@ bison
 fakeroot
 flex
 gcc
+>multilib gcc-libs-multilib
 >multilib gcc-multilib
 libtool
 m4
--- a/manjaro/xfce/Packages-Desktop
+++ b/manjaro/xfce/Packages-Desktop
@ -57,6 +57,7 @@ bison
 fakeroot
 flex
 gcc
+>multilib gcc-libs-multilib
 >multilib gcc-multilib
 libtool
 m4
--- a/shared/Packages-Root
+++ b/shared/Packages-Root
@ -20,6 +20,7 @@ filesystem
 findutils
 gawk
 gcc-libs
+>multilib gcc-libs-multilib
 gettext
 glibc
 grep
@ -48,7 +49,6 @@ memtest86+
 mhwd
 mhwd-db
 mkinitcpio-openswap
->multilib gcc-libs-multilib
 nano
 ntfs-3g
 >openrc acpid-openrc
--- a/sonar/gnome-edition/Packages-Desktop
+++ b/sonar/gnome-edition/Packages-Desktop
@ -173,6 +173,7 @@ libyaml
 >extra fakeroot
 >extra flex
 >extra gcc
+>extra >multilib gcc-libs-multilib
 >extra >multilib gcc-multilib
 >extra libtool
 >extra m4