8 files changed, 84 insertions, 46 deletions
diff --git a/packages/djvulibre/.mtn2git_empty b/packages/djvulibre/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/djvulibre/.mtn2git_empty
diff --git a/packages/djvulibre/djvulibre/.mtn2git_empty b/packages/djvulibre/djvulibre/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/djvulibre/djvulibre/.mtn2git_empty
diff --git a/packages/djvulibre/djvulibre/fix-cross-configure.patch b/packages/djvulibre/djvulibre/fix-cross-configure.patch
new file mode 100644
index 0000000000..42d4eff715
--- /dev/null
+++ b/packages/djvulibre/djvulibre/fix-cross-configure.patch
@@ -0,0 +1,50 @@
+--- /tmp/acinclude.m4	2007-08-09 22:33:05.000000000 +0200
++++ djvulibre-3.5.19/config/acinclude.m4	2007-08-09 22:33:39.288400000 +0200
+@@ -784,30 +784,6 @@
+         QTDIR=no
+     fi
+   fi
+-  # Execute
+-  if test "x$ac_has_qt" != xno ; then
+-    AC_MSG_CHECKING([if a small Qt program runs])
+-    AC_LANG_PUSH(C++)
+-    save_CXXFLAGS="$CXXFLAGS"
+-    save_LIBS="$LIBS"
+-    CXXFLAGS="$CXXFLAGS $CFLAGS $THREAD_CFLAGS $QT_CFLAGS $X_CFLAGS"
+-    LIBS="$THREAD_LIBS $QT_LIBS $X_LIBS $LIBS"
+-    AC_TRY_RUN([
+-#include <qfile.h>
+-#include <qtextstream.h>
+-#include <qglobal.h>
+-int main() { 
+-QFile qf("confout"); if (!qf.open(IO_WriteOnly)) return 1;
+-QTextStream ts(&qf); ts << QT_VERSION; return 0;
+-}],[okay=yes],[okay=no; QTDIR=no]) 
+-    CXXFLAGS="$save_CXXFLAGS"
+-    LIBS="$save_LIBS"
+-    AC_LANG_POP(C++)
+-    AC_MSG_RESULT($okay)
+-    if test "x$okay" = xno ; then
+-      ac_has_qt=no
+-    fi
+-  fi
+   # Version
+   if test "x$ac_has_qt" != xno ; then
+      AC_MSG_CHECKING([Qt version])
+--- /tmp/configure.ac	2007-08-09 22:46:50.000000000 +0200
++++ djvulibre-3.5.19/configure.ac	2007-08-09 22:47:06.988400000 +0200
+@@ -563,14 +563,8 @@
+ 
+ /* - QT */
+ #ifdef HAVE_QT
+-#if HAVE_QT < 200
+-#define QT1
+-#elif HAVE_QT < 300
+-#define QT2
+-#else
+ #define QT3
+ #endif
+-#endif
+ 
+ /* - X STUFF */
+ #ifdef HAVE_SYS_IPC_H
diff --git a/packages/djvulibre/djvulibre_3.5.19.bb b/packages/djvulibre/djvulibre_3.5.19.bb
new file mode 100644
index 0000000000..5ba5751f2d
--- /dev/null
+++ b/packages/djvulibre/djvulibre_3.5.19.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities."
+LICENSE = "GPL"
+
+DEPENDS = "jpeg libpng tiff"
+
+SRC_URI = "http://downloads.sourceforge.net/djvu/djvulibre-${PV}.tar.gz \
+           file://fix-cross-configure.patch;patch=1"
+
+
+inherit qt4x11 autotools pkgconfig
+
+#export QT_LIBS = "${OE_QMAKE_LIBS_QT}"
+#export QT_CFLAGS = "${OE_QMAKE_CXXFLAGS} -I${QTDIR}/include/Qt/ "
+
+EXTRA_OECONF = " --enable-threads \
+                 --with-qt=${QTDIR} "
+
+PACKAGES =+ "libdjvulibre"
+
+FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
+FILES_${PN} += "${datadir}/djvu"
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/evince/evince_0.9.2.bb b/packages/evince/evince_0.9.2.bb
index 64e2e41275..51bc969bff 100644
--- a/packages/evince/evince_0.9.2.bb
+++ b/packages/evince/evince_0.9.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu."
 LICENSE = "GPL"
 SECTION = "x11/office"
-DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
+DEPENDS = "tiff djvulibre libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
 RDEPENDS = "espgs "
 RRECOMMENDS = "gnome-vfs-plugin-file"
 PR = "r1"
@@ -12,5 +12,9 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.9/${PN}-${PV}.tar.bz2
            file://no-icon-theme.diff;patch=1;pnum=0 \
            file://no-help-dir.patch;patch=1"
 
-EXTRA_OECONF = "--without-libgnome --disable-thumbnailer --disable-scrollkeeper"
+EXTRA_OECONF = " --without-libgnome \
+                 --disable-thumbnailer \
+		 --disable-scrollkeeper \
+		 --enable-djvu \
+		 "
 
diff --git a/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch b/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch
deleted file mode 100644
index 83ee765b12..0000000000
--- a/packages/opie-bluetoothapplet/files/sysconfig-bluetooth.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- applet.org/bluezapplet.cpp.org	2007-02-11 16:48:06.000000000 +0000
-+++ applet/bluezapplet.cpp	2007-02-11 16:56:57.000000000 +0000
-@@ -52,6 +52,8 @@
- #include <qtimer.h>
- #include <qpopupmenu.h>
- #include <qmessagebox.h>
-+#include <qfile.h>
-+#include <qtextstream.h>
- 
- /* STD */
- #include <device.h>
-@@ -124,6 +126,28 @@
-     int BluezApplet::setBluezStatus(int c, bool sync) {
- 
-         if ( c == 1 ) {
-+
-+	    QFile cfg("/etc/sysconfig/bluetooth");
-+	    if(cfg.open(IO_ReadOnly)) {
-+	        QTextStream stream (&cfg);
-+    		QString streamIn = stream.read();
-+        	QStringList list = QStringList::split("\n", streamIn);
-+		cfg.close();
-+		if(list.grep("BLUETOOTH_PORT=").count() > 0 &&
-+                   list.grep("BLUETOOTH_PROTOCOL=").count() > 0 &&
-+                   list.grep("BLUETOOTH_SPEED=").count() > 0) {
-+		    btDevice = new Device( list.grep("BLUETOOTH_PORT=")[0].
-+                                           replace((QString)"BLUETOOTH_PORT=", ""),
-+                                           list.grep("BLUETOOTH_PROTOCOL=")[0].
-+                                           replace((QString)"BLUETOOTH_PROTOCOL=", ""),
-+                                           list.grep("BLUETOOTH_SPEED=")[0].
-+                                           replace((QString)"BLUETOOTH_SPEED=", ""));
-+                    return 0;
-+		}
-+	    }
-+
-+	    // Device-specific stuff - should be removed
-+
-             switch ( ODevice::inst()->model() ) {
-             case Model_iPAQ_H39xx:
-                 btDevice = new Device( "/dev/tts/1", "bcsp", "921600" );
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb
index f35accf577..f54012285d 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_1.2.3.bb
@@ -4,5 +4,3 @@ PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/applet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics/bluetoothapplet"
-
-#           file://sysconfig-bluetooth.patch;patch=1"
diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
index a919c3094b..04756ed77a 100644
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
@@ -4,5 +4,4 @@ PV = "${OPIE_CVS_PV}"
 PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/applet \
-           ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet \
-           file://sysconfig-bluetooth.patch;patch=1"
+           ${HANDHELDS_CVS};module=opie/pics/bluetoothapplet"