diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-09-02 13:00:13 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-09-02 13:00:13 +0000 |
| commit | 255a4ed2bfbf928d5c12d74e48b3759de7241e0d (patch) | |
| tree | 81db022dbcfa024e01599370de88039b22f1f0d8 /openembedded/packages/gtk+ | |
| parent | 6de1ae1e2e610b0120a0fcd914f39dfa27ce1e9e (diff) | |
| download | openembedded-core-255a4ed2bfbf928d5c12d74e48b3759de7241e0d.tar.gz openembedded-core-255a4ed2bfbf928d5c12d74e48b3759de7241e0d.tar.bz2 openembedded-core-255a4ed2bfbf928d5c12d74e48b3759de7241e0d.tar.xz openembedded-core-255a4ed2bfbf928d5c12d74e48b3759de7241e0d.zip | |
Remove gtk xsettings patch. Add dbus 0.36
git-svn-id: https://svn.o-hand.com/repos/poky@16 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/gtk+')
| -rw-r--r-- | openembedded/packages/gtk+/gtk+-2.6.7/xsettings.patch | 16 | ||||
| -rw-r--r-- | openembedded/packages/gtk+/gtk+-2.8.3/xsettings.patch | 16 | ||||
| -rw-r--r-- | openembedded/packages/gtk+/gtk+_2.6.7.bb | 3 | ||||
| -rw-r--r-- | openembedded/packages/gtk+/gtk+_2.8.3.bb | 4 |
4 files changed, 3 insertions, 36 deletions
diff --git a/openembedded/packages/gtk+/gtk+-2.6.7/xsettings.patch b/openembedded/packages/gtk+/gtk+-2.6.7/xsettings.patch deleted file mode 100644 index b63e262d3..000000000 --- a/openembedded/packages/gtk+/gtk+-2.6.7/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/openembedded/packages/gtk+/gtk+-2.8.3/xsettings.patch b/openembedded/packages/gtk+/gtk+-2.8.3/xsettings.patch deleted file mode 100644 index b63e262d3..000000000 --- a/openembedded/packages/gtk+/gtk+-2.8.3/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/openembedded/packages/gtk+/gtk+_2.6.7.bb b/openembedded/packages/gtk+/gtk+_2.6.7.bb index 2e8179279..54e0e0e6e 100644 --- a/openembedded/packages/gtk+/gtk+_2.6.7.bb +++ b/openembedded/packages/gtk+/gtk+_2.6.7.bb @@ -6,7 +6,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://no-demos.patch;patch=1 \ @@ -18,7 +18,6 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://disable-tooltips.patch;patch=1 \ file://gtklabel-resize-patch;patch=1 \ file://menu-deactivate.patch;patch=1 \ - file://xsettings.patch;patch=1 \ file://scroll-timings.patch;patch=1 \ file://small-gtkfilesel.patch;patch=1 \ file://migration.patch;patch=1;pnum=0 \ diff --git a/openembedded/packages/gtk+/gtk+_2.8.3.bb b/openembedded/packages/gtk+/gtk+_2.8.3.bb index f697e6ae5..cf32491db 100644 --- a/openembedded/packages/gtk+/gtk+_2.8.3.bb +++ b/openembedded/packages/gtk+/gtk+_2.8.3.bb @@ -13,12 +13,12 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://automake-lossage.patch;patch=1 \ file://hardcoded_libtool.patch;patch=1 \ file://disable-tooltips.patch;patch=1 \ - file://gtklabel-resize-patch;patch=1 + file://gtklabel-resize-patch;patch=1" # file://menu-deactivate.patch;patch=1 \ # file://xsettings.patch;patch=1 \ # file://scroll-timings.patch;patch=1 \ # file://small-gtkfilesel.patch;patch=1 \ -# file://migration.patch;patch=1;pnum=0" +# file://migration.patch;patch=1;pnum=0 # file://no-demos.patch;patch=1 # file://gtk+-handhelds.patch;patch=1 # file://single-click.patch;patch=1 |