author | simon <simon> | 2002-11-24 10:36:54 (UTC) |
---|---|---|
committer | simon <simon> | 2002-11-24 10:36:54 (UTC) |
commit | 9387bc3f63b1e48c559d0758c50d9af857e7feeb (patch) (unidiff) | |
tree | 13318ea1c82fcdb54790af111537ca00708746f3 /inputmethods | |
parent | 83a6751b29b0a7e77d09477880cdc16e14dfe0a1 (diff) | |
download | opie-9387bc3f63b1e48c559d0758c50d9af857e7feeb.zip opie-9387bc3f63b1e48c559d0758c50d9af857e7feeb.tar.gz opie-9387bc3f63b1e48c559d0758c50d9af857e7feeb.tar.bz2 |
- link multikey, dvorak and keyboard input method against pickboard
(and updated ipkg dependencies accordingly) , to avoid duplicated
symbols at run-time (patch posted on opie list a couple of days ago)
-rw-r--r-- | inputmethods/dvorak/dvorak.pro | 6 | ||||
-rw-r--r-- | inputmethods/dvorak/opie-dvorak.control | 2 | ||||
-rw-r--r-- | inputmethods/keyboard/keyboard.pro | 6 | ||||
-rw-r--r-- | inputmethods/keyboard/opie-keyboard.control | 2 | ||||
-rw-r--r-- | inputmethods/multikey/multikey.pro | 6 | ||||
-rw-r--r-- | inputmethods/multikey/opie-multikey.control | 2 |
6 files changed, 6 insertions, 18 deletions
diff --git a/inputmethods/dvorak/dvorak.pro b/inputmethods/dvorak/dvorak.pro index 5c14761..3236749 100644 --- a/inputmethods/dvorak/dvorak.pro +++ b/inputmethods/dvorak/dvorak.pro | |||
@@ -1,31 +1,27 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS= dvorak.h \ | 3 | HEADERS= dvorak.h \ |
4 | ../pickboard/pickboardcfg.h \ | ||
5 | ../pickboard/pickboardpicks.h \ | ||
6 | dvorakimpl.h | 4 | dvorakimpl.h |
7 | SOURCES= dvorak.cpp \ | 5 | SOURCES= dvorak.cpp \ |
8 | ../pickboard/pickboardcfg.cpp \ | ||
9 | ../pickboard/pickboardpicks.cpp \ | ||
10 | dvorakimpl.cpp | 6 | dvorakimpl.cpp |
11 | TARGET = qdvorak | 7 | TARGET = qdvorak |
12 | DESTDIR = ../../plugins/inputmethods | 8 | DESTDIR = ../../plugins/inputmethods |
13 | INCLUDEPATH += $(OPIEDIR)/include | 9 | INCLUDEPATH += $(OPIEDIR)/include |
14 | DEPENDPATH += ../$(OPIEDIR)/include ../../launcher | 10 | DEPENDPATH += ../$(OPIEDIR)/include ../../launcher |
15 | LIBS += -lqpe | 11 | LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard |
16 | VERSION = 1.0.0 | 12 | VERSION = 1.0.0 |
17 | 13 | ||
18 | TRANSLATIONS = ../../i18n/de/libqdvorak.ts \ | 14 | TRANSLATIONS = ../../i18n/de/libqdvorak.ts \ |
19 | ../../i18n/en/libqdvorak.ts \ | 15 | ../../i18n/en/libqdvorak.ts \ |
20 | ../../i18n/es/libqdvorak.ts \ | 16 | ../../i18n/es/libqdvorak.ts \ |
21 | ../../i18n/fr/libqdvorak.ts \ | 17 | ../../i18n/fr/libqdvorak.ts \ |
22 | ../../i18n/hu/libqdvorak.ts \ | 18 | ../../i18n/hu/libqdvorak.ts \ |
23 | ../../i18n/ja/libqdvorak.ts \ | 19 | ../../i18n/ja/libqdvorak.ts \ |
24 | ../../i18n/ko/libqdvorak.ts \ | 20 | ../../i18n/ko/libqdvorak.ts \ |
25 | ../../i18n/no/libqdvorak.ts \ | 21 | ../../i18n/no/libqdvorak.ts \ |
26 | ../../i18n/pl/libqdvorak.ts \ | 22 | ../../i18n/pl/libqdvorak.ts \ |
27 | ../../i18n/pt/libqdvorak.ts \ | 23 | ../../i18n/pt/libqdvorak.ts \ |
28 | ../../i18n/pt_BR/libqdvorak.ts \ | 24 | ../../i18n/pt_BR/libqdvorak.ts \ |
29 | ../../i18n/sl/libqdvorak.ts \ | 25 | ../../i18n/sl/libqdvorak.ts \ |
30 | ../../i18n/zh_CN/libqdvorak.ts \ | 26 | ../../i18n/zh_CN/libqdvorak.ts \ |
31 | ../../i18n/zh_TW/libqdvorak.ts | 27 | ../../i18n/zh_TW/libqdvorak.ts |
diff --git a/inputmethods/dvorak/opie-dvorak.control b/inputmethods/dvorak/opie-dvorak.control index 11a33b9..fcc9138 100644 --- a/inputmethods/dvorak/opie-dvorak.control +++ b/inputmethods/dvorak/opie-dvorak.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Files: plugins/inputmethods/libqdvorak.so* | 1 | Files: plugins/inputmethods/libqdvorak.so* |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/inputmethods | 3 | Section: opie/inputmethods |
4 | Maintainer: Jeremy Cowgar <jc@cowgar.com> | 4 | Maintainer: Jeremy Cowgar <jc@cowgar.com> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-4 | 6 | Version: $QPE_VERSION-4 |
7 | Depends: opie-base ($QPE_VERSION) | 7 | Depends: opie-base ($QPE_VERSION) opie-pickboard |
8 | Description: Dvorak keyboard input method | 8 | Description: Dvorak keyboard input method |
9 | Dvorak keyboard input method for the Opie environment. This is | 9 | Dvorak keyboard input method for the Opie environment. This is |
10 | based off of the original keyboard input method. Thanks be to | 10 | based off of the original keyboard input method. Thanks be to |
11 | Martin Jones <mjones@trolltech.com> for the original. | 11 | Martin Jones <mjones@trolltech.com> for the original. |
diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro index 105316f..540d177 100644 --- a/inputmethods/keyboard/keyboard.pro +++ b/inputmethods/keyboard/keyboard.pro | |||
@@ -1,31 +1,27 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS= keyboard.h \ | 3 | HEADERS= keyboard.h \ |
4 | ../pickboard/pickboardcfg.h \ | ||
5 | ../pickboard/pickboardpicks.h \ | ||
6 | keyboardimpl.h | 4 | keyboardimpl.h |
7 | SOURCES= keyboard.cpp \ | 5 | SOURCES= keyboard.cpp \ |
8 | ../pickboard/pickboardcfg.cpp \ | ||
9 | ../pickboard/pickboardpicks.cpp \ | ||
10 | keyboardimpl.cpp | 6 | keyboardimpl.cpp |
11 | TARGET = qkeyboard | 7 | TARGET = qkeyboard |
12 | DESTDIR = ../../plugins/inputmethods | 8 | DESTDIR = ../../plugins/inputmethods |
13 | INCLUDEPATH += $(OPIEDIR)/include | 9 | INCLUDEPATH += $(OPIEDIR)/include |
14 | DEPENDPATH += ../$(OPIEDIR)/include ../../launcher | 10 | DEPENDPATH += ../$(OPIEDIR)/include ../../launcher |
15 | LIBS += -lqpe | 11 | LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard |
16 | VERSION = 1.0.0 | 12 | VERSION = 1.0.0 |
17 | 13 | ||
18 | TRANSLATIONS = ../../i18n/de/libqkeyboard.ts \ | 14 | TRANSLATIONS = ../../i18n/de/libqkeyboard.ts \ |
19 | ../../i18n/en/libqkeyboard.ts \ | 15 | ../../i18n/en/libqkeyboard.ts \ |
20 | ../../i18n/es/libqkeyboard.ts \ | 16 | ../../i18n/es/libqkeyboard.ts \ |
21 | ../../i18n/fr/libqkeyboard.ts \ | 17 | ../../i18n/fr/libqkeyboard.ts \ |
22 | ../../i18n/hu/libqkeyboard.ts \ | 18 | ../../i18n/hu/libqkeyboard.ts \ |
23 | ../../i18n/ja/libqkeyboard.ts \ | 19 | ../../i18n/ja/libqkeyboard.ts \ |
24 | ../../i18n/ko/libqkeyboard.ts \ | 20 | ../../i18n/ko/libqkeyboard.ts \ |
25 | ../../i18n/no/libqkeyboard.ts \ | 21 | ../../i18n/no/libqkeyboard.ts \ |
26 | ../../i18n/pl/libqkeyboard.ts \ | 22 | ../../i18n/pl/libqkeyboard.ts \ |
27 | ../../i18n/pt/libqkeyboard.ts \ | 23 | ../../i18n/pt/libqkeyboard.ts \ |
28 | ../../i18n/pt_BR/libqkeyboard.ts \ | 24 | ../../i18n/pt_BR/libqkeyboard.ts \ |
29 | ../../i18n/sl/libqkeyboard.ts \ | 25 | ../../i18n/sl/libqkeyboard.ts \ |
30 | ../../i18n/zh_CN/libqkeyboard.ts \ | 26 | ../../i18n/zh_CN/libqkeyboard.ts \ |
31 | ../../i18n/zh_TW/libqkeyboard.ts | 27 | ../../i18n/zh_TW/libqkeyboard.ts |
diff --git a/inputmethods/keyboard/opie-keyboard.control b/inputmethods/keyboard/opie-keyboard.control index cd60148..2a6b7a5 100644 --- a/inputmethods/keyboard/opie-keyboard.control +++ b/inputmethods/keyboard/opie-keyboard.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Files: plugins/inputmethods/libqkeyboard.so* | 1 | Files: plugins/inputmethods/libqkeyboard.so* |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/inputmethods | 3 | Section: opie/inputmethods |
4 | Maintainer: Martin Jones <mjones@trolltech.com> | 4 | Maintainer: Martin Jones <mjones@trolltech.com> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: opie-base ($QPE_VERSION) | 7 | Depends: opie-base ($QPE_VERSION) opie-pickboard |
8 | Description: Keyboard input method | 8 | Description: Keyboard input method |
9 | Keyboard input method for the Opie environment. | 9 | Keyboard input method for the Opie environment. |
diff --git a/inputmethods/multikey/multikey.pro b/inputmethods/multikey/multikey.pro index 1171602..268640e 100644 --- a/inputmethods/multikey/multikey.pro +++ b/inputmethods/multikey/multikey.pro | |||
@@ -1,31 +1,27 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS= keyboard.h \ | 3 | HEADERS= keyboard.h \ |
4 | configdlg.h \ | 4 | configdlg.h \ |
5 | ../pickboard/pickboardcfg.h \ | ||
6 | ../pickboard/pickboardpicks.h \ | ||
7 | keyboardimpl.h | 5 | keyboardimpl.h |
8 | SOURCES= keyboard.cpp \ | 6 | SOURCES= keyboard.cpp \ |
9 | configdlg.cpp \ | 7 | configdlg.cpp \ |
10 | ../pickboard/pickboardcfg.cpp \ | ||
11 | ../pickboard/pickboardpicks.cpp \ | ||
12 | keyboardimpl.cpp | 8 | keyboardimpl.cpp |
13 | TARGET = qmultikey | 9 | TARGET = qmultikey |
14 | DESTDIR = $(OPIEDIR)/plugins/inputmethods | 10 | DESTDIR = $(OPIEDIR)/plugins/inputmethods |
15 | INCLUDEPATH += $(OPIEDIR)/include | 11 | INCLUDEPATH += $(OPIEDIR)/include |
16 | DEPENDPATH += ../$(OPIEDIR)/include ../../launcher | 12 | DEPENDPATH += ../$(OPIEDIR)/include ../../launcher |
17 | LIBS += -lqpe | 13 | LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard |
18 | VERSION = 1.0.0 | 14 | VERSION = 1.0.0 |
19 | 15 | ||
20 | TRANSLATIONS = ../../i18n/pt_BR/libqmultikey.ts | 16 | TRANSLATIONS = ../../i18n/pt_BR/libqmultikey.ts |
21 | TRANSLATIONS += ../../i18n/de/libqmultikey.ts | 17 | TRANSLATIONS += ../../i18n/de/libqmultikey.ts |
22 | TRANSLATIONS += ../../i18n/en/libqmultikey.ts | 18 | TRANSLATIONS += ../../i18n/en/libqmultikey.ts |
23 | TRANSLATIONS += ../../i18n/hu/libqmultikey.ts | 19 | TRANSLATIONS += ../../i18n/hu/libqmultikey.ts |
24 | TRANSLATIONS += ../../i18n/sl/libqmultikey.ts | 20 | TRANSLATIONS += ../../i18n/sl/libqmultikey.ts |
25 | TRANSLATIONS += ../../i18n/ja/libqmultikey.ts | 21 | TRANSLATIONS += ../../i18n/ja/libqmultikey.ts |
26 | TRANSLATIONS += ../../i18n/ko/libqmultikey.ts | 22 | TRANSLATIONS += ../../i18n/ko/libqmultikey.ts |
27 | TRANSLATIONS += ../../i18n/pl/libqmultikey.ts | 23 | TRANSLATIONS += ../../i18n/pl/libqmultikey.ts |
28 | TRANSLATIONS += ../../i18n/no/libqmultikey.ts | 24 | TRANSLATIONS += ../../i18n/no/libqmultikey.ts |
29 | TRANSLATIONS += ../../i18n/zh_CN/libqmultikey.ts | 25 | TRANSLATIONS += ../../i18n/zh_CN/libqmultikey.ts |
30 | TRANSLATIONS += ../../i18n/zh_TW/libqmultikey.ts | 26 | TRANSLATIONS += ../../i18n/zh_TW/libqmultikey.ts |
31 | TRANSLATIONS += ../../i18n/fr/libqmultikey.ts | 27 | TRANSLATIONS += ../../i18n/fr/libqmultikey.ts |
diff --git a/inputmethods/multikey/opie-multikey.control b/inputmethods/multikey/opie-multikey.control index ce39f36..3de8b02 100644 --- a/inputmethods/multikey/opie-multikey.control +++ b/inputmethods/multikey/opie-multikey.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Files: plugins/inputmethods/libqmultikey.so* share/multikey/* | 1 | Files: plugins/inputmethods/libqmultikey.so* share/multikey/* |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/inputmethods | 3 | Section: opie/inputmethods |
4 | Maintainer: Jake Richardson (jake@asdfnews.org) | 4 | Maintainer: Jake Richardson (jake@asdfnews.org) |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: opie-base ($QPE_VERSION) | 7 | Depends: opie-base ($QPE_VERSION) opie-pickboard |
8 | Description: Multiple language keyboard | 8 | Description: Multiple language keyboard |
9 | Keyboard for inputing multiple languages in the OPIE environment. | 9 | Keyboard for inputing multiple languages in the OPIE environment. |