[PULL] XQuartz grab bag

Jeremy Huddleston jeremyhu at apple.com
Tue Jul 19 20:22:44 PDT 2011


Build fix, localization updates, and some DRI fixes that never got folded into master from server-1.4-apple.


The following changes since commit 82f5521a6d91ebcd2a4400f6c221ad625edc99a1:

  XKB: Work around broken interps from old xkbcomp (2011-07-15 15:44:19 +1000)

are available in the git repository at:
  git://people.freedesktop.org/~jeremyhu/xserver master

George Staplin (2):
      XQuartz: Fix a memory leak with surfaces that a new test found.
      XQuartz: Add diagnostic error checking to xp_destroy_surface.

Jeremy Huddleston (7):
      XQuartz: DarwinEQFini doesn't return Bool
      XQuartz: Add some sanity checking and a fallback for the bundle id.
      XQuartz: DRI: Dead code removal
      XQuartz: Add a scroll_in_device_direction preference
      XQuartz: Add GUI controls to toggle scroll_in_device_direction
      XQuartz: Add english NIB changes for scroll_in_device_direction
      XQuartz: Localization updates

 hw/xquartz/GL/indirect.c                           |   15 +-
 hw/xquartz/X11Application.h                        |    3 +
 hw/xquartz/X11Application.m                        |   47 +-
 hw/xquartz/X11Controller.h                         |    2 +
 hw/xquartz/X11Controller.m                         |   18 +-
 .../Resources/Dutch.lproj/Localizable.strings      |  Bin 2786 -> 4560 bytes
 .../bundle/Resources/Dutch.lproj/locversion.plist  |    4 +-
 .../Resources/Dutch.lproj/main.nib/designable.nib  | 7414 ++++++++++----------
 .../Dutch.lproj/main.nib/keyedobjects.nib          |  Bin 33492 -> 34903 bytes
 .../Resources/English.lproj/locversion.plist       |   14 +
 .../Resources/French.lproj/Localizable.strings     |  Bin 2894 -> 4536 bytes
 .../bundle/Resources/French.lproj/locversion.plist |    4 +-
 .../Resources/French.lproj/main.nib/designable.nib |  633 +-
 .../French.lproj/main.nib/keyedobjects.nib         |  Bin 36464 -> 37893 bytes
 .../Resources/German.lproj/Localizable.strings     |  Bin 2812 -> 4590 bytes
 .../bundle/Resources/German.lproj/locversion.plist |    4 +-
 .../Resources/German.lproj/main.nib/designable.nib |  586 +-
 .../German.lproj/main.nib/keyedobjects.nib         |  Bin 35590 -> 36935 bytes
 .../Resources/Italian.lproj/Localizable.strings    |  Bin 2796 -> 4634 bytes
 .../Resources/Italian.lproj/locversion.plist       |    4 +-
 .../Italian.lproj/main.nib/designable.nib          | 7417 ++++++++++----------
 .../Italian.lproj/main.nib/keyedobjects.nib        |  Bin 34798 -> 37627 bytes
 .../Resources/Japanese.lproj/Localizable.strings   |  Bin 2320 -> 3688 bytes
 .../Resources/Japanese.lproj/locversion.plist      |    4 +-
 .../Japanese.lproj/main.nib/designable.nib         |  583 +-
 .../Japanese.lproj/main.nib/keyedobjects.nib       |  Bin 33650 -> 34885 bytes
 .../Resources/Spanish.lproj/Localizable.strings    |  Bin 2744 -> 4452 bytes
 .../Resources/Spanish.lproj/locversion.plist       |    4 +-
 .../Spanish.lproj/main.nib/designable.nib          | 7430 ++++++++++----------
 .../Spanish.lproj/main.nib/keyedobjects.nib        |  Bin 35797 -> 38773 bytes
 .../bundle/Resources/ar.lproj/Localizable.strings  |  Bin 2632 -> 4190 bytes
 .../bundle/Resources/ar.lproj/locversion.plist     |    4 +-
 .../Resources/ar.lproj/main.nib/designable.nib     |  375 +-
 .../Resources/ar.lproj/main.nib/keyedobjects.nib   |  Bin 35150 -> 36522 bytes
 .../bundle/Resources/da.lproj/Localizable.strings  |  Bin 2734 -> 4462 bytes
 .../bundle/Resources/da.lproj/locversion.plist     |    4 +-
 .../Resources/da.lproj/main.nib/designable.nib     |  652 +-
 .../Resources/da.lproj/main.nib/keyedobjects.nib   |  Bin 35240 -> 36655 bytes
 .../bundle/Resources/el.lproj/InfoPlist.strings    |  Bin 0 -> 274 bytes
 .../bundle/Resources/el.lproj/Localizable.strings  |  Bin 0 -> 4844 bytes
 .../bundle/Resources/el.lproj/locversion.plist     |   14 +
 .../Resources/el.lproj/main.nib/designable.nib     | 3521 +++++++++
 .../Resources/el.lproj/main.nib/keyedobjects.nib   |  Bin 0 -> 38421 bytes
 .../bundle/Resources/fi.lproj/Localizable.strings  |  Bin 2778 -> 4392 bytes
 .../bundle/Resources/fi.lproj/locversion.plist     |    4 +-
 .../Resources/fi.lproj/main.nib/designable.nib     |  421 +-
 .../Resources/fi.lproj/main.nib/keyedobjects.nib   |  Bin 51669 -> 36906 bytes
 .../bundle/Resources/he.lproj/InfoPlist.strings    |  Bin 0 -> 310 bytes
 .../bundle/Resources/he.lproj/Localizable.strings  |  Bin 0 -> 4084 bytes
 .../bundle/Resources/he.lproj/locversion.plist     |   14 +
 .../Resources/he.lproj/main.nib/designable.nib     | 3523 +++++++++
 .../Resources/he.lproj/main.nib/keyedobjects.nib   |  Bin 0 -> 36438 bytes
 .../bundle/Resources/ko.lproj/Localizable.strings  |  Bin 2290 -> 3698 bytes
 .../bundle/Resources/ko.lproj/locversion.plist     |    4 +-
 .../Resources/ko.lproj/main.nib/designable.nib     | 7371 ++++++++++----------
 .../Resources/ko.lproj/main.nib/keyedobjects.nib   |  Bin 33266 -> 34656 bytes
 .../bundle/Resources/no.lproj/Localizable.strings  |  Bin 2758 -> 4480 bytes
 .../bundle/Resources/no.lproj/locversion.plist     |    4 +-
 .../Resources/no.lproj/main.nib/designable.nib     |  325 +-
 .../Resources/no.lproj/main.nib/keyedobjects.nib   |  Bin 34852 -> 36178 bytes
 .../bundle/Resources/pl.lproj/Localizable.strings  |  Bin 2672 -> 4232 bytes
 .../bundle/Resources/pl.lproj/locversion.plist     |    4 +-
 .../Resources/pl.lproj/main.nib/designable.nib     | 7446 ++++++++++----------
 .../Resources/pl.lproj/main.nib/keyedobjects.nib   |  Bin 35340 -> 38308 bytes
 .../bundle/Resources/pt.lproj/Localizable.strings  |  Bin 2834 -> 4554 bytes
 .../bundle/Resources/pt.lproj/locversion.plist     |    4 +-
 .../Resources/pt.lproj/main.nib/designable.nib     | 7417 ++++++++++----------
 .../Resources/pt.lproj/main.nib/keyedobjects.nib   |  Bin 35673 -> 37113 bytes
 .../Resources/pt_PT.lproj/Localizable.strings      |  Bin 2784 -> 4436 bytes
 .../bundle/Resources/pt_PT.lproj/locversion.plist  |    4 +-
 .../Resources/pt_PT.lproj/main.nib/designable.nib  |  416 +-
 .../pt_PT.lproj/main.nib/keyedobjects.nib          |  Bin 53755 -> 37202 bytes
 .../bundle/Resources/ru.lproj/Localizable.strings  |  Bin 2826 -> 4582 bytes
 .../bundle/Resources/ru.lproj/locversion.plist     |    4 +-
 .../Resources/ru.lproj/main.nib/designable.nib     | 7444 ++++++++++----------
 .../Resources/ru.lproj/main.nib/keyedobjects.nib   |  Bin 36037 -> 37349 bytes
 .../bundle/Resources/sk.lproj/InfoPlist.strings    |  Bin 0 -> 274 bytes
 .../bundle/Resources/sk.lproj/Localizable.strings  |  Bin 0 -> 4344 bytes
 .../bundle/Resources/sk.lproj/locversion.plist     |   14 +
 .../Resources/sk.lproj/main.nib/designable.nib     | 3522 +++++++++
 .../Resources/sk.lproj/main.nib/keyedobjects.nib   |  Bin 0 -> 35760 bytes
 .../bundle/Resources/sv.lproj/Localizable.strings  |  Bin 2682 -> 4348 bytes
 .../bundle/Resources/sv.lproj/locversion.plist     |    4 +-
 .../Resources/sv.lproj/main.nib/designable.nib     |  327 +-
 .../Resources/sv.lproj/main.nib/keyedobjects.nib   |  Bin 35414 -> 36778 bytes
 .../Resources/zh_CN.lproj/Localizable.strings      |  Bin 2140 -> 3420 bytes
 .../bundle/Resources/zh_CN.lproj/locversion.plist  |    4 +-
 .../Resources/zh_CN.lproj/main.nib/designable.nib  | 7389 ++++++++++---------
 .../zh_CN.lproj/main.nib/keyedobjects.nib          |  Bin 32549 -> 33668 bytes
 .../bundle/Resources/zh_TW.lproj/InfoPlist.strings |  Bin 266 -> 264 bytes
 .../Resources/zh_TW.lproj/Localizable.strings      |  Bin 2166 -> 3416 bytes
 .../bundle/Resources/zh_TW.lproj/locversion.plist  |    4 +-
 .../Resources/zh_TW.lproj/main.nib/designable.nib  |  581 +-
 .../zh_TW.lproj/main.nib/keyedobjects.nib          |  Bin 32488 -> 33671 bytes
 hw/xquartz/darwinEvents.c                          |    2 +-
 hw/xquartz/darwinEvents.h                          |    2 +-
 hw/xquartz/man/Xquartz.man                         |    3 +
 hw/xquartz/xpr/dri.c                               |   61 +-
 98 files changed, 42802 insertions(+), 32272 deletions(-)
 create mode 100644 hw/xquartz/bundle/Resources/English.lproj/locversion.plist
 create mode 100644 hw/xquartz/bundle/Resources/el.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/Resources/el.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/Resources/el.lproj/locversion.plist
 create mode 100644 hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib
 create mode 100644 hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/Resources/he.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/Resources/he.lproj/locversion.plist
 create mode 100644 hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib
 create mode 100644 hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/Resources/sk.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/Resources/sk.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/Resources/sk.lproj/locversion.plist
 create mode 100644 hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib
 create mode 100644 hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects.nib



More information about the xorg-devel mailing list