新秀の介の日記

_ 連休の谷間

うちの会社は、カレンダー通りなので、今日も仕事。今日も予想以上に仕事が多くて、大変だった。6日は、上司が留守らしいので、ちょっとはゆっくりできそうな感じ。

_ libimobiledevice2 1.1.1-1

オーディオCDがマウントできない問題のきっかけになったlibimobiledevice1とlibimobiledevice2がconflictしている問題だが、libimobiledevice2の方は、experimentalにアップロードされた1.1.1-1で対応されたようだ。ただし、libimobiledevice1は1.0.6-1じゃないとダメなのは変わらないが。

_ Bug-org 627699 : Port GTK2 to GTK3

gtk3 directory patch v1を試してみたんだけど、

$ patch -p1 < ~/patch-525346 
patching file widget/src/gtk3/Makefile.in
patching file widget/src/gtk2/gtk2drawing.c
patching file widget/src/gtk2/gtkdrawing.h
patching file widget/src/gtk2/maiRedundantObjectFactory.c
patching file widget/src/gtk2/maiRedundantObjectFactory.h
patching file widget/src/gtk2/mozcontainer.c
patching file widget/src/gtk2/mozcontainer.h
patching file widget/src/gtk2/nsAccessibilityHelper.cpp
patching file widget/src/gtk2/nsAccessibilityHelper.h
patching file widget/src/gtk2/nsAppShell.cpp
patching file widget/src/gtk2/nsAppShell.h
patching file widget/src/gtk2/nsBidiKeyboard.cpp
patching file widget/src/gtk2/nsBidiKeyboard.h
patching file widget/src/gtk2/nsCUPSShim.cpp
patching file widget/src/gtk2/nsCUPSShim.h
patching file widget/src/gtk2/nsClipboard.cpp
patching file widget/src/gtk2/nsClipboard.h
patching file widget/src/gtk2/nsDeviceContextSpecG.cpp
patching file widget/src/gtk2/nsDeviceContextSpecG.h
patching file widget/src/gtk2/nsDragService.cpp
patching file widget/src/gtk2/nsDragService.h
patching file widget/src/gtk2/nsFilePicker.cpp
patching file widget/src/gtk2/nsFilePicker.h
patching file widget/src/gtk2/nsGTKToolkit.h
patching file widget/src/gtk2/nsGtkCursors.h
patching file widget/src/gtk2/nsGtkIMModule.cpp
Hunk #1 succeeded at 127 (offset 1 line).
Hunk #2 succeeded at 281 (offset 1 line).
patching file widget/src/gtk2/nsGtkIMModule.h
patching file widget/src/gtk2/nsGtkKeyUtils.cpp
Hunk #2 FAILED at 217.
1 out of 2 hunks FAILED -- saving rejects to file widget/src/gtk3/nsGtkKeyUtils.cpp.rej
patching file widget/src/gtk2/nsGtkKeyUtils.h
patching file widget/src/gtk2/nsIImageToPixbuf.h
patching file widget/src/gtk2/nsIdleServiceGTK.cpp
patching file widget/src/gtk2/nsIdleServiceGTK.h
patching file widget/src/gtk2/nsImageToPixbuf.cpp
patching file widget/src/gtk2/nsImageToPixbuf.h
patching file widget/src/gtk3/nsLookAndFeel.cpp
patching file widget/src/gtk2/nsLookAndFeel.h
patching file widget/src/gtk2/nsNativeKeyBindings.cpp
patching file widget/src/gtk2/nsNativeKeyBindings.h
patching file widget/src/gtk2/nsNativeThemeGTK.cpp
Hunk #1 succeeded at 63 (offset -1 lines).
Hunk #2 succeeded at 644 (offset -1 lines).
Hunk #3 succeeded at 854 (offset -1 lines).
patching file widget/src/gtk2/nsNativeThemeGTK.h
patching file widget/src/gtk2/nsPSPrinters.cpp
patching file widget/src/gtk2/nsPSPrinters.h
patching file widget/src/gtk2/nsPaperPS.cpp
patching file widget/src/gtk2/nsPaperPS.h
patching file widget/src/gtk2/nsPrintDialogGTK.cpp
patching file widget/src/gtk2/nsPrintDialogGTK.h
patching file widget/src/gtk2/nsPrintOptionsGTK.cpp
patching file widget/src/gtk2/nsPrintOptionsGTK.h
patching file widget/src/gtk2/nsPrintSettingsGTK.cpp
patching file widget/src/gtk2/nsPrintSettingsGTK.h
patching file widget/src/gtk2/nsScreenGtk.cpp
patching file widget/src/gtk2/nsScreenGtk.h
patching file widget/src/gtk2/nsScreenManagerGtk.cpp
patching file widget/src/gtk2/nsScreenManagerGtk.h
patching file widget/src/gtk2/nsSound.cpp
patching file widget/src/gtk2/nsSound.h
patching file widget/src/gtk3/nsToolkit.cpp
patching file widget/src/gtk2/nsWidgetFactory.cpp
patching file widget/src/gtk3/nsWindow.cpp
patching file widget/src/gtk2/nsWindow.h

ってことで、うまくパッチが当たらない。もう少し、様子を見るしかないかな。