← Back to branch summary

~ubuntu-branches/ubuntu/vivid/scim-bridge/vivid

« back to all changes in this revision

Viewing changes to debian/patches/30_correct_moc.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2009-06-25 22:02:52 UTC
  • mfrom: (1.1.9 upstream) (6.2.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090625220252-2qn0jwi9re34zcth
Tags: 0.4.16-2ubuntu1
* Resynchronise with Debian. Remaining changes:
  - 50_check_scim_binary.dpatch: Fix 10-20s delay in launching apps when
    scim is not running.
  - 50_fix_qt4_focus.dpatch: Fix focus loss under KDE 4.
  - 51_quiet.dpatch: Turn some error messages into debug lines.
  - Just have scim-bridge-agent depend on scim, not scim | skim.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/30_correct_moc.dpatch
5
5
## DP:
6
6
 
7
7
@DPATCH@
8
 
diff -ruNad scim-bridge-0.4.13-orig/client-qt/qt4/Makefile.am scim-bridge-0.4.13/client-qt/qt4/Makefile.am
9
 
--- scim-bridge-0.4.13-orig/client-qt/qt4/Makefile.am   2007-08-25 10:19:37.000000000 +0000
10
 
+++ scim-bridge-0.4.13/client-qt/qt4/Makefile.am        2007-08-25 10:20:18.000000000 +0000
11
 
@@ -44,7 +44,7 @@
12
 
 im_scim_bridge_la_LIBADD  = $(top_srcdir)/common/libscimbridgecommon.la \
13
 
                                                        $(top_srcdir)/client-common/libscimbridgeclientcommon.la
14
 
 
15
 
-MOC = @QT4_PREFIX@/bin/moc
16
 
+MOC = /usr/bin/moc-qt4
17
 
 
18
 
 CLEANFILES = moc_scim-bridge-client-qt.cpp
19
 
 
20
 
diff -ruNad scim-bridge-0.4.13-orig/client-qt/qt4/Makefile.in scim-bridge-0.4.13/client-qt/qt4/Makefile.in
21
 
--- scim-bridge-0.4.13-orig/client-qt/qt4/Makefile.in   2007-08-25 10:19:37.000000000 +0000
22
 
+++ scim-bridge-0.4.13/client-qt/qt4/Makefile.in        2007-08-25 10:20:49.000000000 +0000
23
 
@@ -254,7 +254,7 @@
24
 
 im_scim_bridge_la_LIBADD = $(top_srcdir)/common/libscimbridgecommon.la \
25
 
                                                        $(top_srcdir)/client-common/libscimbridgeclientcommon.la
26
 
 
27
 
-MOC = @QT4_PREFIX@/bin/moc
28
 
+MOC = /usr/bin/moc-qt4
29
 
 CLEANFILES = moc_scim-bridge-client-qt.cpp
30
 
 all: all-am
31
 
 
 
8
diff -ruNad scim-bridge-0.4.16.orig/client-qt/qt3/Makefile.am scim-bridge-0.4.16/client-qt/qt3/Makefile.am
 
9
--- scim-bridge-0.4.16.orig/client-qt/qt3/Makefile.am   2009-04-28 12:55:13.000000000 +0800
 
10
+++ scim-bridge-0.4.16/client-qt/qt3/Makefile.am        2009-04-28 13:07:15.000000000 +0800
 
11
@@ -44,7 +44,7 @@
 
12
 im_scim_bridge_la_LIBADD  = $(top_srcdir)/common/libscimbridgecommon.la \
 
13
                                                        $(top_srcdir)/client-common/libscimbridgeclientcommon.la
 
14
 
 
15
-MOC = @QT3_PREFIX@/bin/moc
 
16
+MOC = /usr/bin/moc-qt3
 
17
 
 
18
 moc_scim-bridge-client-qt.cpp: ../scim-bridge-client-qt.h
 
19
        $(MOC) $< -o $@
 
20
diff -ruNad scim-bridge-0.4.16.orig/client-qt/qt3/Makefile.in scim-bridge-0.4.16/client-qt/qt3/Makefile.in
 
21
--- scim-bridge-0.4.16.orig/client-qt/qt3/Makefile.in   2009-04-28 12:55:13.000000000 +0800
 
22
+++ scim-bridge-0.4.16/client-qt/qt3/Makefile.in        2009-04-28 13:07:43.000000000 +0800
 
23
@@ -261,7 +261,7 @@
 
24
 @SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@im_scim_bridge_la_LIBADD = $(top_srcdir)/common/libscimbridgecommon.la \
 
25
 @SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@                                                  $(top_srcdir)/client-common/libscimbridgeclientcommon.la
 
26
 
 
27
-@SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@MOC = @QT3_PREFIX@/bin/moc
 
28
+@SCIM_BRIDGE_BUILD_QT3_IMMODULE_TRUE@MOC = /usr/bin/moc-qt3
 
29
 MAINTAINERCLEANFILES = Makefile.in
 
30
 CLEANFILES = moc_scim-bridge-client-qt.cpp
 
31
 all: all-am
 
32
diff -ruNad scim-bridge-0.4.16.orig/client-qt/qt4/Makefile.am scim-bridge-0.4.16/client-qt/qt4/Makefile.am
 
33
--- scim-bridge-0.4.16.orig/client-qt/qt4/Makefile.am   2009-04-28 12:55:13.000000000 +0800
 
34
+++ scim-bridge-0.4.16/client-qt/qt4/Makefile.am        2009-04-28 13:06:01.000000000 +0800
 
35
@@ -44,7 +44,7 @@
 
36
 im_scim_bridge_la_LIBADD  = $(top_srcdir)/common/libscimbridgecommon.la \
 
37
                                                        $(top_srcdir)/client-common/libscimbridgeclientcommon.la
 
38
 
 
39
-MOC = @QT4_PREFIX@/bin/moc
 
40
+MOC = /usr/bin/moc-qt4
 
41
 
 
42
 moc_scim-bridge-client-qt.cpp: ../scim-bridge-client-qt.h
 
43
        $(MOC) $< -o $@
 
44
diff -ruNad scim-bridge-0.4.16.orig/client-qt/qt4/Makefile.in scim-bridge-0.4.16/client-qt/qt4/Makefile.in
 
45
--- scim-bridge-0.4.16.orig/client-qt/qt4/Makefile.in   2009-04-28 12:55:13.000000000 +0800
 
46
+++ scim-bridge-0.4.16/client-qt/qt4/Makefile.in        2009-04-28 13:06:47.000000000 +0800
 
47
@@ -261,7 +261,7 @@
 
48
 @SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@im_scim_bridge_la_LIBADD = $(top_srcdir)/common/libscimbridgecommon.la \
 
49
 @SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@                                                  $(top_srcdir)/client-common/libscimbridgeclientcommon.la
 
50
 
 
51
-@SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@MOC = @QT4_PREFIX@/bin/moc
 
52
+@SCIM_BRIDGE_BUILD_QT4_IMMODULE_TRUE@MOC = /usr/bin/moc-qt4
 
53
 MAINTAINERCLEANFILES = Makefile.in
 
54
 CLEANFILES = moc_scim-bridge-client-qt.cpp
 
55
 all: all-am