summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/cups/cups_1.1.23.bb17
-rw-r--r--packages/libmatchbox/libmatchbox_1.9.bb9
-rw-r--r--packages/matchbox-wm/matchbox-wm_1.1.bb33
-rw-r--r--packages/nonworking/gutenprint/.mtn2git_empty0
-rw-r--r--packages/nonworking/gutenprint/gutenprint_5.0.0.bb22
5 files changed, 76 insertions, 5 deletions
diff --git a/packages/cups/cups_1.1.23.bb b/packages/cups/cups_1.1.23.bb
index 8252ef949c..d5b0d649ba 100644
--- a/packages/cups/cups_1.1.23.bb
+++ b/packages/cups/cups_1.1.23.bb
@@ -3,12 +3,8 @@ SECTION = "console/utils"
LICENSE = "GPL LGPL"
DEPENDS = "openssl jpeg libpng zlib install-native"
-#the web interface needs a subset of the docs to function, but we don't package that (yet), so we rrecommend the 7MB docs package
-# NOTE: this only affects the webgui, not the cmdline or apps using cups
-RRECOMMENDS = "cups-doc"
-
-PR = "r2"
+PR = "r4"
SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
file://strftime_fix.patch;patch=1"
@@ -37,6 +33,17 @@ fakeroot do_install () {
do_stage () {
install -d ${STAGING_INCDIR}/cups
install ${S}/cups/*.h ${STAGING_INCDIR}/cups/
+ install ${S}/filter/*.h ${STAGING_INCDIR}/cups/
oe_libinstall -C cups -so libcups ${STAGING_LIBDIR}
+ oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR}
}
+#package the html for the webgui inside the main packages (~1MB uncompressed)
+FILES_${PN} += "${datadir}/doc/cups/images \
+ ${datadir}/doc/cups/*html \
+ ${datadir}/doc/cups/*.css \
+ "
+
+
+
+
diff --git a/packages/libmatchbox/libmatchbox_1.9.bb b/packages/libmatchbox/libmatchbox_1.9.bb
new file mode 100644
index 0000000000..d87eb09150
--- /dev/null
+++ b/packages/libmatchbox/libmatchbox_1.9.bb
@@ -0,0 +1,9 @@
+require libmatchbox.inc
+PR = "r0"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
+ file://check.m4"
+
+do_configure_prepend () {
+ mv ${WORKDIR}/check.m4 ${S}/
+}
diff --git a/packages/matchbox-wm/matchbox-wm_1.1.bb b/packages/matchbox-wm/matchbox-wm_1.1.bb
new file mode 100644
index 0000000000..8e28d0c041
--- /dev/null
+++ b/packages/matchbox-wm/matchbox-wm_1.1.bb
@@ -0,0 +1,33 @@
+SECTION = "x11/wm"
+DESCRIPTION = "Matchbox window manager"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common"
+RDEPENDS = "matchbox-common"
+PR="r0"
+
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \
+ file://kbdconfig"
+
+S = "${WORKDIR}/matchbox-window-manager-${PV}"
+
+inherit autotools pkgconfig update-alternatives
+
+FILES_${PN} = "${bindir} \
+ ${datadir}/matchbox \
+ ${sysconfdir}/matchbox \
+ ${datadir}/themes/blondie/matchbox \
+ ${datadir}/themes/Default/matchbox \
+ ${datadir}/themes/MBOpus/matchbox"
+
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_PRIORITY = "10"
+
+EXTRA_OECONF = " --enable-startup-notification --disable-xrm"
+
+do_install_prepend() {
+ install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig
+}
+
diff --git a/packages/nonworking/gutenprint/.mtn2git_empty b/packages/nonworking/gutenprint/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/gutenprint/.mtn2git_empty
diff --git a/packages/nonworking/gutenprint/gutenprint_5.0.0.bb b/packages/nonworking/gutenprint/gutenprint_5.0.0.bb
new file mode 100644
index 0000000000..5a0de7797f
--- /dev/null
+++ b/packages/nonworking/gutenprint/gutenprint_5.0.0.bb
@@ -0,0 +1,22 @@
+
+
+
+DEPENDS = "glib-2.0 gtk+ cups"
+
+inherit autotools pkgconfig
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gimp-print/${P}.tar.bz2"
+
+EXTRA_OECONF = "\
+ --disable-gtktest \
+ --disable-libgutenprintui \
+ --enable-libgutenprintui2 \
+ --enable-translated-cups-ppds \
+ --disable-gimptest \
+ "
+
+do_configure() {
+ oe_runconf
+}
+
+