summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-07-02 22:21:03 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-02 22:21:03 +0000
commit410863206ae912187e07c48f31d4398881c97233 (patch)
treed53cc008e77a0d827340228ab24e4dcd9c9b09af
parentc2fd5f3f9f19914fc7a1e41ffdc9935f54022b49 (diff)
opie-wellenreiter 1.2.2 remove upstream patch
-rw-r--r--packages/opie-wellenreiter/files/.mtn2git_empty0
-rw-r--r--packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch43
-rw-r--r--packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb3
3 files changed, 1 insertions, 45 deletions
diff --git a/packages/opie-wellenreiter/files/.mtn2git_empty b/packages/opie-wellenreiter/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/opie-wellenreiter/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch b/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch
deleted file mode 100644
index b85d46cb08..0000000000
--- a/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-
-This patch is backport from OPIE CVS.
-Submitted upstream by Marcin Juszkiewicz <openembedded@hrw.one.pl>
-Date: 2005-09-16
-
-Index: packetview.cpp
-===================================================================
-RCS file: /cvs/opie/noncore/net/wellenreiter/gui/packetview.cpp,v
-retrieving revision 1.9
-diff -u -r1.9 packetview.cpp
---- wellenreiter/gui/packetview.cpp 24 Aug 2004 11:53:44 -0000 1.9
-+++ wellenreiter/gui/packetview.cpp 16 Sep 2005 17:41:03 -0000
-@@ -20,6 +20,7 @@
- #include <opie2/odebug.h>
- #include <opie2/olistview.h>
- #include <opie2/oapplication.h>
-+#include <qpe/config.h>
-
- /* QT */
- #include <qfont.h>
-@@ -38,6 +39,9 @@
- PacketView::PacketView( QWidget * parent, const char * name, WFlags f )
- :QFrame( parent, name, f )
- {
-+ Config c( "qpe" );
-+ c.setGroup( "Appearance" );
-+
- _number = new QSpinBox( this );
- _number->setPrefix( "Pkt# " );
- _label = new QLabel( this );
-@@ -47,11 +51,10 @@
- _list->setColumnAlignment( 0, Qt::AlignCenter );
- _list->setColumnAlignment( 1, Qt::AlignLeft );
- _list->setAllColumnsShowFocus( true );
-- _list->setFont( QFont( "Fixed", 8 ) );
-
- _hex = new QTextView( this );
- _hex->setMargin( 0 );
-- _hex->setFont( QFont( "Fixed", 8 ) );
-+ _hex->setFont( QFont( c.readEntry( "FixedFontFamily", "Fixed" ), c.readNumEntry( "FixedFontSize", 8 ) ) );
-
- QVBoxLayout* vb = new QVBoxLayout( this, 2, 2 );
- QHBoxLayout* hb = new QHBoxLayout( vb, 2 );
diff --git a/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb b/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb
index 8d06318bb5..b2e3975f7a 100644
--- a/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb
+++ b/packages/opie-wellenreiter/opie-wellenreiter_1.2.2.bb
@@ -3,5 +3,4 @@ include ${PN}.inc
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/wellenreiter \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
- file://0916_wellenreiter-fontfix.patch;patch=1"
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"