Commit: 5c9f6b196452a9563a28f71b4d7c62805ae5c98b - mingw-dist (git)

XML catalogue of packages which are available for installation, using the mingw-get installer.

Commit MetaInfo

• Revision: 5c9f6b196452a9563a28f71b4d7c62805ae5c98b (tree)
• Zeit: 2014-04-30 06:23:38
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Correct broken mingw32-libiconv dependency specification.

Ändern Zusammenfassung

• modified: ChangeLog
• modified: common/issue.log
• modified: mingw32/issue.log
• modified: mingw32/mingw32-libiconv.xml

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2014-04-29  Keith Marshall  <[e-mail]>
 
+	Correct broken mingw32-libiconv dependency specification.
+
+	* mingw32/mingw32-libiconv.xml: Generally rationalize dependencies.
+	(libiconv-bin): Remove bogus 'eq' dependency on gettext-0.18.3.1-dll-8;
+	replace with correctly specified 'ge' dependency on libintl-dll-8, with
+	release 0.18.1.1-1 as the realistic minimum sufficient requirement.
+	* mingw32/issue.log common/issue.log: Updated accordingly.
+
[phone]  Keith Marshall  <[e-mail]>
+
 	Correct omission from gettext-0.18.3.2 package specification.
 
 	* mingw32/mingw32-gettext.xml (gettext-bin): Add missing reference.

--- a/common/issue.log
+++ b/common/issue.log
@@ -23,6 +23,6 @@
 # MinGW Project, accept liability for any damages, however caused,
 # arising from the use of this software.
 #
-  75fc52dde8d408d798c0be51070d5d02f4c63085 2014042901 package-list.xml
+  75fc52dde8d408d798c0be51070d5d02f4c63085 2014042902 package-list.xml
 #
 # $RCSfile$: end of file

--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -41,7 +41,7 @@
   5607b75445b432719b3c4e0781e5e3dca29c606d 2014042901 mingw32-gettext.xml
   8272b6fc44a3e7766adec484742f007f28a39eaf 2013090900 mingw32-gmp.xml
   99e3ac0d2c743b0d927a4d89a3153a975d2bdf87 2012073100 mingw32-libarchive.xml
-  f0a98b86966ef64da0332f8856f37734e1b1ebdb 2013102800 mingw32-libiconv.xml
+  e8392e268250e1bc37bc008e34c4c180cec4fdaa 2014042900 mingw32-libiconv.xml
   ccc15973cdc9ff14c12e4385c3e692af1c18b29d 2012073100 mingw32-libtool.xml
   abf16c6e3575585f92c4a88b7be2c1bf6f7e5f26 2012021600 mingw32-lua.xml
   ad4dbe74ea803c6e1e60aae92768cf62655fb77d 2012090201 mingw32-make.xml
@@ -50,7 +50,7 @@
   cd33ad74b608bce33ea297801253e6efbafce27c 2012073100 mingw32-mingw-utils.xml
   3b9dfae51f73761e69811f402c6374c63aeec552 2013110100 mingw32-mpc.xml
   8a11de23e7a89fd11436bdf162ef90712f30101b 2013102300 mingw32-mpfr.xml
-  1413ad59660ad963082e7de10c31bbb725116aee 2014042901 mingw32-package-list.xml
+  1413ad59660ad963082e7de10c31bbb725116aee 2014042902 mingw32-package-list.xml
   bad22da9b9ec9bcea1d539e29ee2976cc88d9fc2 2013053000 mingw32-pexports.xml
   cdb2a4dbedfc9f2cdfc92340f6f9b12da061c0d9 2012073100 mingw32-popt.xml
   0a5d210a13d073104fb74b4f9c081674c9745cd1 2013090900 mingw32-pthreads-w32.xml

--- a/mingw32/mingw32-libiconv.xml
+++ b/mingw32/mingw32-libiconv.xml
@@ -24,21 +24,12 @@
       <source tarname="libiconv-%-mingw32-%-src.tar.%" />
 
       <component class="bin">
-        <release tarname="libiconv-1.14-3-mingw32-bin.tar.lzma" >
-          <requires eq="mingw32-libgcc-4.8.1-*-mingw32-dll-1.tar" />
-          <requires eq="mingw32-gettext-0.18.3.1-*-mingw32-dll-8.tar" />
-          <requires eq="mingw32-libiconv-%-mingw32-dll-2.tar" />
-        </release>
-        <release tarname="libiconv-1.14-2-mingw32-bin.tar.lzma" >
-          <requires eq="mingw32-libiconv-%-mingw32-%-dll-2.tar" />
-          <requires ge="mingw32-libintl-0.18.1.1-2-mingw32-*-dll-8.tar" />
-          <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
-        </release>
-        <release tarname="libiconv-1.13.1-1-mingw32-bin.tar.lzma" >
-          <requires eq="mingw32-libiconv-%-mingw32-%-dll-2.tar" />
-          <requires eq="mingw32-libintl-*-mingw32-*-dll-8.tar" />
-          <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
-        </release>
+        <release tarname="libiconv-1.14-3-mingw32-bin.tar.lzma" />
+        <release tarname="libiconv-1.14-2-mingw32-bin.tar.lzma" />
+        <release tarname="libiconv-1.13.1-1-mingw32-bin.tar.lzma" />
+        <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
+        <requires ge="mingw32-libintl-0.18.1.1-2-mingw32-*-dll-8.tar" />
+        <requires eq="mingw32-libiconv-%-mingw32-%-dll-2.tar" />
       </component>
 
       <component class="doc">
@@ -55,25 +46,18 @@
 
       <component class="dev">
         <release tarname="libiconv-1.14-3-mingw32-dev.tar.lzma" />
-        <release tarname="libiconv-1.14-2-mingw32-dev.tar.lzma" >
-          <requires eq="mingw32-libiconv-%-mingw32-%-dll-2.tar" />
-        </release>
-        <release tarname="libiconv-1.13.1-1-mingw32-dev.tar.lzma" >
-          <requires eq="mingw32-libiconv-%-mingw32-%-dll-2.tar" />
-        </release>
+        <release tarname="libiconv-1.14-2-mingw32-dev.tar.lzma" />
+        <release tarname="libiconv-1.13.1-1-mingw32-dev.tar.lzma" />
+        <requires eq="mingw32-libiconv-%-mingw32-%-dll-2.tar" />
       </component>
 
       <component class="dll">
         <release tarname="libiconv-1.14-3-mingw32-dll-2.tar" >
           <download tarname="libiconv-1.14-3-mingw32-dll.tar.lzma" />
-          <requires eq="mingw32-libgcc-4.8.1-*-mingw32-dll-1.tar" />
-        </release>
-        <release tarname="libiconv-1.14-2-mingw32-dll-2.tar.lzma" >
-          <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
-        </release>
-        <release tarname="libiconv-1.13.1-1-mingw32-dll-2.tar.lzma" >
-          <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
         </release>
+        <release tarname="libiconv-1.14-2-mingw32-dll-2.tar.lzma" />
+        <release tarname="libiconv-1.13.1-1-mingw32-dll-2.tar.lzma" />
+        <requires eq="mingw32-libgcc-*-mingw32-dll-1.tar" />
       </component>
 
       <component class="html">