diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-09-13 06:56:47 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-13 06:56:47 +0000 |
| commit | a63613a7b4795860b74a9b45a9b0c2653050144c (patch) | |
| tree | 30c55c1abf28c773c1beb4f9abe94cfa616c03cd | |
| parent | 6418fc60db8a058f106f0efcc3a1bc79274387e7 (diff) | |
opie-wellenreiter:
Drop the we-version.patch as it was a backport from Opie CVS
and is now available with Opie 1.2.1
| -rw-r--r-- | packages/opie-wellenreiter/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/opie-wellenreiter/files/we-version.patch | 44 | ||||
| -rw-r--r-- | packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb | 5 |
3 files changed, 2 insertions, 47 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/we-version.patch b/packages/opie-wellenreiter/files/we-version.patch deleted file mode 100644 index 9a35368be9..0000000000 --- a/packages/opie-wellenreiter/files/we-version.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- wellenreiter/gui/gui.pro 2004-12-25 09:13:32.000000000 +1300 -+++ wellenreiter/gui/gui.pro 2005-04-24 21:43:30.000000000 +1200 -@@ -33,6 +33,9 @@ - DEPENDPATH += $(OPIEDIR)/include - INTERFACES = configbase.ui - TARGET = wellenreiter -+VERSION = 1.0.5 -+ -+DEFINES += WELLENREITER_VERSION='"$$VERSION (GPL) Opie"' - - !contains( platform, x11 ) { - message( qws ) ---- wellenreiter/gui/wellenreiter.cpp 2004-10-29 23:51:08.000000000 +1300 -+++ wellenreiter/gui/wellenreiter.cpp 2005-04-24 21:43:30.000000000 +1200 -@@ -569,7 +569,8 @@ - } - - // check if wireless extension version matches -- if ( ONetwork::wirelessExtensionCompileVersion() != iface->wirelessExtensionDriverVersion() ) -+ if ( ONetwork::wirelessExtensionCompileVersion() != iface->wirelessExtensionDriverVersion() -+ && ( ONetwork::wirelessExtensionCompileVersion() <= 15 || iface->wirelessExtensionDriverVersion() <= 15 ) ) - { - QMessageBox::critical( this, "Wellenreiter II", tr( "<p>The Wireless Extension Versions<br>do not match!<p>" - " Wellenreiter II : WE V%1<br>Interface driver: WE V%2" ) ---- wellenreiter/gui/wellenreiterbase.cpp 2004-08-24 23:53:44.000000000 +1200 -+++ wellenreiter/gui/wellenreiterbase.cpp 2005-04-24 21:43:30.000000000 +1200 -@@ -33,8 +33,6 @@ - #include <qtabwidget.h> - #endif - --#define WELLENREITER_VERSION "V1.0.3 (unofficial)" -- - /* - * Constructs a WellenreiterBase which is a child of 'parent', with the - * name 'name' and widget flags set to 'f' -@@ -111,7 +109,7 @@ - QPainter draw( &logo ); - draw.setPen( Qt::black ); - draw.setFont( QFont( "Fixed", 8 ) ); -- draw.drawText( 30, 10, WELLENREITER_VERSION ); -+ draw.drawText( 5, 10, WELLENREITER_VERSION ); - - PixmapLabel1_3_2->setPixmap( logo ); - PixmapLabel1_3_2->setScaledContents( TRUE ); diff --git a/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb b/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb index b57aa392a9..b2e3975f7a 100644 --- a/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb +++ b/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb @@ -1,7 +1,6 @@ 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://we-version.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" |