diff options
| author | ccsmart <ccsmart@smartpal.de> | 2005-07-09 16:29:38 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-09 16:29:38 +0000 |
| commit | 965b805b451106d6a5e41e0fe8fb3847b4dddd29 (patch) | |
| tree | 418d03e54bd5490b8fc3ffc7da3a61c7be6f2347 /packages/kdepimpi | |
| parent | ce85bae0ffbca430dd50976c0b5397b3a822b6f7 (diff) | |
| parent | b10227fbeee14a88de96acaa9b4e3f3042de5b30 (diff) | |
merge of 741270052fa677010603209da3adb0f5194af3ef
and 8b65cbd401e1f926a05aed4038504520748a6824
Diffstat (limited to 'packages/kdepimpi')
| -rw-r--r-- | packages/kdepimpi/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/kdepimpi/files/opie-fontselector-copy.patch | 19 | ||||
| -rw-r--r-- | packages/kdepimpi/kdepimpi_2.1.13.bb (renamed from packages/kdepimpi/kdepimpi_2.1.9.bb) | 0 | ||||
| -rw-r--r-- | packages/kdepimpi/pwmpi.inc | 3 | ||||
| -rw-r--r-- | packages/kdepimpi/pwmpi_2.1.13.bb (renamed from packages/kdepimpi/pwmpi_2.1.9.bb) | 0 |
5 files changed, 3 insertions, 19 deletions
diff --git a/packages/kdepimpi/files/.mtn2git_empty b/packages/kdepimpi/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/kdepimpi/files/.mtn2git_empty +++ /dev/null diff --git a/packages/kdepimpi/files/opie-fontselector-copy.patch b/packages/kdepimpi/files/opie-fontselector-copy.patch deleted file mode 100644 index c38c25a359..0000000000 --- a/packages/kdepimpi/files/opie-fontselector-copy.patch +++ /dev/null @@ -1,19 +0,0 @@ -Patch taken from OPIE project - -Index: ofontselector.cpp -=================================================================== -RCS file: /cvs/opie/libopie2/opieui/ofontselector.cpp,v -retrieving revision 1.7 -retrieving revision 1.8 -diff -u -r1.7 -r1.8 ---- kdepim/microkde/ofontselector.cpp.orig 2005-03-08 14:13:14 +0100 -+++ kdepim/microkde/ofontselector.cpp 2005-03-08 14:14:48 +0100 -@@ -137,7 +137,7 @@ - this, SLOT( fontSizeClicked( int ) ) ); - gridLayout->addWidget( d-> m_font_size_list, 3, 1 ); - -- d-> m_pointbug = ( qt_version ( ) <= 233 ); -+ d->m_pointbug = ( qt_version() == 232 || qt_version() == 233 ); // SharpROM uses 2.3.2 - - if ( withpreview ) { - d-> m_preview = new QMultiLineEdit ( this, "Preview" ); diff --git a/packages/kdepimpi/kdepimpi_2.1.9.bb b/packages/kdepimpi/kdepimpi_2.1.13.bb index f3dde1a2fd..f3dde1a2fd 100644 --- a/packages/kdepimpi/kdepimpi_2.1.9.bb +++ b/packages/kdepimpi/kdepimpi_2.1.13.bb diff --git a/packages/kdepimpi/pwmpi.inc b/packages/kdepimpi/pwmpi.inc index 7f4ebcc5a0..2b77eed0de 100644 --- a/packages/kdepimpi/pwmpi.inc +++ b/packages/kdepimpi/pwmpi.inc @@ -12,6 +12,9 @@ INCLUDEPATH+=${STAGING_INCDIR}/kdepimpi/ \ LIBS+=-L${STAGING_LIBDIR}/kdepimpi/ \ " +do_configure_prepend() { +} + do_stage() { } diff --git a/packages/kdepimpi/pwmpi_2.1.9.bb b/packages/kdepimpi/pwmpi_2.1.13.bb index 904f640955..904f640955 100644 --- a/packages/kdepimpi/pwmpi_2.1.9.bb +++ b/packages/kdepimpi/pwmpi_2.1.13.bb |