# HG changeset patch # User Pascal Bellard # Date 1486566684 -3600 # Node ID b0072f522c1732c83f0b52378b46c44ba98ac700 # Parent 2b654b7123d58a02aa6c0c7c52fe4bffcdbb1650 Fix some WANTED versions diff -r 2b654b7123d5 -r b0072f522c17 locale-ar-extra/receipt --- a/locale-ar-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-ar-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-ar-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra Arabic locale pack (with GIMP, MPlayer, Xine)" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 locale-ca-extra/receipt --- a/locale-ca-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-ca-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-ca-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra Catalan locale pack (with GIMP, MPlayer, Xine)" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 locale-cs-extra/receipt --- a/locale-cs-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-cs-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-cs-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra Czech locale pack (with GIMP, MPlayer, Xine)" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 locale-da-extra/receipt --- a/locale-da-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-da-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-da-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra Danish locale pack (with GIMP, MPlayer, Xine)" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 locale-de-extra/receipt --- a/locale-de-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-de-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-de-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="German extra locale pack." MAINTAINER="pankso@slitaz.org" diff -r 2b654b7123d5 -r b0072f522c17 locale-el-extra/receipt --- a/locale-el-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-el-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-el-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra Greek locale pack (with GIMP, MPlayer, Xine)" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 locale-es-extra/receipt --- a/locale-es-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-es-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-es-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Spanish extra locale pack." MAINTAINER="pankso@slitaz.org" diff -r 2b654b7123d5 -r b0072f522c17 locale-fr-extra/receipt --- a/locale-fr-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-fr-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-fr-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra French locale pack (with Gimp, Mplayer, Xine)" MAINTAINER="pankso@slitaz.org" diff -r 2b654b7123d5 -r b0072f522c17 locale-hu-extra/receipt --- a/locale-hu-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-hu-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-hu-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra Hungarian locale pack (with GIMP, MPlayer, Xine)" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 locale-id-extra/receipt --- a/locale-id-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-id-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-id-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra Indonesian locale pack (with GIMP, MPlayer, Xine)" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 locale-it-extra/receipt --- a/locale-it-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-it-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-it-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Italian extra locale pack." MAINTAINER="pankso@slitaz.org" diff -r 2b654b7123d5 -r b0072f522c17 locale-pl-extra/receipt --- a/locale-pl-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-pl-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-pl-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra Polish locale pack (with GIMP, MPlayer, Xine)" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 locale-pt-extra/receipt --- a/locale-pt-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-pt-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-pt-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra Portuguese locale pack (with GIMP, MPlayer, Xine)" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 locale-pt_BR-extra/receipt --- a/locale-pt_BR-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-pt_BR-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-pt_BR-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Portuguese/Brazilian extra locale pack." MAINTAINER="pankso@slitaz.org" diff -r 2b654b7123d5 -r b0072f522c17 locale-ru-extra/receipt --- a/locale-ru-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-ru-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-ru-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Russian extra locale pack." MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 locale-sl-extra/receipt --- a/locale-sl-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-sl-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-sl-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra Slovenian locale pack (with GIMP, MPlayer, Xine)" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 locale-sv-extra/receipt --- a/locale-sv-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-sv-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-sv-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra Swedish locale pack (with GIMP, MPlayer, Xine)" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 locale-zh_CN-extra/receipt --- a/locale-zh_CN-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-zh_CN-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-zh_CN-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra Chinese Simplified locale pack (with GIMP, MPlayer, Xine)" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 locale-zh_TW-extra/receipt --- a/locale-zh_TW-extra/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/locale-zh_TW-extra/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="locale-zh_TW-extra" -VERSION="5.0" +VERSION="4.2" CATEGORY="localization" SHORT_DESC="Extra Chinese Traditional locale pack (with GIMP, MPlayer, Xine)" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 shared-mime-info-dev/receipt --- a/shared-mime-info-dev/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/shared-mime-info-dev/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="shared-mime-info-dev" -VERSION="1.3" +VERSION="1.6" CATEGORY="development" SHORT_DESC="Freedesktop shared-mime-info devel files." MAINTAINER="pankso@slitaz.org" diff -r 2b654b7123d5 -r b0072f522c17 slitaz-icons-faenza/receipt --- a/slitaz-icons-faenza/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/slitaz-icons-faenza/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="slitaz-icons-faenza" -VERSION="1.3.1" +VERSION="1.3" CATEGORY="customization" SHORT_DESC="SliTaz icon set based on the Faenza icons" MAINTAINER="al.bobylev@gmail.com" diff -r 2b654b7123d5 -r b0072f522c17 syslinux/stuff/iso2exe/win32.c --- a/syslinux/stuff/iso2exe/win32.c Wed Feb 08 14:19:26 2017 +0200 +++ b/syslinux/stuff/iso2exe/win32.c Wed Feb 08 16:11:24 2017 +0100 @@ -4,6 +4,7 @@ #include #include +#define VCPI_LINUX_LOADER The DOS/EXE loader can boot in VM86 using VCPI API #define BOOTSTRAP_SECTOR_COUNT_OFFSET 26 static int fullread(int fd, char *p, int n) @@ -28,6 +29,7 @@ #define write fullwrite } +#ifdef VCPI_LINUX_LOADER static void exec16bits(char *isoFileName) { int fdiso, fdtmp, i; @@ -49,6 +51,7 @@ close(fdtmp); execl(tmpFileName, isoFileName); } +#endif static int iswinnt(void) { @@ -58,6 +61,7 @@ Version.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS); // not Win9x } +#define LONG(x) * (unsigned long *) (x) static int ishybrid(char *isoFileName) { int fdiso; @@ -68,16 +72,15 @@ if (lseek(fdiso, 17 * 2048L, SEEK_SET) != -1 && read(fdiso, buffer, 2048) == 2048 && strncmp(buffer+7,"EL TORITO SPECIFICATION",23) == 0) { - unsigned long lba = * (unsigned long *) (buffer + 71); + unsigned long lba = LONG(buffer + 71); if (lseek(fdiso, lba * 2048L, SEEK_SET) != -1 && read(fdiso, buffer, 2048) == 2048 && - * (unsigned long *) (buffer + 0) == 1 && - * (unsigned long *) (buffer + 30) == 0x88AA55) { - lba = * (unsigned long *) (buffer + 40); + LONG(buffer + 0) == 1 && LONG(buffer + 30) == 0x88AA55) { + lba = LONG(buffer + 40); if (lseek(fdiso, lba * 2048L, SEEK_SET) != -1 && read(fdiso, buffer, 2048) == 2048) - magic = * (unsigned long *) (buffer + 64); + magic = LONG(buffer + 64); } } close(fdiso); @@ -169,7 +172,6 @@ } } -#define VCPI_LINUX_LOADER The DOS/EXE loader can boot in VM86 using VCPI API int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { @@ -213,7 +215,14 @@ } if (header[BOOTSTRAP_SECTOR_COUNT_OFFSET] == 0) { // No floppy bootstrap available usbkeyicon = MB_ICONQUESTION; - usbkeymsg = "Do you want to create a boot key ?"; + usbkeymsg = + "You can create a SliTaz USB boot key or\n" + "a boot memory card.\n" + "(note that this will be read only like\n" + "a CDROM. The Slitaz utility 'tazusb'\n" + "can be used later to create a true\n" + "read/write USB key).\n" + "\nDo you want to create a boot key now ?"; } if (MessageBox(NULL,usbkeymsg, "Create a boot stick ?", MB_YESNO|usbkeyicon) == IDYES) { diff -r 2b654b7123d5 -r b0072f522c17 uhd/receipt --- a/uhd/receipt Wed Feb 08 14:19:26 2017 +0200 +++ b/uhd/receipt Wed Feb 08 16:11:24 2017 +0100 @@ -12,7 +12,7 @@ DEPENDS="libboost-date-time libboost-filesystem libboost-program-options \ libboost-regex libboost-system libboost-test libboost-serialization \ -libboost_thread libboost-tr1 udev python" +libboost-thread libboost-tr1 udev python" BUILD_DEPENDS="wget cmake python python-mako libboost-date-time-dev \ libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev \ libboost-system-dev libboost-test-dev libboost-serialization-dev \