From 39bb9f47c727c5518a794aac976dacd4b00a0534 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 5 Dec 2014 09:11:55 +0100 Subject: midori: update to 0.5.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit midori has moved to cmake for configuration Signed-off-by: Andreas Müller Signed-off-by: Ross Burton --- meta/recipes-sato/midori/midori_0.5.5.bb | 47 -------------------------------- meta/recipes-sato/midori/midori_0.5.8.bb | 26 ++++++++++++++++++ 2 files changed, 26 insertions(+), 47 deletions(-) delete mode 100644 meta/recipes-sato/midori/midori_0.5.5.bb create mode 100644 meta/recipes-sato/midori/midori_0.5.8.bb (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/midori/midori_0.5.5.bb b/meta/recipes-sato/midori/midori_0.5.5.bb deleted file mode 100644 index a9379e7fff..0000000000 --- a/meta/recipes-sato/midori/midori_0.5.5.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "A lightweight web browser" -HOMEPAGE = "http://www.twotoasts.de/index.php?/pages/midori_summary.html" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libunique libxscrnsaver" - -SRC_URI = "http://www.midori-browser.org/downloads/${BPN}_${PV}_all_.tar.bz2 \ -" - -SRC_URI[md5sum] = "b99e87d4b73a4732ed1c1e591f0242ac" -SRC_URI[sha256sum] = "ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62" - -# midori depends on webkit-gtk, and webkit-gtk can NOT be built on -# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily. -COMPATIBLE_HOST_mips64 = "mips64.*-linux$" - -inherit gtk-icon-cache pkgconfig vala pythonnative - -do_configure() { - sed -i -e 's:, shell=False::g' -e s:/usr/X11R6/include::g -e s:/usr/X11R6/lib::g wscript - ./configure \ - --prefix=${prefix} \ - --bindir=${bindir} \ - --sbindir=${sbindir} \ - --libexecdir=${libexecdir} \ - --datadir=${datadir} \ - --sysconfdir=${sysconfdir} \ - --sharedstatedir=${sharedstatedir} \ - --localstatedir=${localstatedir} \ - --libdir=${libdir} \ - --includedir=${includedir} \ - --infodir=${infodir} \ - --mandir=${mandir} \ - --disable-gtk3 \ - --disable-zeitgeist \ -} - -PARALLEL_MAKE = "" -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - oe_runmake DESTDIR=${D} install -} - -RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme" - -FILES_${PN}-dev += "${datadir}/vala/vapi" diff --git a/meta/recipes-sato/midori/midori_0.5.8.bb b/meta/recipes-sato/midori/midori_0.5.8.bb new file mode 100644 index 0000000000..299ecb324c --- /dev/null +++ b/meta/recipes-sato/midori/midori_0.5.8.bb @@ -0,0 +1,26 @@ +SUMMARY = "A lightweight web browser" +HOMEPAGE = "http://midori-browser.org/" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +DEPENDS = "webkit-gtk libsoup-2.4 openssl python-native python-docutils-native librsvg-native libnotify libxscrnsaver" + +SRC_URI = "https://launchpad.net/midori/trunk/0.5.8/+download/${BPN}-${PV}.tar.bz2;subdir=${BPN}-${PV}" +SRC_URI[md5sum] = "b89e25e74199d705e74767499a415976" +SRC_URI[sha256sum] = "af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381" + +# midori depends on webkit-gtk, and webkit-gtk can NOT be built on +# MIPS64 with n32 ABI. So remove it from mips64 n32 temporarily. +COMPATIBLE_HOST_mips64 = "mips64.*-linux$" + +inherit gtk-icon-cache pkgconfig vala pythonnative cmake + +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_PREFIX=${prefix} \ + -DUSE_ZEITGEIST=0 \ +" + +TARGET_CC_ARCH += "${LDFLAGS}" + +RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme" + +FILES_${PN} += "${datadir}/appdata" -- cgit 1.2.3-korg gatesgarth'>jansa/gatesgarth OpenEmbedded layers collection contribution treesGrokmirror user
aboutsummaryrefslogtreecommitdiffstats
blob: 71359e012c91a4e1497aeb82f59bd199f903aabd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
DESCRIPTION="Simple Login Manager"
HOMEPAGE="http://slim.berlios.de"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"

PR = "r1"

DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"

SRC_URI = " \
    http://download.berlios.de/${BPN}/${BP}.tar.gz \
    file://0002-Fix-image-handling-integer-overflows.patch \
    file://0003-Fix-build-failure-with-ld-as-needed.patch \
    file://0004-Add-support-libpng15.patch \
    file://0005-Remove-path-of-gcc-amd-g-and-version-of-g.patch \
    file://0006-Remove-localhost-from-Authenticator-of-pam.patch \
    file://0007-Fix-tty-slowness.patch \
    file://0008-restart-Xserver-if-killed.patch \
    file://slim-dynwm \
    file://update_slim_wmlist \
    file://Makefile.oe \
    file://slim.pamd \
    file://slim.service \
"

SRC_URI[md5sum] = "ca1ae6120e6f4b4969f2d6cf94f47b42"
SRC_URI[sha256sum] = "f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8"


EXTRA_OEMAKE += " \
    USE_PAM=${@bb.utils.contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \
    PREFIX=${prefix} \
    CFGDIR=${sysconfdir} \
    MANDIR=${mandir} \
    DESTDIR=${D} \
    CFLAGS+=-I${STAGING_INCDIR}/freetype2 \
    CXXFLAGS+=-I${STAGING_INCDIR}/freetype2 \
"

do_compile_prepend() {
    cp -pP ${WORKDIR}/Makefile.oe ${S}/Makefile
}

do_install() {
    oe_runmake install
    install -d ${D}${bindir}
    install -m 0755 ${WORKDIR}/slim-dynwm ${D}${bindir}/
    install -m 0755 ${WORKDIR}/update_slim_wmlist ${D}${bindir}/
    install -d ${D}${sysconfdir}/pam.d/
    install -m 0644 ${WORKDIR}/slim.pamd ${D}${sysconfdir}/pam.d/slim

    install -d ${D}${systemd_unitdir}/system/
    install -m 0644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system/

    echo 'sessionstart_cmd    /usr/bin/sessreg -a -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf
    echo 'sessionstop_cmd     /usr/bin/sessreg -d -l $DISPLAY %user' >> ${D}${sysconfdir}/slim.conf
}


RDEPENDS_${PN} = "perl xauth freetype sessreg "
FILES_${PN} += "${systemd_unitdir}/system/"

pkg_postinst_${PN} () {
if test "x$D" != "x"; then
    exit 1
fi
systemctl enable slim.service

# Register SLiM as default DM
mkdir -p ${sysconfdir}/X11/
echo "${bindir}/slim" > ${sysconfdir}/X11/default-display-manager
}

pkg_postrm_${PN} () {
if test "x$D" != "x"; then
    exit 1
fi
systemctl disable slim.service
sed -i /slim/d $D${sysconfdir}/X11/default-display-manager || true
}

PNBLACKLIST[slim] ?= "does not build with distroless qemuarm as reported in 'State of bitbake world' thread, nobody volunteered to fix them"