diff options
-rw-r--r-- | packages/gpe-beam/gpe-beam.inc | 5 | ||||
-rw-r--r-- | packages/gpe-beam/gpe-beam_0.2.3.bb | 10 | ||||
-rw-r--r-- | packages/gpe-beam/gpe-beam_0.2.6.bb | 12 | ||||
-rw-r--r-- | packages/gpe-beam/gpe-beam_0.2.7.bb | 12 | ||||
-rw-r--r-- | packages/gpe-beam/gpe-beam_0.2.8.bb | 11 | ||||
-rw-r--r-- | packages/gpe-beam/gpe-beam_0.2.9.bb | 7 | ||||
-rw-r--r-- | packages/libopie/libopie2_cvs.bb | 3 | ||||
-rw-r--r-- | packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb (renamed from packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb) | 0 | ||||
-rw-r--r-- | packages/opie-multikey/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/opie-multikey/files/friendly-button-names.patch | 16 | ||||
-rw-r--r-- | packages/opie-multikey/opie-multikey_1.2.2.bb | 5 | ||||
-rw-r--r-- | packages/opie-multikey/opie-multikey_cvs.bb | 4 | ||||
-rw-r--r-- | packages/opie-sysinfo/opie-sysinfo_1.2.2.bb | 7 | ||||
-rw-r--r-- | packages/parted/parted-1.8.0/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/parted/parted-1.8.0/memory_allocation.patch | 42 | ||||
-rw-r--r-- | packages/ttf-fonts/ttf-sazanami_20040629.bb | 10 |
16 files changed, 97 insertions, 47 deletions
diff --git a/packages/gpe-beam/gpe-beam.inc b/packages/gpe-beam/gpe-beam.inc new file mode 100644 index 0000000000..5ca6df0b03 --- /dev/null +++ b/packages/gpe-beam/gpe-beam.inc @@ -0,0 +1,5 @@ +DESCRIPTION = "GPE infrared communication applet" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" diff --git a/packages/gpe-beam/gpe-beam_0.2.3.bb b/packages/gpe-beam/gpe-beam_0.2.3.bb index b009b10372..e5861f069a 100644 --- a/packages/gpe-beam/gpe-beam_0.2.3.bb +++ b/packages/gpe-beam/gpe-beam_0.2.3.bb @@ -1,7 +1,5 @@ -inherit gpe pkgconfig -LICENSE = "GPL" -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex" +require ${PN}.inc + RDEPENDS = "libopenobex-1.0-1" -SECTION = "gpe" -PRIORITY = "optional" + +inherit gpe pkgconfig diff --git a/packages/gpe-beam/gpe-beam_0.2.6.bb b/packages/gpe-beam/gpe-beam_0.2.6.bb index 71af4db7e6..89f8e8230a 100644 --- a/packages/gpe-beam/gpe-beam_0.2.6.bb +++ b/packages/gpe-beam/gpe-beam_0.2.6.bb @@ -1,12 +1,8 @@ -PR = "r1" - -inherit gpe +require ${PN}.inc -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" RDEPENDS = "libopenobex-1.0-1 irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" +PR = "r1" SRC_URI += "file://vcard-send.patch;patch=1;pnum=0" + +inherit gpe diff --git a/packages/gpe-beam/gpe-beam_0.2.7.bb b/packages/gpe-beam/gpe-beam_0.2.7.bb index 51b99fcfc6..f19b64d933 100644 --- a/packages/gpe-beam/gpe-beam_0.2.7.bb +++ b/packages/gpe-beam/gpe-beam_0.2.7.bb @@ -1,12 +1,8 @@ -PR = "r1" - -inherit gpe +require ${PN}.inc -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" RDEPENDS = "libopenobex-1.0-1 irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" +PR = "r1" SRC_URI += "file://decl.patch;patch=1;pnum=0" + +inherit gpe diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb index f68b50341a..9795827aa8 100644 --- a/packages/gpe-beam/gpe-beam_0.2.8.bb +++ b/packages/gpe-beam/gpe-beam_0.2.8.bb @@ -1,12 +1,7 @@ -PR = "r0" +require ${PN}.inc -inherit gpe - -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" RDEPENDS = "irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" SRC_URI += "file://dbus-new-api.patch;patch=1" + +inherit gpe diff --git a/packages/gpe-beam/gpe-beam_0.2.9.bb b/packages/gpe-beam/gpe-beam_0.2.9.bb index 8275cf6c3a..b96bed4a2f 100644 --- a/packages/gpe-beam/gpe-beam_0.2.9.bb +++ b/packages/gpe-beam/gpe-beam_0.2.9.bb @@ -1,9 +1,6 @@ -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" +require ${PN}.inc + RDEPENDS = "irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" inherit gpe diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index 78cc00e619..d8385ceea6 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -1,13 +1,12 @@ require ${PN}.inc PV = "1.2.2+cvs${SRCDATE}" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \ file://ipaq-2.6-sys-class-backlight-support.patch;patch=1 \ - file://keyboardless-buttonmap.patch;patch=1 \ file://include.pro" SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb index b34d4630a0..b34d4630a0 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb diff --git a/packages/opie-multikey/files/.mtn2git_empty b/packages/opie-multikey/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-multikey/files/.mtn2git_empty diff --git a/packages/opie-multikey/files/friendly-button-names.patch b/packages/opie-multikey/files/friendly-button-names.patch new file mode 100644 index 0000000000..148204e5b3 --- /dev/null +++ b/packages/opie-multikey/files/friendly-button-names.patch @@ -0,0 +1,16 @@ +--- multikey/configdlg.cpp.org 2005-06-15 22:54:50.000000000 +0000 ++++ multikey/configdlg.cpp 2007-01-11 19:51:09.000000000 +0000 +@@ -144,11 +144,11 @@ + add_remove_grid->setMargin(3); + add_remove_grid->setSpacing(3); + +- add_button = new QPushButton(tr("Add"), add_remove_grid); ++ add_button = new QPushButton(tr("Add custom..."), add_remove_grid); + add_button->setFlat(TRUE); + connect(add_button, SIGNAL(clicked()), SLOT(addMap())); + +- remove_button = new QPushButton(tr("Remove"), add_remove_grid); ++ remove_button = new QPushButton(tr("Remove custom"), add_remove_grid); + remove_button->setFlat(TRUE); + if (keymaps->currentItem() == 0 || default_maps.find(QFileInfo(current_map).fileName()) != default_maps.end()) + remove_button->setDisabled(true); diff --git a/packages/opie-multikey/opie-multikey_1.2.2.bb b/packages/opie-multikey/opie-multikey_1.2.2.bb index 7cd1ac6914..702dda05e9 100644 --- a/packages/opie-multikey/opie-multikey_1.2.2.bb +++ b/packages/opie-multikey/opie-multikey_1.2.2.bb @@ -1,6 +1,7 @@ require ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share" + ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ + file://friendly-button-names.patch;patch=1" diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb index 93d37edfac..5080a4d984 100644 --- a/packages/opie-multikey/opie-multikey_cvs.bb +++ b/packages/opie-multikey/opie-multikey_cvs.bb @@ -1,6 +1,8 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \ - ${HANDHELDS_CVS};module=opie/share" + ${HANDHELDS_CVS};module=opie/share \ + file://friendly-button-names.patch;patch=1" diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb index 597f28970d..3a8954bebe 100644 --- a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb +++ b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb @@ -1,9 +1,10 @@ require ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ - file://jornada-6xx-7xx.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/share" + +SRC_URI_append_jlime = "file://jornada-6xx-7xx.patch;patch=1" diff --git a/packages/parted/parted-1.8.0/.mtn2git_empty b/packages/parted/parted-1.8.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/parted/parted-1.8.0/.mtn2git_empty diff --git a/packages/parted/parted-1.8.0/memory_allocation.patch b/packages/parted/parted-1.8.0/memory_allocation.patch new file mode 100644 index 0000000000..ba3709680b --- /dev/null +++ b/packages/parted/parted-1.8.0/memory_allocation.patch @@ -0,0 +1,42 @@ +--- parted-1.8.0/libparted/exception.c_orig 2006-12-11 19:44:23.000000000 +0000 ++++ parted-1.8.0/libparted/exception.c 2006-12-11 19:47:53.000000000 +0000 +@@ -231,6 +231,9 @@ + PedExceptionOption ex_opts, const char* message, ...) + { + va_list arg_list; ++ int result; ++ static int size = 1000; ++ + + if (ex) + ped_exception_catch (); +@@ -239,16 +242,22 @@ + if (!ex) + goto no_memory; + +- ex->message = (char*) malloc (8192); +- if (!ex->message) +- goto no_memory; +- + ex->type = ex_type; + ex->options = ex_opts; + +- va_start (arg_list, message); +- vsnprintf (ex->message, 8192, message, arg_list); +- va_end (arg_list); ++ while (1) { ++ ex->message = (char*) malloc (size); ++ if (!ex->message) ++ goto no_memory; ++ va_start (arg_list, message); ++ result = vsnprintf (ex->message, size, message, arg_list); ++ va_end (arg_list); ++ ++ if (result > -1 && result < size) ++ break; ++ size += 10; ++ } ++ + + return do_throw (); + diff --git a/packages/ttf-fonts/ttf-sazanami_20040629.bb b/packages/ttf-fonts/ttf-sazanami_20040629.bb index d1c4882d14..a51036155d 100644 --- a/packages/ttf-fonts/ttf-sazanami_20040629.bb +++ b/packages/ttf-fonts/ttf-sazanami_20040629.bb @@ -1,16 +1,18 @@ +require ttf.inc + DESCRIPTION = "Sazanami Gothic/Mincho Japanese TrueType fonts" DESCRIPTION_ttf-sazanami-gothic = "Sazanami Gothic Japanese TrueType font" DESCRIPTION_ttf-sazanami-mincho = "Sazanami Mincho Japanese TrueType font" -LICENSE = "${PN}" -SRC_DISTRIBUTE_LICENSES += "${PN}" AUTHOR = "Electronic Font Open Laboratory (/efont/)" HOMEPAGE = "http://sourceforge.jp/projects/efont/" +LICENSE = "${PN}" +SRC_DISTRIBUTE_LICENSES += "${PN}" +RPROVIDES = "virtual/japanese-font" +PR = "r1" SRC_URI = "http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2" S = "${WORKDIR}/sazanami-20040629" -require ttf.inc - PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho" FILES_ttf-sazanami-gothic = "${datadir}/fonts/truetype/sazanami-gothic.ttf \ ${datadir}/doc/ttf-sazanami-gothic/README" |