fix portabase compiling against recent qte snaps

BKrev: 42022fe1VgKZIGQOUjnEGvkl9-ka6w

diff --git a/packages/portabase/portabase-1.9/qtopia.patch b/packages/portabase/portabase-1.9/qtopia.patch
index e69de29..a3a8077 100644 (file)
--- a/packages/portabase/portabase-1.9/qtopia.patch
+++ b/packages/portabase/portabase-1.9/qtopia.patch
@@ -0,0 +1,70 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- portabase/portabase.pro~qtopia
++++ portabase/portabase.pro
+@@ -7,7 +7,7 @@
+                   portabase_zh_TW.ts
+ # determine which version to compile for
+ # options are desktop, qtopia, or sharp (add "test" for the test environment)
+-CONFIG         += desktop
++CONFIG         += qtopia
+ 
+ # Files common between all versions
+ HEADERS         = portabase.h \
+@@ -120,7 +120,7 @@
+                   metakitfuncs.cpp
+ 
+ # Stuff for all Linux/UNIX versions
+-unix:LIBS       += -lm -lmk4 -lbeecrypt -ljpeg
++unix:LIBS       += -lm -lmk4 -lbeecrypt -ljpeg -lstdc++
+ 
+ # Stuff for older Zaurus ROMs
+ qtopia:CONFIG  += zaurus
+@@ -155,44 +155,3 @@
+                       dynamicedit.cpp \
+                       inputdialog.cpp
+ 
+-# Stuff for the Qtopia test environment
+-test:TMAKE_CC   = gcc-2.95
+-test:TMAKE_CXX  = g++-2.95
+-
+-# Stuff for all desktop versions
+-desktop:CONFIG  += thread
+-desktop:HEADERS += desktop/QtaDatePicker.h \
+-                   desktop/applnk.h \
+-                   desktop/config.h \
+-                   desktop/dynamicedit.h \
+-                   desktop/filemanager.h \
+-                   desktop/fileselector.h \
+-                   desktop/helpbrowser.h \
+-                   desktop/importdialog.h \
+-                   desktop/newfiledialog.h \
+-                   desktop/oldconfig.h \
+-                   desktop/qpeapplication.h \
+-                   desktop/resource.h \
+-                   desktop/timestring.h
+-desktop:SOURCES += desktop/QtaDatePicker.cpp \
+-                   desktop/applnk.cpp \
+-                   desktop/config.cpp \
+-                   desktop/dynamicedit.cpp \
+-                   desktop/filemanager.cpp \
+-                   desktop/fileselector.cpp \
+-                   desktop/helpbrowser.cpp \
+-                   desktop/importdialog.cpp \
+-                   desktop/newfiledialog.cpp \
+-                   desktop/oldconfig.cpp \
+-                   desktop/qpeapplication.cpp \
+-                   desktop/resource.cpp \
+-                   desktop/timestring.cpp
+-
+-# Stuff for Windows
+-win32:LIBS                   += mk4vc60s.lib beecrypt.lib libjpeg.lib
+-win32:DEFINES                += QT_DLL
+-win32:RC_FILE                 = portabase.rc
+-win32:QMAKE_CXXFLAGS_RELEASE += /MD
+-win32:INCLUDEPATH            += D:\Devel\metakit-2.4.9.3\include \
+-                                D:\Devel\jpeg-6b \
+-                                D:\Devel

diff --git a/packages/portabase/portabase-1.9/qtversion.patch b/packages/portabase/portabase-1.9/qtversion.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/portabase/portabase_1.9.bb b/packages/portabase/portabase_1.9.bb
index e69de29..831f226 100644 (file)
--- a/packages/portabase/portabase_1.9.bb
+++ b/packages/portabase/portabase_1.9.bb
@@ -0,0 +1,127 @@
+DESCRIPTION = "Portabase is a small database program for creating, browsing, \
+and editing custom tables of data."
+SECTION = "opie/applications"
+LICENSE = "GPL"
+HOMEPAGE = "http://portabase.sourceforge.net/"
+DEPENDS = "metakit beecrypt"
+APPNAME = "portabase"
+PR = "r3"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/portabase/portabase_${PV}.tar.gz \
+          file://qtopia.patch;patch=1          \
+          file://fileselector.patch;patch=1    \
+           file://qtversion.patch;patch=1"
+S = "${WORKDIR}/portabase"
+
+inherit palmtop 
+
+do_configure_prepend() {
+       find . -name "Makefile"|xargs rm -f
+}
+
+QMAKE_PROFILES = "portabase.pro"
+QPEDIR = ${OPIEDIR}
+EXTRA_QMAKEVARS_POST += "CONFIG-=desktop"
+
+# lrelease portabase.pro
+
+do_install() {
+       install -d ${D}/${palmtopdir}/bin \
+                       ${D}/${palmtopdir}/apps/Applications \
+                       ${D}/${palmtopdir}/pics/${APPNAME}              \
+                       ${D}/${palmtopdir}/help/en
+       install -D -m 0755 ${APPNAME} ${D}/${palmtopdir}/bin/${APPNAME}
+       install -m 0644 package/${APPNAME}.desktop ${D}/${palmtopdir}/apps/Applications/${APPNAME}.desktop
+        
+       install -D -m 0644 pics/PortaBase.png ${D}/${palmtopdir}/pics/PortaBase.png
+       for f in calculator.png checked.png image.png note.png save.png save_disabled.png unchecked.png calendar.xpm QtaDatePickerNext.xpm QtaDatePickerPrev.xpm
+       do
+               install -D -m 0644 pics/$f ${D}/${palmtopdir}/pics/${APPNAME}/$f
+       done         
+
+       install -D -m 0644 help/html/${APPNAME}.html ${D}/${palmtopdir}/help/en/html/${APPNAME}.html
+} 
+
+
+pkg_postinst() {
+#!/bin/sh
+
+NEWTYPE=application/portabase
+EXT=pob
+
+T=${NEWTYPE%/*}
+S=${NEWTYPE#*/}
+
+grep  $EXT $QPEDIR/etc/mime.types |
+(
+    read TYPE EXTS
+    if [ -z "$TYPE" ]
+    then
+        if grep -q "^$NEWTYPE[  ]" $QPEDIR/etc/mime.types || grep -q "^$NEWTYPE$" $QPEDIR/etc/mime.types
+        then
+            if sed -e '/^'$T"\\/"$S'[   ]/ s/$/ '$EXT'/' <$QPEDIR/etc/mime.types >$QPEDIR/etc/mime.types.new ||
+               sed -e '/^'$T"\\/"$S'$/ s/$/             '$EXT'/' <$QPEDIR/etc/mime.types >$QPEDIR/etc/mime.types.new
+            then
+                mv $QPEDIR/etc/mime.types.new $QPEDIR/etc/mime.types
+                exit 0
+            else
+                echo >&2 "Internal MIME type update error"
+                exit 1
+            fi
+        else
+            echo "" >>$QPEDIR/etc/mime.types
+            sed -e :a -e '/^\n*$/{$d;N;};/\n$/ba' $QPEDIR/etc/mime.types >$QPEDIR/etc/mime.types.new
+            mv $QPEDIR/etc/mime.types.new $QPEDIR/etc/mime.types
+            echo "$NEWTYPE              $EXT" >>$QPEDIR/etc/mime.types
+            exit 0
+        fi
+    elif [ "$TYPE" = "$NEWTYPE" ]
+    then
+        #echo "Already done"
+        exit 0
+    else
+        echo >&2 "$EXT already assigned to $TYPE"
+        exit 1
+    fi
+)
+
+NEWTYPE=text/x-csv
+EXT=csv
+
+T=${NEWTYPE%/*}
+S=${NEWTYPE#*/}
+
+grep  $EXT $QPEDIR/etc/mime.types |
+(
+    read TYPE EXTS
+    if [ -z "$TYPE" ]
+    then
+        if grep -q "^$NEWTYPE[  ]" $QPEDIR/etc/mime.types || grep -q "^$NEWTYPE$" $QPEDIR/etc/mime.types
+        then
+            if sed -e '/^'$T"\\/"$S'[   ]/ s/$/ '$EXT'/' <$QPEDIR/etc/mime.types >$QPEDIR/etc/mime.types.new ||
+               sed -e '/^'$T"\\/"$S'$/ s/$/             '$EXT'/' <$QPEDIR/etc/mime.types >$QPEDIR/etc/mime.types.new
+            then
+                mv $QPEDIR/etc/mime.types.new $QPEDIR/etc/mime.types
+                exit 0
+            else
+                echo >&2 "Internal MIME type update error"
+                exit 1
+            fi
+        else
+            echo "" >>$QPEDIR/etc/mime.types
+            sed -e :a -e '/^\n*$/{$d;N;};/\n$/ba' $QPEDIR/etc/mime.types >$QPEDIR/etc/mime.types.new
+            mv $QPEDIR/etc/mime.types.new $QPEDIR/etc/mime.types
+            echo "$NEWTYPE              $EXT" >>$QPEDIR/etc/mime.types
+            exit 0
+        fi
+    elif [ "$TYPE" = "$NEWTYPE" ]
+    then
+        #echo "Already done"
+        exit 0
+    else
+        echo >&2 "$EXT already assigned to $TYPE"
+        exit 1
+    fi
+) 
+} 
+