diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2004-09-08 22:01:54 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2004-09-08 22:01:54 +0000 |
commit | e3c4d5773e5d72874f92f6d02faea1fb53cc52b8 (patch) | |
tree | dec4533437005e807bfec08033bea5e2aeca7fba /kdepimpi | |
parent | 9955daa296111cfc2ade516713c420f72b045508 (diff) |
kdepim/pi: upgraded to 1.9.4
BKrev: 413f81526YF8nnO6JGmBz8VfppZjqA
Diffstat (limited to 'kdepimpi')
-rw-r--r-- | kdepimpi/files/libkcal.pro.patch (renamed from kdepimpi/kdepimpi/libkcal.pro.patch) | 0 | ||||
-rw-r--r-- | kdepimpi/files/libsnames.patch (renamed from kdepimpi/kdepimpi/libsnames.patch) | 0 | ||||
-rw-r--r-- | kdepimpi/files/locale.h.patch (renamed from kdepimpi/kdepimpi/locale.h.patch) | 0 | ||||
-rw-r--r-- | kdepimpi/files/manager.h.patch (renamed from kdepimpi/kdepimpi/xxportmanager.cpp.patch) | 0 | ||||
-rw-r--r-- | kdepimpi/files/qinputdialog_inc.patch | 0 | ||||
-rw-r--r-- | kdepimpi/files/xxportmanager.cpp.patch | 0 | ||||
-rw-r--r-- | kdepimpi/kdepimpi/manager.h.patch | 25 | ||||
-rw-r--r-- | kdepimpi/kdepimpi/qinputdialog_inc.patch | 51 | ||||
-rw-r--r-- | kdepimpi/kdepimpi_1.9.3a.oe | 89 | ||||
-rw-r--r-- | kdepimpi/kdepimpi_1.9.4.oe | 0 | ||||
-rw-r--r-- | kdepimpi/kdepimpi_cvs.oe | 5 |
11 files changed, 2 insertions, 168 deletions
diff --git a/kdepimpi/kdepimpi/libkcal.pro.patch b/kdepimpi/files/libkcal.pro.patch index e69de29bb2..e69de29bb2 100644 --- a/kdepimpi/kdepimpi/libkcal.pro.patch +++ b/kdepimpi/files/libkcal.pro.patch diff --git a/kdepimpi/kdepimpi/libsnames.patch b/kdepimpi/files/libsnames.patch index e69de29bb2..e69de29bb2 100644 --- a/kdepimpi/kdepimpi/libsnames.patch +++ b/kdepimpi/files/libsnames.patch diff --git a/kdepimpi/kdepimpi/locale.h.patch b/kdepimpi/files/locale.h.patch index e69de29bb2..e69de29bb2 100644 --- a/kdepimpi/kdepimpi/locale.h.patch +++ b/kdepimpi/files/locale.h.patch diff --git a/kdepimpi/kdepimpi/xxportmanager.cpp.patch b/kdepimpi/files/manager.h.patch index e69de29bb2..e69de29bb2 100644 --- a/kdepimpi/kdepimpi/xxportmanager.cpp.patch +++ b/kdepimpi/files/manager.h.patch diff --git a/kdepimpi/files/qinputdialog_inc.patch b/kdepimpi/files/qinputdialog_inc.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/kdepimpi/files/qinputdialog_inc.patch diff --git a/kdepimpi/files/xxportmanager.cpp.patch b/kdepimpi/files/xxportmanager.cpp.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/kdepimpi/files/xxportmanager.cpp.patch diff --git a/kdepimpi/kdepimpi/manager.h.patch b/kdepimpi/kdepimpi/manager.h.patch deleted file mode 100644 index bea9863ec0..0000000000 --- a/kdepimpi/kdepimpi/manager.h.patch +++ /dev/null @@ -1,25 +0,0 @@ - -Strange patch - not always needed - -diff -ur kdepim/microkde/kresources/manager.h kdepim-moj/microkde/kresources/manager.h ---- kdepim/microkde/kresources/manager.h 2004-06-26 21:02:46.000000000 +0200 -+++ kdepim-moj/microkde/kresources/manager.h 2004-07-02 17:01:25.000000000 +0200 -@@ -26,6 +26,9 @@ - - #include <qdict.h> - #include <qstringlist.h> -+#include <iostream> -+ -+using namespace std; - - #include "factory.h" - #include "managerimpl.h" -@@ -235,7 +238,7 @@ - - ConfigWidget *configWidget( const QString& type, QWidget *parent = 0 ) - { -- return mFactory->resourceConfigWidget( type, parent ); -+ return mFactory->configWidget( type, parent ); - } - - /** diff --git a/kdepimpi/kdepimpi/qinputdialog_inc.patch b/kdepimpi/kdepimpi/qinputdialog_inc.patch deleted file mode 100644 index 272de15593..0000000000 --- a/kdepimpi/kdepimpi/qinputdialog_inc.patch +++ /dev/null @@ -1,51 +0,0 @@ - -libqtaux contra libmicroqtcompat patch - -diff -ur kdepim/microkde/kresources/configpage.cpp kdepim-moj/microkde/kresources/configpage.cpp ---- kdepim/microkde/kresources/configpage.cpp 2004-06-26 21:02:47.000000000 +0200 -+++ kdepim-moj/microkde/kresources/configpage.cpp 2004-07-02 16:58:47.000000000 +0200 -@@ -22,7 +22,7 @@ - */ - - #include <qgroupbox.h> --#include <qinputdialog.h> -+#include <qtcompat/qinputdialog.h> - #include <qlabel.h> - #include <qlayout.h> - -diff -ur kdepim/kaddressbook/xxport/csvimportdialog.cpp kdepim-moj/kaddressbook/xxport/csvimportdialog.cpp ---- kdepim/kaddressbook/xxport/csvimportdialog.cpp 2004-06-26 21:02:22.000000000 +0200 -+++ kdepim-moj/kaddressbook/xxport/csvimportdialog.cpp 2004-07-02 17:30:28.000000000 +0200 -@@ -30,7 +30,7 @@ - #include <qbuttongroup.h> - #include <qcheckbox.h> - #include <qcombobox.h> --#include <qinputdialog.h> -+#include <qtcompat/qinputdialog.h> - #include <qlabel.h> - #include <qlineedit.h> - #include <qpushbutton.h> -diff -ur kdepim/kabc/distributionlisteditor.cpp kdepim-moj/kabc/distributionlisteditor.cpp ---- kdepim/kabc/distributionlisteditor.cpp 2004-06-29 07:22:55.000000000 +0200 -+++ kdepim-moj/kabc/distributionlisteditor.cpp 2004-07-02 17:09:14.000000000 +0200 -@@ -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> - -diff -ur kdepim/kaddressbook/keywidget.cpp kdepim-moj/kaddressbook/keywidget.cpp ---- kdepim/kaddressbook/keywidget.cpp 2004-06-26 21:02:14.000000000 +0200 -+++ kdepim-moj/kaddressbook/keywidget.cpp 2004-07-02 17:26:33.000000000 +0200 -@@ -23,7 +23,7 @@ - - #include <qfile.h> - --#include <qinputdialog.h> -+#include <qtcompat/qinputdialog.h> - - #include <qlabel.h> - #include <qlayout.h> diff --git a/kdepimpi/kdepimpi_1.9.3a.oe b/kdepimpi/kdepimpi_1.9.3a.oe deleted file mode 100644 index 1c9a244e80..0000000000 --- a/kdepimpi/kdepimpi_1.9.3a.oe +++ /dev/null @@ -1,89 +0,0 @@ -DESCRIPTION = "Korganizer/Pi is a powerful calender and ToDo Tool for Qt/Embedded based Palmtop Environments" -SECTION = "base" -PRIORITY = "optional" -MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" -LICENSE = "GPL" -DEPENDS ="virtual/libqpe" -HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/" -PR = "r3" - -SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepim193a.src.tar.gz \ -file://libkcal.pro.patch;patch=1 \ -file://manager.h.patch;patch=1 \ -file://qinputdialog_inc.patch;patch=1 \ -file://xxportmanager.cpp.patch;patch=1 " - -S = "${WORKDIR}/kdepim" - -inherit palmtop - -EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ INCLUDEPATH+=../ LIBS+=-L${S}/dest/ DESTDIR=${S}/dest LIBS+=-lstdc++" -QMAKE_PROFILES= "all.pro" - -# we don't have libopie1 (and ldap?) -#SUBDIRS="libical/src/libical libical/src/libicalss microkde libkcal libkdepim kabc kabc/converter/opie kabc/formats/binary kabc/plugins/file kabc/plugins/dir kabc/plugins/ldap kabc/plugins/opie korganizer kalarmd kaddressbook/xxport/opie kaddressbook" -SUBDIRS="libical/src/libical libical/src/libicalss microkde libkcal libkdepim kabc korganizer kalarmd kaddressbook kabc/plugins/file kabc/plugins/dir " - -# TODO: -# get KA/PI plugins working -# checking libmailwrapper changes -# author said that he didn't changed libetpan so we probably can get OE one -# compile opie mail/pi - - -do_configure_prepend() { - echo -e "TEMPLATE=subdirs\nSUBDIRS=qtcompat ${SUBDIRS}\n" >all.pro - mv ${S}/kabc/plugins/file/kabc_fileE.pro ${S}/kabc/plugins/file/fileE.pro - mv ${S}/kabc/plugins/dir/kabc_dirE.pro ${S}/kabc/plugins/dir/dirE.pro - for d in ${SUBDIRS} - do - mv -f ${d}/`basename ${d}`E.pro ${d}/`basename ${d}`.pro - done - mkdir "${S}/dest" -} - -do_install() { - install -d ${D}/${palmtopdir}/bin \ - ${D}/${palmtopdir}/lib \ - ${D}/${palmtopdir}/apps/1Pim \ - ${D}/${palmtopdir}/pics/kdepim/korganizer/icons16 \ - ${D}/${palmtopdir}/pics/kdepim/korganizer/iconsmini \ - ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons16 \ - ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons22 \ - ${D}/${palmtopdir}/plugins/applets - - install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}/${palmtopdir}/pics/ - install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}/${palmtopdir}/pics/ - install -m 0644 ${S}/bin/kdepim/korganizer/*.png ${D}/${palmtopdir}/pics/kdepim/korganizer - install -m 0644 ${S}/bin/kdepim/korganizer/*.wav ${D}/${palmtopdir}/pics/kdepim/korganizer - install -m 0644 ${S}/bin/kdepim/korganizer/*.txt ${D}/${palmtopdir}/pics/kdepim/korganizer - install -m 0644 ${S}/bin/kdepim/korganizer/icons16/*.png ${D}/${palmtopdir}/pics/kdepim/korganizer/icons16 - install -m 0644 ${S}/bin/kdepim/korganizer/iconsmini/*.png ${D}/${palmtopdir}/pics/kdepim/korganizer/iconsmini - install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/1Pim/korganizer.desktop - - install -m 0644 ${S}/bin/kdepim/kaddressbook/zone.tab ${D}/${palmtopdir}/pics/kdepim/kaddressbook - install -m 0644 ${S}/bin/kdepim/kaddressbook/*.png ${D}/${palmtopdir}/pics/kdepim/kaddressbook - install -m 0644 ${S}/bin/kdepim/kaddressbook/icons16/*.png ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons16 - install -m 0644 ${S}/bin/kdepim/kaddressbook/icons22/*.png ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons22 - install -m 0644 kaddressbook/kaddressbook.desktop ${D}/${palmtopdir}/apps/1Pim/kaddressbook.desktop - - for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat libmicrokabc_file libmicrokabc_dir - do - oe_libinstall -so -C ${S}/dest/ $f ${D}/${palmtopdir}/lib - done - - install -m 0755 ${S}/dest/kopi ${D}/${palmtopdir}/bin/kopi - install -m 0755 ${S}/dest/kapi ${D}/${palmtopdir}/bin/kapi - - for f in libkopialarmapplet - do - oe_libinstall -so -C ${S}/dest/ $f ${D}/${palmtopdir}/plugins/applets - done -} - -PACKAGES = "kopi kapi libmicrokdelibs kopi-applet" - -FILES_kopi = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/*" -FILES_kapi = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_*" -FILES_kopi-applet = "${palmtopdir}/plugins/applets/* ${palmtopdir}/pics/ko16.png ${palmtopdir}/pics/ko24.png" -FILES_libmicrokdelibs = "${palmtopdir}/lib/*" diff --git a/kdepimpi/kdepimpi_1.9.4.oe b/kdepimpi/kdepimpi_1.9.4.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/kdepimpi/kdepimpi_1.9.4.oe diff --git a/kdepimpi/kdepimpi_cvs.oe b/kdepimpi/kdepimpi_cvs.oe index 15ae404a40..5ee03468fa 100644 --- a/kdepimpi/kdepimpi_cvs.oe +++ b/kdepimpi/kdepimpi_cvs.oe @@ -15,8 +15,7 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" LICENSE = "GPL" DEPENDS = "gammu" # libetpan libmailwrapper" will be needed for KMicroMail/PI HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/" -PV = "1.9.3a-${CVSDATE}" -PR = "r6" +PV = "1.9.4-${CVSDATE}" DEFAULT_PREFERENCE = "-1" @@ -27,8 +26,8 @@ SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/kdepimpi;module=kdepim \ file://qinputdialog_inc.patch;patch=1 \ file://manager.h.patch;patch=1 \ file://libkcal.pro.patch;patch=1 \ -file://libsnames.patch;patch=1 \ " +#file://libsnames.patch;patch=1 \ - patch to get bluetooth & gammu libs S = "${WORKDIR}/kdepim" |