callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* 031_directfb_dead-keys.patch: patch from Jérémy Bobbio to fix dead

Browse Source 
keys in the DirectFB backend.
* Now require DirectFB 0.9.26.
* 070_mandatory_relibtoolize: updated to match the dependency bump.
This commit is contained in:
Josselin Mouette
2008-07-19 10:26:21 +00:00
parent 0a245e1827
commit 0e5d770ac1
6 changed files with 388 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
gtk+2.0 (2.12.11-3) UNRELEASED; urgency=low
* 031_directfb_dead-keys.patch: patch from Jérémy Bobbio to fix dead
keys in the DirectFB backend.
* Now require DirectFB 0.9.26.
* 070_mandatory_relibtoolize: updated to match the dependency bump.
-- Josselin Mouette <joss@debian.org> Sat, 19 Jul 2008 12:11:13 +0200
gtk+2.0 (2.12.11-2) unstable; urgency=low
* 033_treeview_resizing.patch:

4
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: gtk+2.0
Section: libs
Priority: optional
Maintainer: Sebastien Bacher <seb128@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
Build-Depends: debhelper (>= 5.0.22),
gettext,
pkg-config,
@ -31,7 +31,7 @@ Build-Depends: debhelper (>= 5.0.22),
chrpath,
dpkg-dev (>= 1.13.19),
x11proto-xext-dev,
libdirectfb-dev (>= 0.9.24),
libdirectfb-dev (>= 0.9.26),
libcups2-dev (>= 1.2),
quilt
Build-Depends-Indep: gtk-doc-tools (>= 1.6),

2
debian/control.in vendored
View File

@ -31,7 +31,7 @@ Build-Depends: debhelper (>= 5.0.22),
chrpath,
dpkg-dev (>= 1.13.19),
x11proto-xext-dev,
libdirectfb-dev (>= 0.9.24),
libdirectfb-dev (>= 0.9.26),
libcups2-dev (>= 1.2),
quilt
Build-Depends-Indep: gtk-doc-tools (>= 1.6),

50
debian/patches/031_directfb_dead-keys.patch vendored Normal file
View File

@ -0,0 +1,50 @@
Debian #394871
GNOME #543710
Index: gtk+-2.12.11/gdk/directfb/gdkkeys-directfb.c
===================================================================
--- gtk+-2.12.11.orig/gdk/directfb/gdkkeys-directfb.c 2008-07-19 12:21:35.189826919 +0200
+++ gtk+-2.12.11/gdk/directfb/gdkkeys-directfb.c 2008-07-19 12:22:17.381822899 +0200
@@ -1629,28 +1629,7 @@ gdk_directfb_translate_key (DFBInputDevi
break;
case DIKT_DEAD:
- switch (key_symbol)
- {
- case DIKS_DEAD_ABOVEDOT: keyval = GDK_dead_abovedot; break;
- case DIKS_DEAD_ABOVERING: keyval = GDK_dead_abovering; break;
- case DIKS_DEAD_ACUTE: keyval = GDK_dead_acute; break;
- case DIKS_DEAD_BREVE: keyval = GDK_dead_breve; break;
- case DIKS_DEAD_CARON: keyval = GDK_dead_caron; break;
- case DIKS_DEAD_CEDILLA: keyval = GDK_dead_cedilla; break;
- case DIKS_DEAD_CIRCUMFLEX: keyval = GDK_dead_circumflex; break;
- case DIKS_DEAD_DIAERESIS: keyval = GDK_dead_diaeresis; break;
- case DIKS_DEAD_DOUBLEACUTE: keyval = GDK_dead_doubleacute; break;
- case DIKS_DEAD_GRAVE: keyval = GDK_dead_grave; break;
- case DIKS_DEAD_IOTA: keyval = GDK_dead_iota; break;
- case DIKS_DEAD_MACRON: keyval = GDK_dead_macron; break;
- case DIKS_DEAD_OGONEK: keyval = GDK_dead_ogonek; break;
- case DIKS_DEAD_SEMIVOICED_SOUND:
- keyval = GDK_dead_semivoiced_sound; break;
- case DIKS_DEAD_TILDE: keyval = GDK_dead_tilde; break;
- case DIKS_DEAD_VOICED_SOUND: keyval = GDK_dead_voiced_sound; break;
- default:
- break;
- }
+ /* dead keys are handled directly by directfb */
break;
case DIKT_CUSTOM:
Index: gtk+-2.12.11/configure.in
===================================================================
--- gtk+-2.12.11.orig/configure.in 2008-07-19 12:22:22.874320130 +0200
+++ gtk+-2.12.11/configure.in 2008-07-19 12:22:27.902614857 +0200
@@ -1399,7 +1399,7 @@ AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS)
AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS)
if test "x$gdktarget" = "xdirectfb"; then
- DIRECTFB_REQUIRED_VERSION=0.9.24
+ DIRECTFB_REQUIRED_VERSION=0.9.26
AC_MSG_CHECKING(for DirectFB)
if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb && $PKG_CONFIG --exists cairo-directfb ; then

600
debian/patches/070_mandatory-relibtoolize.patch vendored
View File

File diff suppressed because it is too large Load Diff

1
debian/patches/series vendored
View File

@ -13,6 +13,7 @@
021_loader-files-d.patch
022_module-files-append-compat-module-files-d.patch
030_gtkentry_password-char-circle.patch
031_directfb_dead-keys.patch
033_treeview_resizing.patch
041_ia32-libs.patch
042_treeview_single-focus.patch