[haiku-commits] BRANCH waddlesplash-github.repos_new [ad81341d9d41] in build/jam: . repositories/HaikuPorts

  • From: waddlesplash-github.repos_new <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 24 Nov 2017 22:00:31 +0100 (CET)

added 1 changeset to branch 'refs/remotes/waddlesplash-github/repos_new'
old head: fe35a4142700ff1b1dd249fa763c9ea4399a774b
new head: ad81341d9d41d847ecbe96634dafaeb57c9b9400
overview: 
https://github.com/waddlesplash/haiku/compare/fe35a4142700...ad81341d9d41

----------------------------------------------------------------------------

ad81341d9d41: wip: add all packages that are depended on by ones explicitly 
included in jamfiles

                              [ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

----------------------------------------------------------------------------

Commit:      ad81341d9d41d847ecbe96634dafaeb57c9b9400
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Fri Nov 24 20:44:45 2017 UTC

----------------------------------------------------------------------------

11 files changed, 428 insertions(+), 24 deletions(-)
Jamfile                                    |  18 +-
build/jam/BuildFeatures                    |   2 +
build/jam/DefaultBuildProfiles             |  10 +-
build/jam/ImageRules                       |   9 +
build/jam/OptionalPackages                 |  15 +-
build/jam/repositories/HaikuPorts/x86_64   |  15 ++
build/jam/repositories/HaikuPorts/x86_gcc2 |  23 ++
file.txt                                   | 357 +++++++++++++++++++++++++
src/data/package_infos/x86/haiku           |   1 -
src/data/package_infos/x86_64/haiku        |   1 -
src/data/package_infos/x86_gcc2/haiku      |   1 -

----------------------------------------------------------------------------

diff --git a/Jamfile b/Jamfile
index b2582c3..1e68829 100644
--- a/Jamfile
+++ b/Jamfile
@@ -24,19 +24,22 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 # primary architecture
 AddHaikuImagePackages [ FFilterByBuildFeatures
        bash bc coreutils curl freetype icu libsolv zlib
+       readline ca_root_certificates gettext_libintl bzip2
 
        regular_image @{
-               bzip2 ctags diffutils expat ffmpeg findutils gawk glu grep 
gutenprint
-               gzip jasper jpeg
-               less libicns libpcap libpng16 libwebp
-               mesa mesa_devel mesa_swpipe@!gcc2 mesa_swrast@gcc2
+               bzip2 ctags diffutils expat ffmpeg findutils
+               gawk glu grep gutenprint gzip giflib
+               jasper jpeg
+               # libicns depends on jasper1 at present (also below)
+               less libicns jasper1 libiconv libpcap libpng16 libwebp 
libmodplug libogg
+               mesa mesa_devel mesa_swpipe@!gcc2 llvm_libs@!gcc2 
mesa_swrast@gcc2
                netcat
                sed sharutils
                tar tcpdump unzip wget which zip
        }@
 ] ;
 if $(HAIKU_PACKAGING_ARCHS[1]) != x86_gcc2 {
-       AddHaikuImagePackages [ FFilterByBuildFeatures gcc_syslibs ] ;
+       AddHaikuImagePackages [ FFilterByBuildFeatures gcc_syslibs gmp ] ;
 }
 
 if $(HAIKU_PACKAGING_ARCHS[2]) {
@@ -47,13 +50,14 @@ if $(HAIKU_PACKAGING_ARCHS[2]) {
                on $(architectureObject) {
                        AddHaikuImagePackages [ FFilterByBuildFeatures
                                curl freetype icu libsolv zlib
+                               bzip2
 
                                regular_image @{
-                                       ffmpeg glu jasper jpeg libicns libpng16 
libwebp mesa
+                                       ffmpeg glu jasper jpeg libicns jasper1 
libpng16 libwebp mesa
                                }@
                        ] ;
                        if $(TARGET_PACKAGING_ARCH) != x86_gcc2 {
-                               AddHaikuImagePackages [ FFilterByBuildFeatures 
gcc_syslibs
+                               AddHaikuImagePackages [ FFilterByBuildFeatures 
gcc_syslibs gmp
                                        mesa_swpipe ] ;
                        }
                }
diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 098826f..3abe4e5 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -315,6 +315,7 @@ if [ IsPackageAvailable fontconfig_devel ] {
                ;
 
        EnableBuildFeatures fontconfig ;
+       AddHaikuImagePackages libxml2 ;
 } else {
        Echo "fontconfig support not available on $(TARGET_PACKAGING_ARCH)" ;
 }
@@ -399,6 +400,7 @@ if [ IsPackageAvailable haikuwebkit_devel ] {
                ;
 
        EnableBuildFeatures webkit ;
+       AddHaikuImagePackages libwebp5 ;
 } else {
        Echo "WebKit build feature not available for $(TARGET_PACKAGING_ARCH)" ;
 }
diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 358abc5..fe70e1b 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -77,7 +77,7 @@ rule DefineDefaultBuildProfiles
                                cvs
                                keymapswitcher
                                llvm
-                               man
+                               man groff
                                mercurial
                                nano
                                noto
@@ -85,7 +85,7 @@ rule DefineDefaultBuildProfiles
                                openssh
                                p7zip
                                pdfwriter
-                               pe
+                               pe libpcre
                                python
                                subversion
                                timgmsoundfont
@@ -131,15 +131,17 @@ rule DefineDefaultBuildProfiles
                        HAIKU_IMAGE_SIZE ?= 600 ;
 
                        AddHaikuImagePackages
-                               man
+                               man groff
                                nano
                                noto
                                openssh
                                openssl
                                p7zip
-                               pe
+                               pe libpcre
+                               python readline6@gcc2 # gcc2 python requires 
readline6
                                vision
                                wpa_supplicant
+                               noto_sans_cjk_jp
                                # xz_utils can't be built with gcc2, so we 
install it for
                                # primary gcc 4 architectures or gcc 2 hybrids.
                                xz_utils@!gcc2
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index c018470..4cf715b 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -895,6 +895,15 @@ rule AddPackagesAndRepositoryVariablesToContainerScript 
script : container
 
        AddTargetVariableToScript $(script) : $(allPackages) : systemPackages ;
 
+       # The repository cache for HaikuPorts will have been built before,
+       # but that was just before the build of the core packages started.
+       # Now we are about to try to resolve dependencies on everything,
+       # including packages just downloaded, so we need to do this again.
+       InvokeRepositoryMethod <repository>HaikuPorts : CreateCache ;
+       Always [ on <repository>HaikuPorts return 
$(HAIKU_REPOSITORY_CACHE_FILE) ] ;
+       Depends $(script) :
+               [ on <repository>HaikuPorts return 
$(HAIKU_REPOSITORY_CACHE_FILE) ] ;
+
        # Generate the repository package lists and add variables for the
        # repositories.
        local repository ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 9fb6781..ca6919b 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -87,17 +87,18 @@ if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
 # Development
 if [ IsOptionalHaikuImagePackageAdded Development ] {
        # auto tools and perl
-       AddHaikuImagePackages autoconf automake libtool perl texinfo ;
+       AddHaikuImagePackages autoconf automake perl ;
 
        # some other build tools
-       AddHaikuImagePackages pkgconfig scons ;
+       AddHaikuImagePackages pkgconfig ;
 
        # devel packages for mandatory packages
        local architectureObject ;
        for architectureObject in [ MultiArchSubDirSetup ] {
                on $(architectureObject) {
-                       AddHaikuImagePackages curl_devel ffmpeg_devel 
fontconfig_devel
-                               freetype_devel glu_devel jpeg_devel 
libpng16_devel zlib_devel ;
+                       AddHaikuImagePackages curl_devel ffmpeg_devel 
speex_devel
+                               fontconfig_devel freetype_devel bzip2_devel 
libxml2_devel
+                               glu_devel jpeg_devel libpng16_devel zlib_devel ;
                }
        }
 }
@@ -149,12 +150,6 @@ if [ IsOptionalHaikuImagePackageAdded FFMpeg-devel ] {
 # Git
 if [ IsOptionalHaikuImagePackageAdded Git ] {
        AddHaikuImagePackages git git_arch git_daemon git_email git_svn ;
-
-       # git_cvs depends on cvsps, which does not build with gcc2. So it is not
-       # available on gcc2-only builds.
-       if $(TARGET_PACKAGING_ARCHS) != x86_gcc2 {
-               AddHaikuImagePackages git_cvs ;
-       }
 }
 
 
diff --git a/build/jam/repositories/HaikuPorts/x86_64 
b/build/jam/repositories/HaikuPorts/x86_64
index 10eee11..a9dc3de 100644
--- a/build/jam/repositories/HaikuPorts/x86_64
+++ b/build/jam/repositories/HaikuPorts/x86_64
@@ -4,6 +4,7 @@ RemotePackageRepository HaikuPorts
        :
        # architecture "any" packages
        be_book-2008_10_26-1
+       ca_root_certificates-2017_01_18-1
        gnu_efi_kernel-3.0.4-2
        haikuporter-1.2.1-1
        noto-20170920-2
@@ -43,6 +44,7 @@ RemotePackageRepository HaikuPorts
        freetype-2.8.1-2
        freetype_devel-2.8.1-2
        gawk-4.2.0-1
+       gettext_libintl-0
        gcc-5.4.0_2016_06_04-6
        gcc_syslibs-5.4.0_2016_06_04-6
        gcc_syslibs_devel-5.4.0_2016_06_04-6
@@ -56,7 +58,9 @@ RemotePackageRepository HaikuPorts
        git_svn-2.15.0-1
        glu-9.0.0-7
        glu_devel-9.0.0-7
+       gmp-6.1.2-2
        grep-3.1-1
+       groff-1.22.3-1
        gutenprint-5.2.13-2
        gutenprint_devel-5.2.13-2
        gzip-1.8-2
@@ -65,6 +69,7 @@ RemotePackageRepository HaikuPorts
        icu-57.1-2
        icu_devel-57.1-2
        jam-2.5_2012_10_12-5
+       jasper1-1.900.5-1
        jasper-2.0.14-1
        jasper_devel-2.0.14-1
        jpeg-9b-5
@@ -73,12 +78,15 @@ RemotePackageRepository HaikuPorts
        less-487-1
        libedit-2015_03_21_3.1-8
        libedit_devel-2015_03_21_3.1-8
+       libiconv-1.13.1-9
        libicns-0.8.1-6
        libicns_devel-0.8.1-6
+       libmodplug-0.8.9.0-1
        libogg-1.3.3-1
        libogg_devel-1.3.3-1
        libpcap-1.8.1-3
        libpcap_devel-1.8.1-3
+       libpcre-8.41-1
        libpng16-1.6.34-1
        libpng16_devel-1.6.34-1
        libsolv-0.3.0_haiku_2014_12_22-2
@@ -92,6 +100,8 @@ RemotePackageRepository HaikuPorts
        libvpx3_devel-1.5.0-2
        libwebp-0.6.0-2
        libwebp_devel-0.6.0-2
+       libxml2-2.9.7-1
+       libxml2_devel-2.9.7-1
        live555-2016.06.22-5
        live555_devel-2016.06.22-5
        llvm-5.0.0-2
@@ -119,6 +129,7 @@ RemotePackageRepository HaikuPorts
        pkgconfig-0.29.2-3
        python-2.7.14-1
        qrencode_kdl_devel-3.4.4-2
+       readline-7.0.3-1
        scons-2.5.1-3
        sed-4.4-2
        sharutils-4.15.2-3
@@ -171,6 +182,7 @@ RemotePackageRepository HaikuPorts
        giflib
        git
        glu
+       gmp
        grep
        gutenprint
        gzip
@@ -185,6 +197,7 @@ RemotePackageRepository HaikuPorts
        libicns
        libogg
        libpcap
+       libpcre
        libpng16
        libsolv
        libtheora
@@ -192,6 +205,7 @@ RemotePackageRepository HaikuPorts
        libvorbis
        libvpx3
        libwebp
+       libxml2
        live555
        llvm
        m4
@@ -213,6 +227,7 @@ RemotePackageRepository HaikuPorts
        perl
        pkgconfig
        python
+       readline
        scons
        sed
        sharutils
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 
b/build/jam/repositories/HaikuPorts/x86_gcc2
index 52a95fc..e24b9b0 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -4,6 +4,7 @@ RemotePackageRepository HaikuPorts
        :
        # architecture "any" packages
        be_book-2008_10_26-1
+       ca_root_certificates-2017_01_18-1
        gnu_efi_kernel-3.0.4-2
        haikuporter-1.2.1-1
        noto-20170920-2
@@ -42,8 +43,10 @@ RemotePackageRepository HaikuPorts
        freetype-2.8.1-2
        freetype_devel-2.8.1-2
        gawk-4.1.4-2
+       gettext_libintl-0.19.8.1-4
        gcc-2.95.3_2017_07_20-1
        gcc_syslibs_devel-2.95.3_2017_07_20-1
+       giflib6-5.0.5-4
        giflib-5.1.4-1
        giflib_devel-5.1.4-1
        git-2.15.0-1
@@ -55,12 +58,14 @@ RemotePackageRepository HaikuPorts
        glu-9.0.0-7
        glu_devel-9.0.0-7
        grep-2.24-1
+       groff-1.20.1-4
        gutenprint-5.2.13-2
        gutenprint_devel-5.2.13-2
        gzip-1.8-2
        icu-57.1-2
        icu_devel-57.1-2
        jam-2.5_2012_10_12-5
+       jasper1-1.900.5-1
        jasper-2.0.14-1
        jasper_devel-2.0.14-1
        jpeg-9b-5
@@ -69,12 +74,15 @@ RemotePackageRepository HaikuPorts
        less-487-1
        libedit-2015_03_21_3.1-8
        libedit_devel-2015_03_21_3.1-8
+       libiconv-1.13.1-9
        libicns-0.8.1-6
        libicns_devel-0.8.1-6
+       libmodplug-0.8.9.0-1
        libogg-1.3.3-1
        libogg_devel-1.3.3-1
        libpcap-1.8.1-3
        libpcap_devel-1.8.1-3
+       libpcre-8.41-1
        libpng16-1.6.34-1
        libpng16_devel-1.6.34-1
        libsolv-0.3.0_haiku_2014_12_22-2
@@ -86,6 +94,8 @@ RemotePackageRepository HaikuPorts
        libvorbis_devel-1.3.5-5
        libwebp-0.6.0-2
        libwebp_devel-0.6.0-2
+       libxml2-2.9.3-5
+       libxml2_devel-2.9.3-5
        live555-2016.06.22-5
        live555_devel-2016.06.22-5
        m4-1.4.18-3
@@ -112,6 +122,8 @@ RemotePackageRepository HaikuPorts
        pkgconfig-0.29.2-3
        python-2.7.12-1
        qrencode_kdl_devel-3.4.4-2
+       readline6-6.3.8-2
+       readline-7.0.3-1
        scons-2.5.1-3
        sed-4.2.1-6
        sharutils-4.15.2-3
@@ -160,10 +172,12 @@ RemotePackageRepository HaikuPorts
        giflib_x86_devel-5.1.4-1
        glu_x86-9.0.0-7
        glu_x86_devel-9.0.0-7
+       gmp_x86-6.1.2-2
        haikuwebkit_x86-1.6.2-3
        haikuwebkit_x86_devel-1.6.2-3
        icu_x86-57.1-2
        icu_x86_devel-57.1-2
+       jasper1_x86-1.900.5-1
        jasper_x86-2.0.14-1
        jasper_x86_devel-2.0.14-1
        jpeg_x86-9b-5
@@ -186,8 +200,11 @@ RemotePackageRepository HaikuPorts
        libvorbis_x86_devel-1.3.5-5
        libvpx3_x86-1.5.0-2
        libvpx3_x86_devel-1.5.0-2
+       libwebp5_x86-0.4.4-2
        libwebp_x86-0.6.0-2
        libwebp_x86_devel-0.6.0-2
+       libxml2_x86-2.9.3-5
+       libxml2_x86_devel-2.9.3-5
        live555_x86-2016.06.22-5
        live555_x86_devel-2016.06.22-5
        llvm_x86-5.0.0-2
@@ -243,6 +260,7 @@ RemotePackageRepository HaikuPorts
        gawk
        gcc
        gcc_x86
+       giflib6
        giflib
        git
        glu
@@ -263,6 +281,7 @@ RemotePackageRepository HaikuPorts
        libogg
        libogg_x86
        libpcap
+       libpcre
        libpng16
        libpng16_x86
        libsolv
@@ -273,7 +292,9 @@ RemotePackageRepository HaikuPorts
        libvorbis
        libvorbis_x86
        libvpx3_x86
+       libwebp5
        libwebp
+       libxml2
        live555
        llvm_x86
        m4
@@ -298,6 +319,8 @@ RemotePackageRepository HaikuPorts
        pkgconfig
        pkgconfig_x86
        python
+       readline6
+       readline
        scons
        sed
        sharutils
diff --git a/file.txt b/file.txt
new file mode 100644
index 0000000..e709492
--- /dev/null
+++ b/file.txt
@@ -0,0 +1,357 @@
+problem 1: nothing provides speex==1.2.0 needed by speex_devel-1.2.0-2
+  solution 1:
+    - allow deinstallation of speex_devel-1.2.0-2
+problem 2: nothing provides speex_x86==1.2.0 needed by speex_x86_devel-1.2.0-2
+  solution 1:
+    - allow deinstallation of speex_x86_devel-1.2.0-2
+problem 3: nothing provides lib:libspeex>=1.5.1 needed by ffmpeg-0.10.16-1
+  solution 1:
+    - allow deinstallation of ffmpeg-0.10.16-1
+problem 4: nothing provides lib:libmpfr_x86>=4.1.6 needed by 
gcc_x86-5.4.0_2016_06_04-6
+  solution 1:
+    - allow deinstallation of gcc_x86-5.4.0_2016_06_04-6
+problem 5: nothing provides lib:libgif_x86>=6.0.1 needed by 
libwebp5_x86-0.4.4-2
+  solution 1:
+    - allow deinstallation of libwebp5_x86-0.4.4-2
+problem 6: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of libwebp-0.6.0-2
+problem 7: nothing provides lib:libllvm_5.0_x86 needed by 
mesa_x86_swpipe-17.1.7-6
+  solution 1:
+    - allow deinstallation of mesa_x86_swpipe-17.1.7-6
+problem 8: nothing provides lib:libsqlite3>=0.8.6 needed by python-2.7.12-1
+  solution 1:
+    - allow deinstallation of python-2.7.12-1
+problem 9: nothing provides lib:libpcre2_8>=0.4.0 needed by git_daemon-2.15.0-1
+  solution 1:
+    - allow deinstallation of git_daemon-2.15.0-1
+problem 10: nothing provides lib:libpcre2_8>=0.4.0 needed by git-2.15.0-1
+  solution 1:
+    - allow deinstallation of git-2.15.0-1
+problem 11: nothing provides lib:libogg_x86>=0.8.2 needed by ffmpeg_x86-3.2.4-2
+  solution 1:
+    - allow deinstallation of ffmpeg_x86_devel-3.2.4-2
+problem 12: nothing provides lib:libsqlite3_x86>=0.8.6 needed by 
haikuwebkit_x86-1.6.2-3
+  solution 1:
+    - allow deinstallation of webpositive_x86-r1~alpha4_pm_hrev51613-1
+problem 13: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of haiku_x86-r1~alpha4_pm_hrev51613-1
+problem 14: nothing provides lib:libpcre2_8>=0.4.0 needed by git-2.15.0-1
+  solution 1:
+    - allow deinstallation of git_email-2.15.0-1
+problem 15: nothing provides lib:libpcre2_8>=0.4.0 needed by git-2.15.0-1
+  solution 1:
+    - allow deinstallation of git_svn-2.15.0-1
+problem 16: nothing provides lib:libpcre2_8>=0.4.0 needed by git-2.15.0-1
+  solution 1:
+    - allow deinstallation of git_arch-2.15.0-1
+problem 17: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of haiku-r1~alpha4_pm_hrev51613-1
+problem 18: nothing provides lib:libspeex>=1.5.1 needed by ffmpeg-0.10.16-1
+  solution 1:
+    - allow deinstallation of ffmpeg_devel-0.10.16-1
+problem 19: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of haiku_x86_devel-r1~alpha4_pm_hrev51613-1
+problem 20: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of libpng16_x86_devel-1.6.34-1
+problem 21: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of binutils_x86-2.26.1_2016_07_22-5
+problem 22: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of bzip2_x86-1.0.6-6
+problem 23: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of curl_x86-7.54.1-2
+problem 24: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of freetype_x86-2.8.1-2
+problem 25: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of gmp_x86-6.1.2-2
+problem 26: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of icu_x86-57.1-2
+problem 27: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of libsolv_x86-0.3.0_haiku_2014_12_22-2
+problem 28: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of libxml2_x86-2.9.3-5
+problem 29: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of xz_utils_x86-5.2.3-1
+problem 30: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of zlib_x86-1.2.11-3
+problem 31: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of gcc_x86_syslibs-5.4.0_2016_06_04-6
+problem 32: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of haiku_devel-r1~alpha4_pm_hrev51613-1
+problem 33: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of pkgconfig-0.29.2-3
+problem 34: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of libxml2-2.9.3-5
+problem 35: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of giflib-5.1.4-1
+problem 36: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of zlib-1.2.11-3
+problem 37: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of ctags-5.8-5
+problem 38: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of gawk-4.1.4-2
+problem 39: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of libogg-1.3.3-1
+problem 40: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of flex-2.6.4-1
+problem 41: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of groff-1.20.1-4
+problem 42: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of wget-1.19.2-2
+problem 43: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of jasper-2.0.14-1
+problem 44: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of grep-2.24-1
+problem 45: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of libpng16_devel-1.6.34-1
+problem 46: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of libmodplug-0.8.9.0-1
+problem 47: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of jpeg-9b-5
+problem 48: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of sed-4.2.1-6
+problem 49: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of gettext_libintl-0.19.8.1-4
+problem 50: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of icu-57.1-2
+problem 51: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of less-487-1
+problem 52: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of nasm-2.12.01-3
+problem 53: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of openssl-1.0.2m-2
+problem 54: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of patch-2.7.5-2
+problem 55: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of openssh-7.2p2-2
+problem 56: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of bash-4.4.012-3
+problem 57: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of which-2.21-4
+problem 58: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of gcc-2.95.3_2017_07_20-1
+problem 59: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of mesa-7.9.2-11
+problem 60: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of perl-5.18.2-3
+problem 61: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of curl-7.54.1-2
+problem 62: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of readline6-6.3.8-2
+problem 63: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of libpcre-8.41-1
+problem 64: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of netcat-1.10-4
+problem 65: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of expat-2.2.1-2
+problem 66: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of bc-1.07.1-2
+problem 67: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of tar-1.29-3
+problem 68: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of libpcap-1.8.1-3
+problem 69: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of man-1.6g-6
+problem 70: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of jam-2.5_2012_10_12-5
+problem 71: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of pe-2.4.5-7
+problem 72: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of freetype-2.8.1-2
+problem 73: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of bison-3.0.4-5
+problem 74: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of vision-0.10.2-1
+problem 75: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of libiconv-1.13.1-9
+problem 76: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of gutenprint-5.2.13-2
+problem 77: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of wpa_supplicant-2.0-6
+problem 78: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of libicns-0.8.1-6
+problem 79: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of jasper1-1.900.5-1
+problem 80: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of nano-2.8.7-1
+problem 81: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of libpng16-1.6.34-1
+problem 82: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of autoconf-2.69-8
+problem 83: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of readline-7.0.3-1
+problem 84: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of mkdepend-1.7-5
+problem 85: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of tcpdump-4.9.2-1
+problem 86: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of libsolv-0.3.0_haiku_2014_12_22-2
+problem 87: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of glu-9.0.0-7
+problem 88: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of sharutils-4.15.2-3
+problem 89: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of findutils-4.6.0-1
+problem 90: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of diffutils-3.5-2
+problem 91: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of binutils-2.17_2016_07_24-4
+problem 92: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of cdrtools-3.02~a07-2
+problem 93: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of coreutils-8.24-1
+problem 94: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of bzip2-1.0.6-6
+problem 95: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of make-4.1-3
+problem 96: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of automake-1.15.1-1
+problem 97: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of m4-1.4.18-3
+problem 98: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of p7zip-9.20.1-7
+problem 99: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of gzip-1.8-2
+problem 100: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of unzip-6.10c11-1
+problem 101: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of zip-3.0-4
+problem 102: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of fontconfig_x86_devel-2.12.6-1
+problem 103: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of glu_x86_devel-9.0.0-7
+problem 104: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of jpeg_x86_devel-9b-5
+problem 105: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of freetype_x86_devel-2.8.1-2
+problem 106: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of bzip2_x86_devel-1.0.6-6
+problem 107: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of zlib_x86_devel-1.2.11-3
+problem 108: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of curl_x86_devel-7.54.1-2
+problem 109: nothing provides lib:libjasper_x86>=1.0.0 needed by 
libicns_x86-0.8.1-6
+  solution 1:
+    - allow deinstallation of libxml2_x86_devel-2.9.3-5
+problem 110: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of fontconfig_devel-2.12.6-1
+problem 111: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of makefile_engine-r1~alpha4_pm_hrev51613-1
+problem 112: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of freetype_devel-2.8.1-2
+problem 113: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of mesa_devel-7.9.2-11
+problem 114: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of jpeg_devel-9b-5
+problem 115: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of glu_devel-9.0.0-7
+problem 116: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of bzip2_devel-1.0.6-6
+problem 117: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of zlib_devel-1.2.11-3
+problem 118: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of curl_devel-7.54.1-2
+problem 119: nothing provides lib:libgif>=6.0.1 needed by libwebp-0.6.0-2
+  solution 1:
+    - allow deinstallation of libxml2_devel-2.9.3-5
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index ea18764..7559e69 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -93,7 +93,6 @@ requires {
 #ifdef HAIKU_BUILD_FEATURE_X86_LIBPNG_ENABLED
        lib:libpng >= 16.0
 #endif
-       lib:libqrencode
 #ifdef HAIKU_BUILD_FEATURE_X86_TIFF_ENABLED
        lib:libtiff >= 5.2
 #endif
diff --git a/src/data/package_infos/x86_64/haiku 
b/src/data/package_infos/x86_64/haiku
index 026e69a..fb4f10c 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -92,7 +92,6 @@ requires {
 #ifdef HAIKU_BUILD_FEATURE_X86_64_LIBPNG_ENABLED
        lib:libpng >= 16.0
 #endif
-       lib:libqrencode
 #ifdef HAIKU_BUILD_FEATURE_X86_64_TIFF_ENABLED
        lib:libtiff >= 5.2
 #endif
diff --git a/src/data/package_infos/x86_gcc2/haiku 
b/src/data/package_infos/x86_gcc2/haiku
index a92a902..e75d7ed 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -93,7 +93,6 @@ requires {
 #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBPNG_ENABLED
        lib:libpng16 >= 16.0
 #endif
-       lib:libqrencode
 #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_TIFF_ENABLED
        lib:libtiff >= 5.2
 #endif


Other related posts:

  • » [haiku-commits] BRANCH waddlesplash-github.repos_new [ad81341d9d41] in build/jam: . repositories/HaikuPorts - waddlesplash-github . repos_new