diff options
| author | Koen Kooi <koen@openembedded.org> | 2005-07-23 00:08:12 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-23 00:08:12 +0000 |
| commit | 6f04daf899c1100d9bb9c14cf6ccbd3fcea5b4a6 (patch) | |
| tree | 7e699d5bbe72bfa3e914b642fec4a04383654c59 | |
| parent | 15f252db09fd7e5956a5ca6ff32145acc6490c9d (diff) | |
| parent | 0c3ba72a4610f654144536314b9360f2ee4b07cf (diff) | |
merge of 856181643b2a33fbd80da145f003dc111c407d9e
and a09cb27506f56d7b4d048f4d60c7df2e11968692
| -rw-r--r-- | packages/gpsdrive/files/gpsdrive-pda-fix.patch | 72 | ||||
| -rw-r--r-- | packages/gpsdrive/gpsdrive_cvs.bb | 3 | ||||
| -rw-r--r-- | packages/libusb/libusb_0.1.10a.bb | 3 |
3 files changed, 75 insertions, 3 deletions
diff --git a/packages/gpsdrive/files/gpsdrive-pda-fix.patch b/packages/gpsdrive/files/gpsdrive-pda-fix.patch new file mode 100644 index 0000000000..f76d83e3ad --- /dev/null +++ b/packages/gpsdrive/files/gpsdrive-pda-fix.patch @@ -0,0 +1,72 @@ +--- src/gpsdrive.c 2005-07-22 23:17:36.452918848 +0200 ++++ src/gpsdrive.c 2005-07-23 01:02:40.482560672 +0200 +@@ -10516,7 +10516,7 @@ + PangoFontDescription *font_desc; + font_desc = + pango_font_description_from_string +- ("Sans 20"); ++ ("Sans 10"); + gtk_widget_modify_font (myroutelist, font_desc); + pango_font_description_free (font_desc); + } +@@ -12343,6 +12343,8 @@ + GDK_BUTTON_PRESS_MASK); + gtk_signal_connect (GTK_OBJECT (drawing_sats), "button-press-event", + GTK_SIGNAL_FUNC (satpos_cb), NULL); ++ if(!pdamode) ++ { + frame_sats = gtk_frame_new (_("GPS Info")); + sateventbox = gtk_event_box_new (); + gtk_container_add (GTK_CONTAINER (sateventbox), drawing_sats); +@@ -12386,7 +12388,7 @@ + + gtk_box_pack_start (GTK_BOX (hbox2), frame_sats, FALSE, FALSE, + 1 * PADDING); +- ++ } + havebattery = battery_get_values (); + if (debug) + fprintf (stderr, "batt: %d, temp: %d\n", havebattery, +@@ -12569,9 +12571,11 @@ + /* if (!pdamode) */ + /* gtk_box_pack_start (GTK_BOX (hbox2), frame_speed, TRUE, TRUE, */ + /* 1 * PADDING); */ +- ++ if (!pdamode) ++ { + frame_altitude = gtk_frame_new (_("Altitude")); + gtk_container_add (GTK_CONTAINER (frame_altitude), altilabel); ++ } + /*** Mod by Arms */ + /* if (!pdamode) */ + /* gtk_box_pack_start (GTK_BOX (hbox2), frame_altitude, FALSE, TRUE, */ +@@ -12904,23 +12908,23 @@ + if (onemousebutton) + { + /* gtk_misc_set_padding (GTK_MISC (l1), x, y); */ +- gtk_misc_set_padding (GTK_MISC (l1), 50, 1); +- gtk_misc_set_padding (GTK_MISC (l2), 50, 1); +- gtk_misc_set_padding (GTK_MISC (l3), 50, 1); ++ gtk_misc_set_padding (GTK_MISC (l1), 20, 1); ++ gtk_misc_set_padding (GTK_MISC (l2), 20, 1); ++ gtk_misc_set_padding (GTK_MISC (l3), 20, 1); + + /* http://developer.gnome.org/doc/API/2.0/pango/PangoMarkupFormat.html */ + + char *markup; + markup = g_markup_printf_escaped +- ("<span weight='heavy' stretch='ultraexpanded' size='20480'>%s</span>", ++ ("<span font_desc='10'>%s</span>", + _("Map")); + gtk_label_set_markup (GTK_LABEL (l1), markup); + markup = g_markup_printf_escaped +- ("<span weight='heavy' stretch='ultraexpanded' size='20480'>%s</span>", ++ ("<span font_desc='10'>%s</span>", + _("Menu")); + gtk_label_set_markup (GTK_LABEL (l2), markup); + markup = g_markup_printf_escaped +- ("<span weight='heavy' stretch='ultraexpanded' size='20480'>%s</span>", ++ ("<span font_desc='10'>%s</span>", + _("Status")); + gtk_label_set_markup (GTK_LABEL (l3), markup); + diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb index cc623451ef..ba4432f5ca 100644 --- a/packages/gpsdrive/gpsdrive_cvs.bb +++ b/packages/gpsdrive/gpsdrive_cvs.bb @@ -1,6 +1,6 @@ inherit autotools pkgconfig -PR = "r0" +PR = "r1" PV = "2.10pre3+cvs-${CVSDATE}" DEFAULT_PREFERENCE="-1" @@ -14,6 +14,7 @@ PRIORITY = "optional" LICENSE = "GPL" SRC_URI = "cvs://anonymous@cvs.gpsdrive.cc/cvsroot;module=gpsdrive \ + file://gpsdrive-pda-fix.patch;patch=1;pnum=1 \ file://gpsdrive.desktop" S = "${WORKDIR}/gpsdrive" diff --git a/packages/libusb/libusb_0.1.10a.bb b/packages/libusb/libusb_0.1.10a.bb index bcf723a0c6..7f8fd42a4b 100644 --- a/packages/libusb/libusb_0.1.10a.bb +++ b/packages/libusb/libusb_0.1.10a.bb @@ -2,10 +2,9 @@ DESCRIPTION = "libusb is a library to provide userspace \ access to USB devices." SECTION = "libs" LICENSE = "LGPL" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \ - file://ARMfix.patch;patch=1 \ file://debian-changes.patch;patch=1" inherit autotools pkgconfig |