fltk: upgrade 1.3.4-2 -> 1.3.5
PATCH 1/3 fltk: upgrade 1.3.4-2 -> 1.3.5
* upstream tries pkconfig first to check for freetype -> patch can be removed
* looks like a bugfix release [1]
[1] https://raw.githubusercontent.com/fltk/fltk/25b947aa7d28d60a8ab41c21e4fa07bdcb614c7f/CHANGES
--- meta-oe/recipes-support/fltk/fltk.inc | 9 ++--- .../fltk/fltk/fltk-no-freetype-config.patch | 40 ------------------- 2 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch
meta-oe/recipes-support/fltk/fltk.inc +4 -5
@@ -5,16 +5,15 @@ LICENSE = "LGPLv2 & FLTK" LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca" SRC_URI = " \ - http://fltk.org/pub/fltk/1.3.4/${BP}-source.tar.gz \ + http://fltk.org/pub/fltk/${PV}/${BP}-source.tar.bz2 \ file://disable_test.patch \ - file://fltk-no-freetype-config.patch \ file://0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch \ file://0002-always-build-fluid-and-export-pointers.patch \ " -PV = "1.3.4-2" -SRC_URI[md5sum] = "b8e291343357e49dd81a22408744e400" -SRC_URI[sha256sum] = "25d349c18c99508737d48f225a2eb26a43338f9247551cab72a317fa42cda910" +PV = "1.3.5" +SRC_URI[md5sum] = "0de2b45a1896be2b4a8cafae89b84248" +SRC_URI[sha256sum] = "2933c72400f9e7c0f4c3a81a1ce98bc9582b2a3edc44b8597ccd26e240e32c3c" inherit cmake pkgconfig
meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 699420d306cadbb5285942e09f4383d84b01985d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> -Date: Fri, 13 Jan 2017 13:21:23 +0100 -Subject: [PATCH] replace freetype-config by pkg-config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <[email protected]> ---- - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f0efd48..3af5ecb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1006,12 +1006,12 @@ case $host_os_gui in - - xft_found=no - if test x$enable_xft != xno; then -- AC_PATH_PROG(FTCONFIG, freetype-config) -+ AC_PATH_PROG(PKGCONFIG,pkg-config) - -- if test "x$FTCONFIG" != x; then -- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS" -- CFLAGS="`$FTCONFIG --cflags` $CFLAGS" -- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS" -+ if test "x$PKGCONFIG" != x; then -+ CPPFLAGS="`$PKGCONFIG --cflags xft` $CPPFLAGS" -+ CFLAGS="`$PKGCONFIG --cflags xft` $CFLAGS" -+ CXXFLAGS="`$PKGCONFIG --cflags xft` $CXXFLAGS" - - AC_CHECK_LIB(fontconfig, FcPatternCreate) - AC_CHECK_HEADER(X11/Xft/Xft.h, --- -2.7.4 -
Signature · 1 line
2.20.1
PATCH 2/3 samba: install bundled libs into seperate packages
Otherwise bundled libraries find their way into samba
-> that causes several packages to rdepend on samba package
-> samba package rdepends on samba-base (and others) installing daemons
smbd & nmbd autostarted by default. This is unwanted / not necessary:
* NetBIOS (nmbd) can cause a security problems
* slow boot: times reported by systemd-analyse reduced from ~16s -> ~8s
--- .../recipes-connectivity/samba/samba_4.8.4.bb | 10 ++++++++++ 1 file changed, 10 insertions(+)
meta-networking/recipes-connectivity/samba/samba_4.8.4.bb +10 -0
@@ -107,6 +107,16 @@ SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODU # SAMBA4_LIBS="heimdal,cmocka,ldb,pyldb-util,NONE" +# interim packages: As long as ldb/pyldb-util are in SAMBA4_LIBS we need to pack +# bundled libraries in seperate packages. Otherwise they are auto-packed in +# package 'samba' which RDEPENDS on lots of packages not wanted e.g autostarting +# nmbd/smbd daemons +# Once 'ldb,pyldb-util' are removed from SAMBA4_LIBS the bundled packages can +# be removed again. +PACKAGES =+ "${PN}-bundled-ldb ${PN}-bundled-pyldb-util" +FILES_${PN}-bundled-ldb = "${libdir}/samba/libldb${SOLIBS}" +FILES_${PN}-bundled-pyldb-util = "${libdir}/samba/libpyldb-util${SOLIBS}" + EXTRA_OECONF += "--enable-fhs \ --with-piddir=/run \ --with-sockets-dir=/run/samba \
Signature · 1 line
2.20.1
PATCH 3/3 samba: rework localstatedir package split
In reply to Andreas MüllerNow that we can install smbclient without samba package e.g for gvfs there are complains:
| gvsd: mkdir failed on directory /var/lib/samba: Permission denied
and browsing Windows network does not work anymore
--- meta-networking/recipes-connectivity/samba/samba_4.8.4.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta-networking/recipes-connectivity/samba/samba_4.8.4.bb +4 -4
@@ -230,16 +230,13 @@ RDEPENDS_${PN}-python += "pytalloc python-tdb" FILES_${PN}-base = "${sbindir}/nmbd \ ${sbindir}/smbd \ ${sysconfdir}/init.d \ - ${localstatedir}/lib/samba \ - ${localstatedir}/nmbd \ - ${localstatedir}/spool/samba \ ${systemd_system_unitdir}/nmb.service \ ${systemd_system_unitdir}/smb.service" FILES_${PN}-ad-dc = "${sbindir}/samba \ ${systemd_system_unitdir}/samba.service \ ${libdir}/krb5/plugins/kdb/samba.so \ - " +" RDEPENDS_${PN}-ad-dc = "krb5-kdc" FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \
@@ -247,11 +244,14 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ ${sysconfdir}/ctdb/nodes \ ${datadir}/ctdb-tests \ ${datadir}/ctdb/tests \ + ${localstatedir}/lib/ctdb \ " FILES_${BPN}-common = "${sysconfdir}/default \ ${sysconfdir}/samba \ ${sysconfdir}/tmpfiles.d \ + ${localstatedir}/lib/samba \ + ${localstatedir}/spool/samba \ " FILES_${PN} += "${libdir}/vfs/*.so \
Signature · 1 line
2.20.1