wok-next rev 19784
Build glib static libs and make static desktop-file-validate (for cookutils compressor), remake optipng & pngquant: use sbin for static binaries. Up 915resolution, Qt4-qca-ossl, R, accessx, advancecomp, aiksaurus, airpwn, amsn for auto-patching; lowercase libIDL, ORBit2 names.
line diff
1.1 --- a/915resolution/receipt Sun Jun 18 04:38:10 2017 +0300 1.2 +++ b/915resolution/receipt Mon Jun 19 04:02:32 2017 +0300 1.3 @@ -16,11 +16,6 @@ 1.4 # Rules to configure and make the package. 1.5 compile_rules() 1.6 { 1.7 - for i in widescreen-resolution cedarview ; do 1.8 - [ -f done.$i ] && continue 1.9 - patch -p0 < $stuff/$PACKAGE-$VERSION-$i.patch 1.10 - touch done.$i 1.11 - done 1.12 make 1.13 } 1.14
2.1 --- a/915resolution/stuff/915resolution-0.5.3-cedarview.patch Sun Jun 18 04:38:10 2017 +0300 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,54 +0,0 @@ 2.4 ---- 915resolution.c 2.5 -+++ 915resolution.c 2.6 -@@ -56,12 +56,12 @@ 2.7 - 2.8 - typedef enum { 2.9 - CT_UNKWN, CT_500GMA, CT_830, CT_845G, CT_855GM, CT_865G, CT_915G, CT_915GM, CT_945G, CT_945GM, 2.10 -- CT_945GME, CT_946GZ, CT_G965, CT_Q965, CT_965GM 2.11 -+ CT_945GME, CT_946GZ, CT_G965, CT_Q965, CT_965GM, CT_Cedarview 2.12 - } chipset_type; 2.13 - 2.14 - char * chipset_type_names[] = { 2.15 - "UNKNOWN", "500GMA", "830", "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM", 2.16 -- "945GME", "946GZ", "G965", "Q965", "965GM" 2.17 -+ "945GME", "946GZ", "G965", "Q965", "965GM", "Cedarview" 2.18 - }; 2.19 - 2.20 - typedef enum { 2.21 -@@ -237,6 +237,10 @@ 2.22 - type = CT_965GM; 2.23 - break; 2.24 - 2.25 -+ case 0xbf38086: 2.26 -+ type = CT_Cedarview; 2.27 -+ break; 2.28 -+ 2.29 - default: 2.30 - type = CT_UNKWN; 2.31 - break; 2.32 -@@ -526,6 +530,7 @@ 2.33 - case CT_G965: 2.34 - case CT_Q965: 2.35 - case CT_965GM: 2.36 -+ case CT_Cedarview: 2.37 - outl(0x80000090, 0xcf8); 2.38 - map->b1 = inb(0xcfd); 2.39 - map->b2 = inb(0xcfe); 2.40 -@@ -569,6 +574,7 @@ 2.41 - case CT_G965: 2.42 - case CT_Q965: 2.43 - case CT_965GM: 2.44 -+ case CT_Cedarview: 2.45 - outl(0x80000090, 0xcf8); 2.46 - outb(map->b1, 0xcfd); 2.47 - outb(map->b2, 0xcfe); 2.48 -@@ -837,6 +843,9 @@ 2.49 - } 2.50 - else if (!strcmp(argv[index], "965GM")) { 2.51 - *forced_chipset = CT_965GM; 2.52 -+ } 2.53 -+ else if (!strcmp(argv[index], "Cedarview")) { 2.54 -+ *forced_chipset = CT_Cedarview; 2.55 - } 2.56 - else { 2.57 - *forced_chipset = CT_UNKWN;
3.1 --- a/915resolution/stuff/915resolution-0.5.3-widescreen-resolution.patch Sun Jun 18 04:38:10 2017 +0300 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,152 +0,0 @@ 3.4 ---- 915resolution.c 3.5 -+++ 915resolution.c 3.6 -@@ -55,13 +55,13 @@ 3.7 - typedef unsigned int cardinal; 3.8 - 3.9 - typedef enum { 3.10 -- CT_UNKWN, CT_830, CT_845G, CT_855GM, CT_865G, CT_915G, CT_915GM, CT_945G, CT_945GM, 3.11 -- CT_946GZ, CT_G965, CT_Q965 3.12 -+ CT_UNKWN, CT_500GMA, CT_830, CT_845G, CT_855GM, CT_865G, CT_915G, CT_915GM, CT_945G, CT_945GM, 3.13 -+ CT_945GME, CT_946GZ, CT_G965, CT_Q965, CT_965GM 3.14 - } chipset_type; 3.15 - 3.16 - char * chipset_type_names[] = { 3.17 -- "UNKNOWN", "830", "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM", 3.18 -- "946GZ", "G965", "Q965" 3.19 -+ "UNKNOWN", "500GMA", "830", "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM", 3.20 -+ "945GME", "946GZ", "G965", "Q965", "965GM" 3.21 - }; 3.22 - 3.23 - typedef enum { 3.24 -@@ -179,8 +179,12 @@ 3.25 - 3.26 - chipset_type get_chipset(cardinal id) { 3.27 - chipset_type type; 3.28 -- 3.29 -+ 3.30 - switch (id) { 3.31 -+ case 0x81008086: 3.32 -+ type = CT_500GMA; 3.33 -+ break; 3.34 -+ 3.35 - case 0x35758086: 3.36 - type = CT_830; 3.37 - break; 3.38 -@@ -192,14 +196,14 @@ 3.39 - case 0x35808086: 3.40 - type = CT_855GM; 3.41 - break; 3.42 -- 3.43 -+ 3.44 - case 0x25708086: 3.45 - type = CT_865G; 3.46 - break; 3.47 - 3.48 - case 0x25808086: 3.49 -- type = CT_915G; 3.50 -- break; 3.51 -+ type = CT_915G; 3.52 -+ break; 3.53 - 3.54 - case 0x25908086: 3.55 - type = CT_915GM; 3.56 -@@ -213,18 +217,26 @@ 3.57 - type = CT_945GM; 3.58 - break; 3.59 - 3.60 -+ case 0x27ac8086: 3.61 -+ type = CT_945GME; 3.62 -+ break; 3.63 -+ 3.64 - case 0x29708086: 3.65 - type = CT_946GZ; 3.66 - break; 3.67 - 3.68 - case 0x29a08086: 3.69 -- type = CT_G965; 3.70 -- break; 3.71 -+ type = CT_G965; 3.72 -+ break; 3.73 - 3.74 - case 0x29908086: 3.75 - type = CT_Q965; 3.76 - break; 3.77 - 3.78 -+ case 0x2a008086: 3.79 -+ type = CT_965GM; 3.80 -+ break; 3.81 -+ 3.82 - default: 3.83 - type = CT_UNKWN; 3.84 - break; 3.85 -@@ -502,15 +514,18 @@ 3.86 - outl(0x8000005a, 0xcf8); 3.87 - outb(0x33, 0xcfe); 3.88 - break; 3.89 -+ case CT_500GMA: 3.90 - case CT_845G: 3.91 - case CT_865G: 3.92 - case CT_915G: 3.93 - case CT_915GM: 3.94 - case CT_945G: 3.95 - case CT_945GM: 3.96 -+ case CT_945GME: 3.97 - case CT_946GZ: 3.98 - case CT_G965: 3.99 - case CT_Q965: 3.100 -+ case CT_965GM: 3.101 - outl(0x80000090, 0xcf8); 3.102 - map->b1 = inb(0xcfd); 3.103 - map->b2 = inb(0xcfe); 3.104 -@@ -542,15 +557,18 @@ 3.105 - outl(0x8000005a, 0xcf8); 3.106 - outb(map->b1, 0xcfe); 3.107 - break; 3.108 -+ case CT_500GMA: 3.109 - case CT_845G: 3.110 - case CT_865G: 3.111 - case CT_915G: 3.112 - case CT_915GM: 3.113 - case CT_945G: 3.114 - case CT_945GM: 3.115 -+ case CT_945GME: 3.116 - case CT_946GZ: 3.117 - case CT_G965: 3.118 - case CT_Q965: 3.119 -+ case CT_965GM: 3.120 - outl(0x80000090, 0xcf8); 3.121 - outb(map->b1, 0xcfd); 3.122 - outb(map->b2, 0xcfe); 3.123 -@@ -781,8 +799,10 @@ 3.124 - if(argc<=index) { 3.125 - return 0; 3.126 - } 3.127 -- 3.128 -- if (!strcmp(argv[index], "845")) { 3.129 -+ else if (!strcmp(argv[index], "500GMA")) { 3.130 -+ *forced_chipset = CT_500GMA; 3.131 -+ } 3.132 -+ else if (!strcmp(argv[index], "845")) { 3.133 - *forced_chipset = CT_845G; 3.134 - } 3.135 - else if (!strcmp(argv[index], "855")) { 3.136 -@@ -803,6 +823,9 @@ 3.137 - else if (!strcmp(argv[index], "945GM")) { 3.138 - *forced_chipset = CT_945GM; 3.139 - } 3.140 -+ else if (!strcmp(argv[index], "945GME")) { 3.141 -+ *forced_chipset = CT_945GME; 3.142 -+ } 3.143 - else if (!strcmp(argv[index], "946GZ")) { 3.144 - *forced_chipset = CT_946GZ; 3.145 - } 3.146 -@@ -812,6 +835,9 @@ 3.147 - else if (!strcmp(argv[index], "Q965")) { 3.148 - *forced_chipset = CT_Q965; 3.149 - } 3.150 -+ else if (!strcmp(argv[index], "965GM")) { 3.151 -+ *forced_chipset = CT_965GM; 3.152 -+ } 3.153 - else { 3.154 - *forced_chipset = CT_UNKWN; 3.155 - }
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/915resolution/stuff/patches/915resolution-0.5.3-cedarview.patch Mon Jun 19 04:02:32 2017 +0300 4.3 @@ -0,0 +1,54 @@ 4.4 +--- a/915resolution.c 4.5 ++++ b/915resolution.c 4.6 +@@ -56,12 +56,12 @@ 4.7 + 4.8 + typedef enum { 4.9 + CT_UNKWN, CT_500GMA, CT_830, CT_845G, CT_855GM, CT_865G, CT_915G, CT_915GM, CT_945G, CT_945GM, 4.10 +- CT_945GME, CT_946GZ, CT_G965, CT_Q965, CT_965GM 4.11 ++ CT_945GME, CT_946GZ, CT_G965, CT_Q965, CT_965GM, CT_Cedarview 4.12 + } chipset_type; 4.13 + 4.14 + char * chipset_type_names[] = { 4.15 + "UNKNOWN", "500GMA", "830", "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM", 4.16 +- "945GME", "946GZ", "G965", "Q965", "965GM" 4.17 ++ "945GME", "946GZ", "G965", "Q965", "965GM", "Cedarview" 4.18 + }; 4.19 + 4.20 + typedef enum { 4.21 +@@ -237,6 +237,10 @@ 4.22 + type = CT_965GM; 4.23 + break; 4.24 + 4.25 ++ case 0xbf38086: 4.26 ++ type = CT_Cedarview; 4.27 ++ break; 4.28 ++ 4.29 + default: 4.30 + type = CT_UNKWN; 4.31 + break; 4.32 +@@ -526,6 +530,7 @@ 4.33 + case CT_G965: 4.34 + case CT_Q965: 4.35 + case CT_965GM: 4.36 ++ case CT_Cedarview: 4.37 + outl(0x80000090, 0xcf8); 4.38 + map->b1 = inb(0xcfd); 4.39 + map->b2 = inb(0xcfe); 4.40 +@@ -569,6 +574,7 @@ 4.41 + case CT_G965: 4.42 + case CT_Q965: 4.43 + case CT_965GM: 4.44 ++ case CT_Cedarview: 4.45 + outl(0x80000090, 0xcf8); 4.46 + outb(map->b1, 0xcfd); 4.47 + outb(map->b2, 0xcfe); 4.48 +@@ -837,6 +843,9 @@ 4.49 + } 4.50 + else if (!strcmp(argv[index], "965GM")) { 4.51 + *forced_chipset = CT_965GM; 4.52 ++ } 4.53 ++ else if (!strcmp(argv[index], "Cedarview")) { 4.54 ++ *forced_chipset = CT_Cedarview; 4.55 + } 4.56 + else { 4.57 + *forced_chipset = CT_UNKWN;
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/915resolution/stuff/patches/915resolution-0.5.3-widescreen-resolution.patch Mon Jun 19 04:02:32 2017 +0300 5.3 @@ -0,0 +1,152 @@ 5.4 +--- a/915resolution.c 5.5 ++++ b/915resolution.c 5.6 +@@ -55,13 +55,13 @@ 5.7 + typedef unsigned int cardinal; 5.8 + 5.9 + typedef enum { 5.10 +- CT_UNKWN, CT_830, CT_845G, CT_855GM, CT_865G, CT_915G, CT_915GM, CT_945G, CT_945GM, 5.11 +- CT_946GZ, CT_G965, CT_Q965 5.12 ++ CT_UNKWN, CT_500GMA, CT_830, CT_845G, CT_855GM, CT_865G, CT_915G, CT_915GM, CT_945G, CT_945GM, 5.13 ++ CT_945GME, CT_946GZ, CT_G965, CT_Q965, CT_965GM 5.14 + } chipset_type; 5.15 + 5.16 + char * chipset_type_names[] = { 5.17 +- "UNKNOWN", "830", "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM", 5.18 +- "946GZ", "G965", "Q965" 5.19 ++ "UNKNOWN", "500GMA", "830", "845G", "855GM", "865G", "915G", "915GM", "945G", "945GM", 5.20 ++ "945GME", "946GZ", "G965", "Q965", "965GM" 5.21 + }; 5.22 + 5.23 + typedef enum { 5.24 +@@ -179,8 +179,12 @@ 5.25 + 5.26 + chipset_type get_chipset(cardinal id) { 5.27 + chipset_type type; 5.28 +- 5.29 ++ 5.30 + switch (id) { 5.31 ++ case 0x81008086: 5.32 ++ type = CT_500GMA; 5.33 ++ break; 5.34 ++ 5.35 + case 0x35758086: 5.36 + type = CT_830; 5.37 + break; 5.38 +@@ -192,14 +196,14 @@ 5.39 + case 0x35808086: 5.40 + type = CT_855GM; 5.41 + break; 5.42 +- 5.43 ++ 5.44 + case 0x25708086: 5.45 + type = CT_865G; 5.46 + break; 5.47 + 5.48 + case 0x25808086: 5.49 +- type = CT_915G; 5.50 +- break; 5.51 ++ type = CT_915G; 5.52 ++ break; 5.53 + 5.54 + case 0x25908086: 5.55 + type = CT_915GM; 5.56 +@@ -213,18 +217,26 @@ 5.57 + type = CT_945GM; 5.58 + break; 5.59 + 5.60 ++ case 0x27ac8086: 5.61 ++ type = CT_945GME; 5.62 ++ break; 5.63 ++ 5.64 + case 0x29708086: 5.65 + type = CT_946GZ; 5.66 + break; 5.67 + 5.68 + case 0x29a08086: 5.69 +- type = CT_G965; 5.70 +- break; 5.71 ++ type = CT_G965; 5.72 ++ break; 5.73 + 5.74 + case 0x29908086: 5.75 + type = CT_Q965; 5.76 + break; 5.77 + 5.78 ++ case 0x2a008086: 5.79 ++ type = CT_965GM; 5.80 ++ break; 5.81 ++ 5.82 + default: 5.83 + type = CT_UNKWN; 5.84 + break; 5.85 +@@ -502,15 +514,18 @@ 5.86 + outl(0x8000005a, 0xcf8); 5.87 + outb(0x33, 0xcfe); 5.88 + break; 5.89 ++ case CT_500GMA: 5.90 + case CT_845G: 5.91 + case CT_865G: 5.92 + case CT_915G: 5.93 + case CT_915GM: 5.94 + case CT_945G: 5.95 + case CT_945GM: 5.96 ++ case CT_945GME: 5.97 + case CT_946GZ: 5.98 + case CT_G965: 5.99 + case CT_Q965: 5.100 ++ case CT_965GM: 5.101 + outl(0x80000090, 0xcf8); 5.102 + map->b1 = inb(0xcfd); 5.103 + map->b2 = inb(0xcfe); 5.104 +@@ -542,15 +557,18 @@ 5.105 + outl(0x8000005a, 0xcf8); 5.106 + outb(map->b1, 0xcfe); 5.107 + break; 5.108 ++ case CT_500GMA: 5.109 + case CT_845G: 5.110 + case CT_865G: 5.111 + case CT_915G: 5.112 + case CT_915GM: 5.113 + case CT_945G: 5.114 + case CT_945GM: 5.115 ++ case CT_945GME: 5.116 + case CT_946GZ: 5.117 + case CT_G965: 5.118 + case CT_Q965: 5.119 ++ case CT_965GM: 5.120 + outl(0x80000090, 0xcf8); 5.121 + outb(map->b1, 0xcfd); 5.122 + outb(map->b2, 0xcfe); 5.123 +@@ -781,8 +799,10 @@ 5.124 + if(argc<=index) { 5.125 + return 0; 5.126 + } 5.127 +- 5.128 +- if (!strcmp(argv[index], "845")) { 5.129 ++ else if (!strcmp(argv[index], "500GMA")) { 5.130 ++ *forced_chipset = CT_500GMA; 5.131 ++ } 5.132 ++ else if (!strcmp(argv[index], "845")) { 5.133 + *forced_chipset = CT_845G; 5.134 + } 5.135 + else if (!strcmp(argv[index], "855")) { 5.136 +@@ -803,6 +823,9 @@ 5.137 + else if (!strcmp(argv[index], "945GM")) { 5.138 + *forced_chipset = CT_945GM; 5.139 + } 5.140 ++ else if (!strcmp(argv[index], "945GME")) { 5.141 ++ *forced_chipset = CT_945GME; 5.142 ++ } 5.143 + else if (!strcmp(argv[index], "946GZ")) { 5.144 + *forced_chipset = CT_946GZ; 5.145 + } 5.146 +@@ -812,6 +835,9 @@ 5.147 + else if (!strcmp(argv[index], "Q965")) { 5.148 + *forced_chipset = CT_Q965; 5.149 + } 5.150 ++ else if (!strcmp(argv[index], "965GM")) { 5.151 ++ *forced_chipset = CT_965GM; 5.152 ++ } 5.153 + else { 5.154 + *forced_chipset = CT_UNKWN; 5.155 + }
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/915resolution/stuff/patches/series Mon Jun 19 04:02:32 2017 +0300 6.3 @@ -0,0 +1,2 @@ 6.4 +915resolution-0.5.3-widescreen-resolution.patch 6.5 +915resolution-0.5.3-cedarview.patch
7.1 --- a/ORBit2-dev/receipt Sun Jun 18 04:38:10 2017 +0300 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,30 +0,0 @@ 7.4 -# SliTaz package receipt. 7.5 - 7.6 -PACKAGE="ORBit2-dev" 7.7 -VERSION="2.14.19" 7.8 -CATEGORY="development" 7.9 -SHORT_DESC="ORBit2 devel files." 7.10 -MAINTAINER="rcx@zoominternet.net" 7.11 -LICENSE="GPL2" 7.12 -WEB_SITE="http://projects.gnome.org/ORBit2/" 7.13 -WANTED="ORBit2" 7.14 - 7.15 -DEPENDS="ORBit2 glib-dev pkg-config" 7.16 - 7.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 7.18 -genpkg_rules() 7.19 -{ 7.20 - mkdir -p $fs/usr/lib/orbit-2.0 7.21 - cp -a $install/usr/lib/orbit-2.0/*.*a $fs/usr/lib/orbit-2.0 7.22 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 7.23 - cp -a $install/usr/lib/*.*a $fs/usr/lib 7.24 - 7.25 - mkdir -p $fs/usr/bin 7.26 - cp -f $install/usr/bin/orbit2-config $fs/usr/bin 7.27 - 7.28 - cp -a $install/usr/include $fs/usr 7.29 - 7.30 - mkdir -p $fs/usr/share 7.31 - cp -a $install/usr/share/aclocal $fs/usr/share 7.32 - cp -a $install/usr/share/idl $fs/usr/share 7.33 -}
8.1 --- a/ORBit2/receipt Sun Jun 18 04:38:10 2017 +0300 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,36 +0,0 @@ 8.4 -# SliTaz package receipt. 8.5 - 8.6 -PACKAGE="ORBit2" 8.7 -VERSION="2.14.19" 8.8 -CATEGORY="development" 8.9 -SHORT_DESC="A CORBA 2.4-compliant Object Request Broker (ORB)." 8.10 -MAINTAINER="rcx@zoominternet.net" 8.11 -LICENSE="GPL2" 8.12 -TARBALL="$PACKAGE-$VERSION.tar.bz2" 8.13 -WEB_SITE="http://projects.gnome.org/ORBit2/" 8.14 -WGET_URL="ftp://ftp.gnome.org/pub/GNOME/sources/$PACKAGE/${VERSION%.*}/$TARBALL" 8.15 -CROSS="bug: Could not check for borked linking while cross-compiling" 8.16 - 8.17 -DEPENDS="glib libIDL dbus dbus-glib" 8.18 -BUILD_DEPENDS="glib-dev dbus-dev dbus-glib-dev libIDL pkg-config" 8.19 - 8.20 -# Rules to configure and make the package. 8.21 -compile_rules() 8.22 -{ 8.23 - sed -i 's/-DG_DISABLE_DEPRECATED//' linc2/src/Makefile* 8.24 - ./configure \ 8.25 - --prefix=/usr \ 8.26 - --build=$HOST_SYSTEM \ 8.27 - --host=$HOST_SYSTEM && 8.28 - make && make install 8.29 -} 8.30 - 8.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 8.32 -genpkg_rules() 8.33 -{ 8.34 - mkdir -p $fs/usr/lib/orbit-2.0 8.35 - cp -a $install/usr/lib/orbit-2.0/*.so* $fs/usr/lib/orbit-2.0 8.36 - cp -a $install/usr/lib/*.so* $fs/usr/lib 8.37 - cp -a $install/usr/bin $fs/usr 8.38 - rm -f $fs/usr/bin/orbit2-config 8.39 -}
9.1 --- a/Qt4-qca-ossl/receipt Sun Jun 18 04:38:10 2017 +0300 9.2 +++ b/Qt4-qca-ossl/receipt Mon Jun 19 04:02:32 2017 +0300 9.3 @@ -20,51 +20,6 @@ 9.4 # Rules to configure and make the package. 9.5 compile_rules() 9.6 { 9.7 - cd $src 9.8 - 9.9 - patch -u <<EOP 9.10 ---- qca-ossl.cpp 9.11 -+++ qca-ossl.cpp 9.12 -@@ -330,1 +330,1 @@ 9.13 -- X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, "hash"); 9.14 -+ X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, (char *)"hash"); 9.15 -EOP 9.16 - status 9.17 - patch -u <<EOP 9.18 ---- qca-ossl.cpp 9.19 -+++ qca-ossl.cpp 9.20 -@@ -6597,9 +6597,11 @@ 9.21 - #ifdef SHA512_DIGEST_LENGTH 9.22 - list += "sha512"; 9.23 - #endif 9.24 -+ /* 9.25 - #ifdef OBJ_whirlpool 9.26 - list += "whirlpool"; 9.27 - #endif 9.28 -+ */ 9.29 - return list; 9.30 - } 9.31 -EOP 9.32 - status 9.33 - patch -u <<EOP 9.34 ---- qca-ossl.cpp 9.35 -+++ qca-ossl.cpp 9.36 -@@ -6812,10 +6812,12 @@ 9.37 - else if ( type == "sha512" ) 9.38 - return new opensslHashContext( EVP_sha512(), this, type); 9.39 - #endif 9.40 -+/* 9.41 - #ifdef OBJ_whirlpool 9.42 - else if ( type == "whirlpool" ) 9.43 - return new opensslHashContext( EVP_whirlpool(), this, type); 9.44 - #endif 9.45 -+*/ 9.46 - else if ( type == "pbkdf1(sha1)" ) 9.47 - return new opensslPbkdf1Context( EVP_sha1(), this, type ); 9.48 - else if ( type == "pbkdf1(md2)" ) 9.49 -EOP 9.50 - status 9.51 - 9.52 chmod +x configure 9.53 ./configure \ 9.54 --qtdir=/usr/lib/qt && \
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/Qt4-qca-ossl/stuff/patches/qca-ossl-whirlpool.patch Mon Jun 19 04:02:32 2017 +0300 10.3 @@ -0,0 +1,35 @@ 10.4 +--- a/qca-ossl.cpp 10.5 ++++ b/qca-ossl.cpp 10.6 +@@ -330,1 +330,1 @@ 10.7 +- X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, "hash"); 10.8 ++ X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, (char *)"hash"); 10.9 + 10.10 +--- a/qca-ossl.cpp 10.11 ++++ b/qca-ossl.cpp 10.12 +@@ -6597,9 +6597,11 @@ 10.13 + #ifdef SHA512_DIGEST_LENGTH 10.14 + list += "sha512"; 10.15 + #endif 10.16 ++ /* 10.17 + #ifdef OBJ_whirlpool 10.18 + list += "whirlpool"; 10.19 + #endif 10.20 ++ */ 10.21 + return list; 10.22 + } 10.23 + 10.24 +--- a/qca-ossl.cpp 10.25 ++++ b/qca-ossl.cpp 10.26 +@@ -6812,10 +6812,12 @@ 10.27 + else if ( type == "sha512" ) 10.28 + return new opensslHashContext( EVP_sha512(), this, type); 10.29 + #endif 10.30 ++/* 10.31 + #ifdef OBJ_whirlpool 10.32 + else if ( type == "whirlpool" ) 10.33 + return new opensslHashContext( EVP_whirlpool(), this, type); 10.34 + #endif 10.35 ++*/ 10.36 + else if ( type == "pbkdf1(sha1)" ) 10.37 + return new opensslPbkdf1Context( EVP_sha1(), this, type ); 10.38 + else if ( type == "pbkdf1(md2)" )
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/Qt4-qca-ossl/stuff/patches/series Mon Jun 19 04:02:32 2017 +0300 11.3 @@ -0,0 +1,1 @@ 11.4 +qca-ossl-whirlpool.patch
12.1 --- a/R/receipt Sun Jun 18 04:38:10 2017 +0300 12.2 +++ b/R/receipt Mon Jun 19 04:02:32 2017 +0300 12.3 @@ -19,7 +19,6 @@ 12.4 export R_BROWSER="midori" 12.5 export R_PDFVIEWER="epdfview" 12.6 unset DESTDIR 12.7 - patch -p 0 < $stuff/pcre.u 12.8 12.9 ./configure \ 12.10 --enable-R-shlib \
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/R/stuff/patches/pcre.u Mon Jun 19 04:02:32 2017 +0300 13.3 @@ -0,0 +1,33 @@ 13.4 +Fix for pcre-8.30 and above 13.5 + 13.6 +--- a/src/main/util.c.orig 2012-02-09 17:15:08.000000000 +0000 13.7 ++++ b/src/main/util.c 2012-02-09 17:20:31.000000000 +0000 13.8 +@@ -1257,8 +1257,18 @@ 13.9 + } 13.10 + 13.11 + #include "pcre.h" 13.12 ++ 13.13 ++/* This changed at 8.30 */ 13.14 ++#if PCRE_MAJOR > 8 || PCRE_MINOR >= 30 13.15 ++extern int _pcre_valid_utf(const char *string, int length, int *erroroffset); 13.16 ++ 13.17 ++Rboolean utf8Valid(const char *str) 13.18 ++{ 13.19 ++ int errp; 13.20 ++ return (_pcre_valid_utf(str, (int) strlen(str), &errp) == 0); 13.21 ++} 13.22 + /* This changed at 8.13: we don't allow < 8.0 */ 13.23 +-#if PCRE_MAJOR > 8 || PCRE_MINOR >= 13 13.24 ++#elif PCRE_MAJOR > 8 || PCRE_MINOR >= 13 13.25 + extern int _pcre_valid_utf8(const char *string, int length, int *erroroffset); 13.26 + 13.27 + Rboolean utf8Valid(const char *str) 13.28 +@@ -1266,7 +1276,7 @@ 13.29 + int errp; 13.30 + return (_pcre_valid_utf8(str, (int) strlen(str), &errp) == 0); 13.31 + } 13.32 +-#else 13.33 ++#else 13.34 + extern int _pcre_valid_utf8(const char *string, int length); 13.35 + 13.36 + Rboolean utf8Valid(const char *str)
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/R/stuff/patches/series Mon Jun 19 04:02:32 2017 +0300 14.3 @@ -0,0 +1,1 @@ 14.4 +pcre.u
15.1 --- a/R/stuff/pcre.u Sun Jun 18 04:38:10 2017 +0300 15.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 15.3 @@ -1,33 +0,0 @@ 15.4 -Fix for pcre-8.30 and above 15.5 - 15.6 ---- src/main/util.c.orig 2012-02-09 17:15:08.000000000 +0000 15.7 -+++ src/main/util.c 2012-02-09 17:20:31.000000000 +0000 15.8 -@@ -1257,8 +1257,18 @@ 15.9 - } 15.10 - 15.11 - #include "pcre.h" 15.12 -+ 15.13 -+/* This changed at 8.30 */ 15.14 -+#if PCRE_MAJOR > 8 || PCRE_MINOR >= 30 15.15 -+extern int _pcre_valid_utf(const char *string, int length, int *erroroffset); 15.16 -+ 15.17 -+Rboolean utf8Valid(const char *str) 15.18 -+{ 15.19 -+ int errp; 15.20 -+ return (_pcre_valid_utf(str, (int) strlen(str), &errp) == 0); 15.21 -+} 15.22 - /* This changed at 8.13: we don't allow < 8.0 */ 15.23 --#if PCRE_MAJOR > 8 || PCRE_MINOR >= 13 15.24 -+#elif PCRE_MAJOR > 8 || PCRE_MINOR >= 13 15.25 - extern int _pcre_valid_utf8(const char *string, int length, int *erroroffset); 15.26 - 15.27 - Rboolean utf8Valid(const char *str) 15.28 -@@ -1266,7 +1276,7 @@ 15.29 - int errp; 15.30 - return (_pcre_valid_utf8(str, (int) strlen(str), &errp) == 0); 15.31 - } 15.32 --#else 15.33 -+#else 15.34 - extern int _pcre_valid_utf8(const char *string, int length); 15.35 - 15.36 - Rboolean utf8Valid(const char *str)
16.1 --- a/accessx/receipt Sun Jun 18 04:38:10 2017 +0300 16.2 +++ b/accessx/receipt Mon Jun 19 04:02:32 2017 +0300 16.3 @@ -17,8 +17,7 @@ 16.4 compile_rules() 16.5 { 16.6 sed -i 's/^LLIBS=.*/& -lX11/' Makefile 16.7 - # Patch for deprecated <iostream.h> 16.8 - patch -p0 < $stuff/accessx.diff || return 1 16.9 + 16.10 make 16.11 } 16.12
17.1 --- a/accessx/stuff/accessx.diff Sun Jun 18 04:38:10 2017 +0300 17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 17.3 @@ -1,549 +0,0 @@ 17.4 ---- orig.Access.C 2003-09-19 17:08:01.000000000 +0100 17.5 -+++ Access.C 2010-10-03 12:29:36.000000000 +0100 17.6 -@@ -19,6 +19,7 @@ 17.7 - */ 17.8 - 17.9 - #include <X11/Xlib.h> 17.10 -+#include <iostream> 17.11 - #include <X11/XKBlib.h> 17.12 - #include "Access.h" 17.13 - 17.14 -@@ -62,43 +63,43 @@ 17.15 - 17.16 - void Access::ShowDiagnostics() 17.17 - { 17.18 -- cout << "AccessX Timeout: " << onoroff(GetAccessXTOState()) << endl; 17.19 -- cout << "AccessX Timeout Value: " << GetAccessXDelay() << endl; 17.20 -+ std::cout << "AccessX Timeout: " << onoroff(GetAccessXTOState()) << std::endl; 17.21 -+ std::cout << "AccessX Timeout Value: " << GetAccessXDelay() << std::endl; 17.22 - 17.23 -- cout << endl; 17.24 -+ std::cout << std::endl; 17.25 - 17.26 -- cout << "MouseKeys: " << onoroff(GetMouseKeysState()) << endl; 17.27 -- cout << " - Delay: " << GetMouseKeysDelay() << endl; 17.28 -- cout << " - Interval: " << GetMouseKeysInterval() << endl; 17.29 -- cout << " - T to Max: " << GetMouseKeysTimeToMax() << endl; 17.30 -- cout << " - Max Speed: " << GetMouseKeysMaxSpeed() << endl; 17.31 -- cout << " - Curve: " << GetMouseKeysCurve() << endl; 17.32 -+ std::cout << "MouseKeys: " << onoroff(GetMouseKeysState()) << std::endl; 17.33 -+ std::cout << " - Delay: " << GetMouseKeysDelay() << std::endl; 17.34 -+ std::cout << " - Interval: " << GetMouseKeysInterval() << std::endl; 17.35 -+ std::cout << " - T to Max: " << GetMouseKeysTimeToMax() << std::endl; 17.36 -+ std::cout << " - Max Speed: " << GetMouseKeysMaxSpeed() << std::endl; 17.37 -+ std::cout << " - Curve: " << GetMouseKeysCurve() << std::endl; 17.38 - 17.39 -- cout << endl; 17.40 -+ std::cout << std::endl; 17.41 - 17.42 -- cout << "SlowKeys: " << onoroff(GetSlowKeysState()) << endl; 17.43 -- cout << " - Delay: " << GetSlowKeysDelay() << endl; 17.44 -+ std::cout << "SlowKeys: " << onoroff(GetSlowKeysState()) << std::endl; 17.45 -+ std::cout << " - Delay: " << GetSlowKeysDelay() << std::endl; 17.46 - 17.47 -- cout << endl; 17.48 -+ std::cout << std::endl; 17.49 - 17.50 -- cout << "StickyKeys: " << onoroff(GetStickyKeysState()) << endl; 17.51 -- cout << " - Latch/Lock: " << onoroff(GetStickyKeysLatchToLockState()) 17.52 -- << endl; 17.53 -- cout << " - 2 Key Dis: " << 17.54 -- onoroff(GetStickyKeysTwoKeyDisableState()) << endl; 17.55 -+ std::cout << "StickyKeys: " << onoroff(GetStickyKeysState()) << std::endl; 17.56 -+ std::cout << " - Latch/Lock: " << onoroff(GetStickyKeysLatchToLockState()) 17.57 -+ << std::endl; 17.58 -+ std::cout << " - 2 Key Dis: " << 17.59 -+ onoroff(GetStickyKeysTwoKeyDisableState()) << std::endl; 17.60 - 17.61 -- cout << endl; 17.62 -+ std::cout << std::endl; 17.63 - 17.64 -- cout << "BounceKeys: " << onoroff(GetBounceKeysState()) << endl; 17.65 -- cout << " - Delay: " << GetBounceKeysDelay() << endl; 17.66 -+ std::cout << "BounceKeys: " << onoroff(GetBounceKeysState()) << std::endl; 17.67 -+ std::cout << " - Delay: " << GetBounceKeysDelay() << std::endl; 17.68 - 17.69 -- cout << endl; 17.70 -+ std::cout << std::endl; 17.71 - 17.72 -- cout << "RepeatKeys: " << onoroff(GetRepeatKeysState()) << endl; 17.73 -- cout << " - Delay: " << GetRepeatKeysDelay() << endl; 17.74 -- cout << " - Interval: " << GetRepeatKeysInterval() << endl; 17.75 -+ std::cout << "RepeatKeys: " << onoroff(GetRepeatKeysState()) << std::endl; 17.76 -+ std::cout << " - Delay: " << GetRepeatKeysDelay() << std::endl; 17.77 -+ std::cout << " - Interval: " << GetRepeatKeysInterval() << std::endl; 17.78 - 17.79 -- cout << endl; 17.80 -+ std::cout << std::endl; 17.81 - } 17.82 - 17.83 - // 17.84 ---- orig.Access.h 2003-09-19 17:00:42.000000000 +0100 17.85 -+++ Access.h 2010-10-03 12:24:20.000000000 +0100 17.86 -@@ -21,7 +21,7 @@ 17.87 - * 17.88 - */ 17.89 - 17.90 --#include <iostream.h> 17.91 -+#include <iostream> 17.92 - #include <math.h> 17.93 - 17.94 - inline char* onoroff(int val) 17.95 ---- orig.ax.C 2003-09-19 17:09:31.000000000 +0100 17.96 -+++ ax.C 2010-10-03 12:31:00.000000000 +0100 17.97 -@@ -62,45 +62,45 @@ 17.98 - 17.99 - void showHelp(void) { 17.100 - 17.101 -- cout << "Usage: accessx [options & option/value pairs]" 17.102 -- << endl << endl; 17.103 -- cout << "status: Show status of AccessX Features" << endl 17.104 -- << "help: Show this help text" << endl 17.105 -- << "loadconfig: Load the ~/AccessX config file" << endl 17.106 -- << endl 17.107 -- << "+timeout: Enable AccessX Timeout" << endl 17.108 -- << "-timeout: Disable AccessX Timeout" << endl 17.109 -- << "timeout <value>: Set AccessX Timeout" << endl 17.110 -- << endl 17.111 -- << "+mousekeys: Enable MouseKeys" << endl 17.112 -- << "-mousekeys: Disable MouseKeys" << endl 17.113 -- << "mousedelay <value>: Set MouseKeys Delay" << endl 17.114 -- << "mouseinterval <value>: Set MouseKeys Interval" << endl 17.115 -- << "mousetimetomax <value>: Set MouseKeys time to max speed" << endl 17.116 -- << "mousemaxspeed <value>: Set MouseKeys max speed" << endl 17.117 -- << "mousecurve <value>: Set MouseKeys acceleration curve" << endl 17.118 -- << endl 17.119 -- << "+slowkeys: Enable SlowKeys" << endl 17.120 -- << "-slowkeys: Disable SlowKeys" << endl 17.121 -- << "slowdelay <value>: Set SlowKeys Delay" << endl 17.122 -- << endl 17.123 -- << "+stickykeys: Enable StickyKeys" << endl 17.124 -- << "-stickykeys: Disable StickyKeys" << endl 17.125 -- << "+stickylatchtolock: Enable S.K. Latch To Lock" << endl 17.126 -- << "-stickylatchtolock: Disbale S.K. Latch To Lock" << endl 17.127 -- << "+stickytwokeydisable: Enable S.K. Two Key Disable" << endl 17.128 -- << "-stickytwokeydisable: Disable S.K. Two Key Disable" << endl 17.129 -- << endl 17.130 -- << "+bouncekeys: Enable BounceKeys" << endl 17.131 -- << "-bouncekeys: Disable BounceKeys" << endl 17.132 -- << "bouncedelay <value>: Set Debounce Delay" << endl 17.133 -- << endl 17.134 -- << "+repeatkeys: Enable RepeatKeys" << endl 17.135 -- << "-repeatkeys: Disable RepeatKeys" << endl 17.136 -- << "repeatdelay <value>: Set RepeatKeys Delay" << endl 17.137 -- << "repeatinterval <value>: Set RepeatKeys Interval" << endl << endl 17.138 -- << "With no options, loads config file." << endl 17.139 -- << endl; 17.140 -+ std::cout << "Usage: accessx [options & option/value pairs]" 17.141 -+ << std::endl << std::endl; 17.142 -+ std::cout << "status: Show status of AccessX Features" << std::endl 17.143 -+ << "help: Show this help text" << std::endl 17.144 -+ << "loadconfig: Load the ~/AccessX config file" << std::endl 17.145 -+ << std::endl 17.146 -+ << "+timeout: Enable AccessX Timeout" << std::endl 17.147 -+ << "-timeout: Disable AccessX Timeout" << std::endl 17.148 -+ << "timeout <value>: Set AccessX Timeout" << std::endl 17.149 -+ << std::endl 17.150 -+ << "+mousekeys: Enable MouseKeys" << std::endl 17.151 -+ << "-mousekeys: Disable MouseKeys" << std::endl 17.152 -+ << "mousedelay <value>: Set MouseKeys Delay" << std::endl 17.153 -+ << "mouseinterval <value>: Set MouseKeys Interval" << std::endl 17.154 -+ << "mousetimetomax <value>: Set MouseKeys time to max speed" << std::endl 17.155 -+ << "mousemaxspeed <value>: Set MouseKeys max speed" << std::endl 17.156 -+ << "mousecurve <value>: Set MouseKeys acceleration curve" << std::endl 17.157 -+ << std::endl 17.158 -+ << "+slowkeys: Enable SlowKeys" << std::endl 17.159 -+ << "-slowkeys: Disable SlowKeys" << std::endl 17.160 -+ << "slowdelay <value>: Set SlowKeys Delay" << std::endl 17.161 -+ << std::endl 17.162 -+ << "+stickykeys: Enable StickyKeys" << std::endl 17.163 -+ << "-stickykeys: Disable StickyKeys" << std::endl 17.164 -+ << "+stickylatchtolock: Enable S.K. Latch To Lock" << std::endl 17.165 -+ << "-stickylatchtolock: Disbale S.K. Latch To Lock" << std::endl 17.166 -+ << "+stickytwokeydisable: Enable S.K. Two Key Disable" << std::endl 17.167 -+ << "-stickytwokeydisable: Disable S.K. Two Key Disable" << std::endl 17.168 -+ << std::endl 17.169 -+ << "+bouncekeys: Enable BounceKeys" << std::endl 17.170 -+ << "-bouncekeys: Disable BounceKeys" << std::endl 17.171 -+ << "bouncedelay <value>: Set Debounce Delay" << std::endl 17.172 -+ << std::endl 17.173 -+ << "+repeatkeys: Enable RepeatKeys" << std::endl 17.174 -+ << "-repeatkeys: Disable RepeatKeys" << std::endl 17.175 -+ << "repeatdelay <value>: Set RepeatKeys Delay" << std::endl 17.176 -+ << "repeatinterval <value>: Set RepeatKeys Interval" << std::endl << std::endl 17.177 -+ << "With no options, loads config file." << std::endl 17.178 -+ << std::endl; 17.179 - } 17.180 - 17.181 - 17.182 -@@ -115,26 +115,26 @@ 17.183 - 17.184 - void showRawStatus(Access* ax) 17.185 - { 17.186 -- cout << ax->GetAccessXTOState() << endl; 17.187 -- cout << (int)ceil(ax->GetAccessXDelay() / 60.0) << endl; 17.188 -- cout << ax->GetMouseKeysState() << endl; 17.189 -- cout << (int)ceil(ax->GetMouseKeysTimeToMax() / 1000.0) << endl; 17.190 -- cout << ax->GetMouseKeysMaxSpeed() << endl; 17.191 -- cout << ax->GetSlowKeysState() << endl; 17.192 -- cout << (float)(ax->GetSlowKeysDelay() / 1000.0) << endl; 17.193 -- cout << ax->GetStickyKeysState() << endl; 17.194 -- cout << ax->GetStickyKeysLatchToLockState() << endl; 17.195 -- cout << ax->GetStickyKeysTwoKeyDisableState() << endl; 17.196 -- cout << ax->GetBounceKeysState() << endl; 17.197 -- cout << (float)(ax->GetBounceKeysDelay() / 1000.0) << endl; 17.198 -- cout << ax->GetRepeatKeysState() << endl; 17.199 -- cout << (float)(ax->GetRepeatKeysDelay() / 1000.0) << endl; 17.200 -- cout << (float)(1000.0 / ax->GetRepeatKeysInterval()) << endl; 17.201 -- cout << ToggleKeysToggleSet << endl; 17.202 -- cout << SoundOnOffToggleSet << endl; 17.203 -- cout << SlowKeysOnAcceptToggleSet << endl; 17.204 -- cout << SlowKeysOnPressToggleSet << endl; 17.205 -- cout << EnableAccessXToggleSet << endl; 17.206 -+ std::cout << ax->GetAccessXTOState() << std::endl; 17.207 -+ std::cout << (int)ceil(ax->GetAccessXDelay() / 60.0) << std::endl; 17.208 -+ std::cout << ax->GetMouseKeysState() << std::endl; 17.209 -+ std::cout << (int)ceil(ax->GetMouseKeysTimeToMax() / 1000.0) << std::endl; 17.210 -+ std::cout << ax->GetMouseKeysMaxSpeed() << std::endl; 17.211 -+ std::cout << ax->GetSlowKeysState() << std::endl; 17.212 -+ std::cout << (float)(ax->GetSlowKeysDelay() / 1000.0) << std::endl; 17.213 -+ std::cout << ax->GetStickyKeysState() << std::endl; 17.214 -+ std::cout << ax->GetStickyKeysLatchToLockState() << std::endl; 17.215 -+ std::cout << ax->GetStickyKeysTwoKeyDisableState() << std::endl; 17.216 -+ std::cout << ax->GetBounceKeysState() << std::endl; 17.217 -+ std::cout << (float)(ax->GetBounceKeysDelay() / 1000.0) << std::endl; 17.218 -+ std::cout << ax->GetRepeatKeysState() << std::endl; 17.219 -+ std::cout << (float)(ax->GetRepeatKeysDelay() / 1000.0) << std::endl; 17.220 -+ std::cout << (float)(1000.0 / ax->GetRepeatKeysInterval()) << std::endl; 17.221 -+ std::cout << ToggleKeysToggleSet << std::endl; 17.222 -+ std::cout << SoundOnOffToggleSet << std::endl; 17.223 -+ std::cout << SlowKeysOnAcceptToggleSet << std::endl; 17.224 -+ std::cout << SlowKeysOnPressToggleSet << std::endl; 17.225 -+ std::cout << EnableAccessXToggleSet << std::endl; 17.226 - } 17.227 - 17.228 - /////////////////////////////////////////////////////////////////////////////// 17.229 -@@ -183,7 +183,7 @@ 17.230 - index++; 17.231 - rc = getValue(argv[index], &value); 17.232 - if(rc) { 17.233 -- cout << "Invalid Option." << endl; 17.234 -+ std::cout << "Invalid Option." << std::endl; 17.235 - exit(2); 17.236 - } 17.237 - ax->SetAccessXDelay(value); 17.238 -@@ -201,7 +201,7 @@ 17.239 - index++; 17.240 - rc = getValue(argv[index], &value); 17.241 - if(rc) { 17.242 -- cout << "Invalid Option." << endl; 17.243 -+ std::cout << "Invalid Option." << std::endl; 17.244 - exit(2); 17.245 - } 17.246 - ax->SetMouseKeysDelay(value); 17.247 -@@ -210,7 +210,7 @@ 17.248 - index++; 17.249 - rc = getValue(argv[index], &value); 17.250 - if(rc) { 17.251 -- cout << "Invalid Option." << endl; 17.252 -+ std::cout << "Invalid Option." << std::endl; 17.253 - exit(2); 17.254 - } 17.255 - ax->SetMouseKeysInterval(value); 17.256 -@@ -219,7 +219,7 @@ 17.257 - index++; 17.258 - rc = getValue(argv[index], &value); 17.259 - if(rc) { 17.260 -- cout << "Invalid Option." << endl; 17.261 -+ std::cout << "Invalid Option." << std::endl; 17.262 - exit(2); 17.263 - } 17.264 - ax->SetMouseKeysTimeToMax(value); 17.265 -@@ -228,7 +228,7 @@ 17.266 - index++; 17.267 - rc = getValue(argv[index], &value); 17.268 - if(rc) { 17.269 -- cout << "Invalid Option." << endl; 17.270 -+ std::cout << "Invalid Option." << std::endl; 17.271 - exit(2); 17.272 - } 17.273 - ax->SetMouseKeysMaxSpeed(value); 17.274 -@@ -237,7 +237,7 @@ 17.275 - index++; 17.276 - rc = getValue(argv[index], &value); 17.277 - if(rc) { 17.278 -- cout << "Invalid Option." << endl; 17.279 -+ std::cout << "Invalid Option." << std::endl; 17.280 - exit(2); 17.281 - } 17.282 - ax->SetMouseKeysCurve(value); 17.283 -@@ -255,7 +255,7 @@ 17.284 - index++; 17.285 - rc = getValue(argv[index], &value); 17.286 - if(rc) { 17.287 -- cout << "Invalid Option." << endl; 17.288 -+ std::cout << "Invalid Option." << std::endl; 17.289 - exit(2); 17.290 - } 17.291 - ax->SetSlowKeysDelay(value); 17.292 -@@ -294,7 +294,7 @@ 17.293 - index++; 17.294 - rc = getValue(argv[index], &value); 17.295 - if(rc) { 17.296 -- cout << "Invalid Option." << endl; 17.297 -+ std::cout << "Invalid Option." << std::endl; 17.298 - exit(2); 17.299 - } 17.300 - ax->SetBounceKeysDelay(value); 17.301 -@@ -312,7 +312,7 @@ 17.302 - index++; 17.303 - rc = getValue(argv[index], &value); 17.304 - if(rc) { 17.305 -- cout << "Invalid Option." << endl; 17.306 -+ std::cout << "Invalid Option." << std::endl; 17.307 - exit(2); 17.308 - } 17.309 - ax->SetRepeatKeysDelay(value); 17.310 -@@ -321,7 +321,7 @@ 17.311 - index++; 17.312 - rc = getValue(argv[index], &value); 17.313 - if(rc) { 17.314 -- cout << "Invalid Option." << endl; 17.315 -+ std::cout << "Invalid Option." << std::endl; 17.316 - exit(2); 17.317 - } 17.318 - ax->SetRepeatKeysInterval(value); 17.319 -@@ -330,7 +330,7 @@ 17.320 - // AccessX Unknown Features --------------------------------------------- 17.321 - 17.322 - else { 17.323 -- cout << "Unknown Option!" << endl; 17.324 -+ std::cout << "Unknown Option!" << std::endl; 17.325 - exit(1); 17.326 - } 17.327 - 17.328 -@@ -490,14 +490,14 @@ 17.329 - else if(!strcmp(param, "*TimeOutScale.value:")) { 17.330 - rc = getValue(value, &TimeOutScaleValue); 17.331 - if(rc) { 17.332 -- cout << "Invalid Config File Option." << endl; 17.333 -+ std::cout << "Invalid Config File Option." << std::endl; 17.334 - exit(10); 17.335 - } 17.336 - } 17.337 - else if(!strcmp(param, "*TimeOutScale.decimalPoints:")) { 17.338 - rc = getValue(value, &TimeOutScaleDecimalPoints); 17.339 - if(rc) { 17.340 -- cout << "Invalid Config File Option." << endl; 17.341 -+ std::cout << "Invalid Config File Option." << std::endl; 17.342 - exit(10); 17.343 - } 17.344 - } 17.345 -@@ -505,7 +505,7 @@ 17.346 - else if(!strcmp(param, "*KRGSlowKeysDelayScale.value:")) { 17.347 - rc = getValue(value, &KRGSlowKeysDelayScaleValue); 17.348 - if(rc) { 17.349 -- cout << "Invalid Config File Option." << endl; 17.350 -+ std::cout << "Invalid Config File Option." << std::endl; 17.351 - exit(10); 17.352 - } 17.353 - } 17.354 -@@ -513,7 +513,7 @@ 17.355 - else if(!strcmp(param, "*KRGSlowKeysDelayScale.decimalPoints:")) { 17.356 - rc = getValue(value, &KRGSlowKeysDelayScaleDecimalPoints); 17.357 - if(rc) { 17.358 -- cout << "Invalid Config File Option." << endl; 17.359 -+ std::cout << "Invalid Config File Option." << std::endl; 17.360 - exit(10); 17.361 - } 17.362 - } 17.363 -@@ -521,7 +521,7 @@ 17.364 - else if(!strcmp(param, "*MouseMaxSpeedScale.value:")) { 17.365 - rc = getValue(value, &MouseMaxSpeedScaleValue); 17.366 - if(rc) { 17.367 -- cout << "Invalid Config File Option." << endl; 17.368 -+ std::cout << "Invalid Config File Option." << std::endl; 17.369 - exit(10); 17.370 - } 17.371 - } 17.372 -@@ -529,7 +529,7 @@ 17.373 - else if(!strcmp(param, "*MouseMaxSpeedScale.decimalPoints:")) { 17.374 - rc = getValue(value, &MouseMaxSpeedScaleDecimalPoints); 17.375 - if(rc) { 17.376 -- cout << "Invalid Config File Option." << endl; 17.377 -+ std::cout << "Invalid Config File Option." << std::endl; 17.378 - exit(10); 17.379 - } 17.380 - } 17.381 -@@ -537,7 +537,7 @@ 17.382 - else if(!strcmp(param, "*KRGDebounceScale.value:")) { 17.383 - rc = getValue(value, &KRGDebounceScaleValue); 17.384 - if(rc) { 17.385 -- cout << "Invalid Config File Option." << endl; 17.386 -+ std::cout << "Invalid Config File Option." << std::endl; 17.387 - exit(10); 17.388 - } 17.389 - } 17.390 -@@ -545,7 +545,7 @@ 17.391 - else if(!strcmp(param, "*KRGDebounceScale.decimalPoints:")) { 17.392 - rc = getValue(value, &KRGDebounceScaleDecimalPoints); 17.393 - if(rc) { 17.394 -- cout << "Invalid Config File Option." << endl; 17.395 -+ std::cout << "Invalid Config File Option." << std::endl; 17.396 - exit(10); 17.397 - } 17.398 - } 17.399 -@@ -553,7 +553,7 @@ 17.400 - else if(!strcmp(param, "*KRGRepeatDelayScale.value:")) { 17.401 - rc = getValue(value, &KRGRepeatDelayScaleValue); 17.402 - if(rc) { 17.403 -- cout << "Invalid Config File Option." << endl; 17.404 -+ std::cout << "Invalid Config File Option." << std::endl; 17.405 - exit(10); 17.406 - } 17.407 - } 17.408 -@@ -561,7 +561,7 @@ 17.409 - else if(!strcmp(param, "*KRGRepeatDelayScale.decimalPoints:")) { 17.410 - rc = getValue(value, &KRGRepeatDelayScaleDecimalPoints); 17.411 - if(rc) { 17.412 -- cout << "Invalid Config File Option." << endl; 17.413 -+ std::cout << "Invalid Config File Option." << std::endl; 17.414 - exit(10); 17.415 - } 17.416 - } 17.417 -@@ -569,7 +569,7 @@ 17.418 - else if(!strcmp(param, "*KRGRepeatRateScale.value:")) { 17.419 - rc = getValue(value, &KRGRepeatRateScaleValue); 17.420 - if(rc) { 17.421 -- cout << "Invalid Config File Option." << endl; 17.422 -+ std::cout << "Invalid Config File Option." << std::endl; 17.423 - exit(10); 17.424 - } 17.425 - } 17.426 -@@ -577,7 +577,7 @@ 17.427 - else if(!strcmp(param, "*KRGRepeatRateScale.decimalPoints:")) { 17.428 - rc = getValue(value, &KRGRepeatRateScaleDecimalPoints); 17.429 - if(rc) { 17.430 -- cout << "Invalid Config File Option." << endl; 17.431 -+ std::cout << "Invalid Config File Option." << std::endl; 17.432 - exit(10); 17.433 - } 17.434 - } 17.435 -@@ -585,7 +585,7 @@ 17.436 - else if(!strcmp(param, "*MouseTimeToMaxScale.value:")) { 17.437 - rc = getValue(value, &MouseTimeToMaxScaleValue); 17.438 - if(rc) { 17.439 -- cout << "Invalid Config File Option." << endl; 17.440 -+ std::cout << "Invalid Config File Option." << std::endl; 17.441 - exit(10); 17.442 - } 17.443 - } 17.444 -@@ -593,13 +593,13 @@ 17.445 - else if(!strcmp(param, "*MouseTimeToMaxScale.decimalPoints:")) { 17.446 - rc = getValue(value, &MouseTimeToMaxScaleDecimalPoints); 17.447 - if(rc) { 17.448 -- cout << "Invalid Config File Option." << endl; 17.449 -+ std::cout << "Invalid Config File Option." << std::endl; 17.450 - exit(10); 17.451 - } 17.452 - } 17.453 - 17.454 - else { 17.455 -- cout << "Invalid Config File Parameter." << endl; 17.456 -+ std::cout << "Invalid Config File Parameter." << std::endl; 17.457 - exit(10); 17.458 - } 17.459 - } 17.460 -@@ -621,7 +621,7 @@ 17.461 - SlowKeysDelayValue /= 10; 17.462 - 17.463 - if(SlowKeysDelayValue == 0) { 17.464 -- cout << "Config File: Slow Keys Delay Cannot Be Zero." << endl; 17.465 -+ std::cout << "Config File: Slow Keys Delay Cannot Be Zero." << std::endl; 17.466 - exit(10); 17.467 - } 17.468 - 17.469 -@@ -629,7 +629,7 @@ 17.470 - TimeOutValue /= 10; 17.471 - 17.472 - if(TimeOutValue == 0) { 17.473 -- cout << "Config File: Timeout Value Cannot Be Zero." << endl; 17.474 -+ std::cout << "Config File: Timeout Value Cannot Be Zero." << std::endl; 17.475 - exit(10); 17.476 - } 17.477 - 17.478 -@@ -637,7 +637,7 @@ 17.479 - MouseMaxSpeedValue /= 10; 17.480 - 17.481 - if(MouseMaxSpeedValue == 0) { 17.482 -- cout << "Config File: Mouse Keys Max Speed Cannot Be Zero." << endl; 17.483 -+ std::cout << "Config File: Mouse Keys Max Speed Cannot Be Zero." << std::endl; 17.484 - exit(10); 17.485 - } 17.486 - 17.487 -@@ -645,7 +645,7 @@ 17.488 - MouseTimeToMaxValue /= 10; 17.489 - 17.490 - if(MouseTimeToMaxValue == 0) { 17.491 -- cout << "Config File: Mouse Keys Time To Max Cannot Be Zero." << endl; 17.492 -+ std::cout << "Config File: Mouse Keys Time To Max Cannot Be Zero." << std::endl; 17.493 - exit(10); 17.494 - } 17.495 - 17.496 -@@ -653,7 +653,7 @@ 17.497 - DebounceValue /= 10; 17.498 - 17.499 - if(DebounceValue == 0) { 17.500 -- cout << "Config File: Debounce Delay Cannot Be Zero." << endl; 17.501 -+ std::cout << "Config File: Debounce Delay Cannot Be Zero." << std::endl; 17.502 - exit(10); 17.503 - } 17.504 - 17.505 -@@ -661,7 +661,7 @@ 17.506 - RepeatDelayValue /= 10; 17.507 - 17.508 - if(RepeatDelayValue == 0) { 17.509 -- cout << "Config File: Repeat Keys Delay Cannot Be Zero." << endl; 17.510 -+ std::cout << "Config File: Repeat Keys Delay Cannot Be Zero." << std::endl; 17.511 - exit(10); 17.512 - } 17.513 - 17.514 -@@ -669,7 +669,7 @@ 17.515 - RepeatRateValue /= 10; 17.516 - 17.517 - if(RepeatRateValue == 0) { 17.518 -- cout << "Config File: Repeat Keys Rate Cannot Be Zero." << endl; 17.519 -+ std::cout << "Config File: Repeat Keys Rate Cannot Be Zero." << std::endl; 17.520 - exit(10); 17.521 - } 17.522 - 17.523 -@@ -695,14 +695,14 @@ 17.524 - ax->SetRepeatKeysInterval((int)floor(1000.0/RepeatRateValue)); 17.525 - 17.526 - if(!quiet) { 17.527 -- cout << "Config file ~/AccessX loaded." << endl 17.528 -- << "\"ax help\" for help." << endl; 17.529 -+ std::cout << "Config file ~/AccessX loaded." << std::endl 17.530 -+ << "\"ax help\" for help." << std::endl; 17.531 - } 17.532 - } 17.533 - else { 17.534 - if(!quiet) { 17.535 -- cout << "Config File ~/AccessX not found!" << endl 17.536 -- << "\"ax help\" for help." << endl; 17.537 -+ std::cout << "Config File ~/AccessX not found!" << std::endl 17.538 -+ << "\"ax help\" for help." << std::endl; 17.539 - } 17.540 - } 17.541 - } 17.542 ---- orig.ax.h 2003-09-19 17:06:56.000000000 +0100 17.543 -+++ ax.h 2010-10-03 12:24:42.000000000 +0100 17.544 -@@ -24,7 +24,7 @@ 17.545 - 17.546 - // Include Files 17.547 - 17.548 --#include <iostream.h> 17.549 -+#include <iostream> 17.550 - #include <stdio.h> 17.551 - #include <stdlib.h> 17.552 - #include <string.h>
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/accessx/stuff/patches/accessx.diff Mon Jun 19 04:02:32 2017 +0300 18.3 @@ -0,0 +1,551 @@ 18.4 +Patch for deprecated <iostream.h> 18.5 + 18.6 +--- a/Access.C 2003-09-19 17:08:01.000000000 +0100 18.7 ++++ b/Access.C 2010-10-03 12:29:36.000000000 +0100 18.8 +@@ -19,6 +19,7 @@ 18.9 + */ 18.10 + 18.11 + #include <X11/Xlib.h> 18.12 ++#include <iostream> 18.13 + #include <X11/XKBlib.h> 18.14 + #include "Access.h" 18.15 + 18.16 +@@ -62,43 +63,43 @@ 18.17 + 18.18 + void Access::ShowDiagnostics() 18.19 + { 18.20 +- cout << "AccessX Timeout: " << onoroff(GetAccessXTOState()) << endl; 18.21 +- cout << "AccessX Timeout Value: " << GetAccessXDelay() << endl; 18.22 ++ std::cout << "AccessX Timeout: " << onoroff(GetAccessXTOState()) << std::endl; 18.23 ++ std::cout << "AccessX Timeout Value: " << GetAccessXDelay() << std::endl; 18.24 + 18.25 +- cout << endl; 18.26 ++ std::cout << std::endl; 18.27 + 18.28 +- cout << "MouseKeys: " << onoroff(GetMouseKeysState()) << endl; 18.29 +- cout << " - Delay: " << GetMouseKeysDelay() << endl; 18.30 +- cout << " - Interval: " << GetMouseKeysInterval() << endl; 18.31 +- cout << " - T to Max: " << GetMouseKeysTimeToMax() << endl; 18.32 +- cout << " - Max Speed: " << GetMouseKeysMaxSpeed() << endl; 18.33 +- cout << " - Curve: " << GetMouseKeysCurve() << endl; 18.34 ++ std::cout << "MouseKeys: " << onoroff(GetMouseKeysState()) << std::endl; 18.35 ++ std::cout << " - Delay: " << GetMouseKeysDelay() << std::endl; 18.36 ++ std::cout << " - Interval: " << GetMouseKeysInterval() << std::endl; 18.37 ++ std::cout << " - T to Max: " << GetMouseKeysTimeToMax() << std::endl; 18.38 ++ std::cout << " - Max Speed: " << GetMouseKeysMaxSpeed() << std::endl; 18.39 ++ std::cout << " - Curve: " << GetMouseKeysCurve() << std::endl; 18.40 + 18.41 +- cout << endl; 18.42 ++ std::cout << std::endl; 18.43 + 18.44 +- cout << "SlowKeys: " << onoroff(GetSlowKeysState()) << endl; 18.45 +- cout << " - Delay: " << GetSlowKeysDelay() << endl; 18.46 ++ std::cout << "SlowKeys: " << onoroff(GetSlowKeysState()) << std::endl; 18.47 ++ std::cout << " - Delay: " << GetSlowKeysDelay() << std::endl; 18.48 + 18.49 +- cout << endl; 18.50 ++ std::cout << std::endl; 18.51 + 18.52 +- cout << "StickyKeys: " << onoroff(GetStickyKeysState()) << endl; 18.53 +- cout << " - Latch/Lock: " << onoroff(GetStickyKeysLatchToLockState()) 18.54 +- << endl; 18.55 +- cout << " - 2 Key Dis: " << 18.56 +- onoroff(GetStickyKeysTwoKeyDisableState()) << endl; 18.57 ++ std::cout << "StickyKeys: " << onoroff(GetStickyKeysState()) << std::endl; 18.58 ++ std::cout << " - Latch/Lock: " << onoroff(GetStickyKeysLatchToLockState()) 18.59 ++ << std::endl; 18.60 ++ std::cout << " - 2 Key Dis: " << 18.61 ++ onoroff(GetStickyKeysTwoKeyDisableState()) << std::endl; 18.62 + 18.63 +- cout << endl; 18.64 ++ std::cout << std::endl; 18.65 + 18.66 +- cout << "BounceKeys: " << onoroff(GetBounceKeysState()) << endl; 18.67 +- cout << " - Delay: " << GetBounceKeysDelay() << endl; 18.68 ++ std::cout << "BounceKeys: " << onoroff(GetBounceKeysState()) << std::endl; 18.69 ++ std::cout << " - Delay: " << GetBounceKeysDelay() << std::endl; 18.70 + 18.71 +- cout << endl; 18.72 ++ std::cout << std::endl; 18.73 + 18.74 +- cout << "RepeatKeys: " << onoroff(GetRepeatKeysState()) << endl; 18.75 +- cout << " - Delay: " << GetRepeatKeysDelay() << endl; 18.76 +- cout << " - Interval: " << GetRepeatKeysInterval() << endl; 18.77 ++ std::cout << "RepeatKeys: " << onoroff(GetRepeatKeysState()) << std::endl; 18.78 ++ std::cout << " - Delay: " << GetRepeatKeysDelay() << std::endl; 18.79 ++ std::cout << " - Interval: " << GetRepeatKeysInterval() << std::endl; 18.80 + 18.81 +- cout << endl; 18.82 ++ std::cout << std::endl; 18.83 + } 18.84 + 18.85 + // 18.86 +--- a/Access.h 2003-09-19 17:00:42.000000000 +0100 18.87 ++++ b/Access.h 2010-10-03 12:24:20.000000000 +0100 18.88 +@@ -21,7 +21,7 @@ 18.89 + * 18.90 + */ 18.91 + 18.92 +-#include <iostream.h> 18.93 ++#include <iostream> 18.94 + #include <math.h> 18.95 + 18.96 + inline char* onoroff(int val) 18.97 +--- a/ax.C 2003-09-19 17:09:31.000000000 +0100 18.98 ++++ b/ax.C 2010-10-03 12:31:00.000000000 +0100 18.99 +@@ -62,45 +62,45 @@ 18.100 + 18.101 + void showHelp(void) { 18.102 + 18.103 +- cout << "Usage: accessx [options & option/value pairs]" 18.104 +- << endl << endl; 18.105 +- cout << "status: Show status of AccessX Features" << endl 18.106 +- << "help: Show this help text" << endl 18.107 +- << "loadconfig: Load the ~/AccessX config file" << endl 18.108 +- << endl 18.109 +- << "+timeout: Enable AccessX Timeout" << endl 18.110 +- << "-timeout: Disable AccessX Timeout" << endl 18.111 +- << "timeout <value>: Set AccessX Timeout" << endl 18.112 +- << endl 18.113 +- << "+mousekeys: Enable MouseKeys" << endl 18.114 +- << "-mousekeys: Disable MouseKeys" << endl 18.115 +- << "mousedelay <value>: Set MouseKeys Delay" << endl 18.116 +- << "mouseinterval <value>: Set MouseKeys Interval" << endl 18.117 +- << "mousetimetomax <value>: Set MouseKeys time to max speed" << endl 18.118 +- << "mousemaxspeed <value>: Set MouseKeys max speed" << endl 18.119 +- << "mousecurve <value>: Set MouseKeys acceleration curve" << endl 18.120 +- << endl 18.121 +- << "+slowkeys: Enable SlowKeys" << endl 18.122 +- << "-slowkeys: Disable SlowKeys" << endl 18.123 +- << "slowdelay <value>: Set SlowKeys Delay" << endl 18.124 +- << endl 18.125 +- << "+stickykeys: Enable StickyKeys" << endl 18.126 +- << "-stickykeys: Disable StickyKeys" << endl 18.127 +- << "+stickylatchtolock: Enable S.K. Latch To Lock" << endl 18.128 +- << "-stickylatchtolock: Disbale S.K. Latch To Lock" << endl 18.129 +- << "+stickytwokeydisable: Enable S.K. Two Key Disable" << endl 18.130 +- << "-stickytwokeydisable: Disable S.K. Two Key Disable" << endl 18.131 +- << endl 18.132 +- << "+bouncekeys: Enable BounceKeys" << endl 18.133 +- << "-bouncekeys: Disable BounceKeys" << endl 18.134 +- << "bouncedelay <value>: Set Debounce Delay" << endl 18.135 +- << endl 18.136 +- << "+repeatkeys: Enable RepeatKeys" << endl 18.137 +- << "-repeatkeys: Disable RepeatKeys" << endl 18.138 +- << "repeatdelay <value>: Set RepeatKeys Delay" << endl 18.139 +- << "repeatinterval <value>: Set RepeatKeys Interval" << endl << endl 18.140 +- << "With no options, loads config file." << endl 18.141 +- << endl; 18.142 ++ std::cout << "Usage: accessx [options & option/value pairs]" 18.143 ++ << std::endl << std::endl; 18.144 ++ std::cout << "status: Show status of AccessX Features" << std::endl 18.145 ++ << "help: Show this help text" << std::endl 18.146 ++ << "loadconfig: Load the ~/AccessX config file" << std::endl 18.147 ++ << std::endl 18.148 ++ << "+timeout: Enable AccessX Timeout" << std::endl 18.149 ++ << "-timeout: Disable AccessX Timeout" << std::endl 18.150 ++ << "timeout <value>: Set AccessX Timeout" << std::endl 18.151 ++ << std::endl 18.152 ++ << "+mousekeys: Enable MouseKeys" << std::endl 18.153 ++ << "-mousekeys: Disable MouseKeys" << std::endl 18.154 ++ << "mousedelay <value>: Set MouseKeys Delay" << std::endl 18.155 ++ << "mouseinterval <value>: Set MouseKeys Interval" << std::endl 18.156 ++ << "mousetimetomax <value>: Set MouseKeys time to max speed" << std::endl 18.157 ++ << "mousemaxspeed <value>: Set MouseKeys max speed" << std::endl 18.158 ++ << "mousecurve <value>: Set MouseKeys acceleration curve" << std::endl 18.159 ++ << std::endl 18.160 ++ << "+slowkeys: Enable SlowKeys" << std::endl 18.161 ++ << "-slowkeys: Disable SlowKeys" << std::endl 18.162 ++ << "slowdelay <value>: Set SlowKeys Delay" << std::endl 18.163 ++ << std::endl 18.164 ++ << "+stickykeys: Enable StickyKeys" << std::endl 18.165 ++ << "-stickykeys: Disable StickyKeys" << std::endl 18.166 ++ << "+stickylatchtolock: Enable S.K. Latch To Lock" << std::endl 18.167 ++ << "-stickylatchtolock: Disbale S.K. Latch To Lock" << std::endl 18.168 ++ << "+stickytwokeydisable: Enable S.K. Two Key Disable" << std::endl 18.169 ++ << "-stickytwokeydisable: Disable S.K. Two Key Disable" << std::endl 18.170 ++ << std::endl 18.171 ++ << "+bouncekeys: Enable BounceKeys" << std::endl 18.172 ++ << "-bouncekeys: Disable BounceKeys" << std::endl 18.173 ++ << "bouncedelay <value>: Set Debounce Delay" << std::endl 18.174 ++ << std::endl 18.175 ++ << "+repeatkeys: Enable RepeatKeys" << std::endl 18.176 ++ << "-repeatkeys: Disable RepeatKeys" << std::endl 18.177 ++ << "repeatdelay <value>: Set RepeatKeys Delay" << std::endl 18.178 ++ << "repeatinterval <value>: Set RepeatKeys Interval" << std::endl << std::endl 18.179 ++ << "With no options, loads config file." << std::endl 18.180 ++ << std::endl; 18.181 + } 18.182 + 18.183 + 18.184 +@@ -115,26 +115,26 @@ 18.185 + 18.186 + void showRawStatus(Access* ax) 18.187 + { 18.188 +- cout << ax->GetAccessXTOState() << endl; 18.189 +- cout << (int)ceil(ax->GetAccessXDelay() / 60.0) << endl; 18.190 +- cout << ax->GetMouseKeysState() << endl; 18.191 +- cout << (int)ceil(ax->GetMouseKeysTimeToMax() / 1000.0) << endl; 18.192 +- cout << ax->GetMouseKeysMaxSpeed() << endl; 18.193 +- cout << ax->GetSlowKeysState() << endl; 18.194 +- cout << (float)(ax->GetSlowKeysDelay() / 1000.0) << endl; 18.195 +- cout << ax->GetStickyKeysState() << endl; 18.196 +- cout << ax->GetStickyKeysLatchToLockState() << endl; 18.197 +- cout << ax->GetStickyKeysTwoKeyDisableState() << endl; 18.198 +- cout << ax->GetBounceKeysState() << endl; 18.199 +- cout << (float)(ax->GetBounceKeysDelay() / 1000.0) << endl; 18.200 +- cout << ax->GetRepeatKeysState() << endl; 18.201 +- cout << (float)(ax->GetRepeatKeysDelay() / 1000.0) << endl; 18.202 +- cout << (float)(1000.0 / ax->GetRepeatKeysInterval()) << endl; 18.203 +- cout << ToggleKeysToggleSet << endl; 18.204 +- cout << SoundOnOffToggleSet << endl; 18.205 +- cout << SlowKeysOnAcceptToggleSet << endl; 18.206 +- cout << SlowKeysOnPressToggleSet << endl; 18.207 +- cout << EnableAccessXToggleSet << endl; 18.208 ++ std::cout << ax->GetAccessXTOState() << std::endl; 18.209 ++ std::cout << (int)ceil(ax->GetAccessXDelay() / 60.0) << std::endl; 18.210 ++ std::cout << ax->GetMouseKeysState() << std::endl; 18.211 ++ std::cout << (int)ceil(ax->GetMouseKeysTimeToMax() / 1000.0) << std::endl; 18.212 ++ std::cout << ax->GetMouseKeysMaxSpeed() << std::endl; 18.213 ++ std::cout << ax->GetSlowKeysState() << std::endl; 18.214 ++ std::cout << (float)(ax->GetSlowKeysDelay() / 1000.0) << std::endl; 18.215 ++ std::cout << ax->GetStickyKeysState() << std::endl; 18.216 ++ std::cout << ax->GetStickyKeysLatchToLockState() << std::endl; 18.217 ++ std::cout << ax->GetStickyKeysTwoKeyDisableState() << std::endl; 18.218 ++ std::cout << ax->GetBounceKeysState() << std::endl; 18.219 ++ std::cout << (float)(ax->GetBounceKeysDelay() / 1000.0) << std::endl; 18.220 ++ std::cout << ax->GetRepeatKeysState() << std::endl; 18.221 ++ std::cout << (float)(ax->GetRepeatKeysDelay() / 1000.0) << std::endl; 18.222 ++ std::cout << (float)(1000.0 / ax->GetRepeatKeysInterval()) << std::endl; 18.223 ++ std::cout << ToggleKeysToggleSet << std::endl; 18.224 ++ std::cout << SoundOnOffToggleSet << std::endl; 18.225 ++ std::cout << SlowKeysOnAcceptToggleSet << std::endl; 18.226 ++ std::cout << SlowKeysOnPressToggleSet << std::endl; 18.227 ++ std::cout << EnableAccessXToggleSet << std::endl; 18.228 + } 18.229 + 18.230 + /////////////////////////////////////////////////////////////////////////////// 18.231 +@@ -183,7 +183,7 @@ 18.232 + index++; 18.233 + rc = getValue(argv[index], &value); 18.234 + if(rc) { 18.235 +- cout << "Invalid Option." << endl; 18.236 ++ std::cout << "Invalid Option." << std::endl; 18.237 + exit(2); 18.238 + } 18.239 + ax->SetAccessXDelay(value); 18.240 +@@ -201,7 +201,7 @@ 18.241 + index++; 18.242 + rc = getValue(argv[index], &value); 18.243 + if(rc) { 18.244 +- cout << "Invalid Option." << endl; 18.245 ++ std::cout << "Invalid Option." << std::endl; 18.246 + exit(2); 18.247 + } 18.248 + ax->SetMouseKeysDelay(value); 18.249 +@@ -210,7 +210,7 @@ 18.250 + index++; 18.251 + rc = getValue(argv[index], &value); 18.252 + if(rc) { 18.253 +- cout << "Invalid Option." << endl; 18.254 ++ std::cout << "Invalid Option." << std::endl; 18.255 + exit(2); 18.256 + } 18.257 + ax->SetMouseKeysInterval(value); 18.258 +@@ -219,7 +219,7 @@ 18.259 + index++; 18.260 + rc = getValue(argv[index], &value); 18.261 + if(rc) { 18.262 +- cout << "Invalid Option." << endl; 18.263 ++ std::cout << "Invalid Option." << std::endl; 18.264 + exit(2); 18.265 + } 18.266 + ax->SetMouseKeysTimeToMax(value); 18.267 +@@ -228,7 +228,7 @@ 18.268 + index++; 18.269 + rc = getValue(argv[index], &value); 18.270 + if(rc) { 18.271 +- cout << "Invalid Option." << endl; 18.272 ++ std::cout << "Invalid Option." << std::endl; 18.273 + exit(2); 18.274 + } 18.275 + ax->SetMouseKeysMaxSpeed(value); 18.276 +@@ -237,7 +237,7 @@ 18.277 + index++; 18.278 + rc = getValue(argv[index], &value); 18.279 + if(rc) { 18.280 +- cout << "Invalid Option." << endl; 18.281 ++ std::cout << "Invalid Option." << std::endl; 18.282 + exit(2); 18.283 + } 18.284 + ax->SetMouseKeysCurve(value); 18.285 +@@ -255,7 +255,7 @@ 18.286 + index++; 18.287 + rc = getValue(argv[index], &value); 18.288 + if(rc) { 18.289 +- cout << "Invalid Option." << endl; 18.290 ++ std::cout << "Invalid Option." << std::endl; 18.291 + exit(2); 18.292 + } 18.293 + ax->SetSlowKeysDelay(value); 18.294 +@@ -294,7 +294,7 @@ 18.295 + index++; 18.296 + rc = getValue(argv[index], &value); 18.297 + if(rc) { 18.298 +- cout << "Invalid Option." << endl; 18.299 ++ std::cout << "Invalid Option." << std::endl; 18.300 + exit(2); 18.301 + } 18.302 + ax->SetBounceKeysDelay(value); 18.303 +@@ -312,7 +312,7 @@ 18.304 + index++; 18.305 + rc = getValue(argv[index], &value); 18.306 + if(rc) { 18.307 +- cout << "Invalid Option." << endl; 18.308 ++ std::cout << "Invalid Option." << std::endl; 18.309 + exit(2); 18.310 + } 18.311 + ax->SetRepeatKeysDelay(value); 18.312 +@@ -321,7 +321,7 @@ 18.313 + index++; 18.314 + rc = getValue(argv[index], &value); 18.315 + if(rc) { 18.316 +- cout << "Invalid Option." << endl; 18.317 ++ std::cout << "Invalid Option." << std::endl; 18.318 + exit(2); 18.319 + } 18.320 + ax->SetRepeatKeysInterval(value); 18.321 +@@ -330,7 +330,7 @@ 18.322 + // AccessX Unknown Features --------------------------------------------- 18.323 + 18.324 + else { 18.325 +- cout << "Unknown Option!" << endl; 18.326 ++ std::cout << "Unknown Option!" << std::endl; 18.327 + exit(1); 18.328 + } 18.329 + 18.330 +@@ -490,14 +490,14 @@ 18.331 + else if(!strcmp(param, "*TimeOutScale.value:")) { 18.332 + rc = getValue(value, &TimeOutScaleValue); 18.333 + if(rc) { 18.334 +- cout << "Invalid Config File Option." << endl; 18.335 ++ std::cout << "Invalid Config File Option." << std::endl; 18.336 + exit(10); 18.337 + } 18.338 + } 18.339 + else if(!strcmp(param, "*TimeOutScale.decimalPoints:")) { 18.340 + rc = getValue(value, &TimeOutScaleDecimalPoints); 18.341 + if(rc) { 18.342 +- cout << "Invalid Config File Option." << endl; 18.343 ++ std::cout << "Invalid Config File Option." << std::endl; 18.344 + exit(10); 18.345 + } 18.346 + } 18.347 +@@ -505,7 +505,7 @@ 18.348 + else if(!strcmp(param, "*KRGSlowKeysDelayScale.value:")) { 18.349 + rc = getValue(value, &KRGSlowKeysDelayScaleValue); 18.350 + if(rc) { 18.351 +- cout << "Invalid Config File Option." << endl; 18.352 ++ std::cout << "Invalid Config File Option." << std::endl; 18.353 + exit(10); 18.354 + } 18.355 + } 18.356 +@@ -513,7 +513,7 @@ 18.357 + else if(!strcmp(param, "*KRGSlowKeysDelayScale.decimalPoints:")) { 18.358 + rc = getValue(value, &KRGSlowKeysDelayScaleDecimalPoints); 18.359 + if(rc) { 18.360 +- cout << "Invalid Config File Option." << endl; 18.361 ++ std::cout << "Invalid Config File Option." << std::endl; 18.362 + exit(10); 18.363 + } 18.364 + } 18.365 +@@ -521,7 +521,7 @@ 18.366 + else if(!strcmp(param, "*MouseMaxSpeedScale.value:")) { 18.367 + rc = getValue(value, &MouseMaxSpeedScaleValue); 18.368 + if(rc) { 18.369 +- cout << "Invalid Config File Option." << endl; 18.370 ++ std::cout << "Invalid Config File Option." << std::endl; 18.371 + exit(10); 18.372 + } 18.373 + } 18.374 +@@ -529,7 +529,7 @@ 18.375 + else if(!strcmp(param, "*MouseMaxSpeedScale.decimalPoints:")) { 18.376 + rc = getValue(value, &MouseMaxSpeedScaleDecimalPoints); 18.377 + if(rc) { 18.378 +- cout << "Invalid Config File Option." << endl; 18.379 ++ std::cout << "Invalid Config File Option." << std::endl; 18.380 + exit(10); 18.381 + } 18.382 + } 18.383 +@@ -537,7 +537,7 @@ 18.384 + else if(!strcmp(param, "*KRGDebounceScale.value:")) { 18.385 + rc = getValue(value, &KRGDebounceScaleValue); 18.386 + if(rc) { 18.387 +- cout << "Invalid Config File Option." << endl; 18.388 ++ std::cout << "Invalid Config File Option." << std::endl; 18.389 + exit(10); 18.390 + } 18.391 + } 18.392 +@@ -545,7 +545,7 @@ 18.393 + else if(!strcmp(param, "*KRGDebounceScale.decimalPoints:")) { 18.394 + rc = getValue(value, &KRGDebounceScaleDecimalPoints); 18.395 + if(rc) { 18.396 +- cout << "Invalid Config File Option." << endl; 18.397 ++ std::cout << "Invalid Config File Option." << std::endl; 18.398 + exit(10); 18.399 + } 18.400 + } 18.401 +@@ -553,7 +553,7 @@ 18.402 + else if(!strcmp(param, "*KRGRepeatDelayScale.value:")) { 18.403 + rc = getValue(value, &KRGRepeatDelayScaleValue); 18.404 + if(rc) { 18.405 +- cout << "Invalid Config File Option." << endl; 18.406 ++ std::cout << "Invalid Config File Option." << std::endl; 18.407 + exit(10); 18.408 + } 18.409 + } 18.410 +@@ -561,7 +561,7 @@ 18.411 + else if(!strcmp(param, "*KRGRepeatDelayScale.decimalPoints:")) { 18.412 + rc = getValue(value, &KRGRepeatDelayScaleDecimalPoints); 18.413 + if(rc) { 18.414 +- cout << "Invalid Config File Option." << endl; 18.415 ++ std::cout << "Invalid Config File Option." << std::endl; 18.416 + exit(10); 18.417 + } 18.418 + } 18.419 +@@ -569,7 +569,7 @@ 18.420 + else if(!strcmp(param, "*KRGRepeatRateScale.value:")) { 18.421 + rc = getValue(value, &KRGRepeatRateScaleValue); 18.422 + if(rc) { 18.423 +- cout << "Invalid Config File Option." << endl; 18.424 ++ std::cout << "Invalid Config File Option." << std::endl; 18.425 + exit(10); 18.426 + } 18.427 + } 18.428 +@@ -577,7 +577,7 @@ 18.429 + else if(!strcmp(param, "*KRGRepeatRateScale.decimalPoints:")) { 18.430 + rc = getValue(value, &KRGRepeatRateScaleDecimalPoints); 18.431 + if(rc) { 18.432 +- cout << "Invalid Config File Option." << endl; 18.433 ++ std::cout << "Invalid Config File Option." << std::endl; 18.434 + exit(10); 18.435 + } 18.436 + } 18.437 +@@ -585,7 +585,7 @@ 18.438 + else if(!strcmp(param, "*MouseTimeToMaxScale.value:")) { 18.439 + rc = getValue(value, &MouseTimeToMaxScaleValue); 18.440 + if(rc) { 18.441 +- cout << "Invalid Config File Option." << endl; 18.442 ++ std::cout << "Invalid Config File Option." << std::endl; 18.443 + exit(10); 18.444 + } 18.445 + } 18.446 +@@ -593,13 +593,13 @@ 18.447 + else if(!strcmp(param, "*MouseTimeToMaxScale.decimalPoints:")) { 18.448 + rc = getValue(value, &MouseTimeToMaxScaleDecimalPoints); 18.449 + if(rc) { 18.450 +- cout << "Invalid Config File Option." << endl; 18.451 ++ std::cout << "Invalid Config File Option." << std::endl; 18.452 + exit(10); 18.453 + } 18.454 + } 18.455 + 18.456 + else { 18.457 +- cout << "Invalid Config File Parameter." << endl; 18.458 ++ std::cout << "Invalid Config File Parameter." << std::endl; 18.459 + exit(10); 18.460 + } 18.461 + } 18.462 +@@ -621,7 +621,7 @@ 18.463 + SlowKeysDelayValue /= 10; 18.464 + 18.465 + if(SlowKeysDelayValue == 0) { 18.466 +- cout << "Config File: Slow Keys Delay Cannot Be Zero." << endl; 18.467 ++ std::cout << "Config File: Slow Keys Delay Cannot Be Zero." << std::endl; 18.468 + exit(10); 18.469 + } 18.470 + 18.471 +@@ -629,7 +629,7 @@ 18.472 + TimeOutValue /= 10; 18.473 + 18.474 + if(TimeOutValue == 0) { 18.475 +- cout << "Config File: Timeout Value Cannot Be Zero." << endl; 18.476 ++ std::cout << "Config File: Timeout Value Cannot Be Zero." << std::endl; 18.477 + exit(10); 18.478 + } 18.479 + 18.480 +@@ -637,7 +637,7 @@ 18.481 + MouseMaxSpeedValue /= 10; 18.482 + 18.483 + if(MouseMaxSpeedValue == 0) { 18.484 +- cout << "Config File: Mouse Keys Max Speed Cannot Be Zero." << endl; 18.485 ++ std::cout << "Config File: Mouse Keys Max Speed Cannot Be Zero." << std::endl; 18.486 + exit(10); 18.487 + } 18.488 + 18.489 +@@ -645,7 +645,7 @@ 18.490 + MouseTimeToMaxValue /= 10; 18.491 + 18.492 + if(MouseTimeToMaxValue == 0) { 18.493 +- cout << "Config File: Mouse Keys Time To Max Cannot Be Zero." << endl; 18.494 ++ std::cout << "Config File: Mouse Keys Time To Max Cannot Be Zero." << std::endl; 18.495 + exit(10); 18.496 + } 18.497 + 18.498 +@@ -653,7 +653,7 @@ 18.499 + DebounceValue /= 10; 18.500 + 18.501 + if(DebounceValue == 0) { 18.502 +- cout << "Config File: Debounce Delay Cannot Be Zero." << endl; 18.503 ++ std::cout << "Config File: Debounce Delay Cannot Be Zero." << std::endl; 18.504 + exit(10); 18.505 + } 18.506 + 18.507 +@@ -661,7 +661,7 @@ 18.508 + RepeatDelayValue /= 10; 18.509 + 18.510 + if(RepeatDelayValue == 0) { 18.511 +- cout << "Config File: Repeat Keys Delay Cannot Be Zero." << endl; 18.512 ++ std::cout << "Config File: Repeat Keys Delay Cannot Be Zero." << std::endl; 18.513 + exit(10); 18.514 + } 18.515 + 18.516 +@@ -669,7 +669,7 @@ 18.517 + RepeatRateValue /= 10; 18.518 + 18.519 + if(RepeatRateValue == 0) { 18.520 +- cout << "Config File: Repeat Keys Rate Cannot Be Zero." << endl; 18.521 ++ std::cout << "Config File: Repeat Keys Rate Cannot Be Zero." << std::endl; 18.522 + exit(10); 18.523 + } 18.524 + 18.525 +@@ -695,14 +695,14 @@ 18.526 + ax->SetRepeatKeysInterval((int)floor(1000.0/RepeatRateValue)); 18.527 + 18.528 + if(!quiet) { 18.529 +- cout << "Config file ~/AccessX loaded." << endl 18.530 +- << "\"ax help\" for help." << endl; 18.531 ++ std::cout << "Config file ~/AccessX loaded." << std::endl 18.532 ++ << "\"ax help\" for help." << std::endl; 18.533 + } 18.534 + } 18.535 + else { 18.536 + if(!quiet) { 18.537 +- cout << "Config File ~/AccessX not found!" << endl 18.538 +- << "\"ax help\" for help." << endl; 18.539 ++ std::cout << "Config File ~/AccessX not found!" << std::endl 18.540 ++ << "\"ax help\" for help." << std::endl; 18.541 + } 18.542 + } 18.543 + } 18.544 +--- a/ax.h 2003-09-19 17:06:56.000000000 +0100 18.545 ++++ b/ax.h 2010-10-03 12:24:42.000000000 +0100 18.546 +@@ -24,7 +24,7 @@ 18.547 + 18.548 + // Include Files 18.549 + 18.550 +-#include <iostream.h> 18.551 ++#include <iostream> 18.552 + #include <stdio.h> 18.553 + #include <stdlib.h> 18.554 + #include <string.h>
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 19.2 +++ b/accessx/stuff/patches/series Mon Jun 19 04:02:32 2017 +0300 19.3 @@ -0,0 +1,1 @@ 19.4 +accessx.diff
20.1 --- a/advancecomp/receipt Sun Jun 18 04:38:10 2017 +0300 20.2 +++ b/advancecomp/receipt Mon Jun 19 04:02:32 2017 +0300 20.3 @@ -19,8 +19,6 @@ 20.4 # Rules to configure and make the package. 20.5 compile_rules() 20.6 { 20.7 - patch -p1 -i $stuff/advancecomp.patch 20.8 - 20.9 ./autogen.sh && 20.10 ./configure $CONFIGURE_ARGS && 20.11 make && make install
21.1 --- a/advancecomp/stuff/advancecomp.patch Sun Jun 18 04:38:10 2017 +0300 21.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 21.3 @@ -1,13 +0,0 @@ 21.4 ---- a/autogen.sh 21.5 -+++ b/autogen.sh 21.6 -@@ -8,9 +8,9 @@ 21.7 - 21.8 - # Regenerate configuration files 21.9 - aclocal 21.10 --automake --add-missing --force-missing 21.11 - autoconf 21.12 - autoheader && touch config.h.in 21.13 -+automake --add-missing --force-missing 21.14 - 21.15 - # Run configure for this platform 21.16 - echo "Now you are ready to run ./configure"
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 22.2 +++ b/advancecomp/stuff/patches/advancecomp.patch Mon Jun 19 04:02:32 2017 +0300 22.3 @@ -0,0 +1,13 @@ 22.4 +--- a/autogen.sh 22.5 ++++ b/autogen.sh 22.6 +@@ -8,9 +8,9 @@ 22.7 + 22.8 + # Regenerate configuration files 22.9 + aclocal 22.10 +-automake --add-missing --force-missing 22.11 + autoconf 22.12 + autoheader && touch config.h.in 22.13 ++automake --add-missing --force-missing 22.14 + 22.15 + # Run configure for this platform 22.16 + echo "Now you are ready to run ./configure"
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 23.2 +++ b/advancecomp/stuff/patches/series Mon Jun 19 04:02:32 2017 +0300 23.3 @@ -0,0 +1,1 @@ 23.4 +advancecomp.patch
24.1 --- a/aiksaurus/receipt Sun Jun 18 04:38:10 2017 +0300 24.2 +++ b/aiksaurus/receipt Mon Jun 19 04:02:32 2017 +0300 24.3 @@ -16,8 +16,6 @@ 24.4 # Rules to configure and make the package. 24.5 compile_rules() 24.6 { 24.7 - cd $src 24.8 - patch -Np0 -i $stuff/aiksaurus-gcc44.patch 24.9 ./configure --with-gtk $CONFIGURE_ARGS && 24.10 make && make -j1 DESTDIR=$DESTDIR install 24.11 }
25.1 --- a/aiksaurus/stuff/aiksaurus-gcc44.patch Sun Jun 18 04:38:10 2017 +0300 25.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 25.3 @@ -1,31 +0,0 @@ 25.4 ---- base/aiksaurus.t.cpp~ 2003-06-26 21:44:38.000000000 -0400 25.5 -+++ base/aiksaurus.t.cpp 2009-05-31 20:02:29.172988678 -0400 25.6 -@@ -22,6 +22,7 @@ 25.7 - #include "Aiksaurus.h" 25.8 - #include "AsciiCompare.h" 25.9 - #include "config.h" 25.10 -+#include <cstdlib> 25.11 - #include <iostream> 25.12 - #include <string> 25.13 - using namespace std; 25.14 - 25.15 ---- ./gtk/src/Display.cpp~ 2003-05-27 19:56:54.000000000 -0400 25.16 -+++ ./gtk/src/Display.cpp 2009-06-02 18:09:36.198627551 -0400 25.17 -@@ -22,6 +22,7 @@ 25.18 - #include "Meaning.h" 25.19 - #include "DialogMediator.h" 25.20 - #include "Exception.h" 25.21 -+#include <cstring> 25.22 - using namespace std; 25.23 - 25.24 - namespace AiksaurusGTK_impl 25.25 ---- ./gtk/src/gtkAiksaur.t.cpp~ 2002-01-11 21:02:12.000000000 -0500 25.26 -+++ ./gtk/src/gtkAiksaur.t.cpp 2009-06-02 18:12:06.815277325 -0400 25.27 -@@ -21,6 +21,7 @@ 25.28 - #include <AiksaurusGTK.h> 25.29 - #include "config.h" 25.30 - #include <gtk/gtk.h> 25.31 -+#include <cstdlib> 25.32 - #include <iostream> 25.33 - #include <string> 25.34 - using namespace std;
26.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 26.2 +++ b/aiksaurus/stuff/patches/aiksaurus-gcc44.patch Mon Jun 19 04:02:32 2017 +0300 26.3 @@ -0,0 +1,31 @@ 26.4 +--- a/base/aiksaurus.t.cpp~ 2003-06-26 21:44:38.000000000 -0400 26.5 ++++ b/base/aiksaurus.t.cpp 2009-05-31 20:02:29.172988678 -0400 26.6 +@@ -22,6 +22,7 @@ 26.7 + #include "Aiksaurus.h" 26.8 + #include "AsciiCompare.h" 26.9 + #include "config.h" 26.10 ++#include <cstdlib> 26.11 + #include <iostream> 26.12 + #include <string> 26.13 + using namespace std; 26.14 + 26.15 +--- a/gtk/src/Display.cpp~ 2003-05-27 19:56:54.000000000 -0400 26.16 ++++ b/gtk/src/Display.cpp 2009-06-02 18:09:36.198627551 -0400 26.17 +@@ -22,6 +22,7 @@ 26.18 + #include "Meaning.h" 26.19 + #include "DialogMediator.h" 26.20 + #include "Exception.h" 26.21 ++#include <cstring> 26.22 + using namespace std; 26.23 + 26.24 + namespace AiksaurusGTK_impl 26.25 +--- a/gtk/src/gtkAiksaur.t.cpp~ 2002-01-11 21:02:12.000000000 -0500 26.26 ++++ b/gtk/src/gtkAiksaur.t.cpp 2009-06-02 18:12:06.815277325 -0400 26.27 +@@ -21,6 +21,7 @@ 26.28 + #include <AiksaurusGTK.h> 26.29 + #include "config.h" 26.30 + #include <gtk/gtk.h> 26.31 ++#include <cstdlib> 26.32 + #include <iostream> 26.33 + #include <string> 26.34 + using namespace std;
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/aiksaurus/stuff/patches/series Mon Jun 19 04:02:32 2017 +0300 27.3 @@ -0,0 +1,1 @@ 27.4 +aiksaurus-gcc44.patch
28.1 --- a/airpwn/receipt Sun Jun 18 04:38:10 2017 +0300 28.2 +++ b/airpwn/receipt Mon Jun 19 04:02:32 2017 +0300 28.3 @@ -17,9 +17,6 @@ 28.4 # Rules to configure and make the package. 28.5 compile_rules() 28.6 { 28.7 - # Patch configure to link libcrypto 28.8 - patch -Np1 -i $stuff/link-libcrypto.patch 28.9 - 28.10 # Fix airpwn files so we can use it with a Python version other than 2.4. 28.11 PYTHON_VERSION1=$(python -c 'import sys; print sys.version[:3]') 28.12 PYTHON_VERSION2=$(echo $PYTHON_VERSION1 | tr . _)
29.1 --- a/airpwn/stuff/link-libcrypto.patch Sun Jun 18 04:38:10 2017 +0300 29.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 29.3 @@ -1,11 +0,0 @@ 29.4 -diff -u airpwn-1.4.orig/configure.ac airpwn-1.4/configure.ac 29.5 ---- airpwn-1.4.orig/configure.ac 2009-05-27 09:15:23.000000000 -0700 29.6 -+++ airpwn-1.4/configure.ac 2010-05-06 21:13:36.576175190 -0700 29.7 -@@ -14,6 +14,7 @@ 29.8 - AC_CHECK_LIB(pthread, pthread_create, [], AC_MSG_ERROR(libpthread required)) 29.9 - AC_CHECK_LIB(orcon, tx80211_txpacket, [], AC_MSG_ERROR(LORCON required. Install LORCON before building airpwn.)) 29.10 - AC_CHECK_LIB(ssl, MD5_Init, [], AC_MSG_NOTICE(openssl required for full WEP key generation)) 29.11 -+AC_CHECK_LIB(crypto, MD5_Init, [], AC_MSG_NOTICE(libcrypto required for full WEP key generation)) 29.12 - AC_CHECK_LIB(python2.4, PyString_FromString, [], AC_MSG_NOTICE(Python2.4 required)) 29.13 - 29.14 - # Checks for header files.
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 30.2 +++ b/airpwn/stuff/patches/link-libcrypto.patch Mon Jun 19 04:02:32 2017 +0300 30.3 @@ -0,0 +1,13 @@ 30.4 +Patch configure to link libcrypto 30.5 + 30.6 +diff -u airpwn-1.4.orig/configure.ac airpwn-1.4/configure.ac 30.7 +--- airpwn-1.4.orig/configure.ac 2009-05-27 09:15:23.000000000 -0700 30.8 ++++ airpwn-1.4/configure.ac 2010-05-06 21:13:36.576175190 -0700 30.9 +@@ -14,6 +14,7 @@ 30.10 + AC_CHECK_LIB(pthread, pthread_create, [], AC_MSG_ERROR(libpthread required)) 30.11 + AC_CHECK_LIB(orcon, tx80211_txpacket, [], AC_MSG_ERROR(LORCON required. Install LORCON before building airpwn.)) 30.12 + AC_CHECK_LIB(ssl, MD5_Init, [], AC_MSG_NOTICE(openssl required for full WEP key generation)) 30.13 ++AC_CHECK_LIB(crypto, MD5_Init, [], AC_MSG_NOTICE(libcrypto required for full WEP key generation)) 30.14 + AC_CHECK_LIB(python2.4, PyString_FromString, [], AC_MSG_NOTICE(Python2.4 required)) 30.15 + 30.16 + # Checks for header files.
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 31.2 +++ b/airpwn/stuff/patches/series Mon Jun 19 04:02:32 2017 +0300 31.3 @@ -0,0 +1,1 @@ 31.4 +link-libcrypto.patch
32.1 --- a/amsn/receipt Sun Jun 18 04:38:10 2017 +0300 32.2 +++ b/amsn/receipt Mon Jun 19 04:02:32 2017 +0300 32.3 @@ -20,9 +20,6 @@ 32.4 # Rules to configure and make the package. 32.5 compile_rules() 32.6 { 32.7 - cd $src 32.8 - patch -Np0 -i $stuff/$PACKAGE-v4l2.patch 32.9 - patch -Np0 -i $stuff/$PACKAGE-0.98.9-no-rebuild-on-install.patch 32.10 ./configure --prefix=/usr \ 32.11 --with-tcl=/usr/lib $CONFIGURE_ARGS && \ 32.12 make && \
33.1 --- a/amsn/stuff/amsn-0.98.9-no-rebuild-on-install.patch Sun Jun 18 04:38:10 2017 +0300 33.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 33.3 @@ -1,22 +0,0 @@ 33.4 ---- Makefile.in 2012/05/18 19:28:05 12371 33.5 -+++ Makefile.in 2012/05/28 19:41:51 12400 33.6 -@@ -259,7 +259,9 @@ 33.7 - 33.8 - ln -sf $(dstdir)/$(PACKAGE)/desktop-icons/48x48/apps/amsn.png $(DESTDIR)$(dstdir)/pixmaps/ 33.9 - 33.10 --install_libs:: rebuild_libs do_install_libs 33.11 -+install_libs:: clean_libs 33.12 -+ $(MAKE) rebuild_libs 33.13 -+ $(MAKE) do_install_libs 33.14 - 33.15 - do_install_libs:: $(LIBS_TO_INSTALL) 33.16 - rm -Rf $(DESTDIR)$(libdir)/$(PACKAGE) 33.17 -@@ -276,7 +278,7 @@ 33.18 - 33.19 - rebuild_libs: RPATH+=$(libdir)/$(PACKAGE) 33.20 - rebuild_libs: LIBDIR=$(libdir)/$(PACKAGE) 33.21 --rebuild_libs: clean_libs $(LIBS_WITH_RPATH) 33.22 -+rebuild_libs: $(LIBS_WITH_RPATH) 33.23 - 33.24 - uninstall:: 33.25 - rm -Rf $(dstdir)/$(PACKAGE)
34.1 --- a/amsn/stuff/amsn-v4l2.patch Sun Jun 18 04:38:10 2017 +0300 34.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 34.3 @@ -1,43 +0,0 @@ 34.4 ---- configure.ac 2012-05-23 21:21:14.000000000 +0200 34.5 -+++ configure.ac 2012-06-02 12:29:24.836921683 +0200 34.6 -@@ -378,6 +378,10 @@ 34.7 - AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux) 34.8 - fi 34.9 - 34.10 -+if test "$FOUND_OS" = "linux"; then 34.11 -+ AC_CHECK_HEADERS(linux/videodev2.h) 34.12 -+fi 34.13 -+ 34.14 - #--------------------------------------------------------------------------------------------- 34.15 - 34.16 - dnl --------------------------------------------------------------------- 34.17 ---- utils/linux/capture/capture.h 2011-04-12 02:20:59.000000000 +0200 34.18 -+++ utils/linux/capture/capture.h 2012-06-02 12:29:24.836921683 +0200 34.19 -@@ -34,7 +34,11 @@ 34.20 - #ifdef HAVE_SYS_VIDEODEV2_H 34.21 - # include <sys/videodev2.h> 34.22 - #else 34.23 --# include <linux/videodev.h> 34.24 -+ #ifdef HAVE_LINUX_VIDEODEV2_H 34.25 -+ #include <linux/videodev2.h> 34.26 -+ #else 34.27 -+ #include <linux/videodev.h> 34.28 -+ #endif 34.29 - #endif 34.30 - */ 34.31 - 34.32 ---- utils/linux/capture/libng/plugins/Rules.mk 2012-05-18 17:31:32.000000000 +0200 34.33 -+++ utils/linux/capture/libng/plugins/Rules.mk 2012-06-02 12:51:59.523065502 +0200 34.34 -@@ -2,6 +2,13 @@ 34.35 - TARGETS-plugins := $(capture_dir)/libng/plugins/conv-mjpeg.so 34.36 - TARGETS-plugins += $(patsubst %,$(capture_dir)/libng/plugins/%.so,${LIBNG_PLUGINS}) 34.37 - 34.38 -+plugin_link_so = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(capture_dir)/capture.so $(SHARED) -o $@ 34.39 -+ifeq ($(verbose),no) 34.40 -+ echo_plugin_link_so = echo " LDP " $@ 34.41 -+else 34.42 -+ echo_plugin_link_so = echo $(plugin_link_so) 34.43 -+endif 34.44 -+ 34.45 - # global targets 34.46 - all:: $(TARGETS-plugins)
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 35.2 +++ b/amsn/stuff/patches/amsn-0.98.9-no-rebuild-on-install.patch Mon Jun 19 04:02:32 2017 +0300 35.3 @@ -0,0 +1,22 @@ 35.4 +--- a/Makefile.in 2012/05/18 19:28:05 12371 35.5 ++++ b/Makefile.in 2012/05/28 19:41:51 12400 35.6 +@@ -259,7 +259,9 @@ 35.7 + 35.8 + ln -sf $(dstdir)/$(PACKAGE)/desktop-icons/48x48/apps/amsn.png $(DESTDIR)$(dstdir)/pixmaps/ 35.9 + 35.10 +-install_libs:: rebuild_libs do_install_libs 35.11 ++install_libs:: clean_libs 35.12 ++ $(MAKE) rebuild_libs 35.13 ++ $(MAKE) do_install_libs 35.14 + 35.15 + do_install_libs:: $(LIBS_TO_INSTALL) 35.16 + rm -Rf $(DESTDIR)$(libdir)/$(PACKAGE) 35.17 +@@ -276,7 +278,7 @@ 35.18 + 35.19 + rebuild_libs: RPATH+=$(libdir)/$(PACKAGE) 35.20 + rebuild_libs: LIBDIR=$(libdir)/$(PACKAGE) 35.21 +-rebuild_libs: clean_libs $(LIBS_WITH_RPATH) 35.22 ++rebuild_libs: $(LIBS_WITH_RPATH) 35.23 + 35.24 + uninstall:: 35.25 + rm -Rf $(dstdir)/$(PACKAGE)
36.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 36.2 +++ b/amsn/stuff/patches/amsn-v4l2.patch Mon Jun 19 04:02:32 2017 +0300 36.3 @@ -0,0 +1,43 @@ 36.4 +--- a/configure.ac 2012-05-23 21:21:14.000000000 +0200 36.5 ++++ b/configure.ac 2012-06-02 12:29:24.836921683 +0200 36.6 +@@ -378,6 +378,10 @@ 36.7 + AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux) 36.8 + fi 36.9 + 36.10 ++if test "$FOUND_OS" = "linux"; then 36.11 ++ AC_CHECK_HEADERS(linux/videodev2.h) 36.12 ++fi 36.13 ++ 36.14 + #--------------------------------------------------------------------------------------------- 36.15 + 36.16 + dnl --------------------------------------------------------------------- 36.17 +--- a/utils/linux/capture/capture.h 2011-04-12 02:20:59.000000000 +0200 36.18 ++++ b/utils/linux/capture/capture.h 2012-06-02 12:29:24.836921683 +0200 36.19 +@@ -34,7 +34,11 @@ 36.20 + #ifdef HAVE_SYS_VIDEODEV2_H 36.21 + # include <sys/videodev2.h> 36.22 + #else 36.23 +-# include <linux/videodev.h> 36.24 ++ #ifdef HAVE_LINUX_VIDEODEV2_H 36.25 ++ #include <linux/videodev2.h> 36.26 ++ #else 36.27 ++ #include <linux/videodev.h> 36.28 ++ #endif 36.29 + #endif 36.30 + */ 36.31 + 36.32 +--- a/utils/linux/capture/libng/plugins/Rules.mk 2012-05-18 17:31:32.000000000 +0200 36.33 ++++ b/utils/linux/capture/libng/plugins/Rules.mk 2012-06-02 12:51:59.523065502 +0200 36.34 +@@ -2,6 +2,13 @@ 36.35 + TARGETS-plugins := $(capture_dir)/libng/plugins/conv-mjpeg.so 36.36 + TARGETS-plugins += $(patsubst %,$(capture_dir)/libng/plugins/%.so,${LIBNG_PLUGINS}) 36.37 + 36.38 ++plugin_link_so = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(capture_dir)/capture.so $(SHARED) -o $@ 36.39 ++ifeq ($(verbose),no) 36.40 ++ echo_plugin_link_so = echo " LDP " $@ 36.41 ++else 36.42 ++ echo_plugin_link_so = echo $(plugin_link_so) 36.43 ++endif 36.44 ++ 36.45 + # global targets 36.46 + all:: $(TARGETS-plugins)
37.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 37.2 +++ b/amsn/stuff/patches/series Mon Jun 19 04:02:32 2017 +0300 37.3 @@ -0,0 +1,2 @@ 37.4 +amsn-v4l2.patch 37.5 +amsn-0.98.9-no-rebuild-on-install.patch
38.1 --- a/desktop-file-utils/receipt Sun Jun 18 04:38:10 2017 +0300 38.2 +++ b/desktop-file-utils/receipt Mon Jun 19 04:02:32 2017 +0300 38.3 @@ -12,26 +12,39 @@ 38.4 WGET_URL="https://www.freedesktop.org/software/desktop-file-utils/releases/$TARBALL" 38.5 38.6 BUILD_DEPENDS="pkg-config glib-dev" 38.7 -SPLIT="desktop-file-utils-extra" 38.8 +SPLIT="desktop-file-validate-static desktop-file-utils-extra" 38.9 38.10 # Rules to configure and make the package. 38.11 compile_rules() 38.12 { 38.13 - ./configure $CONFIGURE_ARGS && make && make install 38.14 + ./configure $CONFIGURE_ARGS && make && make install && 38.15 + 38.16 + make clean && 38.17 + ./configure \ 38.18 + LDFLAGS='-static -pthread' \ 38.19 + --bindir=/usr/sbin \ 38.20 + $CONFIGURE_ARGS && 38.21 + make && make bin_PROGRAMS=desktop-file-validate LN_S=echo install 38.22 } 38.23 38.24 # Rules to gen a SliTaz package suitable for Tazpkg. 38.25 genpkg_rules() 38.26 { 38.27 + val='desktop-file-validate' 38.28 case $PACKAGE in 38.29 desktop-file-utils) 38.30 - copy update-desktop-database 38.31 - DEPENDS="glib glibc-base pcre" 38.32 + copy bin/update-desktop-database 38.33 + DEPENDS="glib" 38.34 ;; 38.35 - desktop-file-utils-extra) 38.36 - copy desktop-file-edit desktop-file-install desktop-file-validate 38.37 - DEPENDS="glib glibc-base pcre" 38.38 - CAT="system-tools|extra desktop file utils" 38.39 + *-static) 38.40 + copy sbin/ 38.41 + CAT="system tools|static desktop-file-validate" 38.42 + DEPENDS=" " 38.43 + ;; 38.44 + *-extra) 38.45 + copy @std; remove_already_packed 38.46 + CAT="system-tools|extra utils" 38.47 + DEPENDS="glib" 38.48 ;; 38.49 esac 38.50 }
39.1 --- a/glib/receipt Sun Jun 18 04:38:10 2017 +0300 39.2 +++ b/glib/receipt Mon Jun 19 04:02:32 2017 +0300 39.3 @@ -25,6 +25,7 @@ 39.4 ./configure \ 39.5 --sysconfdir=/etc \ 39.6 --with-pcre=system \ 39.7 + --enable-static \ 39.8 $CONFIGURE_ARGS ;; 39.9 arm*) 39.10 # Native ARM build --> if ARCH != SLITAZ_ARCH ?
40.1 --- a/libIDL/receipt Sun Jun 18 04:38:10 2017 +0300 40.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 40.3 @@ -1,35 +0,0 @@ 40.4 -# SliTaz package receipt. 40.5 - 40.6 -PACKAGE="libIDL" 40.7 -VERSION="0.8.14" 40.8 -CATEGORY="development" 40.9 -SHORT_DESC="IDL Compiling Library." 40.10 -MAINTAINER="pankso@slitaz.org" 40.11 -LICENSE="LGPL2" 40.12 -TARBALL="$PACKAGE-$VERSION.tar.bz2" 40.13 -WEB_SITE="http://andrewtv.org/libIDL/" 40.14 -WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 40.15 -CROSS="bug: can not run test program" 40.16 - 40.17 -DEPENDS="glib" 40.18 -BUILD_DEPENDS="bison flex glib-dev pkg-config" 40.19 - 40.20 -# Rules to configure and make the package. 40.21 -compile_rules() 40.22 -{ 40.23 - cd $src 40.24 - ./configure \ 40.25 - --cache-file=config.cache \ 40.26 - --build=$HOST_SYSTEM \ 40.27 - --host=$HOST_SYSTEM && 40.28 - make && make install 40.29 -} 40.30 - 40.31 -# Rules to gen a SliTaz package suitable for Tazpkg. 40.32 -genpkg_rules() 40.33 -{ 40.34 - mkdir -p $fs/usr 40.35 - cp -a $install/usr/lib $fs/usr 40.36 - cp -a $install/usr/bin $fs/usr 40.37 - cp -a $install/usr/include $fs/usr 40.38 -}
41.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 41.2 +++ b/libidl/receipt Mon Jun 19 04:02:32 2017 +0300 41.3 @@ -0,0 +1,33 @@ 41.4 +# SliTaz package receipt v2. 41.5 + 41.6 +PACKAGE="libidl" 41.7 +VERSION="0.8.14" 41.8 +CATEGORY="development" 41.9 +SHORT_DESC="IDL Compiling Library" 41.10 +MAINTAINER="pankso@slitaz.org" 41.11 +LICENSE="LGPL2" 41.12 +WEB_SITE="https://github.com/GNOME/libIDL" 41.13 +CROSS="bug: can not run test program" 41.14 + 41.15 +TARBALL="libIDL-$VERSION.tar.bz2" 41.16 +WGET_URL="$GNOME_MIRROR/libIDL/${VERSION%.*}/$TARBALL" 41.17 + 41.18 +BUILD_DEPENDS="bison flex glib-dev pkg-config" 41.19 + 41.20 +# Rules to configure and make the package. 41.21 +compile_rules() 41.22 +{ 41.23 + ./configure \ 41.24 + --cache-file=config.cache \ 41.25 + --build=$HOST_SYSTEM \ 41.26 + --host=$HOST_SYSTEM && 41.27 + make && make install 41.28 +} 41.29 + 41.30 +# Rules to gen a SliTaz package suitable for Tazpkg. 41.31 +genpkg_rules() 41.32 +{ 41.33 + copy @std @dev 41.34 + PROVIDE="libIDL" 41.35 + DEPENDS="glib-dev pcre-dev" 41.36 +}
42.1 --- a/nspr-dev/receipt Sun Jun 18 04:38:10 2017 +0300 42.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 42.3 @@ -1,22 +0,0 @@ 42.4 -# SliTaz package receipt. 42.5 - 42.6 -PACKAGE="nspr-dev" 42.7 -VERSION="4.10.8" 42.8 -CATEGORY="development" 42.9 -SHORT_DESC="nspr devel library." 42.10 -MAINTAINER="slaxemulator@gmail.com" 42.11 -LICENSE="MPL2" 42.12 -WANTED="nspr" 42.13 -WEB_SITE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" 42.14 - 42.15 -DEPENDS="nspr pkg-config" 42.16 - 42.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 42.18 -genpkg_rules() 42.19 -{ 42.20 - mkdir -p $fs/usr/bin $fs/usr/lib $fs/usr/share 42.21 - cp -a $install/usr/include $fs/usr 42.22 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 42.23 - cp -a $install/usr/share/aclocal $fs/usr/share 42.24 - cp -a $install/usr/bin/nspr-config $fs/usr/bin/nspr-config 42.25 -}
43.1 --- a/nspr/receipt Sun Jun 18 04:38:10 2017 +0300 43.2 +++ b/nspr/receipt Mon Jun 19 04:02:32 2017 +0300 43.3 @@ -1,38 +1,39 @@ 43.4 -# SliTaz package receipt. 43.5 +# SliTaz package receipt v2. 43.6 43.7 PACKAGE="nspr" 43.8 -VERSION="4.10.8" 43.9 +VERSION="4.13.1" 43.10 CATEGORY="utilities" 43.11 SHORT_DESC="Netscape Portable Runtime" 43.12 MAINTAINER="rocky@slitaz.org" 43.13 LICENSE="MPL2" 43.14 -TARBALL="$PACKAGE-$VERSION.tar.gz" 43.15 WEB_SITE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" 43.16 -WGET_URL="http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${VERSION}/src/${TARBALL}" 43.17 43.18 -DEPENDS="glibc-base" 43.19 +TARBALL="nspr-$VERSION.tar.gz" 43.20 +WGET_URL="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$VERSION/src/$TARBALL" 43.21 + 43.22 BUILD_DEPENDS="perl" 43.23 +SPLIT="nspr-dev" 43.24 43.25 # Rules to configure and make the package. 43.26 compile_rules() 43.27 { 43.28 - cd $src/nspr 43.29 + cd nspr && 43.30 + sed -ri 's#^(RELEASE_BINS =).*#\1#' pr/src/misc/Makefile.in && 43.31 + sed -i 's#$(LIBRARY) ##' config/rules.mk && 43.32 + 43.33 ./configure \ 43.34 - --prefix=/usr \ 43.35 - --libdir=/usr/lib \ 43.36 - --includedir=/usr/include/nspr \ 43.37 - --enable-optimize \ 43.38 - --disable-debug \ 43.39 --with-mozilla \ 43.40 --with-pthreads \ 43.41 $([ $(uname -m) = x86_64 ] && echo --enable-64bit) \ 43.42 $CONFIGURE_ARGS && 43.43 - make && make DESTDIR=$DESTDIR install 43.44 + make && make install 43.45 } 43.46 43.47 # Rules to gen a SliTaz package suitable for Tazpkg. 43.48 genpkg_rules() 43.49 { 43.50 - mkdir -p $fs/usr/lib 43.51 - cp -a $install/usr/lib/*so* $fs/usr/lib 43.52 + case $PACKAGE in 43.53 + nspr) copy @std;; 43.54 + *-dev) copy @dev;; 43.55 + esac 43.56 }
44.1 --- a/nspr/stuff/nspr.pc.in Sun Jun 18 04:38:10 2017 +0300 44.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 44.3 @@ -1,10 +0,0 @@ 44.4 -prefix=%prefix% 44.5 -exec_prefix=%exec_prefix% 44.6 -libdir=%libdir% 44.7 -includedir=%includedir% 44.8 - 44.9 -Name: NSPR 44.10 -Description: The Netscape Portable Runtime 44.11 -Version: %NSPR_VERSION% 44.12 -Libs: %FULL_NSPR_LIBS% 44.13 -Cflags: %FULL_NSPR_CFLAGS%
45.1 --- a/optipng/receipt Sun Jun 18 04:38:10 2017 +0300 45.2 +++ b/optipng/receipt Mon Jun 19 04:02:32 2017 +0300 45.3 @@ -24,9 +24,9 @@ 45.4 LDFLAGS='-static' \ 45.5 ./configure \ 45.6 -prefix=/usr \ 45.7 + -bindir=/usr/sbin \ 45.8 -with-system-libpng && 45.9 make && make install && 45.10 - mv -v $install/usr/bin/optipng $install/usr/bin/optipng-static && 45.11 45.12 # make dynamically linked binary 45.13 make clean && 45.14 @@ -41,13 +41,12 @@ 45.15 { 45.16 case $PACKAGE in 45.17 optipng) 45.18 - copy optipng 45.19 + copy bin/optipng 45.20 DEPENDS="libpng16 zlib" 45.21 ;; 45.22 optipng-static) 45.23 - copy optipng-static 45.24 - ln -s optipng-static $fs/usr/bin/optipng 45.25 - CAT="graphics|statically linked" 45.26 + copy sbin/optipng 45.27 + CAT="graphics|static binary" 45.28 PROVIDE="optipng" 45.29 DEPENDS=" " 45.30 ;;
46.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 46.2 +++ b/orbit2/receipt Mon Jun 19 04:02:32 2017 +0300 46.3 @@ -0,0 +1,46 @@ 46.4 +# SliTaz package receipt v2. 46.5 + 46.6 +PACKAGE="orbit2" 46.7 +VERSION="2.14.19" 46.8 +CATEGORY="development" 46.9 +SHORT_DESC="A CORBA 2.4-compliant Object Request Broker (ORB) - deprecated" 46.10 +MAINTAINER="rcx@zoominternet.net" 46.11 +LICENSE="GPL2" 46.12 +WEB_SITE="https://projects.gnome.org/ORBit2/" 46.13 +CROSS="bug: Could not check for borked linking while cross-compiling" 46.14 + 46.15 +TARBALL="ORBit2-$VERSION.tar.bz2" 46.16 +WGET_URL="$GNOME_MIRROR/ORBit2/${VERSION%.*}/$TARBALL" 46.17 + 46.18 +BUILD_DEPENDS="glib-dev dbus-dev dbus-glib-dev libidl pkg-config" 46.19 +SPLIT="orbit2-dev" 46.20 + 46.21 +# Rules to configure and make the package. 46.22 +compile_rules() 46.23 +{ 46.24 + sed -i 's/-DG_DISABLE_DEPRECATED//' linc2/src/Makefile* 46.25 + 46.26 + ./configure \ 46.27 + --prefix=/usr \ 46.28 + --build=$HOST_SYSTEM \ 46.29 + --host=$HOST_SYSTEM && 46.30 + make && make install 46.31 +} 46.32 + 46.33 +# Rules to gen a SliTaz package suitable for Tazpkg. 46.34 +genpkg_rules() 46.35 +{ 46.36 + case $PACKAGE in 46.37 + orbit2) 46.38 + copy @std 46.39 + rm -r $fs/usr/share 46.40 + DEPENDS="glib libffi libidl pcre dbus dbus-glib" 46.41 + PROVIDE="ORBit2" 46.42 + ;; 46.43 + *-dev) 46.44 + copy @dev *.idl 46.45 + DEPENDS="orbit2 glib-dev libffi-dev pcre-dev" 46.46 + PROVIDE="ORBit2-dev" 46.47 + ;; 46.48 + esac 46.49 +}
47.1 --- a/pngquant/receipt Sun Jun 18 04:38:10 2017 +0300 47.2 +++ b/pngquant/receipt Mon Jun 19 04:02:32 2017 +0300 47.3 @@ -27,11 +27,11 @@ 47.4 mv $src/ImageOptim-*/* $src/lib/ 47.5 47.6 # make statically linked binary 47.7 - LDFLAGS='-static -pthread' \ 47.8 ./configure \ 47.9 - --prefix=/usr && 47.10 - make && make install && 47.11 - mv -v $install/usr/bin/pngquant $install/usr/bin/pngquant-static && 47.12 + LDFLAGS='-static -pthread' \ 47.13 + --prefix=/usr \ 47.14 + --with-openmp=static && 47.15 + make && make BINPREFIX=$install/usr/sbin install && 47.16 47.17 # make dynamically linked binary 47.18 ./configure \ 47.19 @@ -44,13 +44,12 @@ 47.20 { 47.21 case $PACKAGE in 47.22 pngquant) 47.23 - copy pngquant 47.24 + copy bin/pngquant 47.25 DEPENDS="lcms2 libpng16 zlib" 47.26 ;; 47.27 pngquant-static) 47.28 - copy pngquant-static 47.29 - ln -s pngquant-static $fs/usr/bin/pngquant 47.30 - CAT="graphics|statically linked" 47.31 + copy sbin/pngquant 47.32 + CAT="graphics|static binary" 47.33 PROVIDE="pngquant" 47.34 DEPENDS=" " 47.35 ;;