diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2009-08-30 21:13:37 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2009-08-30 21:13:37 +0000 |
commit | 3a7534f955177d85fc7206bdd23e65f6d7ff615e (patch) | |
tree | 3a5218170208c39f2cd2d9af0a23a8588ca78d53 | |
parent | Fix build with current git (diff) | |
download | suka-3a7534f955177d85fc7206bdd23e65f6d7ff615e.tar.gz suka-3a7534f955177d85fc7206bdd23e65f6d7ff615e.tar.bz2 suka-3a7534f955177d85fc7206bdd23e65f6d7ff615e.zip |
Bumping all sorts of GNOME Shell stuff
svn path=/; revision=144
15 files changed, 85 insertions, 21 deletions
diff --git a/dev-libs/gir-repository/Manifest b/dev-libs/gir-repository/Manifest index 8c22d78..25f29a7 100644 --- a/dev-libs/gir-repository/Manifest +++ b/dev-libs/gir-repository/Manifest @@ -1,3 +1,3 @@ AUX gir-repository-0.6.3-fix-worlds-worst-automagic-configure.patch 17076 RMD160 f73c364dbea9e55da5eac2941e709a2482705ea5 SHA1 906b93e77ec4697a6cf9baa2c63d336509d35fe0 SHA256 af8d42db6dbff99895ec70d3e416e3f3f7b2b237bfa55cddd163066c7c858f7f -DIST gir-repository-0.6.3.tar.bz2 241687 RMD160 aa74253f06d8d3bba5e0a6166765b69615ea3913 SHA1 4c1fad85efe6be72552bee5ae0a80752b8753b67 SHA256 afb28441b0c98e4e6404b673a81ccdb8a05e8f5d86b8abd17e86352c61bac794 -EBUILD gir-repository-0.6.3.ebuild 2338 RMD160 4d5cc7cdd7d424b1bc96ec9ffbd132630c6eb685 SHA1 ea17c77ba914f3cc0a42ced9c5f4bcdda296e675 SHA256 c2e628c188605a0230bbb0a22f0a0849bfdb7eb9986eae22f3717fd7063b9634 +DIST gir-repository-0.6.4.tar.bz2 264515 RMD160 c22453e4f7609720624b7a0f9a60a3ca04716982 SHA1 d78d2ce407d7d48f5be36f2bd6c74fafd7335ce1 SHA256 34660fc9fd43a04227b8bd52a609c4f928dc5df0b03dbe06bb56d3dfd1b64738 +EBUILD gir-repository-0.6.4.ebuild 2339 RMD160 766c60cc496cc91ba18e8483e185f81b737b08aa SHA1 151b15a20e63c8ece6ca60963d2177acd9a95bc7 SHA256 eceada94acdd8ccc6cc019e3ec87e12f50b8c8db03b01d65686823f2a2d74010 diff --git a/dev-libs/gir-repository/gir-repository-0.6.3.ebuild b/dev-libs/gir-repository/gir-repository-0.6.4.ebuild index 6d4f991..fb95f2b 100644 --- a/dev-libs/gir-repository/gir-repository-0.6.3.ebuild +++ b/dev-libs/gir-repository/gir-repository-0.6.4.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86" IUSE="atk avahi babl dbus gconf gnome-keyring gstreamer +gtk gtksourceview gupnp libnotify libsoup libunique libwnck pango poppler vte webkit" -RDEPEND=">=dev-libs/gobject-introspection-0.6.3" +RDEPEND=">=dev-libs/gobject-introspection-0.6.4" DEPEND="${RDEPEND} atk? ( >=dev-libs/atk-1.12.0 ) avahi? ( >=net-dns/avahi-0.6 ) @@ -84,7 +84,7 @@ pkg_setup() { src_prepare() { gnome2_src_prepare - epatch "${FILESDIR}/${P}-fix-worlds-worst-automagic-configure.patch" +# epatch "${FILESDIR}/${P}-fix-worlds-worst-automagic-configure.patch" eautoreconf } diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index 3ebc6bb..eb4bd06 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,3 +1,3 @@ -DIST gjs-0.3.tar.bz2 421641 RMD160 0845b264e2e4480aa8bf3ab9cdf40fd90d5ac160 SHA1 80d6baf1525e4641fb455a2beaa03d2d0246ab12 SHA256 767c7736b1e821c9b65d456a649d2dfaaf3dc613eea5976dd671456f7c270dde -EBUILD gjs-0.3.ebuild 382 RMD160 50bf45817b2bac1fc5577e678d8a881685ef99a3 SHA1 234447ed472519d63512bcda8346e4696a9e5b86 SHA256 92eee4d90efe4f247375756221f61f7e314808fd5dfe19c72416744460d05161 +DIST gjs-0.4.tar.bz2 401868 RMD160 23673430a97f93fc846eab2568bc8a888ae50b7e SHA1 5b90233e9da4b660c3d128800bb7ada8ddfd9d8f SHA256 78c3116cfb0feba08c79b4beea4b6ef16bfca3be9b59efcfa7e6eca79911aca6 +EBUILD gjs-0.4.ebuild 382 RMD160 50bf45817b2bac1fc5577e678d8a881685ef99a3 SHA1 234447ed472519d63512bcda8346e4696a9e5b86 SHA256 92eee4d90efe4f247375756221f61f7e314808fd5dfe19c72416744460d05161 EBUILD gjs-9999.ebuild 447 RMD160 298fe5a63a48d110dd2fe7ab89dd9817b20bd706 SHA1 021739697f69c3a8290d73fd8c59f6a179b0f683 SHA256 90ec7cfb775f7fdbf4b2fc5d3929cd63f0b35c31145fe7a48a1ad41e8d53b6ff diff --git a/dev-libs/gjs/gjs-0.3.ebuild b/dev-libs/gjs/gjs-0.4.ebuild index f4986b6..f4986b6 100644 --- a/dev-libs/gjs/gjs-0.3.ebuild +++ b/dev-libs/gjs/gjs-0.4.ebuild diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest index 52c2a4f..73043b5 100644 --- a/dev-libs/gobject-introspection/Manifest +++ b/dev-libs/gobject-introspection/Manifest @@ -1,3 +1,5 @@ AUX gobject-introspection-0.6.2-gir.patch 432 RMD160 f159e05133c1ba71061c9e111cf0fcd0e23e7d62 SHA1 bd62f296172403d0bb56d11564be4f00b3ae47e4 SHA256 23f22a27b97f51b622efee870cf3925458ca744869ce2db3d4effb48fe7d075e -DIST gobject-introspection-0.6.3.tar.bz2 550737 RMD160 564ca049e36b75fc0fb1dd98206d5868680ebede SHA1 5c3b6d3eecd47087fb35e35b8f4e8855e0aac9d5 SHA256 c6ae995ba759dd8634b8815980687b565d3d5f8fae5e514d8329d2ac2bd83ca5 -EBUILD gobject-introspection-0.6.3.ebuild 843 RMD160 bcd559a5c9a68632037cc96e4de3beb216b53cf2 SHA1 922295bc87aa13338587ced634f4f2d63cb8d0dc SHA256 a853cfe673cf4952251d3c9d59aba6f65961828e9cb9951c9d8c678df44f6dc6 +AUX gobject-introspection-0.6.4-gir-export.patch 1585 RMD160 d2dde4b4dfcbb917263a79672ead2186525a9db6 SHA1 e344ea1f41d85e4df291821c3d9b1546a9df70a3 SHA256 7e5be6f42333594fe9a2b2a1307c2fa418f68052f59cd257921def311e211f52 +AUX gobject-introspection-0.6.4-libtool.patch 674 RMD160 7cbb7074b878b5ebbcb70cf71592b32d150ebbfe SHA1 278321eb086f459db59a2a5f60b446312a6aa30c SHA256 b2fb65fbac1809663f931f214a572aec924c37c5b8c57db5b7a12459e1a6e9d7 +DIST gobject-introspection-0.6.4.tar.bz2 608062 RMD160 b8f12297ebd982ec5a5f7be0829cd13cee3ab5a3 SHA1 07ff1f8b9f59c844a543fde8d48cbf60a22e5c27 SHA256 6ca9cf935dd553e4e7f6c93361e8218886837d93d76a68a54fcfcc601ee57059 +EBUILD gobject-introspection-0.6.4.ebuild 942 RMD160 5a0676a5f0f08b0d032cca17f5a5a17ba3360d59 SHA1 15d83919dba994307ef26e3a4234a1a32ae05323 SHA256 6fb34cdceac44636ac019fee8d969e37a5764786cc7d9352bd26961a526995d9 diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-0.6.4-gir-export.patch b/dev-libs/gobject-introspection/files/gobject-introspection-0.6.4-gir-export.patch new file mode 100644 index 0000000..e233504 --- /dev/null +++ b/dev-libs/gobject-introspection/files/gobject-introspection-0.6.4-gir-export.patch @@ -0,0 +1,39 @@ +--- gir/Makefile.am ++++ gir/Makefile.am +@@ -161,8 +161,8 @@ GIRepository-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) $(GIREPOSIT + --include=GObject-2.0 \ + --library=girepository-1.0 \ + -I$(srcdir)/girepository \ ++ --pkg glib-2.0 \ + --pkg gobject-2.0 \ +- --pkg-export gobject-introspection-1.0 \ + $(GIREPOSITORY_FILES) + BUILT_GIRSOURCES += GIRepository-2.0.gir + +--- giscanner/scannermain.py ++++ giscanner/scannermain.py +@@ -81,9 +81,6 @@ def _get_option_parser(): + parser.add_option("", "--pkg", + action="append", dest="packages", default=[], + help="pkg-config packages to get cflags from") +- parser.add_option("", "--pkg-export", +- action="append", dest="packages_export", default=[], +- help="Associated pkg-config packages for this library") + parser.add_option("-v", "--verbose", + action="store_true", dest="verbose", + help="be verbose") +@@ -319,12 +322,8 @@ def scanner_main(args): + raise SystemExit("ERROR in annotation: %s" % (str(e), )) + + # Write out AST +- if options.packages_export: +- exported_packages = options.packages_export +- else: +- exported_packages = options.packages + writer = Writer(namespace, shlibs, transformer.get_includes(), ++ options.packages, options.c_includes, +- exported_packages, options.c_includes, + transformer.get_strip_prefix()) + data = writer.get_xml() + if options.output: + diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-0.6.4-libtool.patch b/dev-libs/gobject-introspection/files/gobject-introspection-0.6.4-libtool.patch new file mode 100644 index 0000000..bbbc35d --- /dev/null +++ b/dev-libs/gobject-introspection/files/gobject-introspection-0.6.4-libtool.patch @@ -0,0 +1,21 @@ +--- gir/Makefile.am ++++ gir/Makefile.am +@@ -66,7 +66,7 @@ GObject-2.0.gir: GLib-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) Makefile + --noclosure \ + --output $@ \ + --strip-prefix=g \ +- --libtool="$(LIBTOOL_LIBTOOL)" \ ++ --libtool="$(LIBTOOL)" \ + --c-include="glib-object.h" \ + --include=GLib-2.0 \ + --library=$(GOBJECT_LIBRARY) \ +@@ -98,7 +98,7 @@ GModule-2.0.gir: GLib-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) + --noclosure \ + --output $@ \ + --strip-prefix=g \ +- --libtool="$(LIBTOOL_LIBTOOL)" \ ++ --libtool="$(LIBTOOL)" \ + --c-include="gmodule.h" \ + --include=GLib-2.0 \ + --library=$(GMODULE_LIBRARY) \ + diff --git a/dev-libs/gobject-introspection/gobject-introspection-0.6.3.ebuild b/dev-libs/gobject-introspection/gobject-introspection-0.6.4.ebuild index 58583fd..9524479 100644 --- a/dev-libs/gobject-introspection/gobject-introspection-0.6.3.ebuild +++ b/dev-libs/gobject-introspection/gobject-introspection-0.6.4.ebuild @@ -34,6 +34,8 @@ src_prepare() { # Fix build failure epatch "${FILESDIR}/${PN}-0.6.2-gir.patch" + epatch "${FILESDIR}/${PN}-0.6.4-gir-export.patch" + epatch "${FILESDIR}/${PN}-0.6.4-libtool.patch" # Make it libtool-1 compatible, bug #270909 rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index d9ec37c..0385271 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,3 +1,3 @@ -DIST gnome-shell-2.27.0.tar.bz2 437202 RMD160 9d13cb841472b0cdc9a6bbfc7da48be95429ca09 SHA1 9bf1f96e4d70505101730579d396cd32e2488bce SHA256 df59d50e7653abfcf05d7d94f0aaefe8f05329e47d5c43510418622a40e84fb0 -EBUILD gnome-shell-2.27.0.ebuild 1281 RMD160 ca90b8ffeeacb4d5efccea9926034b7d8ab73715 SHA1 2cba05e09c64143e61554608acb6eb39fd0c63fd SHA256 93bf2a1f99693a52f5d531cb64d9fd61a58c5752f9de4031ed54b43dba0ce8d9 -EBUILD gnome-shell-9999.ebuild 1448 RMD160 1039d65d8070d0b54fa0786e751fefc3e9772965 SHA1 239fc0770cc3b5558f73f1e1bdda01b32d50d6bb SHA256 22d231a6ca0f63c2d0c077336b9f4a750e8f8d62fffe31b7f31564677fd89a70 +DIST gnome-shell-2.27.1.tar.bz2 464266 RMD160 8133ae2f0f298fac23a01e3f0487cff6b1dcfad1 SHA1 d321629fdeb29418f016e9123291980ed78e19c1 SHA256 ae2725f6e2c1ea94477045afedf0845dcada2e2ffacfa5b8d2437fbf9b6b6de5 +EBUILD gnome-shell-2.27.1.ebuild 1287 RMD160 38c1780fc20a7525fe70a088f8c17aea53e2e0fa SHA1 b7ef460aab96b7c28a3a0562e6309bf4df7ae927 SHA256 1e814c5a7e225199963edd8f05e2d365ac2b1c06473d326892e4d6436c1f8f9b +EBUILD gnome-shell-9999.ebuild 1468 RMD160 d8f27f730b49b6debeec892fd9bde66b059164b0 SHA1 6fecc0d8c7110ccf6a7c4345c61f212e98cb4056 SHA256 16f8b07149adee47c5f813b37615a3d9eab1bc5a02c0b615d3d2e95882b1c755 diff --git a/gnome-base/gnome-shell/gnome-shell-2.27.0.ebuild b/gnome-base/gnome-shell/gnome-shell-2.27.1.ebuild index 2d15a54..f25f217 100644 --- a/gnome-base/gnome-shell/gnome-shell-2.27.0.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-2.27.1.ebuild @@ -18,10 +18,10 @@ RDEPEND=">=gnome-base/gnome-desktop-2.26.0 >=x11-libs/pango-1.15.4 >=dev-libs/glib-2.18.0 >=x11-libs/gtk+-2.15.1 - >=x11-wm/mutter-2.27.2 - dev-libs/gjs - >=dev-libs/gobject-introspection-0.6.3 - >=dev-libs/gir-repository-0.6.3[pango] + >=x11-wm/mutter-2.27.3 + >=dev-libs/gjs-0.4 + >=dev-libs/gobject-introspection-0.6.4 + >=dev-libs/gir-repository-0.6.4[pango] >=gnome-base/gconf-2.6.1 >=gnome-base/gnome-menus-2.11.1 gnome-base/librsvg diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild index 7bf4d57..40feb89 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -30,7 +30,8 @@ RDEPEND=">=gnome-base/gnome-desktop-2.26.0 gnome-base/librsvg >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-1.1.2 - x11-libs/libXau" + x11-libs/libXau + x11-apps/mesa-progs" DEPEND="${RDEPEND} >=dev-lang/perl-5 gnome-base/gnome-common @@ -60,5 +61,4 @@ pkg_postinst() { elog " Start with 'gnome-shell --replace' " elog " or add gnome-shell.desktop to ~/.config/autostart/ " - } diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest index 7ca10d5..549f1e9 100644 --- a/media-libs/clutter/Manifest +++ b/media-libs/clutter/Manifest @@ -1,4 +1,4 @@ AUX clutter-1.0.0-disable-tests.patch 1445 RMD160 95018f8fce1d4c2d47ebd16402a02f2c86e0fdbc SHA1 f355cb8f13cb8fd4e192c925ea23efb8ac64f40b SHA256 5e168f0854c0883fc96ae489947b5b4e3b3f5ca36b6b0b461b5acfcd36e0c815 -DIST clutter-1.0.0.tar.bz2 2028734 RMD160 bd39285d6472d3ce92e112ae8f241d643f715944 SHA1 3f7e9703e26399a4818ddc6b6d87d8184a1d215f SHA256 50166927f9eeb12902d3297476d92c702edb2df82b5df8d3847cbf2c51e0e768 -EBUILD clutter-1.0.0.ebuild 2124 RMD160 b3a052b4246020734369f346f42d2dcc3ad3d908 SHA1 6f5b2fb0831330f031eb67e0d1408f7b5edb86d3 SHA256 3f7d845c53f5d0cb2b91d4af1d929993b3764cbb2829a05282ac75147051abe8 +DIST clutter-1.0.4.tar.bz2 2040023 RMD160 4fd2d032df0e45aab574f4388275a9d1ff234148 SHA1 91476f5c3089bab35dfb1c3a0bc18c44f161b6f0 SHA256 56d9751f5623dbd8554a120deb9e47f4426cedd992daa0f41516b25f05d78cf7 +EBUILD clutter-1.0.4.ebuild 2124 RMD160 b3a052b4246020734369f346f42d2dcc3ad3d908 SHA1 6f5b2fb0831330f031eb67e0d1408f7b5edb86d3 SHA256 3f7d845c53f5d0cb2b91d4af1d929993b3764cbb2829a05282ac75147051abe8 MISC metadata.xml 602 RMD160 fa6d7f9c710892075862023297970fc261c1394c SHA1 28e1b953378601a1b93231f64a82e47a384852ce SHA256 8c76b22622c2c0793629693cfa507367f65221a1bce7b5d65c13605353718efb diff --git a/media-libs/clutter/clutter-1.0.0.ebuild b/media-libs/clutter/clutter-1.0.4.ebuild index ab473cc..ab473cc 100644 --- a/media-libs/clutter/clutter-1.0.0.ebuild +++ b/media-libs/clutter/clutter-1.0.4.ebuild diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 1439c94..0f538f4 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,4 +1,4 @@ -DIST mutter-2.27.2.tar.bz2 1994571 RMD160 53648018328bff478e585a920849db1b03bb28fb SHA1 6de00711a4062f0f375a287574677f58e7734c5c SHA256 713cd0621547907a80f5d3b73f482ce0ec1633bacabcaf6eb7e8ec77dd37bddd -EBUILD mutter-2.27.2.ebuild 1495 RMD160 43c1f8dcbd73d9e1388c2a49b819bbdefe25d0c9 SHA1 5f5905f5f241b36988b1b56e3d2905cc4ae1ed5c SHA256 1d95f49a8a41231764ea26fb3dd81d9b0d29d21eb799246dc652ec94480291ac +DIST mutter-2.27.3.tar.bz2 1992846 RMD160 9e051ae5d797eda6460425e0b51c7c26375c7688 SHA1 9455d19041bf4c6a348bd2dc401c7109ad9139d4 SHA256 7e5695413ac48e4be931a1000573b37eb41b8ffbab680bbfd7037b6f16760ce3 +EBUILD mutter-2.27.3.ebuild 1495 RMD160 43c1f8dcbd73d9e1388c2a49b819bbdefe25d0c9 SHA1 5f5905f5f241b36988b1b56e3d2905cc4ae1ed5c SHA256 1d95f49a8a41231764ea26fb3dd81d9b0d29d21eb799246dc652ec94480291ac EBUILD mutter-9999.ebuild 1454 RMD160 afcaf0ce12ea422542d4e701729c9e4035f307c3 SHA1 f0587ac90167fc9c0f1ee1bc3334f462a0b1e9db SHA256 eb5d4fc12405ea4dc6696310a49f8ca88a4e76c6e3b59a006024f4b48e644e8b MISC metadata.xml 595 RMD160 e354511f8cf82c440781b7d2f2f48af495ac0ae2 SHA1 82abd21f65ca6e7275bc32aee890fe124ade7092 SHA256 977b829df1bda476da07f5be78d64cf40f86c5e3232e2f72554c3112d1621acb diff --git a/x11-wm/mutter/mutter-2.27.2.ebuild b/x11-wm/mutter/mutter-2.27.3.ebuild index 979bacd..979bacd 100644 --- a/x11-wm/mutter/mutter-2.27.2.ebuild +++ b/x11-wm/mutter/mutter-2.27.3.ebuild |