diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-08 13:40:51 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-08 13:40:51 -0300 |
| commit | 1eb44cdc16d2ce4e40d42cacea7456ad245994f1 (patch) | |
| tree | 8fffd10c72c5c326bcc41cdbbafda13c0ec5b2b6 /extra/gcin/missing.patch | |
| parent | 69d3aee0c3f0bb876065264baccf86c13088dd01 (diff) | |
| parent | 8cca36c97b57b8d0a7e5521647c02409eb94ade4 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/portaudio/PKGBUILD
extra/ettercap/PKGBUILD
extra/kdelibs/PKGBUILD
extra/qt/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/pulseaudio/PKGBUILD
gnome-unstable/vala/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
testing/xf86-video-glint/PKGBUILD
Diffstat (limited to 'extra/gcin/missing.patch')
| -rw-r--r-- | extra/gcin/missing.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/extra/gcin/missing.patch b/extra/gcin/missing.patch new file mode 100644 index 000000000..3d8737392 --- /dev/null +++ b/extra/gcin/missing.patch @@ -0,0 +1,31 @@ +diff -aur old/gen-dist new/gen-dist +--- old/gen-dist 2011-09-07 10:51:59.214132579 -0700 ++++ new/gen-dist 2011-09-07 10:53:27.534010656 -0700 +@@ -1,5 +1,5 @@ + GCIN_VERSION="gcin-`cat VERSION.gcin`" +-sh gen-gtk3 ++#sh gen-gtk3 + sed -i '/^$/d' Changelog.html + rm -f tags core.* + cd .. +diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c +--- old/gtk3-im/gtkimcontextgcin.c 2011-09-07 10:51:59.224132565 -0700 ++++ new/gtk3-im/gtkimcontextgcin.c 2011-09-07 10:53:09.984034884 -0700 +@@ -128,7 +128,7 @@ + GdkWindow *client_window = context_xim->client_window; + if (!client_window) + return; +- GdkScreen *screen = gdk_drawable_get_screen (client_window); ++ GdkScreen *screen = gdk_window_get_screen (client_window); + if (!screen) + return; + +@@ -137,7 +137,7 @@ + return; + + if (!context_xim->gcin_ch) { +- if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY()))) ++ if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default())))) + perror("cannot open gcin_ch"); + #if 1 + context_xim->timeout_handle = 0; |