diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /qpe-gaim | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
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
Diffstat (limited to 'qpe-gaim')
-rw-r--r-- | qpe-gaim/files/dont-look-for-gtk.patch | 18 | ||||
-rw-r--r-- | qpe-gaim/files/fix-compilation.patch | 16 | ||||
-rw-r--r-- | qpe-gaim/files/libopie2.patch | 92 | ||||
-rw-r--r-- | qpe-gaim/qpe-gaim_20041030.bb | 0 | ||||
-rw-r--r-- | qpe-gaim/qpe-libgaim_20041030.bb | 0 |
5 files changed, 0 insertions, 126 deletions
diff --git a/qpe-gaim/files/dont-look-for-gtk.patch b/qpe-gaim/files/dont-look-for-gtk.patch deleted file mode 100644 index 889a6aef31..0000000000 --- a/qpe-gaim/files/dont-look-for-gtk.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libgaim/configure.ac~dont-look-for-gtk -+++ libgaim/configure.ac -@@ -253,10 +253,6 @@ - *** GLib 2.0 is required to build Gaim; please make sure you have the GLib - *** development headers installed. The latest version of GLib is - *** always available at http://www.gtk.org/.])) --AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR([ --*** GTK+ 2.0 is required to build Gaim; please make sure you have the GTK+ --*** development headers installed. The latest version of GTK+ is --*** always available at http://www.gtk.org/.])) - - AC_PATH_PROG(gaimpath, gaim) - AC_SUBST(GTK_CFLAGS) diff --git a/qpe-gaim/files/fix-compilation.patch b/qpe-gaim/files/fix-compilation.patch deleted file mode 100644 index b752a03f20..0000000000 --- a/qpe-gaim/files/fix-compilation.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libgaim/Makefile.am~fix-compilation -+++ libgaim/Makefile.am -@@ -32,7 +32,7 @@ - appsdir = $(datadir)/applications - apps_DATA = gaim.desktop - --SUBDIRS = doc intl plugins po src -+SUBDIRS = plugins src - - docs: Doxyfile - @doxygen diff --git a/qpe-gaim/files/libopie2.patch b/qpe-gaim/files/libopie2.patch deleted file mode 100644 index 9ebb8bc264..0000000000 --- a/qpe-gaim/files/libopie2.patch +++ /dev/null @@ -1,92 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qpe-gaim/src/QGaimNotify.cpp~libopie2 -+++ qpe-gaim/src/QGaimNotify.cpp -@@ -28,9 +28,9 @@ - #include <qmessagebox.h> - #include <qtextview.h> - --#include <opie/odevice.h> -+#include <opie2/odevice.h> - --using namespace Opie; -+using namespace Opie::Core; - - static int notifyActiveCount = 0; - -@@ -215,7 +215,7 @@ - if (!gaim_prefs_get_bool("/gaim/qpe/notify/use_buzzer")) - return; - -- ODevice::inst()->alarmSound(); -+ ODevice::inst()->playAlarmSound(); - } - - void ---- qpe-gaim/src/QGaimPrefsDialog.cpp~libopie2 -+++ qpe-gaim/src/QGaimPrefsDialog.cpp -@@ -30,8 +30,8 @@ - #include <qvbox.h> - #include <qvgroupbox.h> - --#include <opie/otabwidget.h> --#include <opie/owait.h> -+#include <opie2/otabwidget.h> -+#include <opie2/owait.h> - - #include <qpe/resource.h> - -@@ -306,7 +306,7 @@ - layout = new QVBoxLayout(this); - layout->setAutoAdd(true); - -- tabs = new OTabWidget(this, "pref tabs"); -+ tabs = new Opie::Ui::OTabWidget(this, "pref tabs"); - - blistPage = new QGaimBlistPrefPage(this, "blist page"); - notifyPage = new QGaimNotifyPrefPage(this, "notify page"); -@@ -332,7 +332,7 @@ - void - QGaimPrefsDialog::accept() - { -- OWait wait(this); -+ Opie::Ui::OWait wait(this); - - wait.show(); - ---- qpe-gaim/src/QGaimPrefsDialog.h~libopie2 -+++ qpe-gaim/src/QGaimPrefsDialog.h -@@ -22,8 +22,8 @@ - #define _QGAIM_PREFS_DIALOG_H_ - - #include <qdialog.h> -+#include <opie2/otabwidget.h> - --class OTabWidget; - class QCheckBox; - - class QGaimPrefPage : public QWidget -@@ -150,7 +150,7 @@ - void buildInterface(); - - private: -- OTabWidget *tabs; -+ Opie::Ui::OTabWidget *tabs; - - QGaimPrefPage *blistPage; - QGaimPrefPage *convPage; ---- qpe-gaim/src/main.cpp~libopie2 -+++ qpe-gaim/src/main.cpp -@@ -20,7 +20,7 @@ - */ - #include "QGaimMainWindow.h" - --#include <qpe/qpeapplication.h> --#include <opie/oapplicationfactory.h> -+#include <opie2/oapplicationfactory.h> -+using namespace Opie::Core; - - OPIE_EXPORT_APP(OApplicationFactory<QGaimMainWindow>) diff --git a/qpe-gaim/qpe-gaim_20041030.bb b/qpe-gaim/qpe-gaim_20041030.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/qpe-gaim/qpe-gaim_20041030.bb +++ /dev/null diff --git a/qpe-gaim/qpe-libgaim_20041030.bb b/qpe-gaim/qpe-libgaim_20041030.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/qpe-gaim/qpe-libgaim_20041030.bb +++ /dev/null |