summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2007-04-03 22:57:15 +0000
committerFlorian Boor <florian.boor@kernelconcepts.de>2007-04-03 22:57:15 +0000
commit79c1321ceef5a08e82736001150252908a9c7d5b (patch)
treefdc1fb9287ea5525b07cb712d48d1c9d4af5f605
parent57a694b5428496fb3a695c9464a233c417338f00 (diff)
parent8f4d2026901746ce13a60cf6257f98d626ee3e9e (diff)
merge of '6bfdd9236ce5c2bd674bdbbed5ae1c5559601bbb'
and 'fabb00d3c735a2ae45fdff625310786d786ca26b'
-rw-r--r--packages/gnome/libart-lgpl/i486/.mtn2git_empty0
-rw-r--r--packages/gnome/libart-lgpl/i486/art_config.h10
-rw-r--r--packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/.mtn2git_empty0
-rw-r--r--packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/gpsapi.patch13
-rw-r--r--packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb8
5 files changed, 28 insertions, 3 deletions
diff --git a/packages/gnome/libart-lgpl/i486/.mtn2git_empty b/packages/gnome/libart-lgpl/i486/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome/libart-lgpl/i486/.mtn2git_empty
diff --git a/packages/gnome/libart-lgpl/i486/art_config.h b/packages/gnome/libart-lgpl/i486/art_config.h
new file mode 100644
index 0000000000..b0e74ad6ae
--- /dev/null
+++ b/packages/gnome/libart-lgpl/i486/art_config.h
@@ -0,0 +1,10 @@
+/* Automatically generated by gen_art_config.c */
+
+#define ART_SIZEOF_CHAR 1
+#define ART_SIZEOF_SHORT 2
+#define ART_SIZEOF_INT 4
+#define ART_SIZEOF_LONG 4
+
+typedef unsigned char art_u8;
+typedef unsigned short art_u16;
+typedef unsigned int art_u32;
diff --git a/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/.mtn2git_empty b/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/.mtn2git_empty
diff --git a/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/gpsapi.patch b/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/gpsapi.patch
new file mode 100644
index 0000000000..638a877b77
--- /dev/null
+++ b/packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/gpsapi.patch
@@ -0,0 +1,13 @@
+--- prismstumbler-0.7.4pre1/src/daemon/gpsctl.c~ 2007-04-04 00:10:03.000000000 +0200
++++ prismstumbler-0.7.4pre1/src/daemon/gpsctl.c 2007-04-04 00:10:03.000000000 +0200
+@@ -30,8 +30,8 @@
+ if(!gps_conn)
+ return 0;
+
+- *lat = (float) gps_conn->newdata.latitude;
+- *lon = (float) gps_conn->newdata.longitude;
++ *lat = (float) gps_conn->fix.latitude;
++ *lon = (float) gps_conn->fix.longitude;
+ return 1;
+ }
+
diff --git a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
index 44401df7dd..9311f894d0 100644
--- a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
@@ -1,5 +1,5 @@
SECTION = "x11/network"
-PR = "r0"
+PR = "r1"
PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc"
DESCRIPTION = "Prismstumbler wireless LAN scanner"
@@ -9,7 +9,8 @@ DEPENDS = "libpcap gtk+ wireless-tools sqlite zlib dbus-glib gpsd"
RDEPENDS = "wireless-tools"
RRECOMMENDS = "gpsd"
-SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-0.7.4pre1.tar.gz"
+SRC_URI = "http://projects.linuxtogo.org/frs/download.php/14/${PN}-0.7.4pre1.tar.gz \
+ file://gpsapi.patch;patch=1"
S = "${WORKDIR}/${PN}-0.7.4pre1"
@@ -21,7 +22,8 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--with-libpcap=${STAGING_DIR}/${HOST_SYS} \
--with-sqlite-includes=${STAGING_INCDIR} \
--with-sqlite-libs=${STAGING_LIBDIR} \
- --without-athena --enable-dbus"
+ --without-athena --enable-dbus \
+ --with-libiw=${STAGING_DIR}/${HOST_SYS}"
CFLAGS =+ "-I${S}/include"
LDFLAGS += "-lz"