diff options
| -rw-r--r-- | media-video/camorama/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/camorama/Manifest | 17 | ||||
| -rw-r--r-- | media-video/camorama/camorama-0.19-r1.ebuild | 6 | ||||
| -rw-r--r-- | media-video/camorama/camorama-0.19-r2.ebuild | 8 | ||||
| -rw-r--r-- | media-video/camorama/files/camorama-0.19-glib-232.patch | 24 |
5 files changed, 46 insertions, 18 deletions
diff --git a/media-video/camorama/ChangeLog b/media-video/camorama/ChangeLog index 0115b6fbb804..e7d29b72db8e 100644 --- a/media-video/camorama/ChangeLog +++ b/media-video/camorama/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/camorama -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.24 2011/10/04 14:07:44 nativemad Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.25 2012/05/02 20:58:38 eva Exp $ + + 02 May 2012; Gilles Dartiguelongue <eva@gentoo.org> camorama-0.19-r1.ebuild, + camorama-0.19-r2.ebuild, +files/camorama-0.19-glib-232.patch: + Fix build issues with glib-2.32 and drop SCROLLKEEPER_UPDATE which had no + effect since there is no scrollkeeper usage at all in the package. 04 Oct 2011; Andreas Schuerch <nativemad@gentoo.org> camorama-0.19-r2.ebuild: x86 stable, see bug 385343 diff --git a/media-video/camorama/Manifest b/media-video/camorama/Manifest index 8290c2801954..210aae7a7b2f 100644 --- a/media-video/camorama/Manifest +++ b/media-video/camorama/Manifest @@ -1,19 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX camorama-0.19-fixes.patch 3930 RMD160 306b7cb8c413fea5fac55d7e8c264ca81b8b7141 SHA1 b2ef5b11c6b7e9e183b20c19841937212f5775ed SHA256 ac9fa437d928e77b299e8a2b24b28ce5b0d91a619a9bc2bbfebdd32c7edf3839 AUX camorama-0.19-gconf.patch 1541 RMD160 51f36bfbd32b8830ac0b775112fec439f95a9861 SHA1 de4123c27f47f8c3cc1899514fa52782cccec84e SHA256 4ac3b70bf976ce8b03b71a4ef3d7984a8a9da7058b7a3f189eb7149bf2f12185 +AUX camorama-0.19-glib-232.patch 658 RMD160 5e9446502cc44c9c4d74bbeb4967ad5a6635bf26 SHA1 1e428872b58efb31170897716a01c354b71a56b6 SHA256 675ca6eea1b73ca4729a800b5171682f2070a6cc7406b08b9f1cfdb97cc6d1de AUX camorama-0.19-libv4l.patch 7007 RMD160 6f8f833ed87ccb7df6f43b8c007222a1f11748ed SHA1 072138ecbaacb4c3f9f23d0d331872396a3b5629 SHA256 921c4428edcac808e3d5d8b383cf8b9878026c0aecd7594a5efc4563179edba3 AUX camorama-0.19-no-more-videodev_h.patch 369 RMD160 da0e083ca55722e8376eaa33fe9c7f635740a441 SHA1 860da76bf60f5784357342edd4ded0e3050ed6e4 SHA256 5f34a9601f1199a9c2c20fb5d50c0d0eba4bbab7b264a5d5ac953ec29e21ab96 DIST camorama-0.19.tar.bz2 277169 RMD160 c8a491dd2c75b2e4b98b115a628af0008f5c4804 SHA1 ce04cd2d4abe265b19a365a515f225111dcfb969 SHA256 948c24f96c77f550881102c2c6ca818ba00ffb7a48216ae21ae75eb55d351970 -EBUILD camorama-0.19-r1.ebuild 851 RMD160 ba1351c6b19f8897d0ff1c5d3204d9108d745e17 SHA1 798a56be005feb144f698da14bb3bf82c52f2fbe SHA256 a001b2e1f330ecbcd1d043c4a7e60062d9d5a005efddfd971950c851910f4161 -EBUILD camorama-0.19-r2.ebuild 949 RMD160 dcbcc33760100cfe69335ca5db2e218a874bdbe3 SHA1 1718ead72ca9c5759d7ec8363656f392c5f53c0a SHA256 d98a22eb4516053034872477aff2162f8e4c396d9be102dbd6b7e2650b5b2bca -MISC ChangeLog 3490 RMD160 0e42d1dfa172949569723cf279c9fb5605932d59 SHA1 8a48b0f7354001041306d6b7a729cc29c9c4ef9f SHA256 6bc70346b67eb4d695072964baa327c4cd1f865b6c4aebef176421f0f85dff29 +EBUILD camorama-0.19-r1.ebuild 820 RMD160 d51e82fbed618e11affda3f855e0c0c891c1629c SHA1 f11b5806aaf730f9a7e0dcd140f14d54e8015e82 SHA256 935a27062057fa586275e2d873aa39398d99136243fe096184927d604741e53d +EBUILD camorama-0.19-r2.ebuild 956 RMD160 0beadcb01d03ca12bf699cd0b1c37edefcc755c5 SHA1 907365778f14800993160c73f519765bc6f139b2 SHA256 592f0641f3060fb16376d37cca8ab9b0c1eeb00f36af852d4e2fff31a589c97d +MISC ChangeLog 3773 RMD160 f1746a8306a6694ac48574cd97658f214485e1aa SHA1 c307ba020386a31ebce64932585fceef3ad7891c SHA256 995003f9ed16cb68e3c52862087f8d8dc72e0bf6613a5d7da68ec7bc5b08b783 MISC metadata.xml 224 RMD160 a894a47c3ba494f6e918fe6ebc70da6877385457 SHA1 d53ccf04d9b49b1152b19604732fa1c842a70cb6 SHA256 888efa552a0159d0de6ea80ae3d38ab453c12fcc62a0ede08e26ddc35fc1ed2d -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk6LEygACgkQB6aLYPQCwOCf6QCfeGt/K7/kH8vUyKomd+DBcMJM -QqIAoN1jx8mF30A5GBZHNcpKOFjKgyTb -=sunW +iEYEAREKAAYFAk+hoAQACgkQ1fmVwcYIWAZoKQCgogHxufWGB+XjpKiV8+lRuYS4 +pA4AoL85orpYZA1+Gzh5mwugaK+2BX1q +=wNIB -----END PGP SIGNATURE----- diff --git a/media-video/camorama/camorama-0.19-r1.ebuild b/media-video/camorama/camorama-0.19-r1.ebuild index daddd0e102c1..712d904f3f34 100644 --- a/media-video/camorama/camorama-0.19-r1.ebuild +++ b/media-video/camorama/camorama-0.19-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.19-r1.ebuild,v 1.3 2011/03/23 08:24:23 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.19-r1.ebuild,v 1.4 2012/05/02 20:58:38 eva Exp $ EAPI=1 @@ -24,8 +24,6 @@ DEPEND="${RDEPEND} dev-util/pkgconfig dev-util/intltool" -SCROLLKEEPER_UPDATE="0" - pkg_setup() { G2CONF="${G2CONF} --disable-schemas-install" } diff --git a/media-video/camorama/camorama-0.19-r2.ebuild b/media-video/camorama/camorama-0.19-r2.ebuild index 9de2d6eef8cd..152935dc0b65 100644 --- a/media-video/camorama/camorama-0.19-r2.ebuild +++ b/media-video/camorama/camorama-0.19-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.19-r2.ebuild,v 1.4 2011/10/04 14:07:44 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.19-r2.ebuild,v 1.5 2012/05/02 20:58:39 eva Exp $ EAPI=2 inherit eutils gnome2 @@ -26,7 +26,6 @@ DEPEND="${RDEPEND} pkg_setup() { G2CONF="${G2CONF} --disable-schemas-install" - SCROLLKEEPER_UPDATE="0" } src_prepare() { @@ -34,7 +33,8 @@ src_prepare() { "${FILESDIR}"/${P}-gconf.patch \ "${FILESDIR}"/${P}-fixes.patch \ "${FILESDIR}"/${P}-libv4l.patch \ - "${FILESDIR}"/${P}-no-more-videodev_h.patch + "${FILESDIR}"/${P}-no-more-videodev_h.patch \ + "${FILESDIR}"/${P}-glib-232.patch gnome2_src_prepare } diff --git a/media-video/camorama/files/camorama-0.19-glib-232.patch b/media-video/camorama/files/camorama-0.19-glib-232.patch new file mode 100644 index 000000000000..d6a76b8e45c2 --- /dev/null +++ b/media-video/camorama/files/camorama-0.19-glib-232.patch @@ -0,0 +1,24 @@ +diff -Nu a/src/camorama-stock-items.h b/src/camorama-stock-items.h +--- a/src/camorama-stock-items.h 2007-06-14 16:05:33.000000000 +0200 ++++ b/src/camorama-stock-items.h 2012-05-02 22:40:21.000000000 +0200 +@@ -1,7 +1,7 @@ + #ifndef CAMORAMA_STOCK_ITEMS_H + #define CAMORAMA_STOCK_ITEMS_H + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + +diff -Nu a/src/glib-helpers.h b/src/glib-helpers.h +--- a/src/glib-helpers.h 2007-06-14 16:05:33.000000000 +0200 ++++ b/src/glib-helpers.h 2012-05-02 22:46:06.000000000 +0200 +@@ -24,7 +24,7 @@ + #ifndef GLIB_HELPERS_H + #define GLIB_HELPERS_H + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + |