Merge oe-devel@oe-devel.bkbits.net:openembedded

into hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA

6 files changed, 0 insertions, 203 deletions

diff --git a/kdepimpi/files/libkcal.pro.patch b/kdepimpi/files/libkcal.pro.patch
deleted file mode 100644
index 48733e2176..0000000000
--- a/kdepimpi/files/libkcal.pro.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdepim/libkcal/libkcalE.pro.orig	2004-06-29 18:51:39.000000000 +0200
-+++ kdepim/libkcal/libkcalE.pro	2004-07-05 21:58:01.000000000 +0200
-@@ -8,8 +8,8 @@
- OBJECTS_DIR = obj/$(PLATFORM)
- MOC_DIR = moc/$(PLATFORM)
- DESTDIR = $(QPEDIR)/lib
--LIBS += ../libical/lib/$(PLATFORM)/libical.a
--LIBS += ../libical/lib/$(PLATFORM)/libicalss.a
-+LIBS += ../dest/libical.a
-+LIBS += ../dest/libicalss.a
- 
- INTERFACES = \
- 
diff --git a/kdepimpi/files/manager.h.patch b/kdepimpi/files/manager.h.patch
deleted file mode 100644
index bea9863ec0..0000000000
--- a/kdepimpi/files/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/files/qinputdialog_inc.patch b/kdepimpi/files/qinputdialog_inc.patch
deleted file mode 100644
index 272de15593..0000000000
--- a/kdepimpi/files/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-base.inc b/kdepimpi/kdepimpi-base.inc
deleted file mode 100644
index 8397ead352..0000000000
--- a/kdepimpi/kdepimpi-base.inc
+++ /dev/null
@@ -1,114 +0,0 @@
-DESCRIPTION = "KDE-Pim Platform Independent - port of KDE Pim to PDA"
-DESCRIPTION_kopi = "Korganizer/PI is a powerful calendar and ToDo Tool"
-DESCRIPTION_kopi-applet = "KDE Pim/PI applet"
-DESCRIPTION_kapi = "KAddressbook/PI is a port of KDE addressbook"
-DESCRIPTION_libmicrokdelibs    = "KDE Pim/PI library - microkde"
-DESCRIPTION_libmicrokcal     = "KDE Pim/PI library - microkcal"
-DESCRIPTION_libmicrokabc     = "KDE Pim/PI library - microkabc"
-
-SECTION = "opie/pim"
-PRIORITY = "optional"
-MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
-LICENSE = "GPL"
-HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
-#DEPENDS = "gammu libetpan libmailwrapper"
-# gammu as replacement for libmicrogammu
-# libetpan & libmailwrapper as replacement for kdepim/pi versions
-
-SRC_URI += "\
-file://qinputdialog_inc.patch;patch=1 \
-file://manager.h.patch;patch=1 \
-file://libkcal.pro.patch;patch=1 \
-"
-
-# TODO:
-# checking libmailwrapper changes (diff sent to opie-devel ML)
-# author said that he didn't changed libetpan so we probably can get OE one
-# compile opie mail/pi
-
-# we can't build:
-# kabc/plugins/sharpdtm - wants libsl     (Sharp ROM 3.x closed source library)
-# kabc/plugins/ldap     - wants ldap libs (?)
-# kabc/plugins/opie     - wants libopie1  (we don't plan to have it in OE)
-# kmicromail            - have to check changes in KDEPIM/PI version libmailwrapper
-
-
-S = "${WORKDIR}/kdepim"
-EXTRA_QMAKEVARS_POST += "KDEPIMDIR=${S} INCLUDEPATH+=../ OBJECTS_DIR=obj/ MOC_DIR=moc/ \
-			 LIBS+=-L${S}/dest/ DESTDIR=${S}/dest LIBS+=-lstdc++ \
-			 LIBS+=-Wl,-rpath-link,${S}/dest \
-			 "
-
-# That changes will be needed for KMicroMail/PI to get it build with OE libs
-#
-#             LIBS-=-lkmicromailwrapper LIBS+=-lmailwrapper LIBS+=-lopiecore2 \
-
-QMAKE_PROFILES= "all.pro"
-SUBDIRS="libical/src/libical libical/src/libicalss microkde libkcal libkdepim \
-		kabc korganizer kalarmd kaddressbook kabc/plugins/file kabc/plugins/dir \ 
-		kabc/formats/binary kabc/plugins/qtopia "
-#		"gammu/emb/common gammu/emb/gammu " build
-#		"pwmanager/pwmanager" needs patching to link with qpe (?)
-
-inherit palmtop
-
-do_compile() {
-	export KDEPIMDIR=${S}
-	oe_runmake
-}
-
-do_configure_prepend() {
-		mv ${S}/kabc/formats/binary/kabcformat_binaryE.pro ${S}/kabc/formats/binary/binaryE.pro
-        echo -e "TEMPLATE=subdirs\nSUBDIRS=qtcompat ${SUBDIRS}\n" >all.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/*.* ${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/*.* ${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 libmicrokabcformat_binary libmicrokabc_qtopia
-    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 = "libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs"
-
-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_* ${palmtopdir}/lib/libmicrokabcformat_binary*"
-FILES_kopi-applet = "${palmtopdir}/plugins/applets/* ${palmtopdir}/pics/ko16.png ${palmtopdir}/pics/ko24.png"
-FILES_libmicrokabc = "${palmtopdir}/lib/libmicrokabc*"
-FILES_libmicrokcal = "${palmtopdir}/lib/libmicrokcal*"
-FILES_libmicrokdelibs = "${palmtopdir}/lib/*"
diff --git a/kdepimpi/kdepimpi_1.9.14.bb b/kdepimpi/kdepimpi_1.9.14.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/kdepimpi/kdepimpi_1.9.14.bb
+++ /dev/null
diff --git a/kdepimpi/kdepimpi_cvs.bb b/kdepimpi/kdepimpi_cvs.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/kdepimpi/kdepimpi_cvs.bb
+++ /dev/null