[lfs-patches] r3047 - in trunk: cairo systemd

krejzi at higgs.linuxfromscratch.org krejzi at higgs.linuxfromscratch.org
Wed Oct 29 14:47:10 PDT 2014


Author: krejzi
Date: Wed Oct 29 14:47:10 2014
New Revision: 3047

Log:
Add some patches.

Added:
   trunk/cairo/cairo-1.14.0-upstream_fixes-1.patch
   trunk/systemd/systemd-217-compat-1.patch

Added: trunk/cairo/cairo-1.14.0-upstream_fixes-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/cairo/cairo-1.14.0-upstream_fixes-1.patch	Wed Oct 29 14:47:10 2014	(r3047)
@@ -0,0 +1,20 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2014-10-29
+Initial Package Version: 1.14.0
+Upstream Status:         Fixed
+Origin:                  Upstream
+Description:             Fixes segmentation fault when handling some PDF documents.
+
+--- a/src/cairo-tor-scan-converter.c	2014-10-14 03:46:33.000000000 +0200
++++ b/src/cairo-tor-scan-converter.c	2014-10-29 22:40:03.337773983 +0100
+@@ -1167,8 +1167,8 @@
+ 
+ 	if (e->dy) {
+ 	    struct quorem x = e->x;
+-	    x.quo += e->dxdy_full.quo - e->dxdy.quo/2;
+-	    x.rem += e->dxdy_full.rem - e->dxdy.rem/2;
++	    x.quo += e->dxdy_full.quo;
++	    x.rem += e->dxdy_full.rem;
+ 	    if (x.rem < 0) {
+ 		x.quo--;
+ 		x.rem += e->dy;

Added: trunk/systemd/systemd-217-compat-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/systemd/systemd-217-compat-1.patch	Wed Oct 29 14:47:10 2014	(r3047)
@@ -0,0 +1,219 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2014-10-29
+Initial Package Version: 211
+Upstream Status:         Not applicable
+Origin:                  Self
+Description:             Make it install compat pkg-config files without
+                         building compat-libs which are useless on LFS.
+
+--- a/Makefile.am	2014-10-28 18:49:51.860848669 +0100
++++ b/Makefile.am	2014-10-29 22:13:32.367028216 +0100
+@@ -2677,7 +2677,11 @@
+ UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
+ 
+ pkgconfiglib_DATA += \
+-	src/libsystemd/libsystemd.pc
++	src/libsystemd/libsystemd.pc \
++	src/compat-libs/libsystemd-journal.pc \
++	src/compat-libs/libsystemd-login.pc \
++	src/compat-libs/libsystemd-id128.pc \
++	src/compat-libs/libsystemd-daemon.pc
+ 
+ pkginclude_HEADERS += \
+ 	src/systemd/sd-login.h \
+@@ -5672,12 +5676,6 @@
+ 	libsystemd-id128.la \
+ 	libsystemd-daemon.la
+ 
+-pkgconfiglib_DATA += \
+-	src/compat-libs/libsystemd-journal.pc \
+-	src/compat-libs/libsystemd-login.pc \
+-	src/compat-libs/libsystemd-id128.pc \
+-	src/compat-libs/libsystemd-daemon.pc
+-
+ # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+ compat-lib-install-hook:
+ 	libname=libsystemd-login.so && $(move-to-rootlibdir)
+--- a/Makefile.in	2014-10-28 18:50:14.527941307 +0100
++++ b/Makefile.in	2014-10-29 22:13:32.373028297 +0100
+@@ -1342,21 +1342,18 @@
+ @ENABLE_COMPAT_LIBS_TRUE@	libsystemd-id128.la \
+ @ENABLE_COMPAT_LIBS_TRUE@	libsystemd-daemon.la
+ 
+- at ENABLE_COMPAT_LIBS_TRUE@am__append_302 = \
+- at ENABLE_COMPAT_LIBS_TRUE@	src/compat-libs/libsystemd-journal.pc \
+- at ENABLE_COMPAT_LIBS_TRUE@	src/compat-libs/libsystemd-login.pc \
+- at ENABLE_COMPAT_LIBS_TRUE@	src/compat-libs/libsystemd-id128.pc \
+- at ENABLE_COMPAT_LIBS_TRUE@	src/compat-libs/libsystemd-daemon.pc
+-
+- at ENABLE_COMPAT_LIBS_TRUE@am__append_303 = compat-lib-install-hook
+- at ENABLE_COMPAT_LIBS_TRUE@am__append_304 = compat-lib-uninstall-hook
+- at ENABLE_MANPAGES_TRUE@am__append_305 = \
++ at ENABLE_COMPAT_LIBS_TRUE@am__append_302 = compat-lib-install-hook
++ at ENABLE_COMPAT_LIBS_TRUE@am__append_303 = compat-lib-uninstall-hook
++ at ENABLE_MANPAGES_TRUE@am__append_304 = \
+ @ENABLE_MANPAGES_TRUE@	man/custom-entities.ent
+ 
+- at HAVE_SYSV_COMPAT_TRUE@am__append_306 = \
++ at HAVE_SYSV_COMPAT_TRUE@am__append_305 = \
+ @HAVE_SYSV_COMPAT_TRUE@	docs/sysvinit/README \
+ @HAVE_SYSV_COMPAT_TRUE@	docs/var-log/README
+ 
++ at HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE at am__append_306 = \
++ at HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@	systemd-update-utmp-runlevel.service
++
+ @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE at am__append_307 = \
+ @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@	systemd-update-utmp-runlevel.service
+ 
+@@ -1369,13 +1366,10 @@
+ @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE at am__append_310 = \
+ @HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@	systemd-update-utmp-runlevel.service
+ 
+- at HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE at am__append_311 = \
+- at HAVE_SYSV_COMPAT_TRUE@@HAVE_UTMP_TRUE@	systemd-update-utmp-runlevel.service
+-
+- at HAVE_UTMP_TRUE@am__append_312 = \
++ at HAVE_UTMP_TRUE@am__append_311 = \
+ @HAVE_UTMP_TRUE@	systemd-update-utmp.service
+ 
+- at HAVE_SYSV_COMPAT_TRUE@am__append_313 = \
++ at HAVE_SYSV_COMPAT_TRUE@am__append_312 = \
+ @HAVE_SYSV_COMPAT_TRUE@	poweroff.target runlevel0.target \
+ @HAVE_SYSV_COMPAT_TRUE@	rescue.target runlevel1.target \
+ @HAVE_SYSV_COMPAT_TRUE@	multi-user.target runlevel2.target \
+@@ -1384,28 +1378,28 @@
+ @HAVE_SYSV_COMPAT_TRUE@	graphical.target runlevel5.target \
+ @HAVE_SYSV_COMPAT_TRUE@	reboot.target runlevel6.target
+ 
+- at ENABLE_KDBUS_TRUE@am__append_314 = \
++ at ENABLE_KDBUS_TRUE@am__append_313 = \
+ @ENABLE_KDBUS_TRUE@	$(systemunitdir)/busnames.target busnames.target
+ 
+- at HAVE_SYSV_COMPAT_TRUE@am__append_315 = \
++ at HAVE_SYSV_COMPAT_TRUE@am__append_314 = \
+ @HAVE_SYSV_COMPAT_TRUE@	$(systemunitdir)/runlevel1.target.wants \
+ @HAVE_SYSV_COMPAT_TRUE@	$(systemunitdir)/runlevel2.target.wants \
+ @HAVE_SYSV_COMPAT_TRUE@	$(systemunitdir)/runlevel3.target.wants \
+ @HAVE_SYSV_COMPAT_TRUE@	$(systemunitdir)/runlevel4.target.wants \
+ @HAVE_SYSV_COMPAT_TRUE@	$(systemunitdir)/runlevel5.target.wants
+ 
+- at HAVE_SYSV_COMPAT_TRUE@am__append_316 = \
++ at HAVE_SYSV_COMPAT_TRUE@am__append_315 = \
+ @HAVE_SYSV_COMPAT_TRUE@	--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
+ @HAVE_SYSV_COMPAT_TRUE@	--with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
+ 
+- at HAVE_SYSV_COMPAT_FALSE@am__append_317 = \
++ at HAVE_SYSV_COMPAT_FALSE@am__append_316 = \
+ @HAVE_SYSV_COMPAT_FALSE@	--with-sysvinit-path= \
+ @HAVE_SYSV_COMPAT_FALSE@	--with-sysvrcnd-path=
+ 
+- at HAVE_PYTHON_TRUE@am__append_318 = \
++ at HAVE_PYTHON_TRUE@am__append_317 = \
+ @HAVE_PYTHON_TRUE@	--with-python
+ 
+- at ENABLE_GTK_DOC_TRUE@am__append_319 = \
++ at ENABLE_GTK_DOC_TRUE@am__append_318 = \
+ @ENABLE_GTK_DOC_TRUE@	--enable-gtk-doc
+ 
+ subdir = .
+@@ -5050,8 +5044,8 @@
+ 	$(am__append_274) $(am__append_297) $(nodist_systemunit_DATA) \
+ 	$(nodist_userunit_DATA) $(pkgconfigdata_DATA) \
+ 	$(pkgconfiglib_DATA) $(nodist_polkitpolicy_DATA) \
+-	$(am__append_306) defined undefined
+-DISTCLEANFILES = $(am__append_305)
++	$(am__append_305) defined undefined
++DISTCLEANFILES = $(am__append_304)
+ 
+ # Really, do not edit this file.
+ EXTRA_DIST = shell-completion/bash/systemctl.in \
+@@ -5277,10 +5271,10 @@
+ 	systemd-detect-virt-install-hook $(am__append_105) \
+ 	bus-proxyd-install-hook libsystemd-install-hook \
+ 	libudev-install-hook $(am__append_140) journal-install-hook \
+-	$(am__append_303)
++	$(am__append_302)
+ UNINSTALL_EXEC_HOOKS = $(am__append_106) bus-proxyd-uninstall-hook \
+ 	libsystemd-uninstall-hook libudev-uninstall-hook \
+-	journal-uninstall-hook $(am__append_304)
++	journal-uninstall-hook $(am__append_303)
+ INSTALL_DATA_HOOKS = units-install-hook hwdb-update-hook \
+ 	catalog-update-hook
+ UNINSTALL_DATA_HOOKS = units-uninstall-hook catalog-remove-hook
+@@ -5320,7 +5314,11 @@
+ include_HEADERS = src/libudev/libudev.h
+ noinst_DATA = $(am__append_57) $(am__append_59) $(am__append_122)
+ pkgconfiglib_DATA = src/libsystemd/libsystemd.pc \
+-	src/libudev/libudev.pc $(am__append_131) $(am__append_302)
++	src/compat-libs/libsystemd-journal.pc \
++	src/compat-libs/libsystemd-login.pc \
++	src/compat-libs/libsystemd-id128.pc \
++	src/compat-libs/libsystemd-daemon.pc src/libudev/libudev.pc \
++	$(am__append_131)
+ polkitpolicy_in_in_files =  \
+ 	src/core/org.freedesktop.systemd1.policy.in.in
+ polkitpolicy_in_files =  \
+@@ -5460,7 +5458,7 @@
+ # ------------------------------------------------------------------------------
+ INSTALL_DIRS = $(am__append_83) $(am__append_89) \
+ 	$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d \
+-	$(am__append_178) $(am__append_291) $(am__append_315) \
++	$(am__append_178) $(am__append_291) $(am__append_314) \
+ 	$(prefix)/lib/modules-load.d $(sysconfdir)/modules-load.d \
+ 	$(prefix)/lib/systemd/network $(sysconfdir)/systemd/network \
+ 	$(prefix)/lib/sysctl.d $(sysconfdir)/sysctl.d \
+@@ -5471,11 +5469,11 @@
+ 	$(pkgsysconfdir)/system/getty.target.wants \
+ 	$(pkgsysconfdir)/user $(dbussessionservicedir) \
+ 	$(sysconfdir)/xdg/systemd
+-RUNLEVEL1_TARGET_WANTS = $(am__append_307)
+-RUNLEVEL2_TARGET_WANTS = $(am__append_308)
+-RUNLEVEL3_TARGET_WANTS = $(am__append_309)
+-RUNLEVEL4_TARGET_WANTS = $(am__append_310)
+-RUNLEVEL5_TARGET_WANTS = $(am__append_311)
++RUNLEVEL1_TARGET_WANTS = $(am__append_306)
++RUNLEVEL2_TARGET_WANTS = $(am__append_307)
++RUNLEVEL3_TARGET_WANTS = $(am__append_308)
++RUNLEVEL4_TARGET_WANTS = $(am__append_309)
++RUNLEVEL5_TARGET_WANTS = $(am__append_310)
+ SHUTDOWN_TARGET_WANTS = 
+ LOCAL_FS_TARGET_WANTS = systemd-remount-fs.service tmp.mount
+ MULTI_USER_TARGET_WANTS = $(am__append_292) getty.target \
+@@ -5487,7 +5485,7 @@
+ 	systemd-journald.service systemd-journal-flush.service \
+ 	systemd-journal-catalog-update.service $(am__append_179) \
+ 	$(am__append_182) $(am__append_189) $(am__append_197) \
+-	$(am__append_312) systemd-update-done.service \
++	$(am__append_311) systemd-update-done.service \
+ 	dev-hugepages.mount dev-mqueue.mount sys-kernel-config.mount \
+ 	sys-kernel-debug.mount sys-fs-fuse-connections.mount \
+ 	systemd-sysctl.service systemd-ask-password-console.path
+@@ -5505,7 +5503,7 @@
+ USER_BUSNAMES_TARGET_WANTS = 
+ SYSTEM_UNIT_ALIASES = $(am__append_204) $(am__append_215) \
+ 	$(am__append_227) $(am__append_250) $(am__append_261) \
+-	$(am__append_293) $(am__append_313) graphical.target \
++	$(am__append_293) $(am__append_312) graphical.target \
+ 	default.target reboot.target ctrl-alt-del.target \
+ 	getty at .service autovt at .service
+ USER_UNIT_ALIASES = $(systemunitdir)/shutdown.target shutdown.target \
+@@ -5516,7 +5514,7 @@
+ 	$(systemunitdir)/printer.target printer.target \
+ 	$(systemunitdir)/sound.target sound.target \
+ 	$(systemunitdir)/smartcard.target smartcard.target \
+-	$(am__append_314)
++	$(am__append_313)
+ GENERAL_ALIASES = $(am__append_236) $(am__append_263) \
+ 	$(am__append_272) $(systemunitdir)/remote-fs.target \
+ 	$(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
+@@ -8898,8 +8896,8 @@
+ 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
+ 	--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
+ 	--with-rootprefix=$$dc_install_base --disable-split-usr \
+-	--enable-kdbus --enable-compat-libs $(am__append_316) \
+-	$(am__append_317) $(am__append_318) $(am__append_319)
++	--enable-kdbus --enable-compat-libs $(am__append_315) \
++	$(am__append_316) $(am__append_317) $(am__append_318)
+ www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
+ OBJECT_VARIABLES := $(filter %_OBJECTS,$(.VARIABLES))
+ ALL_OBJECTS := $(foreach v,$(OBJECT_VARIABLES),$($(v)))


More information about the patches mailing list