diff options
| -rw-r--r-- | packages/gtk+/gtk+_2.10.12.bb | 2 | ||||
| -rw-r--r-- | packages/gtk+/gtk-2.10.inc | 8 | ||||
| -rw-r--r-- | packages/matchbox2/matchbox-desktop-2_svn.bb | 27 |
3 files changed, 32 insertions, 5 deletions
diff --git a/packages/gtk+/gtk+_2.10.12.bb b/packages/gtk+/gtk+_2.10.12.bb index 895d10e4f3..d344eb42ed 100644 --- a/packages/gtk+/gtk+_2.10.12.bb +++ b/packages/gtk+/gtk+_2.10.12.bb @@ -1,6 +1,6 @@ require gtk-2.10.inc -PR = "r1" +PR = "r2" # disable per default - untested and not all patches included. DEFAULT_PREFERENCE = "-1" diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc index 7f610294d1..cc97e960a4 100644 --- a/packages/gtk+/gtk-2.10.inc +++ b/packages/gtk+/gtk-2.10.inc @@ -28,10 +28,10 @@ FILES_${PN}-dbg += " \ RRECOMMENDS_${PN} = " ttf-dejavu-sans" -RRECOMMENDS_${PN}_angstrom += " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus += " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_linux += " glibc-gconv-iso8859-1" - +RRECOMMENDS_${PN}_append_angstrom = " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_append_openzaurus = " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_append_linux = " glibc-gconv-iso8859-1" +RRECOMMENDS_${PN}_append_linux-gnueabi = " glibc-gconv-iso8859-1" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" diff --git a/packages/matchbox2/matchbox-desktop-2_svn.bb b/packages/matchbox2/matchbox-desktop-2_svn.bb new file mode 100644 index 0000000000..31a6b9836d --- /dev/null +++ b/packages/matchbox2/matchbox-desktop-2_svn.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Matchbox Window Manager Desktop" +LICENSE = "GPL" +SECTION = "x11/panels" +DEPENDS = "gtk+ startup-notification" + +PV = "0.1+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" +S = "${WORKDIR}/${PN}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-startup-notification --disable-libnotify" + +PARALLEL_MAKE = "" + +# matchbox-<anything>-2 aims to replace their -1 counterpart, but at this point in time it's unfinished and unusable, so make it parallel installable +do_install_append() { + mv ${D}${bindir}/matchbox-desktop ${D}${bindir}/matchbox-desktop-2 +} + +do_stage() { + autotools_stage_all +} + + |