wok-6.x rev 19676

Fix some WANTED versions
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Feb 08 16:11:24 2017 +0100 (2017-02-08)
parents 2b654b7123d5
children 8b8fae260ab7
files locale-ar-extra/receipt locale-ca-extra/receipt locale-cs-extra/receipt locale-da-extra/receipt locale-de-extra/receipt locale-el-extra/receipt locale-es-extra/receipt locale-fr-extra/receipt locale-hu-extra/receipt locale-id-extra/receipt locale-it-extra/receipt locale-pl-extra/receipt locale-pt-extra/receipt locale-pt_BR-extra/receipt locale-ru-extra/receipt locale-sl-extra/receipt locale-sv-extra/receipt locale-zh_CN-extra/receipt locale-zh_TW-extra/receipt shared-mime-info-dev/receipt slitaz-icons-faenza/receipt syslinux/stuff/iso2exe/win32.c uhd/receipt
line diff
     1.1 --- a/locale-ar-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
     1.2 +++ b/locale-ar-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt
     1.5  
     1.6  PACKAGE="locale-ar-extra"
     1.7 -VERSION="5.0"
     1.8 +VERSION="4.2"
     1.9  CATEGORY="localization"
    1.10  SHORT_DESC="Extra Arabic locale pack (with GIMP, MPlayer, Xine)"
    1.11  MAINTAINER="al.bobylev@gmail.com"
     2.1 --- a/locale-ca-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
     2.2 +++ b/locale-ca-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt
     2.5  
     2.6  PACKAGE="locale-ca-extra"
     2.7 -VERSION="5.0"
     2.8 +VERSION="4.2"
     2.9  CATEGORY="localization"
    2.10  SHORT_DESC="Extra Catalan locale pack (with GIMP, MPlayer, Xine)"
    2.11  MAINTAINER="al.bobylev@gmail.com"
     3.1 --- a/locale-cs-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
     3.2 +++ b/locale-cs-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt
     3.5  
     3.6  PACKAGE="locale-cs-extra"
     3.7 -VERSION="5.0"
     3.8 +VERSION="4.2"
     3.9  CATEGORY="localization"
    3.10  SHORT_DESC="Extra Czech locale pack (with GIMP, MPlayer, Xine)"
    3.11  MAINTAINER="al.bobylev@gmail.com"
     4.1 --- a/locale-da-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
     4.2 +++ b/locale-da-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt
     4.5  
     4.6  PACKAGE="locale-da-extra"
     4.7 -VERSION="5.0"
     4.8 +VERSION="4.2"
     4.9  CATEGORY="localization"
    4.10  SHORT_DESC="Extra Danish locale pack (with GIMP, MPlayer, Xine)"
    4.11  MAINTAINER="al.bobylev@gmail.com"
     5.1 --- a/locale-de-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
     5.2 +++ b/locale-de-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
     5.3 @@ -1,7 +1,7 @@
     5.4  # SliTaz package receipt
     5.5  
     5.6  PACKAGE="locale-de-extra"
     5.7 -VERSION="5.0"
     5.8 +VERSION="4.2"
     5.9  CATEGORY="localization"
    5.10  SHORT_DESC="German extra locale pack."
    5.11  MAINTAINER="pankso@slitaz.org"
     6.1 --- a/locale-el-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
     6.2 +++ b/locale-el-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
     6.3 @@ -1,7 +1,7 @@
     6.4  # SliTaz package receipt
     6.5  
     6.6  PACKAGE="locale-el-extra"
     6.7 -VERSION="5.0"
     6.8 +VERSION="4.2"
     6.9  CATEGORY="localization"
    6.10  SHORT_DESC="Extra Greek locale pack (with GIMP, MPlayer, Xine)"
    6.11  MAINTAINER="al.bobylev@gmail.com"
     7.1 --- a/locale-es-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
     7.2 +++ b/locale-es-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
     7.3 @@ -1,7 +1,7 @@
     7.4  # SliTaz package receipt
     7.5  
     7.6  PACKAGE="locale-es-extra"
     7.7 -VERSION="5.0"
     7.8 +VERSION="4.2"
     7.9  CATEGORY="localization"
    7.10  SHORT_DESC="Spanish extra locale pack."
    7.11  MAINTAINER="pankso@slitaz.org"
     8.1 --- a/locale-fr-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
     8.2 +++ b/locale-fr-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
     8.3 @@ -1,7 +1,7 @@
     8.4  # SliTaz package receipt
     8.5  
     8.6  PACKAGE="locale-fr-extra"
     8.7 -VERSION="5.0"
     8.8 +VERSION="4.2"
     8.9  CATEGORY="localization"
    8.10  SHORT_DESC="Extra French locale pack (with Gimp, Mplayer, Xine)"
    8.11  MAINTAINER="pankso@slitaz.org"
     9.1 --- a/locale-hu-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
     9.2 +++ b/locale-hu-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
     9.3 @@ -1,7 +1,7 @@
     9.4  # SliTaz package receipt
     9.5  
     9.6  PACKAGE="locale-hu-extra"
     9.7 -VERSION="5.0"
     9.8 +VERSION="4.2"
     9.9  CATEGORY="localization"
    9.10  SHORT_DESC="Extra Hungarian locale pack (with GIMP, MPlayer, Xine)"
    9.11  MAINTAINER="al.bobylev@gmail.com"
    10.1 --- a/locale-id-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
    10.2 +++ b/locale-id-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
    10.3 @@ -1,7 +1,7 @@
    10.4  # SliTaz package receipt
    10.5  
    10.6  PACKAGE="locale-id-extra"
    10.7 -VERSION="5.0"
    10.8 +VERSION="4.2"
    10.9  CATEGORY="localization"
   10.10  SHORT_DESC="Extra Indonesian locale pack (with GIMP, MPlayer, Xine)"
   10.11  MAINTAINER="al.bobylev@gmail.com"
    11.1 --- a/locale-it-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
    11.2 +++ b/locale-it-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
    11.3 @@ -1,7 +1,7 @@
    11.4  # SliTaz package receipt
    11.5  
    11.6  PACKAGE="locale-it-extra"
    11.7 -VERSION="5.0"
    11.8 +VERSION="4.2"
    11.9  CATEGORY="localization"
   11.10  SHORT_DESC="Italian extra locale pack."
   11.11  MAINTAINER="pankso@slitaz.org"
    12.1 --- a/locale-pl-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
    12.2 +++ b/locale-pl-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
    12.3 @@ -1,7 +1,7 @@
    12.4  # SliTaz package receipt
    12.5  
    12.6  PACKAGE="locale-pl-extra"
    12.7 -VERSION="5.0"
    12.8 +VERSION="4.2"
    12.9  CATEGORY="localization"
   12.10  SHORT_DESC="Extra Polish locale pack (with GIMP, MPlayer, Xine)"
   12.11  MAINTAINER="al.bobylev@gmail.com"
    13.1 --- a/locale-pt-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
    13.2 +++ b/locale-pt-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
    13.3 @@ -1,7 +1,7 @@
    13.4  # SliTaz package receipt
    13.5  
    13.6  PACKAGE="locale-pt-extra"
    13.7 -VERSION="5.0"
    13.8 +VERSION="4.2"
    13.9  CATEGORY="localization"
   13.10  SHORT_DESC="Extra Portuguese locale pack (with GIMP, MPlayer, Xine)"
   13.11  MAINTAINER="al.bobylev@gmail.com"
    14.1 --- a/locale-pt_BR-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
    14.2 +++ b/locale-pt_BR-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
    14.3 @@ -1,7 +1,7 @@
    14.4  # SliTaz package receipt
    14.5  
    14.6  PACKAGE="locale-pt_BR-extra"
    14.7 -VERSION="5.0"
    14.8 +VERSION="4.2"
    14.9  CATEGORY="localization"
   14.10  SHORT_DESC="Portuguese/Brazilian extra locale pack."
   14.11  MAINTAINER="pankso@slitaz.org"
    15.1 --- a/locale-ru-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
    15.2 +++ b/locale-ru-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
    15.3 @@ -1,7 +1,7 @@
    15.4  # SliTaz package receipt
    15.5  
    15.6  PACKAGE="locale-ru-extra"
    15.7 -VERSION="5.0"
    15.8 +VERSION="4.2"
    15.9  CATEGORY="localization"
   15.10  SHORT_DESC="Russian extra locale pack."
   15.11  MAINTAINER="al.bobylev@gmail.com"
    16.1 --- a/locale-sl-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
    16.2 +++ b/locale-sl-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
    16.3 @@ -1,7 +1,7 @@
    16.4  # SliTaz package receipt
    16.5  
    16.6  PACKAGE="locale-sl-extra"
    16.7 -VERSION="5.0"
    16.8 +VERSION="4.2"
    16.9  CATEGORY="localization"
   16.10  SHORT_DESC="Extra Slovenian locale pack (with GIMP, MPlayer, Xine)"
   16.11  MAINTAINER="al.bobylev@gmail.com"
    17.1 --- a/locale-sv-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
    17.2 +++ b/locale-sv-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
    17.3 @@ -1,7 +1,7 @@
    17.4  # SliTaz package receipt
    17.5  
    17.6  PACKAGE="locale-sv-extra"
    17.7 -VERSION="5.0"
    17.8 +VERSION="4.2"
    17.9  CATEGORY="localization"
   17.10  SHORT_DESC="Extra Swedish locale pack (with GIMP, MPlayer, Xine)"
   17.11  MAINTAINER="al.bobylev@gmail.com"
    18.1 --- a/locale-zh_CN-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
    18.2 +++ b/locale-zh_CN-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
    18.3 @@ -1,7 +1,7 @@
    18.4  # SliTaz package receipt
    18.5  
    18.6  PACKAGE="locale-zh_CN-extra"
    18.7 -VERSION="5.0"
    18.8 +VERSION="4.2"
    18.9  CATEGORY="localization"
   18.10  SHORT_DESC="Extra Chinese Simplified locale pack (with GIMP, MPlayer, Xine)"
   18.11  MAINTAINER="al.bobylev@gmail.com"
    19.1 --- a/locale-zh_TW-extra/receipt	Wed Feb 08 14:19:26 2017 +0200
    19.2 +++ b/locale-zh_TW-extra/receipt	Wed Feb 08 16:11:24 2017 +0100
    19.3 @@ -1,7 +1,7 @@
    19.4  # SliTaz package receipt
    19.5  
    19.6  PACKAGE="locale-zh_TW-extra"
    19.7 -VERSION="5.0"
    19.8 +VERSION="4.2"
    19.9  CATEGORY="localization"
   19.10  SHORT_DESC="Extra Chinese Traditional locale pack (with GIMP, MPlayer, Xine)"
   19.11  MAINTAINER="al.bobylev@gmail.com"
    20.1 --- a/shared-mime-info-dev/receipt	Wed Feb 08 14:19:26 2017 +0200
    20.2 +++ b/shared-mime-info-dev/receipt	Wed Feb 08 16:11:24 2017 +0100
    20.3 @@ -1,7 +1,7 @@
    20.4  # SliTaz package receipt.
    20.5  
    20.6  PACKAGE="shared-mime-info-dev"
    20.7 -VERSION="1.3"
    20.8 +VERSION="1.6"
    20.9  CATEGORY="development"
   20.10  SHORT_DESC="Freedesktop shared-mime-info devel files."
   20.11  MAINTAINER="pankso@slitaz.org"
    21.1 --- a/slitaz-icons-faenza/receipt	Wed Feb 08 14:19:26 2017 +0200
    21.2 +++ b/slitaz-icons-faenza/receipt	Wed Feb 08 16:11:24 2017 +0100
    21.3 @@ -1,7 +1,7 @@
    21.4  # SliTaz package receipt.
    21.5  
    21.6  PACKAGE="slitaz-icons-faenza"
    21.7 -VERSION="1.3.1"
    21.8 +VERSION="1.3"
    21.9  CATEGORY="customization"
   21.10  SHORT_DESC="SliTaz icon set based on the Faenza icons"
   21.11  MAINTAINER="al.bobylev@gmail.com"
    22.1 --- a/syslinux/stuff/iso2exe/win32.c	Wed Feb 08 14:19:26 2017 +0200
    22.2 +++ b/syslinux/stuff/iso2exe/win32.c	Wed Feb 08 16:11:24 2017 +0100
    22.3 @@ -4,6 +4,7 @@
    22.4  #include <sys/stat.h>
    22.5  #include <fcntl.h>
    22.6  
    22.7 +#define VCPI_LINUX_LOADER The DOS/EXE loader can boot in VM86 using VCPI API
    22.8  #define BOOTSTRAP_SECTOR_COUNT_OFFSET	26
    22.9  
   22.10  static int fullread(int fd, char *p, int n)
   22.11 @@ -28,6 +29,7 @@
   22.12  #define write fullwrite
   22.13  }
   22.14  
   22.15 +#ifdef VCPI_LINUX_LOADER
   22.16  static void exec16bits(char *isoFileName)
   22.17  {
   22.18  	int fdiso, fdtmp, i;
   22.19 @@ -49,6 +51,7 @@
   22.20  	close(fdtmp);
   22.21  	execl(tmpFileName, isoFileName);
   22.22  }
   22.23 +#endif
   22.24  
   22.25  static int iswinnt(void)
   22.26  {
   22.27 @@ -58,6 +61,7 @@
   22.28  	    Version.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS); // not Win9x
   22.29  }
   22.30  
   22.31 +#define LONG(x)	* (unsigned long *) (x)
   22.32  static int ishybrid(char *isoFileName)
   22.33  {
   22.34  	int fdiso;
   22.35 @@ -68,16 +72,15 @@
   22.36  	if (lseek(fdiso, 17 * 2048L, SEEK_SET) != -1 &&
   22.37  	    read(fdiso, buffer, 2048) == 2048 &&
   22.38  	    strncmp(buffer+7,"EL TORITO SPECIFICATION",23) == 0) {
   22.39 -		unsigned long lba = * (unsigned long *) (buffer + 71);
   22.40 +		unsigned long lba = LONG(buffer + 71);
   22.41  		
   22.42  		if (lseek(fdiso, lba * 2048L, SEEK_SET) != -1 &&
   22.43  		    read(fdiso, buffer, 2048) == 2048 &&
   22.44 -		    * (unsigned long *) (buffer + 0) == 1 &&
   22.45 -		    * (unsigned long *) (buffer + 30) == 0x88AA55) {
   22.46 -			lba = * (unsigned long *) (buffer + 40);
   22.47 +		    LONG(buffer + 0) == 1 && LONG(buffer + 30) == 0x88AA55) {
   22.48 +			lba = LONG(buffer + 40);
   22.49  			if (lseek(fdiso, lba * 2048L, SEEK_SET) != -1 &&
   22.50  			    read(fdiso, buffer, 2048) == 2048)
   22.51 -				magic = * (unsigned long *) (buffer + 64);
   22.52 +				magic = LONG(buffer + 64);
   22.53  		}
   22.54  	}
   22.55  	close(fdiso);
   22.56 @@ -169,7 +172,6 @@
   22.57  	}
   22.58  }
   22.59  
   22.60 -#define VCPI_LINUX_LOADER The DOS/EXE loader can boot in VM86 using VCPI API
   22.61  int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
   22.62  		   LPSTR lpCmdLine, int nCmdShow)
   22.63  {
   22.64 @@ -213,7 +215,14 @@
   22.65  	}
   22.66  	if (header[BOOTSTRAP_SECTOR_COUNT_OFFSET] == 0) { // No floppy bootstrap available
   22.67  		usbkeyicon = MB_ICONQUESTION;
   22.68 -		usbkeymsg = "Do you want to create a boot key ?";
   22.69 +		usbkeymsg =
   22.70 +		"You can create a SliTaz USB boot key or\n"
   22.71 +		"a boot memory card.\n"
   22.72 +		"(note that this will be read only like\n"
   22.73 +		"a CDROM. The Slitaz utility 'tazusb'\n"
   22.74 +		"can be used later to create a true\n"
   22.75 +		"read/write USB key).\n"
   22.76 +		"\nDo you want to create a boot key now ?";
   22.77  	}
   22.78  	if (MessageBox(NULL,usbkeymsg, "Create a boot stick ?",
   22.79  			MB_YESNO|usbkeyicon) == IDYES) {
    23.1 --- a/uhd/receipt	Wed Feb 08 14:19:26 2017 +0200
    23.2 +++ b/uhd/receipt	Wed Feb 08 16:11:24 2017 +0100
    23.3 @@ -12,7 +12,7 @@
    23.4  
    23.5  DEPENDS="libboost-date-time libboost-filesystem libboost-program-options \
    23.6  libboost-regex libboost-system libboost-test libboost-serialization \
    23.7 -libboost_thread libboost-tr1 udev python"
    23.8 +libboost-thread libboost-tr1 udev python"
    23.9  BUILD_DEPENDS="wget cmake python python-mako libboost-date-time-dev \
   23.10  libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev \
   23.11  libboost-system-dev libboost-test-dev libboost-serialization-dev \