diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-07 12:19:54 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-07 12:19:54 -0300 |
| commit | 730bda0e79d3e122d665663a18e0c973d7209236 (patch) | |
| tree | 251b00a85c7bbc2e3ee21102c5c16c1054cf4669 /extra/gcin | |
| parent | cfe7b034671297c6bba5e91867d98e182c683ded (diff) | |
| parent | fe769389426a6aa5a2878bf7dcfc6144717e1e93 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gcolor2/PKGBUILD
community/perl-list-moreutils/PKGBUILD
extra/boost/PKGBUILD
extra/cdrkit/PKGBUILD
extra/ettercap/PKGBUILD
extra/lame/PKGBUILD
extra/sdl/PKGBUILD
extra/unzip/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/caribou/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/glibmm/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gtkmm3/PKGBUILD
gnome-unstable/yelp/PKGBUILD
Diffstat (limited to 'extra/gcin')
| -rw-r--r-- | extra/gcin/gtk3-crash.patch | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/extra/gcin/gtk3-crash.patch b/extra/gcin/gtk3-crash.patch deleted file mode 100644 index 17cfa6c2d..000000000 --- a/extra/gcin/gtk3-crash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c ---- old/gtk3-im/gtkimcontextgcin.c 2011-08-31 09:14:58.000000000 -0700 -+++ new/gtk3-im/gtkimcontextgcin.c 2011-09-04 13:29:58.838065420 -0700 -@@ -127,6 +127,8 @@ - { - GdkWindow *client_window = context_xim->client_window; - GdkScreen *screen = gdk_window_get_screen (client_window); -+ if (screen == NULL) -+ return; - GdkDisplay *display = gdk_screen_get_display (screen); - if (!context_xim->gcin_ch) { - if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default())))) |