From b55145146ec4d0a089d2484638836f24ebb7f04f Mon Sep 17 00:00:00 2001 From: Philip Date: Wed, 31 May 2017 18:07:27 +0200 Subject: [PATCH] [Packages-Desktop] fix gcc pkg conflict in multilib - see also https://github.com/manjaro/iso-profiles/issues/65 --- community/budgie/Packages-Desktop | 1 + community/deepin/Packages-Desktop | 2 ++ community/i3/Packages-Desktop | 1 + community/lxde/Packages-Desktop | 1 + community/mate/Packages-Desktop | 1 + manjaro/gnome/Packages-Desktop | 1 + manjaro/kde/Packages-Desktop | 1 + manjaro/xfce/Packages-Desktop | 1 + shared/Packages-Root | 2 +- sonar/gnome-edition/Packages-Desktop | 1 + 10 files changed, 11 insertions(+), 1 deletion(-) diff --git a/community/budgie/Packages-Desktop b/community/budgie/Packages-Desktop index f659286..593a736 100644 --- 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 diff --git a/community/deepin/Packages-Desktop b/community/deepin/Packages-Desktop index 3d3dcaf..b5ff33e 100644 --- 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 diff --git a/community/i3/Packages-Desktop b/community/i3/Packages-Desktop index 77fb5e0..8a72d28 100644 --- 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 diff --git a/community/lxde/Packages-Desktop b/community/lxde/Packages-Desktop index d682147..817adab 100644 --- 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 diff --git a/community/mate/Packages-Desktop b/community/mate/Packages-Desktop index 1c9e9b1..7120f2f 100644 --- 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 diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index 84a638d..63333d0 100644 --- 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 diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop index 5860cc6..44b9de3 100644 --- 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 diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index 82bcf96..c21683e 100644 --- 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 diff --git a/shared/Packages-Root b/shared/Packages-Root index c214631..14498fa 100644 --- 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 diff --git a/sonar/gnome-edition/Packages-Desktop b/sonar/gnome-edition/Packages-Desktop index 77622f6..bc365a0 100644 --- 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