---

yaml
---
r: 47358
b: refs/heads/master-next
c: 77c9927
h: refs/heads/master

[refs]

@@ -8,7 +8,7 @@ refs/heads/denzil: c0117f5ad7d1fe18d149bda426c7134ff24daae8
 refs/heads/dora: e75ae8f50af3effe560c43fc63cfd1f39395f011
 refs/heads/dylan-next: ac1fad48216f9c4b851541f8433a50c2f0795a54
 refs/heads/dylan: 4e3362f9c2b5540231011930b91d2cf56e487ff7
-refs/heads/master-next: 8293e6f617992bf7254c68d8eb0d0b9ee2d1b54d
+refs/heads/master-next: 77c992785c546a5783c13954839d6a85a2709abc
 refs/heads/dizzy: 70beecb2716bca1b9dfbc7d6a264233e1f05e82b
 refs/heads/daisy-next: d3d14d3fcca7fcde362cf0b31411dc4eea6d20aa
 refs/heads/dizzy-next: 70beecb2716bca1b9dfbc7d6a264233e1f05e82b

branches/master-next/meta-oe/conf/layer.conf

@@ -5,7 +5,7 @@
 # Therefore if you want a given layer to be considered high priority
 # for the .inc and .conf etc. then consider it adding at the beginning
 # of BBPATH. For bblayers bitbake will use BBFILES_PRIORITY to resolve
-# the recipe contention so the order of directories in BBFILES does
+# the recipe contention so the order of directories in BBFILES does 
 # not matter.
 
 # We have a conf and classes directory, append to BBPATH
@@ -81,7 +81,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   ttf-gentium->fontconfig \
   ttf-hunkyfonts->fontconfig \
   ttf-inconsolata->fontconfig \
-  ttf-ipa->fontconfig \
   ttf-liberation->fontconfig \
   ttf-liberation-sans-narrow->fontconfig \
   ttf-lklug->fontconfig \

branches/master-next/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb

@@ -493,6 +493,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\
     packagegroup-fonts-truetype \
     qrencode \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "st", "", d)} \
+    takao-fonts \
     leptonica \
     libvncserver \
     libmng \
@@ -524,7 +525,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\
     ttf-gentium \
     ttf-hunky-sans \
     ttf-hunky-serif \
-    ttf-ipag ttf-ipagp ttf-ipamp ttf-ipam \
+    ttf-ipa \
     ttf-lohit \
     ttf-inconsolata \
     ttf-liberation-sans-narrow \
@@ -536,7 +537,6 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\
     ttf-noto-emoji-regular \
     ttf-sazanami-gothic \
     ttf-sazanami-mincho \
-    ttf-takao-pgothic ttf-takao-gothic ttf-takao-pmincho ttf-takao-mincho \
     ttf-tlwg \
     ttf-roboto \
     ttf-wqy-zenhei \

branches/master-next/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb

@@ -180,9 +180,3 @@ FILES:${PN}-fstools = "\
 "
 
 BBCLASSEXTEND = "native"
-
-android_tools_enable_devmode() {
-    touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled
-}
-
-ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}"

branches/master-next/meta-oe/recipes-graphics/ttf-fonts/ttf-takao_003.03.01.bb → branches/master-next/meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.03.01.bb

@@ -1,5 +1,3 @@
-require ttf.inc
-
 SUMMARY = "Takao Fonts are a community developed derivatives of IPA Fonts."
 DESCRIPTION = "Takao Fonts are a community developed derivatives of IPA Fonts."
 
@@ -8,18 +6,14 @@ SECTION = "User Interface/X"
 
 LICENSE = "IPA"
 LIC_FILES_CHKSUM = "file://IPA_Font_License_Agreement_v1.0.txt;md5=6cd3351ba979cf9db1fad644e8221276"
-
 SRC_URI = "https://launchpad.net/${BPN}/trunk/15.03/+download/TakaoFonts_00303.01.tar.xz"
+SRC_URI[md5sum] = "8cd3fe724faa5034a9369e98cf108d2d"
 SRC_URI[sha256sum] = "e9871f72ac69acb3e277aebbee7ca01fbebf54800733e29fafdc46133fc3552f"
 
 S = "${WORKDIR}/TakaoFonts_00303.01"
-
-PACKAGES = "ttf-takao-pgothic ttf-takao-gothic ttf-takao-pmincho ttf-takao-mincho"
-FONT_PACKAGES = "ttf-takao-pgothic ttf-takao-gothic ttf-takao-pmincho ttf-takao-mincho"
-
-FILES:ttf-takao-pgothic = "${datadir}/fonts/truetype/TakaoPGothic.ttf"
-FILES:ttf-takao-gothic = "${datadir}/fonts/truetype/TakaoGothic.ttf"
-FILES:ttf-takao-pmincho = "${datadir}/fonts/truetype/TakaoPMincho.ttf"
-FILES:ttf-takao-mincho = "${datadir}/fonts/truetype/TakaoMincho.ttf"
+do_install() {
+    install -m 0755 -d ${D}/${datadir}/fonts
+    install -m 0644 -p ${S}/*.ttf ${D}/${datadir}/fonts/
+}
 
 FILES:${PN} += "${datadir}/fonts/*.ttf"

branches/master-next/meta-oe/recipes-support/uim/uim_1.8.8.bb

@@ -17,10 +17,10 @@ SRC_URI[sha256sum] = "34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 
 DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool libedit"
-DEPENDS:append:class-target = " intltool-native gtk+ gtk+3 uim-native"
+DEPENDS:append:class-target = " intltool-native gtk+ gtk+3 uim-native takao-fonts"
 
 RDEPENDS:uim = "libuim0 libedit"
-RDEPENDS:uim-anthy = "anthy libanthy0"
+RDEPENDS:uim-anthy = "takao-fonts anthy libanthy0"
 RDEPENDS:uim-anthy:append:libc-glibc = " glibc-utils glibc-gconv-euc-jp"
 
 LEAD_SONAME = "libuim.so.1"

branches/master-next/meta-python/recipes-devtools/python/python3-pycurl_7.44.1.bb → branches/master-next/meta-python/recipes-devtools/python/python3-pycurl_7.44.0.bb

@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING-LGPL;md5=4fbd65380cdd255951079008b364516c \
                     file://COPYING-MIT;md5=75f131c591546fd1277ca49c9a81ab1b \
                     "
 
-SRC_URI[sha256sum] = "5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8"
+SRC_URI[sha256sum] = "2ce9905626d8ceafcbadee666e2f45397e29c7618ddcdc63fc22d85e5046c6d6"
 
 inherit pypi setuptools3
 

branches/master-next/meta-python/recipes-devtools/python/python3-ujson_4.1.0.bb → branches/master-next/meta-python/recipes-devtools/python/python3-ujson_4.0.2.bb

@@ -4,7 +4,7 @@ DESCRIPTION = "UltraJSON is an ultra fast JSON encoder and decoder written in pu
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=10fa10456417c0252bcb8a498e498ffe"
 
-SRC_URI[sha256sum] = "22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c"
+SRC_URI[sha256sum] = "c615a9e9e378a7383b756b7e7a73c38b22aeb8967a8bfbffd4741f7ffd043c4d"
 
 inherit pypi ptest setuptools3