diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-01-31 14:08:06 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-01-31 14:08:06 +0000 |
| commit | 89f1a8087bb92e853ae09b2bd25a10eede6b6cb5 (patch) | |
| tree | 4e9487da1150e54f108b1f506cf9a41f3ef540ee | |
| parent | 0b3d3d6023caa009737b7b820d67f125dab4a376 (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into marcinj.local:/home/hrw/zaurus/bb/openembedded
2005/01/31 15:07:30+01:00 local!hrw
kdepimpi updated to 2.0.0
BKrev: 41fe3bc6Rm9keN9-yojNYP3wGO67rA
| -rw-r--r-- | packages/kdepimpi/files/qinputdialog_inc.patch | 11 | ||||
| -rw-r--r-- | packages/kdepimpi/files/qt2310.patch (renamed from packages/kdepimpi/kdepimpi_1.9.16.bb) | 0 | ||||
| -rw-r--r-- | packages/kdepimpi/kdepimpi-base.inc | 1 | ||||
| -rw-r--r-- | packages/kdepimpi/kdepimpi_2.0.0.bb | 0 | ||||
| -rw-r--r-- | packages/kdepimpi/kdepimpi_cvs.bb | 2 |
5 files changed, 2 insertions, 12 deletions
diff --git a/packages/kdepimpi/files/qinputdialog_inc.patch b/packages/kdepimpi/files/qinputdialog_inc.patch index 6044ae5c14..50a925c64d 100644 --- a/packages/kdepimpi/files/qinputdialog_inc.patch +++ b/packages/kdepimpi/files/qinputdialog_inc.patch @@ -25,17 +25,6 @@ #include <qlabel.h> #include <qlineedit.h> #include <qpushbutton.h> ---- kdepim/kabc/distributionlisteditor.cpp~qinputdialog_inc.patch -+++ kdepim/kabc/distributionlisteditor.cpp -@@ -22,7 +22,7 @@ - #include <qlayout.h> - #include <qpushbutton.h> - #include <qcombobox.h> --#include <qinputdialog.h> -+#include <qtcompat/qinputdialog.h> - #include <qbuttongroup.h> - #include <qradiobutton.h> - --- kdepim/kaddressbook/keywidget.cpp~qinputdialog_inc.patch +++ kdepim/kaddressbook/keywidget.cpp @@ -23,7 +23,7 @@ diff --git a/packages/kdepimpi/kdepimpi_1.9.16.bb b/packages/kdepimpi/files/qt2310.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/kdepimpi/kdepimpi_1.9.16.bb +++ b/packages/kdepimpi/files/qt2310.patch diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc index 8702419b4e..6e8340ccc3 100644 --- a/packages/kdepimpi/kdepimpi-base.inc +++ b/packages/kdepimpi/kdepimpi-base.inc @@ -18,6 +18,7 @@ HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/" # libetpan & libmailwrapper as replacement for kdepim/pi versions SRC_URI += "\ +file://qt2310.patch;patch=1 \ file://qinputdialog_inc.patch;patch=1 \ file://libkcal.pro.patch;patch=1 \ " diff --git a/packages/kdepimpi/kdepimpi_2.0.0.bb b/packages/kdepimpi/kdepimpi_2.0.0.bb new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/kdepimpi/kdepimpi_2.0.0.bb diff --git a/packages/kdepimpi/kdepimpi_cvs.bb b/packages/kdepimpi/kdepimpi_cvs.bb index b520981d7c..343ce7d8ed 100644 --- a/packages/kdepimpi/kdepimpi_cvs.bb +++ b/packages/kdepimpi/kdepimpi_cvs.bb @@ -1,4 +1,4 @@ -PV = "1.9.16+cvs-${CVSDATE}" +PV = "2.0.0+cvs-${CVSDATE}" DEFAULT_PREFERENCE = "-1" |