diff options
Diffstat (limited to 'packages')
74 files changed, 556 insertions, 58 deletions
diff --git a/packages/busybox/busybox-static_1.2.1.bb b/packages/busybox/busybox-static_1.2.1.bb index e51bb86da0..abc127ad93 100644 --- a/packages/busybox/busybox-static_1.2.1.bb +++ b/packages/busybox/busybox-static_1.2.1.bb @@ -1,5 +1,4 @@ require busybox_${PV}.bb -PR = "r2" S = "${WORKDIR}/busybox-1.2.1" diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc index 0fb3b5efff..04decf61b2 100644 --- a/packages/busybox/busybox.inc +++ b/packages/busybox/busybox.inc @@ -32,7 +32,10 @@ SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1" export EXTRA_CFLAGS = "${CFLAGS}" EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}" PACKAGES =+ "${PN}-httpd ${PN}-udhcpd" - +# We need this RRECOMMENDS because libc dlopens libgcc +# and shlib mechanism can not detect it because its not +# listed in the NEEDED field. +RDEPENDS += "libgcc" FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" diff --git a/packages/busybox/busybox_1.11.1.bb b/packages/busybox/busybox_1.11.1.bb index 945ab7f718..e170a20512 100644 --- a/packages/busybox/busybox_1.11.1.bb +++ b/packages/busybox/busybox_1.11.1.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r1" +PR = "r2" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb index 1accc790a2..4ef3cfeb66 100644 --- a/packages/busybox/busybox_1.2.1.bb +++ b/packages/busybox/busybox_1.2.1.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r16" +PR = "r17" SRC_URI += "file://wget-long-options.patch;patch=1 \ file://df_rootfs.patch;patch=1 \ diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb index fbf05e7182..14379a5da6 100644 --- a/packages/busybox/busybox_1.2.2.bb +++ b/packages/busybox/busybox_1.2.2.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb index 1eea1edea2..31a2f1abe7 100644 --- a/packages/busybox/busybox_1.3.1.bb +++ b/packages/busybox/busybox_1.3.1.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb index 75f59cf932..53304df387 100644 --- a/packages/busybox/busybox_1.7.2.bb +++ b/packages/busybox/busybox_1.7.2.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r8" +PR = "r9" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://busybox-cron \ diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb index 5da0f03093..c9440e7b4f 100644 --- a/packages/busybox/busybox_1.9.2.bb +++ b/packages/busybox/busybox_1.9.2.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r0" +PR = "r1" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://udhcpscript.patch;patch=1 \ diff --git a/packages/busybox/slingbox_1.3.1.bb b/packages/busybox/slingbox_1.3.1.bb index a680efc843..cbcce6c675 100644 --- a/packages/busybox/slingbox_1.3.1.bb +++ b/packages/busybox/slingbox_1.3.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r2" +PR = "r3" COMPATIBLE_MACHINE = "nslu2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ diff --git a/packages/eglibc/eglibc.inc b/packages/eglibc/eglibc.inc index 0309a7f1b2..e91ddaa40e 100644 --- a/packages/eglibc/eglibc.inc +++ b/packages/eglibc/eglibc.inc @@ -11,10 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" -# We need this RRECOMMENDS because libc dlopens libgcc -# and shlib mechanism can not detect it because its not -# listed in the NEEDED field. -RRECOMMENDS += "libgcc" inherit autotools LEAD_SONAME = "libc.so" diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb index 3e8a5a0c99..a47e94ef2e 100644 --- a/packages/eglibc/eglibc_svn.bb +++ b/packages/eglibc/eglibc_svn.bb @@ -3,7 +3,7 @@ require eglibc.inc # DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.8+svnr${SRCREV}" -PR = "r8" +PR = "r9" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ file://etc/ld.so.conf \ diff --git a/packages/expat/expat-1.95.7/expat-XMLCALL.patch b/packages/expat/expat-1.95.7/expat-XMLCALL.patch new file mode 100644 index 0000000000..c688f06426 --- /dev/null +++ b/packages/expat/expat-1.95.7/expat-XMLCALL.patch @@ -0,0 +1,17 @@ +--- + lib/expat.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: expat-1.95.7/lib/expat.h +=================================================================== +--- expat-1.95.7.orig/lib/expat.h 2008-07-31 15:56:39.000000000 -0700 ++++ expat-1.95.7/lib/expat.h 2008-07-31 15:58:38.000000000 -0700 +@@ -45,7 +45,7 @@ + #ifndef XMLCALL + #if defined(XML_USE_MSC_EXTENSIONS) + #define XMLCALL __cdecl +-#elif defined(__GNUC__) ++#elif defined(__GNUC__) && defined(__i386) && !defined(__INTEL_COMPILER) + #define XMLCALL __attribute__((cdecl)) + #else + /* For any platform which uses this definition and supports more than diff --git a/packages/expat/expat_1.95.7.bb b/packages/expat/expat_1.95.7.bb index a4dda4dcb6..7b48305933 100644 --- a/packages/expat/expat_1.95.7.bb +++ b/packages/expat/expat_1.95.7.bb @@ -1,7 +1,9 @@ require expat.inc -PR = "r1" +PR = "r2" -SRC_URI += "file://autotools.patch;patch=1" +SRC_URI += "file://autotools.patch;patch=1 \ + file://expat-XMLCALL.patch;patch=1 \ + " inherit lib_package diff --git a/packages/gcc/gcc-cross-intermediate.inc b/packages/gcc/gcc-cross-intermediate.inc index 4fa12886f1..de260ed981 100644 --- a/packages/gcc/gcc-cross-intermediate.inc +++ b/packages/gcc/gcc-cross-intermediate.inc @@ -16,6 +16,13 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ ${@get_gcc_fpu_setting(bb, d)}" +do_stage_prepend () { + # get rid of dummy libc.so + if [ -z "`file ${STAGING_DIR_TARGET}${layout_libdir}/libc.so | grep "ASCII C program text"`" ]; then + rm -rf ${STAGING_DIR_TARGET}${layout_libdir}/libc.so + fi +} + do_install () { : } diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc index e8d56c2a42..8f9b34b252 100644 --- a/packages/glibc/glibc.inc +++ b/packages/glibc/glibc.inc @@ -7,8 +7,6 @@ LICENSE = "LGPL" DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" #this leads to circular deps, so lets not add it yet #RDEPENDS_ldd += " bash" -# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this -RRECOMMENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 2d37d5cf7f..3e57d857ae 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r17" +PR = "r18" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index 7bb7cf5e43..c53c2dd620 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r28" +PR = "r29" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 22fa33ec44..05b46ba2e9 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r17" +PR = "r18" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index 89dd366c86..a2492f6801 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r13" +PR = "r14" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index 3d21504842..16525029da 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -3,7 +3,7 @@ require glibc.inc DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r13" +PR = "r14" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index fdb9ad1519..bd394921b9 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r11" +PR = "r12" GLIBC_ADDONS ?= "linuxthreads" diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index 1b527fbc10..2908baf4cb 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r14" +PR = "r15" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index e00836b7be..54a1654404 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -2,7 +2,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r20" +PR = "r21" #Doesnt build for sh3 DEFAULT_PREFERENCE_sh3="-1" diff --git a/packages/glibc/glibc_2.3.6.bb b/packages/glibc/glibc_2.3.6.bb index 31a06de9cd..edf15cab61 100644 --- a/packages/glibc/glibc_2.3.6.bb +++ b/packages/glibc/glibc_2.3.6.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r2" +PR = "r3" #FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}" diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 62a4e36768..17cebf8921 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -1,6 +1,6 @@ require glibc.inc -PR = "r18" +PR = "r19" #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)' diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index c58561a679..701556d35a 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -1,5 +1,5 @@ require glibc.inc -PR = "r15" +PR = "r16" ARM_INSTRUCTION_SET = "arm" diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb index 8d38c4890d..60eb071032 100644 --- a/packages/glibc/glibc_2.6.1.bb +++ b/packages/glibc/glibc_2.6.1.bb @@ -1,5 +1,5 @@ require glibc.inc -PR = "r9" +PR = "r10" ARM_INSTRUCTION_SET = "arm" diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb index 8c82203024..0e5a96234b 100644 --- a/packages/glibc/glibc_2.7.bb +++ b/packages/glibc/glibc_2.7.bb @@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev" -PR = "r5" +PR = "r6" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index 14de0300cf..186c7d6be7 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -1,7 +1,7 @@ require glibc.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" -PR = "r10" +PR = "r11" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" diff --git a/packages/gpe-scap/gpe-scap_1.3.bb b/packages/gpe-scap/gpe-scap_1.3.bb index 438a80f4a3..c90bfd075d 100644 --- a/packages/gpe-scap/gpe-scap_1.3.bb +++ b/packages/gpe-scap/gpe-scap_1.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GPE screenshot application" LICENSE = "GPL" PRIORITY = "optional" SECTION = "gpe" -PR = "r0" +PR = "r1" RREPLACES = "gpe-screenshot" diff --git a/packages/qt4/qt-embedded-4.4.0/.mtn2git_empty b/packages/oneko/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt4/qt-embedded-4.4.0/.mtn2git_empty +++ b/packages/oneko/.mtn2git_empty diff --git a/packages/qt4/qt4-x11-free-4.4.0/.mtn2git_empty b/packages/oneko/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/.mtn2git_empty +++ b/packages/oneko/files/.mtn2git_empty diff --git a/packages/oneko/files/kill-oneko.desktop b/packages/oneko/files/kill-oneko.desktop new file mode 100644 index 0000000000..54f7f16334 --- /dev/null +++ b/packages/oneko/files/kill-oneko.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Kill oneko +Comment=Kills cute cat chasing mouse cursor +Icon=kill-oneko.png +Exec=killall oneko +Type=Application +Categories=Game;Amusement; +Terminal=false + diff --git a/packages/oneko/files/kill-oneko.png b/packages/oneko/files/kill-oneko.png Binary files differnew file mode 100644 index 0000000000..136265245d --- /dev/null +++ b/packages/oneko/files/kill-oneko.png diff --git a/packages/oneko/files/oneko.desktop b/packages/oneko/files/oneko.desktop new file mode 100644 index 0000000000..b2c78ff325 --- /dev/null +++ b/packages/oneko/files/oneko.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Oneko +Comment=Cute cat chasing around your mouse cursor. +Icon=oneko.png +Exec=/usr/bin/oneko +Type=Application +Categories=Game;Amusement; +Terminal=false + diff --git a/packages/oneko/files/oneko.png b/packages/oneko/files/oneko.png Binary files differnew file mode 100644 index 0000000000..8980e0e990 --- /dev/null +++ b/packages/oneko/files/oneko.png diff --git a/packages/oneko/files/remove-bsd-daemon-logo.patch b/packages/oneko/files/remove-bsd-daemon-logo.patch new file mode 100644 index 0000000000..7c0415593c --- /dev/null +++ b/packages/oneko/files/remove-bsd-daemon-logo.patch @@ -0,0 +1,250 @@ +--- oneko-1.2.sakura.5.orig/cursors/cursor.include ++++ oneko-1.2.sakura.5/cursors/cursor.include +@@ -2,8 +2,6 @@ + #include "mouse_cursor_mask.xbm" + #include "bone_cursor.xbm" + #include "bone_cursor_mask.xbm" +-#include "bsd_cursor.xbm" +-#include "bsd_cursor_mask.xbm" + #include "card_cursor.xbm" + #include "card_cursor_mask.xbm" + #include "petal_cursor.xbm" +--- oneko-1.2.sakura.5.orig/oneko.h ++++ oneko-1.2.sakura.5/oneko.h +@@ -36,7 +36,6 @@ + #include "bitmaps/neko/neko.include" + #include "bitmaps/tora/tora.include" + #include "bitmaps/dog/dog.include" +-#include "bitmaps/bsd/bsd.include" + #include "bitmaps/sakura/sakura.include" + #include "bitmaps/tomoyo/tomoyo.include" + +@@ -44,7 +43,6 @@ + + #include "bitmasks/neko/neko.mask.include" + #include "bitmasks/dog/dog.mask.include" +-#include "bitmasks/bsd/bsd.mask.include" + #include "bitmasks/sakura/sakura.mask.include" + #include "bitmasks/tomoyo/tomoyo.mask.include" + +--- oneko-1.2.sakura.5.orig/oneko.c ++++ oneko-1.2.sakura.5/oneko.c +@@ -33,7 +33,7 @@ + + int Synchronous = False; + /* Types of animals */ +-#define BITMAPTYPES 6 ++#define BITMAPTYPES 5 + typedef struct _AnimalDefaults { + char *name; + int speed, idle, bitmap_width, bitmap_height; +@@ -51,8 +51,6 @@ + mouse_cursor_width,mouse_cursor_height, mouse_cursor_x_hot,mouse_cursor_y_hot }, + { "dog" , 10, 6, 32, 32, 125000L, 0, 0, bone_cursor_bits,bone_cursor_mask_bits, + bone_cursor_width,bone_cursor_height, bone_cursor_x_hot,bone_cursor_y_hot }, +- { "bsd_daemon" , 16, 6, 32, 32, 300000L, 22, 20, bsd_cursor_bits,bsd_cursor_mask_bits, +- bsd_cursor_width,bsd_cursor_height, bsd_cursor_x_hot,bsd_cursor_y_hot }, + { "sakura" , 13, 6, 32, 32, 125000L, 0, 0, card_cursor_bits,card_cursor_mask_bits, + card_cursor_width,card_cursor_height, card_cursor_x_hot,card_cursor_y_hot }, + { "tomoyo" , 10, 6, 32, 32, 125000L, 32, 32, petal_cursor_bits,petal_cursor_mask_bits, +@@ -154,70 +152,70 @@ + + BitmapGCData BitmapGCDataTable[] = + { +- { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, mati2_dog_bits, mati2_bsd_bits, mati2_sakura_bits, mati2_tomoyo_bits, +- &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits, mati2_bsd_mask_bits, mati2_sakura_mask_bits, mati2_tomoyo_mask_bits }, +- { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, jare2_dog_bits, jare2_bsd_bits, jare2_sakura_bits, jare2_tomoyo_bits, +- &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits, jare2_bsd_mask_bits, jare2_sakura_mask_bits, jare2_tomoyo_mask_bits }, +- { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, kaki1_bsd_bits, kaki1_sakura_bits, kaki1_tomoyo_bits, +- &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits, kaki1_bsd_mask_bits, kaki1_sakura_mask_bits, kaki1_tomoyo_mask_bits }, +- { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, kaki2_bsd_bits, kaki2_sakura_bits, kaki2_tomoyo_bits, +- &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits, kaki2_bsd_mask_bits, kaki2_sakura_mask_bits, kaki2_tomoyo_mask_bits }, +- { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, mati3_dog_bits, mati3_bsd_bits, mati3_sakura_bits, mati3_tomoyo_bits, +- &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits, mati3_bsd_mask_bits, mati3_sakura_mask_bits, mati3_tomoyo_mask_bits }, +- { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, sleep1_bsd_bits, sleep1_sakura_bits, sleep1_tomoyo_bits, +- &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits, sleep1_bsd_mask_bits, sleep1_sakura_mask_bits, sleep1_tomoyo_mask_bits }, +- { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, sleep2_bsd_bits, sleep2_sakura_bits, sleep2_tomoyo_bits, +- &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits, sleep2_bsd_mask_bits, sleep2_sakura_mask_bits, sleep2_tomoyo_mask_bits }, +- { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, awake_dog_bits, awake_bsd_bits, awake_sakura_bits, awake_tomoyo_bits, +- &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits, awake_bsd_mask_bits, awake_sakura_mask_bits, awake_tomoyo_mask_bits }, +- { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, up1_bsd_bits, up1_sakura_bits, up1_tomoyo_bits, +- &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, up1_bsd_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits }, +- { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, up2_bsd_bits, up2_sakura_bits, up2_tomoyo_bits, +- &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, up2_bsd_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits }, +- { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, down1_dog_bits, down1_bsd_bits, down1_sakura_bits, down1_tomoyo_bits, +- &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits, down1_bsd_mask_bits, down1_sakura_mask_bits, down1_tomoyo_mask_bits }, +- { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, down2_dog_bits, down2_bsd_bits, down2_sakura_bits, down2_tomoyo_bits, +- &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits, down2_bsd_mask_bits, down2_sakura_mask_bits, down2_tomoyo_mask_bits }, +- { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, left1_dog_bits, left1_bsd_bits, left1_sakura_bits, left1_tomoyo_bits, +- &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits, left1_bsd_mask_bits, left1_sakura_mask_bits, left1_tomoyo_mask_bits }, +- { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, left2_dog_bits, left2_bsd_bits, left2_sakura_bits, left2_tomoyo_bits, +- &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits, left2_bsd_mask_bits, left2_sakura_mask_bits, left2_tomoyo_mask_bits }, +- { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, right1_dog_bits, right1_bsd_bits, right1_sakura_bits, right1_tomoyo_bits, +- &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits, right1_bsd_mask_bits, right1_sakura_mask_bits, right1_tomoyo_mask_bits }, +- { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, right2_dog_bits, right2_bsd_bits, right2_sakura_bits, right2_tomoyo_bits, +- &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits, right2_bsd_mask_bits, right2_sakura_mask_bits, right2_tomoyo_mask_bits }, +- { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, upleft1_bsd_bits, upleft1_sakura_bits, upleft1_tomoyo_bits, +- &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits, upleft1_bsd_mask_bits, upleft1_sakura_mask_bits, upleft1_tomoyo_mask_bits }, +- { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, upleft2_bsd_bits, upleft2_sakura_bits, upleft2_tomoyo_bits, +- &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits, upleft2_bsd_mask_bits, upleft2_sakura_mask_bits, upleft2_tomoyo_mask_bits }, +- { &UpRight1GC, &UpRight1Xbm, upright1_bits, upright1_tora_bits, upright1_dog_bits, upright1_bsd_bits, upright1_sakura_bits, upright1_tomoyo_bits, +- &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits, upright1_bsd_mask_bits, upright1_sakura_mask_bits, upright1_tomoyo_mask_bits }, +- { &UpRight2GC, &UpRight2Xbm, upright2_bits, upright2_tora_bits, upright2_dog_bits, upright2_bsd_bits, upright2_sakura_bits, upright2_tomoyo_bits, +- &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits, upright2_bsd_mask_bits, upright2_sakura_mask_bits, upright2_tomoyo_mask_bits }, +- { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, dwleft1_bsd_bits, dwleft1_sakura_bits, dwleft1_tomoyo_bits, +- &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits, dwleft1_bsd_mask_bits, dwleft1_sakura_mask_bits, dwleft1_tomoyo_mask_bits }, +- { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, dwleft2_bsd_bits, dwleft2_sakura_bits, dwleft2_tomoyo_bits, +- &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits, dwleft2_bsd_mask_bits, dwleft2_sakura_mask_bits, dwleft2_tomoyo_mask_bits }, +- { &DownRight1GC, &DownRight1Xbm, dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, dwright1_bsd_bits, dwright1_sakura_bits, dwright1_tomoyo_bits, +- &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits, dwright1_bsd_mask_bits, dwright1_sakura_mask_bits, dwright1_tomoyo_mask_bits }, +- { &DownRight2GC, &DownRight2Xbm, dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, dwright2_bsd_bits, dwright2_sakura_bits, dwright2_tomoyo_bits, +- &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits, dwright2_bsd_mask_bits, dwright2_sakura_mask_bits, dwright2_tomoyo_mask_bits }, +- { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, utogi1_bsd_bits, utogi1_sakura_bits, utogi1_tomoyo_bits, +- &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits, utogi1_bsd_mask_bits, utogi1_sakura_mask_bits, utogi1_tomoyo_mask_bits }, +- { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, utogi2_bsd_bits, utogi2_sakura_bits, utogi2_tomoyo_bits, +- &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits, utogi2_bsd_mask_bits, utogi2_sakura_mask_bits, utogi2_tomoyo_mask_bits }, +- { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, dtogi1_bsd_bits, dtogi1_sakura_bits, dtogi1_tomoyo_bits, +- &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits, dtogi1_bsd_mask_bits, dtogi1_sakura_mask_bits, dtogi1_tomoyo_mask_bits }, +- { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, dtogi2_bsd_bits, dtogi2_sakura_bits, dtogi2_tomoyo_bits, +- &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits, dtogi2_bsd_mask_bits, dtogi2_sakura_mask_bits, dtogi2_tomoyo_mask_bits }, +- { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ltogi1_bsd_bits, ltogi1_sakura_bits, ltogi1_tomoyo_bits, +- &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits, ltogi1_bsd_mask_bits, ltogi1_sakura_mask_bits, ltogi1_tomoyo_mask_bits }, +- { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ltogi2_bsd_bits, ltogi2_sakura_bits, ltogi2_tomoyo_bits, +- &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits, ltogi2_bsd_mask_bits, ltogi2_sakura_mask_bits, ltogi2_tomoyo_mask_bits }, +- { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, rtogi1_bsd_bits, rtogi1_sakura_bits, rtogi1_tomoyo_bits, +- &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits, rtogi1_bsd_mask_bits, rtogi1_sakura_mask_bits, rtogi1_tomoyo_mask_bits }, +- { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, rtogi2_bsd_bits, rtogi2_sakura_bits, rtogi2_tomoyo_bits, +- &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits, rtogi2_bsd_mask_bits, rtogi2_sakura_mask_bits, rtogi2_tomoyo_mask_bits }, ++ { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, mati2_dog_bits, mati2_sakura_bits, mati2_tomoyo_bits, ++ &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits, mati2_sakura_mask_bits, mati2_tomoyo_mask_bits }, ++ { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, jare2_dog_bits, jare2_sakura_bits, jare2_tomoyo_bits, ++ &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits, jare2_sakura_mask_bits, jare2_tomoyo_mask_bits }, ++ { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, kaki1_sakura_bits, kaki1_tomoyo_bits, ++ &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits, kaki1_sakura_mask_bits, kaki1_tomoyo_mask_bits }, ++ { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, kaki2_sakura_bits, kaki2_tomoyo_bits, ++ &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits, kaki2_sakura_mask_bits, kaki2_tomoyo_mask_bits }, ++ { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, mati3_dog_bits, mati3_sakura_bits, mati3_tomoyo_bits, ++ &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits, mati3_sakura_mask_bits, mati3_tomoyo_mask_bits }, ++ { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, sleep1_sakura_bits, sleep1_tomoyo_bits, ++ &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits, sleep1_sakura_mask_bits, sleep1_tomoyo_mask_bits }, ++ { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, sleep2_sakura_bits, sleep2_tomoyo_bits, ++ &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits, sleep2_sakura_mask_bits, sleep2_tomoyo_mask_bits }, ++ { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, awake_dog_bits, awake_sakura_bits, awake_tomoyo_bits, ++ &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits, awake_sakura_mask_bits, awake_tomoyo_mask_bits }, ++ { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, up1_sakura_bits, up1_tomoyo_bits, ++ &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits }, ++ { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, up2_sakura_bits, up2_tomoyo_bits, ++ &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits }, ++ { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, down1_dog_bits, down1_sakura_bits, down1_tomoyo_bits, ++ &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits, down1_sakura_mask_bits, down1_tomoyo_mask_bits }, ++ { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, down2_dog_bits, down2_sakura_bits, down2_tomoyo_bits, ++ &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits, down2_sakura_mask_bits, down2_tomoyo_mask_bits }, ++ { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, left1_dog_bits, left1_sakura_bits, left1_tomoyo_bits, ++ &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits, left1_sakura_mask_bits, left1_tomoyo_mask_bits }, ++ { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, left2_dog_bits, left2_sakura_bits, left2_tomoyo_bits, ++ &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits, left2_sakura_mask_bits, left2_tomoyo_mask_bits }, ++ { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, right1_dog_bits, right1_sakura_bits, right1_tomoyo_bits, ++ &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits, right1_sakura_mask_bits, right1_tomoyo_mask_bits }, ++ { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, right2_dog_bits, right2_sakura_bits, right2_tomoyo_bits, ++ &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits, right2_sakura_mask_bits, right2_tomoyo_mask_bits }, ++ { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, upleft1_sakura_bits, upleft1_tomoyo_bits, ++ &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits, upleft1_sakura_mask_bits, upleft1_tomoyo_mask_bits }, ++ { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, upleft2_sakura_bits, upleft2_tomoyo_bits, ++ &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits, upleft2_sakura_mask_bits, upleft2_tomoyo_mask_bits }, ++ { &UpRight1GC, &UpRight1Xbm, upright1_bits, upright1_tora_bits, upright1_dog_bits, upright1_sakura_bits, upright1_tomoyo_bits, ++ &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits, upright1_sakura_mask_bits, upright1_tomoyo_mask_bits }, ++ { &UpRight2GC, &UpRight2Xbm, upright2_bits, upright2_tora_bits, upright2_dog_bits, upright2_sakura_bits, upright2_tomoyo_bits, ++ &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits, upright2_sakura_mask_bits, upright2_tomoyo_mask_bits }, ++ { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, dwleft1_sakura_bits, dwleft1_tomoyo_bits, ++ &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits, dwleft1_sakura_mask_bits, dwleft1_tomoyo_mask_bits }, ++ { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, dwleft2_sakura_bits, dwleft2_tomoyo_bits, ++ &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits, dwleft2_sakura_mask_bits, dwleft2_tomoyo_mask_bits }, ++ { &DownRight1GC, &DownRight1Xbm, dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, dwright1_sakura_bits, dwright1_tomoyo_bits, ++ &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits, dwright1_sakura_mask_bits, dwright1_tomoyo_mask_bits }, ++ { &DownRight2GC, &DownRight2Xbm, dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, dwright2_sakura_bits, dwright2_tomoyo_bits, ++ &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits, dwright2_sakura_mask_bits, dwright2_tomoyo_mask_bits }, ++ { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, utogi1_sakura_bits, utogi1_tomoyo_bits, ++ &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits, utogi1_sakura_mask_bits, utogi1_tomoyo_mask_bits }, ++ { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, utogi2_sakura_bits, utogi2_tomoyo_bits, ++ &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits, utogi2_sakura_mask_bits, utogi2_tomoyo_mask_bits }, ++ { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, dtogi1_sakura_bits, dtogi1_tomoyo_bits, ++ &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits, dtogi1_sakura_mask_bits, dtogi1_tomoyo_mask_bits }, ++ { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, dtogi2_sakura_bits, dtogi2_tomoyo_bits, ++ &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits, dtogi2_sakura_mask_bits, dtogi2_tomoyo_mask_bits }, ++ { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ltogi1_sakura_bits, ltogi1_tomoyo_bits, ++ &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits, ltogi1_sakura_mask_bits, ltogi1_tomoyo_mask_bits }, ++ { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ltogi2_sakura_bits, ltogi2_tomoyo_bits, ++ &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits, ltogi2_sakura_mask_bits, ltogi2_tomoyo_mask_bits }, ++ { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, rtogi1_sakura_bits, rtogi1_tomoyo_bits, ++ &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits, rtogi1_sakura_mask_bits, rtogi1_tomoyo_mask_bits }, ++ { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, rtogi2_sakura_bits, rtogi2_tomoyo_bits, ++ &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits, rtogi2_sakura_mask_bits, rtogi2_tomoyo_mask_bits }, + { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } + }; + +@@ -1512,8 +1510,6 @@ + } + else { + char *av = argv[ArgCounter] + 1; +- if (strcmp(av, "bsd") == 0) +- av = "bsd_daemon"; + for (loop=0;loop<BITMAPTYPES;loop++) { + if (strcmp(av,AnimalDefaultsDataTable[loop].name)==0) + {NekoMoyou = loop;found=1;} +--- oneko-1.2.sakura.5.orig/oneko.man ++++ oneko-1.2.sakura.5/oneko.man +@@ -4,7 +4,7 @@ + .SH SYNOPSIS + .B oneko + [\fB-help\fP] [\fB-tora\fP] +-[\fB-dog\fP] [\fB-bsd_daemon\fP] [\fB-bsd\fP] ++[\fB-dog\fP] + [\fB-sakura\fP] [\fB-tomoyo\fP] + [\fB-time\fP \fIn\fP] [\fB-speed\fP \fIn\fP] [\fB-idle\fP \fIn\fP] + [\fB-name\fP \fIname\fP] [\fB-towindow\fP] [\fB-toname\fP \fIname\fP] +@@ -22,19 +22,11 @@ + Prints help message on usage. + .TP + .B -tora +-Make cat into "tora-neko". "Tora-neko" means cat wite tiger-like stripe. +-I don't know how to say it in English. ++Make cat into "tora-neko", a cat with tiger-like stripe. + .TP + .B -dog + Runs a dog instead of a cat. + .TP +-.B -bsd_daemon +-Runs a 4.3BSD daemon instead of a cat. +-.TP +-.B -bsd +-Same as +-.B -bsd_daemon. +-.TP + .B -sakura + Runs Sakura Kinomoto instead of a cat. + .TP +--- oneko-1.2.sakura.5.orig/oneko.man.jp ++++ oneko-1.2.sakura.5/oneko.man.jp +@@ -4,7 +4,7 @@ + .SH $@=q<0(J + .B oneko + [\fB-help\fP] [\fB-tora\fP] +-[\fB-dog\fP] [\fB-bsd_daemon\fP] [\fB-bsd\fP] ++[\fB-dog\fP] + [\fB-sakura\fP] [\fB-tomoyo\fP] + [\fB-time\fP \fIn\fP] [\fB-speed\fP \fIn\fP] [\fB-idle\fP \fIn\fP] + [\fB-name\fP \fIname\fP] [\fB-towindow\fP] [\fB-toname\fP \fIname\fP] +@@ -27,13 +27,6 @@ + .B -dog + $@G-$KBe$o$j8$$,Av$j$^$9!#(J + .TP +-.B -bsd_daemon +-$@G-$KBe$o$j(J 4.3BSD $@%G!<%b%s$,Av$j$^$9!#(J +-.TP +-.B -bsd +-.B -bsd_daemon +-$@$KF1$8!#(J +-.TP + .B -sakura + $@G-$KBe$o$jLZG7K\:y$,Av$j$^$9!#(J + .TP diff --git a/packages/oneko/oneko_1.2.sakura.5.bb b/packages/oneko/oneko_1.2.sakura.5.bb new file mode 100644 index 0000000000..efec192cc6 --- /dev/null +++ b/packages/oneko/oneko_1.2.sakura.5.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Small cat chasing mouse cursor" +AUTHOR = "Tatsuya Kato" +HOMEPAGE = "http://www.daidouji.com/oneko/" +SECTION = "x11/applications" +PRIORITY = "optional" +LICENSE = "PD" +DEPENDS = "virtual/libx11 libxext" + +SRC_URI = "http://www.daidouji.com/oneko/distfiles/oneko-${PV}.tar.gz \ + file://oneko.desktop \ + file://kill-oneko.desktop \ + file://oneko.png \ + file://kill-oneko.png \ + file://remove-bsd-daemon-logo.patch;patch=1" + +inherit pkgconfig + +do_compile() { + ${CC} oneko.c -o oneko -lm `pkg-config --cflags --libs x11 xext` \ + -DSHAPE +} + +do_install() { + install -d ${D}/${bindir} + install -d ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps + install -d ${D}/${mandir}/man6 + install -m 0755 ${S}/oneko ${D}/${bindir} + install -m 0644 ${WORKDIR}/*oneko.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/*oneko.desktop ${D}/${datadir}/applications + install -m 0644 ${S}/oneko.man ${D}/${mandir}/man6/oneko.6 +} + + + diff --git a/packages/otpcalc/.mtn2git_empty b/packages/otpcalc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/otpcalc/.mtn2git_empty diff --git a/packages/otpcalc/otpcalc-0.97/.mtn2git_empty b/packages/otpcalc/otpcalc-0.97/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/otpcalc/otpcalc-0.97/.mtn2git_empty diff --git a/packages/otpcalc/otpcalc-0.97/otpcalc-0.97-badindex.diff b/packages/otpcalc/otpcalc-0.97/otpcalc-0.97-badindex.diff new file mode 100644 index 0000000000..92ccf0f03a --- /dev/null +++ b/packages/otpcalc/otpcalc-0.97/otpcalc-0.97-badindex.diff @@ -0,0 +1,15 @@ +upstream: all patches sent upstream to Anthony D. Urso <anthonyu@killa.net> by Yuri Bushmelev. +status: pending +origin: http://packages.gentoo.org/package/sys-auth/otpcalc?full_cat + +--- otpCalc-0.97.orig/callbacks.c 2004-11-24 05:57:45.000000000 +0000 ++++ otpCalc-0.97/callbacks.c 2006-02-24 22:36:56.602831704 +0000 +@@ -81,7 +81,7 @@ + void calculate(void) + { + +- void (*hashes[4])(); ++ void (*hashes[5])(); + + gchar *challenge, *passwd, *message, *response; + struct tokens *set; diff --git a/packages/otpcalc/otpcalc-0.97/otpcalc-0.97-gtk2-gentoo.patch b/packages/otpcalc/otpcalc-0.97/otpcalc-0.97-gtk2-gentoo.patch new file mode 100644 index 0000000000..4157374cd3 --- /dev/null +++ b/packages/otpcalc/otpcalc-0.97/otpcalc-0.97-gtk2-gentoo.patch @@ -0,0 +1,74 @@ +upstream: all patches sent upstream to Anthony D. Urso <anthonyu@killa.net> by Yuri Bushmelev. +status: pending +origin: http://packages.gentoo.org/package/sys-auth/otpcalc?full_cat + +--- otpCalc-0.97-orig/Makefile.in 2004-11-24 07:44:12.000000000 +0100 ++++ otpCalc-0.97/Makefile.in 2007-12-26 00:38:52.000000000 +0100 +@@ -3,8 +3,8 @@ + + CC = @CC@ + DEFS = -DVERSION=\"$(VER)\" @DEFS@ +-CFLAGS = -s -O3 -Wall -pipe `gtk-config --cflags` +-LIBS = `gtk-config --libs` @LIBS@ ++CFLAGS += -Wall -pipe `pkg-config --cflags gtk+-2.0` ++LIBS = `pkg-config --libs gtk+-2.0` @LIBS@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +--- otpCalc-0.97-orig/callbacks.c 2004-11-24 06:57:45.000000000 +0100 ++++ otpCalc-0.97/callbacks.c 2007-12-26 00:38:52.000000000 +0100 +@@ -236,7 +236,7 @@ + } + + +-void focus(GtkWidget *widget, gpointer data) ++gboolean focus(GtkWidget *widget, GdkEvent *event, gpointer data) + { + + static GdkAtom targets; +@@ -244,12 +244,12 @@ + + + if (!autopaste) +- return; ++ return FALSE; + + targets = gdk_atom_intern("STRING", FALSE); + + gtk_selection_convert(widget, GDK_SELECTION_PRIMARY, targets, + GDK_CURRENT_TIME); + +- ++ return FALSE; + } +--- otpCalc-0.97-orig/gui.c 2004-11-24 07:46:53.000000000 +0100 ++++ otpCalc-0.97/gui.c 2007-12-26 00:38:52.000000000 +0100 +@@ -29,7 +29,7 @@ + GtkWidget *te_response; + + unsigned short hash; +-unsigned short newline = 1; ++unsigned short newline = 0; + unsigned short autopaste = 1; + + int main(int argc, char *argv[]) +@@ -147,7 +147,7 @@ + + /* Setup the menu bar... */ + mb_top = gtk_menu_bar_new(); +- gtk_menu_bar_set_shadow_type(GTK_MENU_BAR(mb_top), GTK_SHADOW_NONE); ++ /*gtk_menu_bar_set_shadow_type(GTK_MENU_BAR(mb_top), GTK_SHADOW_NONE);*/ + gtk_table_attach(GTK_TABLE(ta_top), mb_top, 0, 3, 0, 1, + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); +--- otpCalc-0.97-orig/utility.c 2004-11-24 06:59:09.000000000 +0100 ++++ otpCalc-0.97/utility.c 2007-12-26 00:38:52.000000000 +0100 +@@ -422,7 +422,7 @@ + words[extract(message, 33, 11)], + words[extract(message, 44, 11)], + words[extract(message, 55, 11)], +- (newline == 1) ? "\n" : NULL); ++ (newline == 1) ? "\n" : ""); + + return response; + diff --git a/packages/otpcalc/otpcalc-0.97/otpcalc-crypto-proto.diff b/packages/otpcalc/otpcalc-0.97/otpcalc-crypto-proto.diff new file mode 100644 index 0000000000..ff51173255 --- /dev/null +++ b/packages/otpcalc/otpcalc-0.97/otpcalc-crypto-proto.diff @@ -0,0 +1,16 @@ +upstream: all patches sent upstream to Anthony D. Urso <anthonyu@killa.net> by Yuri Bushmelev. +status: pending +origin: http://packages.gentoo.org/package/sys-auth/otpcalc?full_cat + +diff -urN otpCalc-0.97.orig/crypto.h otpCalc-0.97/crypto.h +--- otpCalc-0.97.orig/crypto.h 2001-05-12 02:04:54.000000000 -0400 ++++ otpCalc-0.97/crypto.h 2006-03-21 17:24:54.000000000 -0500 +@@ -1,4 +1,4 @@ +-void md4lite(char *, size_t); +-void md5lite(char *, size_t); +-void rmd160lite(char *, size_t); +-void sha1lite(char *, size_t); ++void md4lite(char *message, unsigned int len); ++void md5lite(char *message, unsigned int len); ++void rmd160lite(char *message, unsigned int len); ++void sha1lite(char *message, unsigned int len); diff --git a/packages/otpcalc/otpcalc-0.97/otpcalc-man-table-format.diff b/packages/otpcalc/otpcalc-0.97/otpcalc-man-table-format.diff new file mode 100644 index 0000000000..bbe6e19e61 --- /dev/null +++ b/packages/otpcalc/otpcalc-0.97/otpcalc-man-table-format.diff @@ -0,0 +1,37 @@ +upstream: all patches sent upstream to Anthony D. Urso <anthonyu@killa.net> by Yuri Bushmelev. +status: pending +origin: http://packages.gentoo.org/package/sys-auth/otpcalc?full_cat + +--- otpCalc-0.97.orig/otpCalc.man 2005-04-29 23:17:06.000000000 +0100 ++++ otpCalc-0.97/otpCalc.man 2005-04-29 23:19:03.000000000 +0100 +@@ -24,18 +24,20 @@ + the Challenge input: + .IP + .TS +-s/key MD4 +-.br +-otp-md4 MD4 +-.br +-otp-md5 MD5 +-.br +-otp-rmd160 RIPEMD-160 +-.br +-otp-sha1 SHA1 +-.br ++allbox tab(#); ++cb l ++cb l ++cb l ++cb l ++cb l. ++s/key#MD4 ++otp-md4#MD4 ++otp-md5#MD5 ++otp-rmd160#RIPEMD-160 ++otp-sha1#SHA1 + .TE + .LP ++.LP + In the absence of a prefix, the default hash, specified in the Settings menu, + is used. + .SH "SEE ALSO" diff --git a/packages/otpcalc/otpcalc_0.97.bb b/packages/otpcalc/otpcalc_0.97.bb new file mode 100644 index 0000000000..dd113c9504 --- /dev/null +++ b/packages/otpcalc/otpcalc_0.97.bb @@ -0,0 +1,24 @@ +HOMEPAGE = "http://killa.net/infosec/otpCalc/" +DESCRIPTION = "An OTP and S/Key calculator for X" +SECTION = "x11" +LICENSE = "GPL" +DEPENDS = "gtk+ openssl" +PR = "r0" + +SRC_URI = "http://killa.net/infosec/otpCalc/otpCalc-${PV}.tar.gz \ + file://otpcalc-man-table-format.diff;patch=1 \ + file://otpcalc-0.97-badindex.diff;patch=1 \ + file://otpcalc-crypto-proto.diff;patch=1 \ + file://otpcalc-0.97-gtk2-gentoo.patch;patch=1 \ + " + +inherit autotools pkgconfig + +do_install() { + install -d ${D}${bindir} + install -d ${D}${mandir}/man1 + cat ${S}/otpCalc.man | sed -e "s/VERSION/${PV}/g" | gzip -c9 > ${D}${mandir}/man1/otpCalc.1.gz + install -m 755 otpCalc ${D}${bindir} +} + + diff --git a/packages/qt4/qt-embedded-4.4.1/.mtn2git_empty b/packages/qt4/qt-embedded-4.4.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt4/qt-embedded-4.4.1/.mtn2git_empty diff --git a/packages/qt4/qt-embedded-4.4.0/0001-cross-compile.patch b/packages/qt4/qt-embedded-4.4.1/0001-cross-compile.patch index 310f1931bc..f20576b45e 100644 --- a/packages/qt4/qt-embedded-4.4.0/0001-cross-compile.patch +++ b/packages/qt4/qt-embedded-4.4.1/0001-cross-compile.patch @@ -1,6 +1,6 @@ ---- /tmp/configure 2008-07-08 10:01:36.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.0/configure 2008-07-08 10:23:04.000000000 +0200 -@@ -762,7 +762,7 @@ +--- /tmp/configure 2008-08-01 20:59:48.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.1/configure 2008-08-01 21:02:05.000000000 +0200 +@@ -765,7 +765,7 @@ UNKNOWN_ARG=yes fi ;; @@ -9,7 +9,7 @@ VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" -@@ -1179,7 +1179,10 @@ +@@ -1182,7 +1182,10 @@ xplatform) XPLATFORM="$VAL" ;; @@ -21,12 +21,12 @@ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_DEBUG_RELEASE="$VAL" else -@@ -2417,6 +2420,8 @@ - ARCH=$HOST_ARCH +@@ -2437,6 +2440,8 @@ + CFG_ARCH=$CFG_HOST_ARCH fi -+ARCH="$CROSSARCH" ++CFG_ARCH="$CROSSARCH" + - if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then + if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$ARCH' is supported" + echo " '$CFG_ARCH' is supported" diff --git a/packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch b/packages/qt4/qt-embedded-4.4.1/0003-no-tools.patch index bb36444f80..bb36444f80 100644 --- a/packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch +++ b/packages/qt4/qt-embedded-4.4.1/0003-no-tools.patch diff --git a/packages/qt4/qt-embedded-4.4.0/0004-no-qmake.patch b/packages/qt4/qt-embedded-4.4.1/0004-no-qmake.patch index 28f8d3ad9d..28f8d3ad9d 100644 --- a/packages/qt4/qt-embedded-4.4.0/0004-no-qmake.patch +++ b/packages/qt4/qt-embedded-4.4.1/0004-no-qmake.patch diff --git a/packages/qt4/qt-embedded-4.4.0/0005-fix-mkspecs.patch b/packages/qt4/qt-embedded-4.4.1/0005-fix-mkspecs.patch index c6f55906bc..c6f55906bc 100644 --- a/packages/qt4/qt-embedded-4.4.0/0005-fix-mkspecs.patch +++ b/packages/qt4/qt-embedded-4.4.1/0005-fix-mkspecs.patch diff --git a/packages/qt4/qt-embedded-4.4.0/0006-freetype-host-includes.patch b/packages/qt4/qt-embedded-4.4.1/0006-freetype-host-includes.patch index cc8e115fee..cc8e115fee 100644 --- a/packages/qt4/qt-embedded-4.4.0/0006-freetype-host-includes.patch +++ b/packages/qt4/qt-embedded-4.4.1/0006-freetype-host-includes.patch diff --git a/packages/qt4/qt-embedded-4.4.0/0007-openssl-host-includes.patch b/packages/qt4/qt-embedded-4.4.1/0007-openssl-host-includes.patch index 35b71d9694..35b71d9694 100644 --- a/packages/qt4/qt-embedded-4.4.0/0007-openssl-host-includes.patch +++ b/packages/qt4/qt-embedded-4.4.1/0007-openssl-host-includes.patch diff --git a/packages/qt4/qt-embedded-4.4.0/allow-configure-plugins.patch b/packages/qt4/qt-embedded-4.4.1/allow-configure-plugins.patch index 601f2fc369..601f2fc369 100644 --- a/packages/qt4/qt-embedded-4.4.0/allow-configure-plugins.patch +++ b/packages/qt4/qt-embedded-4.4.1/allow-configure-plugins.patch diff --git a/packages/qt4/qt-embedded-4.4.0/build-tools.patch b/packages/qt4/qt-embedded-4.4.1/build-tools.patch index 54ad666374..54ad666374 100644 --- a/packages/qt4/qt-embedded-4.4.0/build-tools.patch +++ b/packages/qt4/qt-embedded-4.4.1/build-tools.patch diff --git a/packages/qt4/qt-embedded-4.4.0/linux-oe-qmake.conf b/packages/qt4/qt-embedded-4.4.1/linux-oe-qmake.conf index fc5ac6dc5c..fc5ac6dc5c 100644 --- a/packages/qt4/qt-embedded-4.4.0/linux-oe-qmake.conf +++ b/packages/qt4/qt-embedded-4.4.1/linux-oe-qmake.conf diff --git a/packages/qt4/qt-embedded-4.4.0/qconfig-oe.h b/packages/qt4/qt-embedded-4.4.1/qconfig-oe.h index f820c01da8..f820c01da8 100644 --- a/packages/qt4/qt-embedded-4.4.0/qconfig-oe.h +++ b/packages/qt4/qt-embedded-4.4.1/qconfig-oe.h diff --git a/packages/qt4/qt-embedded_4.4.0.bb b/packages/qt4/qt-embedded_4.4.1.bb index f83b2516d7..70a461d2d2 100644 --- a/packages/qt4/qt-embedded_4.4.0.bb +++ b/packages/qt4/qt-embedded_4.4.1.bb @@ -3,7 +3,7 @@ require qtopia-core.inc PROVIDES += "qtopia-core" RPROVIDES_${PN} = "qtopia-core" -PR = "r4" +PR = "r0" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ file://qconfig-oe.h \ diff --git a/packages/qt4/qt4-x11-free-4.4.1/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.4.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.4.1/.mtn2git_empty diff --git a/packages/qt4/qt4-x11-free-4.4.0/0001-cross-compile.patch b/packages/qt4/qt4-x11-free-4.4.1/0001-cross-compile.patch index 310f1931bc..f20576b45e 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0001-cross-compile.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0001-cross-compile.patch @@ -1,6 +1,6 @@ ---- /tmp/configure 2008-07-08 10:01:36.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.0/configure 2008-07-08 10:23:04.000000000 +0200 -@@ -762,7 +762,7 @@ +--- /tmp/configure 2008-08-01 20:59:48.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.1/configure 2008-08-01 21:02:05.000000000 +0200 +@@ -765,7 +765,7 @@ UNKNOWN_ARG=yes fi ;; @@ -9,7 +9,7 @@ VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" -@@ -1179,7 +1179,10 @@ +@@ -1182,7 +1182,10 @@ xplatform) XPLATFORM="$VAL" ;; @@ -21,12 +21,12 @@ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_DEBUG_RELEASE="$VAL" else -@@ -2417,6 +2420,8 @@ - ARCH=$HOST_ARCH +@@ -2437,6 +2440,8 @@ + CFG_ARCH=$CFG_HOST_ARCH fi -+ARCH="$CROSSARCH" ++CFG_ARCH="$CROSSARCH" + - if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then + if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$ARCH' is supported" + echo " '$CFG_ARCH' is supported" diff --git a/packages/qt4/qt4-x11-free-4.4.0/0002-fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.4.1/0002-fix-resinit-declaration.patch index e479a64a2b..e479a64a2b 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0002-fix-resinit-declaration.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0002-fix-resinit-declaration.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0003-no-tools.patch b/packages/qt4/qt4-x11-free-4.4.1/0003-no-tools.patch index bb36444f80..bb36444f80 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0003-no-tools.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0003-no-tools.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0004-no-qmake.patch b/packages/qt4/qt4-x11-free-4.4.1/0004-no-qmake.patch index 28f8d3ad9d..28f8d3ad9d 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0004-no-qmake.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0004-no-qmake.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0005-fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.4.1/0005-fix-mkspecs.patch index c6f55906bc..c6f55906bc 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0005-fix-mkspecs.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0005-fix-mkspecs.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0006-freetype-host-includes.patch b/packages/qt4/qt4-x11-free-4.4.1/0006-freetype-host-includes.patch index cc8e115fee..cc8e115fee 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0006-freetype-host-includes.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0006-freetype-host-includes.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0007-openssl-host-includes.patch b/packages/qt4/qt4-x11-free-4.4.1/0007-openssl-host-includes.patch index 35b71d9694..35b71d9694 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0007-openssl-host-includes.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0007-openssl-host-includes.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/allow-configure-plugins.patch b/packages/qt4/qt4-x11-free-4.4.1/allow-configure-plugins.patch index 601f2fc369..601f2fc369 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/allow-configure-plugins.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/allow-configure-plugins.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/build-tools.patch b/packages/qt4/qt4-x11-free-4.4.1/build-tools.patch index 54ad666374..54ad666374 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/build-tools.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/build-tools.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/linux-oe-qmake.conf b/packages/qt4/qt4-x11-free-4.4.1/linux-oe-qmake.conf index fc5ac6dc5c..fc5ac6dc5c 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/linux-oe-qmake.conf +++ b/packages/qt4/qt4-x11-free-4.4.1/linux-oe-qmake.conf diff --git a/packages/qt4/qt4-x11-free-4.4.0/qconfig-oe.h b/packages/qt4/qt4-x11-free-4.4.1/qconfig-oe.h index f820c01da8..f820c01da8 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/qconfig-oe.h +++ b/packages/qt4/qt4-x11-free-4.4.1/qconfig-oe.h diff --git a/packages/qt4/qt4-x11-free_4.4.0.bb b/packages/qt4/qt4-x11-free_4.4.1.bb index 7d30503c07..7d30503c07 100644 --- a/packages/qt4/qt4-x11-free_4.4.0.bb +++ b/packages/qt4/qt4-x11-free_4.4.1.bb diff --git a/packages/qt4/qtopia-core_4.4.0.bb b/packages/qt4/qtopia-core_4.4.1.bb index 71a702b965..158e29c432 100644 --- a/packages/qt4/qtopia-core_4.4.0.bb +++ b/packages/qt4/qtopia-core_4.4.1.bb @@ -2,5 +2,5 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" -#keep in sync with qt-embedded_4.4.0.bb -PR = "r4" +#keep in sync with qt-embedded_${PV}.bb +PR = "r0" diff --git a/packages/tangogps/tangogps.inc b/packages/tangogps/tangogps.inc index a96ed8988f..5389f25f9a 100644 --- a/packages/tangogps/tangogps.inc +++ b/packages/tangogps/tangogps.inc @@ -1,10 +1,12 @@ -DESCRIPTION = "A lightweight and fast mapping application" -LICENSE = "GPLv2" +DESCRIPTION = "tangoGPS is a map and GPS application using Openstreetmap" +AUTHOR = "Marcus Bauer <marcus.bauer@gmail.com>" +HOMEPAGE = "http://tangogps.org/" SECTION = "x11/applications" +LICENSE = "GPLv2" PRIORITY = "optional" DEPENDS = "curl gtk+ gconf gypsy" +RRECOMMENDS = "gpsd" SRC_URI = "http://www.tangogps.org/downloads/tangogps-${PV}.tar.gz" -S = "${WORKDIR}/tangogps-${PV}" -inherit autotools +inherit autotools pkgconfig diff --git a/packages/tangogps/tangogps_0.9.0.3.bb b/packages/tangogps/tangogps_0.9.0.3.bb index 66c7c9d3ef..a023594b53 100644 --- a/packages/tangogps/tangogps_0.9.0.3.bb +++ b/packages/tangogps/tangogps_0.9.0.3.bb @@ -2,3 +2,4 @@ require tangogps.inc DEPENDS += "gpsd" RDEPENDS = "gpsd" +PR = "r2" diff --git a/packages/tangogps/tangogps_0.9.2.bb b/packages/tangogps/tangogps_0.9.2.bb new file mode 100644 index 0000000000..83465c1da9 --- /dev/null +++ b/packages/tangogps/tangogps_0.9.2.bb @@ -0,0 +1,4 @@ +require tangogps.inc + +DEPENDS += "sqlite3" +PR = "r1" |
