[Packages-Desktop] fix gcc pkg conflict in multilib

- see also https://github.com/manjaro/iso-profiles/issues/65
This commit is contained in:
Philip 2017-05-31 18:07:27 +02:00
parent 543ebadd6f
commit b55145146e
10 changed files with 11 additions and 1 deletions

View File

@ -172,6 +172,7 @@ yelp
>extra fakeroot >extra fakeroot
>extra flex >extra flex
>extra gcc >extra gcc
>extra >multilib gcc-libs-multilib
>extra >multilib gcc-multilib >extra >multilib gcc-multilib
>extra libtool >extra libtool
>extra m4 >extra m4

View File

@ -28,6 +28,8 @@ dmidecode
>extra flex >extra flex
>extra galculator >extra galculator
>extra gcc >extra gcc
>extra >multilib gcc-libs-multilib
>extra >multilib gcc-multilib
gedit gedit
>extra gimp >extra gimp
gksu gksu

View File

@ -27,6 +27,7 @@ flac
# >extra flashplugin # >extra flashplugin
flex flex
gcc gcc
>multilib gcc-libs-multilib
>multilib gcc-multilib >multilib gcc-multilib
gcolor2 gcolor2
gconf gconf

View File

@ -52,6 +52,7 @@ bison
fakeroot fakeroot
flex flex
gcc gcc
>multilib gcc-libs-multilib
>multilib gcc-multilib >multilib gcc-multilib
libtool libtool
m4 m4

View File

@ -145,6 +145,7 @@ yelp
>extra fakeroot >extra fakeroot
>extra flex >extra flex
>extra gcc >extra gcc
>extra >multilib gcc-libs-multilib
>extra >multilib gcc-multilib >extra >multilib gcc-multilib
>extra libtool >extra libtool
>extra m4 >extra m4

View File

@ -153,6 +153,7 @@ gnome-getting-started-docs
>extra fakeroot >extra fakeroot
>extra flex >extra flex
>extra gcc >extra gcc
>extra >multilib gcc-libs-multilib
>extra >multilib gcc-multilib >extra >multilib gcc-multilib
>extra libtool >extra libtool
>extra m4 >extra m4

View File

@ -65,6 +65,7 @@ bison
fakeroot fakeroot
flex flex
gcc gcc
>multilib gcc-libs-multilib
>multilib gcc-multilib >multilib gcc-multilib
libtool libtool
m4 m4

View File

@ -57,6 +57,7 @@ bison
fakeroot fakeroot
flex flex
gcc gcc
>multilib gcc-libs-multilib
>multilib gcc-multilib >multilib gcc-multilib
libtool libtool
m4 m4

View File

@ -20,6 +20,7 @@ filesystem
findutils findutils
gawk gawk
gcc-libs gcc-libs
>multilib gcc-libs-multilib
gettext gettext
glibc glibc
grep grep
@ -48,7 +49,6 @@ memtest86+
mhwd mhwd
mhwd-db mhwd-db
mkinitcpio-openswap mkinitcpio-openswap
>multilib gcc-libs-multilib
nano nano
ntfs-3g ntfs-3g
>openrc acpid-openrc >openrc acpid-openrc

View File

@ -173,6 +173,7 @@ libyaml
>extra fakeroot >extra fakeroot
>extra flex >extra flex
>extra gcc >extra gcc
>extra >multilib gcc-libs-multilib
>extra >multilib gcc-multilib >extra >multilib gcc-multilib
>extra libtool >extra libtool
>extra m4 >extra m4