[patch] libcdio-0.82 patch: restore FS patch for Solaris prefix

libcdio-0.82-bug292180.patch (text/plain), 4.10 KB, created by Darik Horn on 2009-11-06 21:24:09 UTC

diff -Ndru /gentoo/usr/portage/dev-libs/libcdio/files/libcdio-0.82-solaris.patch /gentoo/usr/local/portage/dev-libs/libcdio/files/libcdio-0.82-solaris.patch
--- /gentoo/usr/portage/dev-libs/libcdio/files/libcdio-0.82-solaris.patch	1969-12-31 18:00:00.000000000 -0600
+++ /gentoo/usr/local/portage/dev-libs/libcdio/files/libcdio-0.82-solaris.patch	2009-11-06 15:10:11.596234675 -0600
@@ -0,0 +1,17 @@
+diff -dru libcdio-0.82/include/cdio++/iso9660.hpp libcdio-0.82-solaris/include/cdio++/iso9660.hpp
+--- libcdio-0.82/include/cdio++/iso9660.hpp	2008-11-28 22:52:43.000000000 -0600
++++ libcdio-0.82-solaris/include/cdio++/iso9660.hpp	2009-11-06 15:09:08.198868814 -0600
+@@ -33,6 +33,13 @@
+ #include <cstring>
+ using namespace std;
+ 
++/* On Solaris, FS is defined to an integer which makes compilation fail
++ * since we use that as identifier below.  It gets included via the
++ * chain sys/signal.h -> sys/ucontext.h -> sys/regset.h. */
++#if defined (__SVR4) && defined (__sun)
++#undef FS
++#endif
++
+ /** ISO 9660 class.
+ */
+ class ISO9660
diff -Ndru /gentoo/usr/portage/dev-libs/libcdio/libcdio-0.82.ebuild /gentoo/usr/local/portage/dev-libs/libcdio/libcdio-0.82.ebuild
--- /gentoo/usr/portage/dev-libs/libcdio/libcdio-0.82.ebuild	2009-11-03 09:19:21.000000000 -0600
+++ /gentoo/usr/local/portage/dev-libs/libcdio/libcdio-0.82.ebuild	2009-11-06 15:12:06.985204047 -0600
@@ -25,6 +25,8 @@
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-solaris.patch
+
 	eautomake
 	elibtoolize
 }
diff -Ndru /gentoo/usr/portage/dev-libs/libcdio/Manifest /gentoo/usr/local/portage/dev-libs/libcdio/Manifest
--- /gentoo/usr/portage/dev-libs/libcdio/Manifest	2009-11-03 09:19:21.000000000 -0600
+++ /gentoo/usr/local/portage/dev-libs/libcdio/Manifest	2009-11-06 15:12:31.033572805 -0600
@@ -4,10 +4,11 @@
 AUX libcdio-0.80-fix-pkgconfig.patch 552 RMD160 90c73b3177c29a7772150d72103d16ee84bfe452 SHA1 37a2f9779c19850487d807a67f9a062e254c0ee0 SHA256 c0264ea0392f705580fa852cc45fbe0bf0ef79a01beb05ff84f9376743e3a49e
 AUX libcdio-0.80-minimal.patch 2897 RMD160 2e2f9fc0dc26123de0048245fe7790c40cdd1cf0 SHA1 b60c9d83f112a88e458d04fbf4d73f36db1a411b SHA256 f5d5210bfacb7340292324470d8295fdcd5c865aef715fe427aa70f57dc51eaa
 AUX libcdio-0.80-solaris.patch 1172 RMD160 fe26df640591cdb37dd13188ca91bfe2cd2a23c1 SHA1 eb2d6d3abb470dcff8d9380c84201549c120c503 SHA256 6e77c916c8ddcd87067fdefcadea053c756cb13c4a0529340831cc1f15feafd3
+AUX libcdio-0.82-solaris.patch 634 RMD160 5e9bdfddc0d9509cb30b3f5679871c22bd9587d6 SHA1 b96bc6cf1fb59ea3844209387618e234e7e8999a SHA256 57c4a53b9da25727fbe79a1aafbc003da9652df929685183c5f2aa5d26a06d1e
 DIST libcdio-0.80.tar.gz 2083287 RMD160 3ca404bffb107ad950505b8ccd9e659e306545cb SHA1 40c1558a65a9eca2b693d1951ed2664efbe7d1ed SHA256 b1a41a34db5a034649109c3328782e4e2fa438b1e2bddc458cd260f60ef7ca66
 DIST libcdio-0.82.tar.gz 2240599 RMD160 48dc71f349235ab501985a296fd3deee295c167f SHA1 b3a87283a373eed816c15584c373ad6d2f95f09a SHA256 1acb3de8e0927906ade7a34c5853173d3068b87b02dfba80d0bf11e47f0b5d39
 EBUILD libcdio-0.80-r1.ebuild 2293 RMD160 46f1bd7103d62a3d3919f1d50033749621fb08b0 SHA1 369fad7d0f1eb8f9f3232e7e53b51fce4d0d8e37 SHA256 f10e187e6b24f33c546fb48057cff893f03c65ab5ec5e9d73f875435c074bcfa
 EBUILD libcdio-0.80.ebuild 2242 RMD160 b0ee996726376df43767a608b4519af4b971056c SHA1 9e0e719658b7caf8bb7a4cc72a60f942861464f9 SHA256 15d4816ab1b1454127c4ce3e53d7af3c13be7f64b76e577c7d8524430e2381f5
-EBUILD libcdio-0.82.ebuild 1677 RMD160 91a1247e5142e40b2813ea0c9315e989a62bcd91 SHA1 09881c6325d7da23b4e74c37043a2a7179f6e470 SHA256 08ec6098ae8bd21bd91116f27036554dbf3711b9c1439245faa666b936c89843
+EBUILD libcdio-0.82.ebuild 1719 RMD160 57afc3921e9398733946a6f0f6bb944450182770 SHA1 3f5c4ee1a06f2560073c170f852383d607e2dbc4 SHA256 23efe09a0594d3ccc3019a14078c1df8999120b53b44620b54b99a373ffcd702
 MISC ChangeLog 15917 RMD160 0f4402bf927171bd0423d7ee77a089bc1b264a85 SHA1 cb1afef195b03556bfb2459c38d3cab97f4cb28a SHA256 a560a42bf94912ee6f4fed1d2d5bfeb6549207e6ba7e6c568d662d41c73a93cb
 MISC metadata.xml 422 RMD160 157ce766b850a7bdd941a3e629258265e22501e8 SHA1 b7e40367ad2bab50ec3448e9a223a34bb6c45092 SHA256 07686b4cc783be22b54d0c85d2112dc0b9815d0fb71792e1d7410aa66c05f459