diff options
| author | Chris Lord <chris@openedhand.com> | 2005-10-04 00:57:50 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2005-10-04 00:57:50 +0000 |
| commit | 86ac5925e2460bc4df852f9b4d22c2a04a698164 (patch) | |
| tree | 4fd52e6ec943f5e7c5bcf35ee889daae3d3188cc /openembedded/packages/gtk+ | |
| parent | c9b9b5bbbd5a8081740d319c15f3f1cebd0c4921 (diff) | |
| download | openembedded-core-86ac5925e2460bc4df852f9b4d22c2a04a698164.tar.gz openembedded-core-86ac5925e2460bc4df852f9b4d22c2a04a698164.tar.bz2 openembedded-core-86ac5925e2460bc4df852f9b4d22c2a04a698164.tar.xz openembedded-core-86ac5925e2460bc4df852f9b4d22c2a04a698164.zip | |
Remove some gtk 2.6.7 patches aimed at 240x320 screens that make things
look ugly
git-svn-id: https://svn.o-hand.com/repos/poky@113 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/gtk+')
| -rw-r--r-- | openembedded/packages/gtk+/gtk+-2.6.7/gtk+-handhelds.patch | 50 | ||||
| -rw-r--r-- | openembedded/packages/gtk+/gtk+_2.6.7.bb | 3 |
2 files changed, 1 insertions, 52 deletions
diff --git a/openembedded/packages/gtk+/gtk+-2.6.7/gtk+-handhelds.patch b/openembedded/packages/gtk+/gtk+-2.6.7/gtk+-handhelds.patch index 20481f059..2c5fc39d2 100644 --- a/openembedded/packages/gtk+/gtk+-2.6.7/gtk+-handhelds.patch +++ b/openembedded/packages/gtk+/gtk+-2.6.7/gtk+-handhelds.patch @@ -1,53 +1,3 @@ ---- gtk+-2.4.1/gtk/gtkarrow.c 2004-03-13 09:51:13.000000000 +1100 -+++ gtk+-2.4.1/gtk/gtkarrow.c 2004-05-26 14:52:17.000000000 +1000 -@@ -29,7 +29,7 @@ - #include "gtkarrow.h" - #include "gtkintl.h" - --#define MIN_ARROW_SIZE 15 -+#define MIN_ARROW_SIZE 7 - - enum { - PROP_0, -@@ -53,6 +53,8 @@ - guint prop_id, - GValue *value, - GParamSpec *pspec); -+static void gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition); - - GType - gtk_arrow_get_type (void) -@@ -111,6 +113,7 @@ - G_PARAM_READABLE | G_PARAM_WRITABLE)); - - widget_class->expose_event = gtk_arrow_expose; -+ widget_class->size_request = gtk_arrow_size_request; - } - - static void -@@ -166,13 +169,18 @@ - } - - static void -+gtk_arrow_size_request (GtkWidget *arrow, -+ GtkRequisition *requisition) -+{ -+ requisition->width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -+ requisition->height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -+} -+ -+static void - gtk_arrow_init (GtkArrow *arrow) - { - GTK_WIDGET_SET_FLAGS (arrow, GTK_NO_WINDOW); - -- GTK_WIDGET (arrow)->requisition.width = MIN_ARROW_SIZE + GTK_MISC (arrow)->xpad * 2; -- GTK_WIDGET (arrow)->requisition.height = MIN_ARROW_SIZE + GTK_MISC (arrow)->ypad * 2; -- - arrow->arrow_type = GTK_ARROW_RIGHT; - arrow->shadow_type = GTK_SHADOW_OUT; - } --- gtk+-2.4.1/gtk/gtkcalendar.c 2004-03-06 14:37:26.000000000 +1100 +++ gtk+-2.4.1/gtk/gtkcalendar.c 2004-05-26 14:58:57.000000000 +1000 @@ -340,6 +340,9 @@ diff --git a/openembedded/packages/gtk+/gtk+_2.6.7.bb b/openembedded/packages/gtk+/gtk+_2.6.7.bb index 54e0e0e6e..b53d7350e 100644 --- a/openembedded/packages/gtk+/gtk+_2.6.7.bb +++ b/openembedded/packages/gtk+/gtk+_2.6.7.bb @@ -6,14 +6,13 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://no-demos.patch;patch=1 \ file://no-xwc.patch;patch=1 \ file://automake-lossage.patch;patch=1 \ file://gtk+-handhelds.patch;patch=1 \ - file://spinbutton.patch;patch=1 \ file://hardcoded_libtool.patch;patch=1 \ file://disable-tooltips.patch;patch=1 \ file://gtklabel-resize-patch;patch=1 \ |