summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/gpe-dm/files/Xserver-spitz.patch11
-rw-r--r--packages/gpe-dm/gpe-dm_0.47.bb5
-rw-r--r--packages/gqview/.mtn2git_empty0
-rw-r--r--packages/gqview/gqview-2.1.1/.mtn2git_empty0
-rw-r--r--packages/gqview/gqview-2.1.1/include-path-fix.patch11
-rw-r--r--packages/gqview/gqview_2.1.1.bb12
-rw-r--r--packages/gtk-webcore/osb-jscore_20050430.bb4
7 files changed, 41 insertions, 2 deletions
diff --git a/packages/gpe-dm/files/Xserver-spitz.patch b/packages/gpe-dm/files/Xserver-spitz.patch
new file mode 100644
index 0000000000..f30b705d13
--- /dev/null
+++ b/packages/gpe-dm/files/Xserver-spitz.patch
@@ -0,0 +1,11 @@
+--- gpe-dm-0.47/Xserver~ 2005-07-29 11:58:59.000000000 -0700
++++ gpe-dm-0.47/Xserver 2005-08-01 11:20:42.000000000 -0700
+@@ -62,6 +62,8 @@
+ ;;
+ "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+ ARGS="$ARGS -rgba rgb" ;;
++ "SHARP Spitz")
++ ARGS="$ARGS -rgba rgb -screen 640x480@270" ;;
+ "Simpad")
+ ARGS="$ARGS -rgba rgb" ;;
+ "Generic OMAP1510/1610/1710")
diff --git a/packages/gpe-dm/gpe-dm_0.47.bb b/packages/gpe-dm/gpe-dm_0.47.bb
index a98220547e..5f87b3ce6a 100644
--- a/packages/gpe-dm/gpe-dm_0.47.bb
+++ b/packages/gpe-dm/gpe-dm_0.47.bb
@@ -6,9 +6,10 @@ SECTION = "gpe"
PRIORITY = "optional"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
DEPENDS = "glib-2.0"
-PR = "r1"
+PR = "r2"
INITSCRIPT_NAME = "gpe-dm"
INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
-SRC_URI += "file://collie-suspend-hack.patch;patch=1"
+SRC_URI += "file://collie-suspend-hack.patch;patch=1 \
+ file://Xserver-spitz.patch;patch=1"
diff --git a/packages/gqview/.mtn2git_empty b/packages/gqview/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gqview/.mtn2git_empty
diff --git a/packages/gqview/gqview-2.1.1/.mtn2git_empty b/packages/gqview/gqview-2.1.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gqview/gqview-2.1.1/.mtn2git_empty
diff --git a/packages/gqview/gqview-2.1.1/include-path-fix.patch b/packages/gqview/gqview-2.1.1/include-path-fix.patch
new file mode 100644
index 0000000000..614c69a2c3
--- /dev/null
+++ b/packages/gqview/gqview-2.1.1/include-path-fix.patch
@@ -0,0 +1,11 @@
+--- gqview-2.1.1/src/Makefile.am.orig 2005-08-02 10:27:57.883396232 +0000
++++ gqview-2.1.1/src/Makefile.am 2005-08-02 10:28:19.032181128 +0000
+@@ -3,7 +3,7 @@
+
+ INCLUDES = -I$(srcdir) -I$(builddir) \
+ -I$(top_srcdir) -I$(top_builddir) \
+- -I$(includedir) $(GTK_CFLAGS)
++ $(GTK_CFLAGS)
+
+ module_SLIK = \
+ intl.h \
diff --git a/packages/gqview/gqview_2.1.1.bb b/packages/gqview/gqview_2.1.1.bb
new file mode 100644
index 0000000000..83f9de44e2
--- /dev/null
+++ b/packages/gqview/gqview_2.1.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "A gtk based image viewer"
+SECTION = "x11/graphics"
+DEPENDS = "gtk+"
+LICENSE = "GPL"
+HOMEPAGE = "http://gqview.sourceforge.net/"
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gqview/gqview-2.1.1.tar.gz \
+ file://include-path-fix.patch;patch=1"
+
+inherit autotools
+
diff --git a/packages/gtk-webcore/osb-jscore_20050430.bb b/packages/gtk-webcore/osb-jscore_20050430.bb
index 963f603ca3..d7bf8cb7a1 100644
--- a/packages/gtk-webcore/osb-jscore_20050430.bb
+++ b/packages/gtk-webcore/osb-jscore_20050430.bb
@@ -7,6 +7,7 @@ SECTION = "gpe"
FIXEDCVSDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
PV = "0.5.0+cvs${FIXEDCVSDATE}"
+PR = "r1"
SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDCVSDATE} \
file://libm.patch;patch=1"
@@ -14,6 +15,9 @@ S = "${WORKDIR}/JavaScriptCore"
inherit autotools pkgconfig
+# zap CPPFLAGS to avoid trouble with internal vs. pcre from staging
+CPPFLAGS = ""
+
do_configure () {
autotools_do_configure
cd ${S}