Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.

BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA

3 files changed, 126 insertions, 0 deletions

diff --git a/qpe-gaim/files/dont-look-for-gtk.patch b/qpe-gaim/files/dont-look-for-gtk.patch
index e69de29bb2..889a6aef31 100644
--- a/qpe-gaim/files/dont-look-for-gtk.patch
+++ b/qpe-gaim/files/dont-look-for-gtk.patch
@@ -0,0 +1,18 @@
+
+#
+# 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
index e69de29bb2..b752a03f20 100644
--- a/qpe-gaim/files/fix-compilation.patch
+++ b/qpe-gaim/files/fix-compilation.patch
@@ -0,0 +1,16 @@
+
+#
+# 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
index e69de29bb2..9ebb8bc264 100644
--- a/qpe-gaim/files/libopie2.patch
+++ b/qpe-gaim/files/libopie2.patch
@@ -0,0 +1,92 @@
+
+#
+# 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>)