From f96441b9faf769c9ecdd4d338b605ea3d0cc4010 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Tue, 9 Nov 2004 00:36:47 +0000
Subject: Disable bk EOLN_NATIVE conversions on all files in packages
 FILESPATHs, to prevent it screwing up patches.

BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
---
 kdepimpi/files/libkcal.pro.patch      | 13 +++++++++
 kdepimpi/files/manager.h.patch        | 25 +++++++++++++++++
 kdepimpi/files/qinputdialog_inc.patch | 51 +++++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+)

(limited to 'kdepimpi/files')

diff --git a/kdepimpi/files/libkcal.pro.patch b/kdepimpi/files/libkcal.pro.patch
index e69de29bb2..48733e2176 100644
--- a/kdepimpi/files/libkcal.pro.patch
+++ b/kdepimpi/files/libkcal.pro.patch
@@ -0,0 +1,13 @@
+--- 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
index e69de29bb2..bea9863ec0 100644
--- a/kdepimpi/files/manager.h.patch
+++ b/kdepimpi/files/manager.h.patch
@@ -0,0 +1,25 @@
+
+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
index e69de29bb2..272de15593 100644
--- a/kdepimpi/files/qinputdialog_inc.patch
+++ b/kdepimpi/files/qinputdialog_inc.patch
@@ -0,0 +1,51 @@
+
+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>
-- 
cgit v1.2.3