Bläddra i källkod

Added workaround for (#177402) and (#437446)

Maxim Kammerer 12 år sedan
förälder
incheckning
46939acbfb
4 ändrade filer med 15 tillägg och 2 borttagningar
  1. 2 1
      src/root/config/rootfs-cp.excludes
  2. 10 0
      src/root/patches/portage/nip2.patch
  3. 2 0
      src/root/setup
  4. 1 1
      src/root/setup-copy

+ 2 - 1
src/root/config/rootfs-cp.excludes

@@ -32,6 +32,7 @@
 /usr/lib/cairo/libcairo-trace.*
 
 # Unnecessary libraries (verified with revdep-rebuild)
-# (#416817, #444248)
+# (#177402, #416817, #444248)
+/usr/lib/libunrar.so*
 /usr/lib/libvipsCC.so*
 /usr/lib/libchromeXvMC*.so*

+ 10 - 0
src/root/patches/portage/nip2.patch

@@ -0,0 +1,10 @@
+--- /usr/portage/media-gfx/nip2/nip2-7.26.4.ebuild	2013-01-08 15:37:01.645719577 +0000
++++ /usr/portage/media-gfx/nip2/nip2-7.26.4.ebuild	2013-01-08 15:36:54.465719492 +0000
+@@ -29,6 +29,7 @@
+ 	test? ( media-libs/vips[jpeg,lcms,tiff] )"
+ 
+ src_prepare() {
++	sed -i 's/^extern int yyleng\>/extern size_t yyleng/' src/parser.h
+ 	epatch "${FILESDIR}"/${PN}-7.16.4-fftw3-build.patch
+ 	eautoreconf
+ }

+ 2 - 0
src/root/setup

@@ -87,6 +87,8 @@ patch_ebuild ${HOME}/patches/portage/fbreader.patch
 # (#424816, VirtualBox: #11335)
 patch_ebuild ${HOME}/patches/portage/virtualbox-guest-additions.patch
 patch_ebuild ${HOME}/patches/portage/xf86-video-virtualbox.patch
+# (#437446)
+patch_ebuild ${HOME}/patches/portage/nip2.patch
 # (restore removed unstable ebuild)
 khs=/usr/portage/sys-kernel/hardened-sources/hardened-sources-3.4.5.ebuild
 cp -a ${khs} ${khs/3.4.5/3.4.7}

+ 1 - 1
src/root/setup-copy

@@ -97,7 +97,7 @@ for ebuild in ${!ebuild_*}; do
 done
 rm -f /var/cache/edb/vdb_*.pickle
 
-# [gettext] coreutils, powertop, cdrtools: not needed (#398983, #398977 (fixed in 2.2-r1), #410501)
+# [gettext] coreutils, powertop: not needed (#398983, #398977 (fixed in 2.2-r1)))
 echo sys-devel/gettext-0.18.1.1 >> /etc/portage/profile/package.provided