r21001 - in /desktop/experimental/gtk+2.0/debian: changelog control.in libgtk-directfb-2.0-0.symbols patches/005_gdk_directfb_window_new.patch patches/series rules
pochu-guest at users.alioth.debian.org
pochu-guest at users.alioth.debian.org
Wed Aug 19 19:26:52 UTC 2009
Author: pochu-guest
Date: Wed Aug 19 19:26:52 2009
New Revision: 21001
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21001
Log:
- Standards-Version is 3.8.3, no changes needed.
* debian/patches/005_gdk_directfb_window_new.patch:
- New patch. Readd gdk_directfb_window_new(), which is exported in the
public API and was removed by mistake.
- Updated for the new symbols. There's one symbol removed from the
directfb backend, gdk_display_pointer_grab(). It wasn't exported in
the headers, nor was supposed to be public, so if something out there
is using it, they are doing it wrong.
* debian/rules:
- Remove a trailing backslash that prevented -c4 to be passed to
dh_makeshlibs.
Added:
desktop/experimental/gtk+2.0/debian/patches/005_gdk_directfb_window_new.patch
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/control.in
desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0.symbols
desktop/experimental/gtk+2.0/debian/patches/series
desktop/experimental/gtk+2.0/debian/rules
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=21001&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Wed Aug 19 19:26:52 2009
@@ -8,6 +8,7 @@
- Configure with --with-libjasper, it's disabled by default now.
* debian/control.in:
- Remove conflicts and replaces no longer needed for packages in stable.
+ - Standards-Version is 3.8.3, no changes needed.
* debian/patches/005_xpmico.patch:
- Removed, this check is not needed as HeaderSize can't overflow because
IconCount will be at most 16 bits, and that multiplied by 16 is not
@@ -15,11 +16,20 @@
* debian/patches/001_static-linking-dont-query-immodules.patch,
debian/patches/002_static-linking-dont-build-perf.patch:
- Add headers.
+ * debian/patches/005_gdk_directfb_window_new.patch:
+ - New patch. Readd gdk_directfb_window_new(), which is exported in the
+ public API and was removed by mistake.
* debian/patches/*
- Refreshed.
* debian/libgtk-directfb-2.0-0.symbols,
debian/libgtk2.0-0.symbols:
- - Updated for the new symbols.
+ - Updated for the new symbols. There's one symbol removed from the
+ directfb backend, gdk_display_pointer_grab(). It wasn't exported in
+ the headers, nor was supposed to be public, so if something out there
+ is using it, they are doing it wrong.
+ * debian/rules:
+ - Remove a trailing backslash that prevented -c4 to be passed to
+ dh_makeshlibs.
-- Emilio Pozuelo Monfort <pochu at ubuntu.com> Tue, 18 Aug 2009 20:41:54 +0200
Modified: desktop/experimental/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control.in?rev=21001&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/control.in [utf-8] Wed Aug 19 19:26:52 2009
@@ -42,7 +42,7 @@
libatk1.0-doc,
libpango1.0-doc,
libcairo2-doc
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Package: @SHARED_PKG@
Architecture: any
Modified: desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk-directfb-2.0-0.symbols?rev=21001&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0.symbols [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk-directfb-2.0-0.symbols [utf-8] Wed Aug 19 19:26:52 2009
@@ -111,6 +111,7 @@
gdk_directfb_window_id_table_remove at Base 2.8.0
gdk_directfb_window_input_shape_combine_region at Base 2.17.8
gdk_directfb_window_lookup at Base 2.10.0
+ gdk_directfb_window_new at Base 2.17.8
gdk_directfb_window_send_crossing_events at Base 2.8.0
gdk_directfb_window_set_opacity at Base 2.8.0
gdk_display_add_client_message_filter at Base 2.8.0
Added: desktop/experimental/gtk+2.0/debian/patches/005_gdk_directfb_window_new.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/005_gdk_directfb_window_new.patch?rev=21001&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/005_gdk_directfb_window_new.patch (added)
+++ desktop/experimental/gtk+2.0/debian/patches/005_gdk_directfb_window_new.patch [utf-8] Wed Aug 19 19:26:52 2009
@@ -1,0 +1,236 @@
+Description: Add gdk_directfb_window_new() back, it's a public API
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=592371
+
+--- a/gdk/directfb/gdkwindow-directfb.c
++++ b/gdk/directfb/gdkwindow-directfb.c
+@@ -351,6 +351,213 @@
+ }
+
+
++GdkWindow *
++gdk_directfb_window_new (GdkWindow *parent,
++ GdkWindowAttr *attributes,
++ gint attributes_mask,
++ DFBWindowCapabilities window_caps,
++ DFBWindowOptions window_options,
++ DFBSurfaceCapabilities surface_caps)
++{
++ GdkWindow *window;
++ GdkWindowObject *private;
++ GdkWindowObject *parent_private;
++ GdkWindowImplDirectFB *impl;
++ GdkWindowImplDirectFB *parent_impl;
++ GdkVisual *visual;
++ DFBWindowDescription desc;
++ gint x, y;
++
++ g_return_val_if_fail (attributes != NULL, NULL);
++
++ D_DEBUG_AT( GDKDFB_Window, "%s( %p )\n", __FUNCTION__, parent );
++
++ if (!parent || attributes->window_type != GDK_WINDOW_CHILD)
++ parent = _gdk_parent_root;
++
++ window = g_object_new (GDK_TYPE_WINDOW, NULL);
++ private = GDK_WINDOW_OBJECT (window);
++ private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
++
++ parent_private = GDK_WINDOW_OBJECT (parent);
++ parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl);
++ private->parent = parent_private;
++
++ x = (attributes_mask & GDK_WA_X) ? attributes->x : 0;
++ y = (attributes_mask & GDK_WA_Y) ? attributes->y : 0;
++
++ gdk_window_set_events (window, attributes->event_mask | GDK_STRUCTURE_MASK);
++
++ impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl);
++ impl->drawable.wrapper = GDK_DRAWABLE (window);
++ impl->gdkWindow = window;
++
++ private->x = x;
++ private->y = y;
++
++ _gdk_directfb_calc_abs (window);
++
++ impl->drawable.width = MAX (1, attributes->width);
++ impl->drawable.height = MAX (1, attributes->height);
++
++ private->window_type = attributes->window_type;
++
++ desc.flags = 0;
++
++ if (attributes_mask & GDK_WA_VISUAL)
++ visual = attributes->visual;
++ else
++ visual = gdk_drawable_get_visual (parent);
++
++ switch (attributes->wclass)
++ {
++ case GDK_INPUT_OUTPUT:
++ private->input_only = FALSE;
++
++ desc.flags |= DWDESC_PIXELFORMAT;
++ desc.pixelformat = ((GdkVisualDirectFB *) visual)->format;
++
++ if (DFB_PIXELFORMAT_HAS_ALPHA (desc.pixelformat))
++ {
++ desc.flags |= DWDESC_CAPS;
++ desc.caps = DWCAPS_ALPHACHANNEL;
++ }
++ break;
++
++ case GDK_INPUT_ONLY:
++ private->input_only = TRUE;
++ desc.flags |= DWDESC_CAPS;
++ desc.caps = DWCAPS_INPUTONLY;
++ break;
++
++ default:
++ g_warning ("gdk_window_new: unsupported window class\n");
++ _gdk_window_destroy (window, FALSE);
++ return NULL;
++ }
++
++ switch (private->window_type)
++ {
++ case GDK_WINDOW_TOPLEVEL:
++ case GDK_WINDOW_DIALOG:
++ case GDK_WINDOW_TEMP:
++ desc.flags |= ( DWDESC_WIDTH | DWDESC_HEIGHT |
++ DWDESC_POSX | DWDESC_POSY );
++ desc.posx = x;
++ desc.posy = y;
++ desc.width = impl->drawable.width;
++ desc.height = impl->drawable.height;
++
++#if 0
++ if (window_caps)
++ {
++ if (! (desc.flags & DWDESC_CAPS))
++ {
++ desc.flags |= DWDESC_CAPS;
++ desc.caps = DWCAPS_NONE;
++ }
++
++ desc.caps |= window_caps;
++ }
++
++ if (surface_caps)
++ {
++ desc.flags |= DWDESC_SURFACE_CAPS;
++ desc.surface_caps = surface_caps;
++ }
++#endif
++
++ if (!create_directfb_window (impl, &desc, window_options))
++ {
++ g_assert(0);
++ _gdk_window_destroy (window, FALSE);
++
++ return NULL;
++ }
++
++ if (desc.caps != DWCAPS_INPUTONLY)
++ {
++ impl->window->SetOpacity(impl->window, 0x00 );
++ }
++
++ break;
++
++ case GDK_WINDOW_CHILD:
++ impl->window=NULL;
++
++ if (!private->input_only && parent_impl->drawable.surface)
++ {
++
++ DFBRectangle rect =
++ { x, y, impl->drawable.width, impl->drawable.height };
++ parent_impl->drawable.surface->GetSubSurface (parent_impl->drawable.surface,
++ &rect,
++ &impl->drawable.surface);
++ }
++
++ break;
++
++ default:
++ g_warning ("gdk_window_new: unsupported window type: %d",
++ private->window_type);
++ _gdk_window_destroy (window, FALSE);
++
++ return NULL;
++ }
++
++ if (impl->drawable.surface)
++ {
++ GdkColormap *colormap;
++
++ impl->drawable.surface->GetPixelFormat (impl->drawable.surface,
++ &impl->drawable.format);
++
++ private->depth = DFB_BITS_PER_PIXEL(impl->drawable.format);
++
++ if ((attributes_mask & GDK_WA_COLORMAP) && attributes->colormap)
++ {
++ colormap = attributes->colormap;
++ }
++ else
++ {
++ if (gdk_visual_get_system () == visual)
++ colormap = gdk_colormap_get_system ();
++ else
++ colormap =gdk_drawable_get_colormap (parent);
++ }
++
++ gdk_drawable_set_colormap (GDK_DRAWABLE (window), colormap);
++ }
++ else
++ {
++ impl->drawable.format = ((GdkVisualDirectFB *)visual)->format;
++ private->depth = visual->depth;
++ }
++
++ gdk_window_set_cursor (window, ((attributes_mask & GDK_WA_CURSOR) ?
++ (attributes->cursor) : NULL));
++
++ if (parent_private)
++ parent_private->children = g_list_prepend (parent_private->children,
++ window);
++
++ /* we hold a reference count on ourselves */
++ g_object_ref (window);
++
++ if (impl->window)
++ {
++ impl->window->GetID (impl->window, &impl->dfb_id);
++ gdk_directfb_window_id_table_insert (impl->dfb_id, window);
++ gdk_directfb_event_windows_add (window);
++ }
++
++ if (attributes_mask & GDK_WA_TYPE_HINT)
++ gdk_window_set_type_hint (window, attributes->type_hint);
++
++ return window;
++}
++
++
+ void
+ _gdk_window_impl_new (GdkWindow *window,
+ GdkWindow *real_parent,
+--- a/gdk/directfb/gdkdirectfb.h
++++ b/gdk/directfb/gdkdirectfb.h
+@@ -68,12 +68,14 @@
+ void gdk_directfb_window_set_opacity (GdkWindow *window,
+ guchar opacity);
+
++#ifndef GDK_DISABLE_DEPRECATED
+ GdkWindow * gdk_directfb_window_new (GdkWindow *parent,
+ GdkWindowAttr *attributes,
+ gint attributes_mask,
+ DFBWindowCapabilities window_caps,
+ DFBWindowOptions window_options,
+ DFBSurfaceCapabilities surface_caps);
++#endif /* GDK_DISABLE_DEPRECATED */
+
+ GdkVisual * gdk_directfb_visual_by_format (DFBSurfacePixelFormat pixel_format);
+
Modified: desktop/experimental/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/series?rev=21001&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/series [utf-8] Wed Aug 19 19:26:52 2009
@@ -2,6 +2,7 @@
002_static-linking-dont-build-perf.patch
003_gdk.pc_privates.patch
004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
+005_gdk_directfb_window_new.patch
009_gtk-export-filechooser.patch
010_gdkpixbuf_-lm.patch
015_default-fallback-icon-theme.patch
Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=21001&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/rules [utf-8] Wed Aug 19 19:26:52 2009
@@ -365,7 +365,7 @@
dh_makeshlibs -p$(DIRECTFB_PKG) \
-X$(MODULES_BASE_PATH) \
-V"$(DIRECTFB_PKG) (>= $(SHVER))" \
- --add-udeb=$(UDEB_PKG) \\
+ --add-udeb=$(UDEB_PKG) \
-- -c4
dh_makeshlibs -plibgail18 \
-X$(MODULES_BASE_PATH) \
More information about the pkg-gnome-commits
mailing list