diff options
author | jmmv <jmmv@pkgsrc.org> | 2003-12-14 19:46:25 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2003-12-14 19:46:25 +0000 |
commit | 38613678dd4726d44265bf48aa88288deb1e8d96 (patch) | |
tree | f5414874e011c733476a59c51eaa2268a19cbeaa /devel | |
parent | d8c3b5d28a554091fd96655787066aa86fc143f1 (diff) | |
download | pkgsrc-38613678dd4726d44265bf48aa88288deb1e8d96.tar.gz |
Update to 2.4.2, based on work done by xtraeme@. The following list of
changes is according to the development branch, 2.3. Changes since then
include several bugfixes.
libbonobo 2.3.6
+ bugs fixes
+ improved tests (Gustavo)
+ improved FAQ (Gustavo)
+ featurelets
+ bogus inheritance trap (Michael)
libbonobo 2.3.5
* Bugs fixed
+ reference tracking race (Gustavo Carneiro)
+ incompatible activation-client fix (Antonio Xu)
+ popt fixage (Michael, Damien Carbery)
* Featurelets
+ factory regression tests (Gustavo)
libbonobo 2.3.4
* Bugs fixed
+ don't use C++ keyword in C code (Frederic Crozat)
+ fix activation test linking and script (Michael)
* Translations
+ az (Metin Amiroff)
+ id (Mohammad Damt)
+ ml (Guntupalli Karunakar)
+ nl (Huib Kleinhout)
+ bn (Mahmudur Rahman)
+ fi (Pauli Virtanen)
+ ru (Russian team, Dmitry G. Mastrukov)
+ da (Ole Laursen)
+ sr (Serbian team, Danilo Å egan)
+ sq (Laurent Dhima)
libbonobo 2.3.3
* Features
+ use Gdk::WindowId for Bonobo_Canvas (Michael)
* Bugs fixed
+ CORBA_boolean handling in property bag (Dan Winship)
+ cancel pending timeouts when destroying factory (Gustavo
Carneiro)
libbonobo 2.3.2
* Features
+ very much improved API docs (Gustavo Carneiro,
Martin Kretschmar, Rodrigo Moya)
+ dynamic b-a-s path update (Antonio Xu)
+ fix DNS reverse-lookup (Shailesh Mittal, Michael)
+ always run in thread-safe mode (Michael)
+ tentative BonoboObject locking action (Michael)
+ new thread policy APIs (Michael)
+ bump default factory timeouts (Gustavo)
+ more regression tests (Michael, Gustavo)
* Bugs fixed
+ de-linc-ization (Michael)
+ build fixes (Jens Granseuer, Martin)
libbonobo 2.3.1
* Features
+ lots more API & other doc work (Gustavo)
+ selectable BonoboObject POAs (Michael, Gustavo)
+ re-factored activation server (Michael)
+ merged bonobo-activation (Michael)
+ unknown app registration (Gustavo)
+ cygwin build fixes (Masahiro Sakai)
+ BonoboForeignObject - for bindings (Gustavo, James H)
* Bugs fixed
+ BonoboArg improvements (Gustavo)
+ make check doesn't trash /tmp (Michael)
+ remove .so library suffix (Michael)
+ trailing ; fixes (Padraig O'Briain)
+ C++ BonoboArg bits (Martin Kretzchmar)
+ gettext fixes (Hidetoshi Tajima)
+ build fixes (Thomas VS, James H, Carlos Marin)
* Translations
+ am - Daniel Yacob, de, fa, mk, nl - Pablo Saratxaga
+ ro - Marius Andreiana, mn, id, eo, sr - Christian Rose
+ ml - Guntupalli Karunakar
Diffstat (limited to 'devel')
-rw-r--r-- | devel/libbonobo/Makefile | 26 | ||||
-rw-r--r-- | devel/libbonobo/PLIST | 94 | ||||
-rw-r--r-- | devel/libbonobo/buildlink2.mk | 25 | ||||
-rw-r--r-- | devel/libbonobo/distinfo | 8 |
4 files changed, 130 insertions, 23 deletions
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 85b84f1a5b2..bc56fd64379 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -1,26 +1,42 @@ -# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:48 salo Exp $ +# $NetBSD: Makefile,v 1.16 2003/12/14 19:46:25 jmmv Exp $ -DISTNAME= libbonobo-2.2.0 -PKGREVISION= 4 +DISTNAME= libbonobo-2.4.2 CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libbonobo/2.2/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libbonobo/2.4/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://developer.gnome.org/ COMMENT= GNOME2 Object activation framework library +CONFLICTS= bonobo-activation-[0-9]* + GNU_CONFIGURE= YES USE_BUILDLINK2= YES +USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES USE_GMAKE= YES + LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= bonobo/libbonobo-2.0.pc.in +PKGCONFIG_OVERRIDE+= bonobo-activation/bonobo-activation-2.0.pc.in CONFIGURE_ARGS= --enable-gtk-doc=no +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html -.include "../../devel/bonobo-activation/buildlink2.mk" +PKG_SYSCONFSUBDIR= bonobo-activation +EGDIR= ${PREFIX}/share/examples/bonobo-activation +CONF_FILES= ${EGDIR}/bonobo-activation-config.xml \ + ${PKG_SYSCONFDIR}/bonobo-activation-config.xml + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/lib/bonobo/monikers + +.include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/glib2/buildlink2.mk" +.include "../../devel/popt/buildlink2.mk" +.include "../../net/ORBit2/buildlink2.mk" +.include "../../textproc/libxml2/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libbonobo/PLIST b/devel/libbonobo/PLIST index 1a761d78193..3b7a257d84d 100644 --- a/devel/libbonobo/PLIST +++ b/devel/libbonobo/PLIST @@ -1,10 +1,25 @@ -@comment $NetBSD: PLIST,v 1.4 2003/01/25 22:27:10 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.5 2003/12/14 19:46:25 jmmv Exp $ +bin/activation-client +bin/bonobo-activation-run-query +bin/bonobo-slay bin/echo-client-2 +include/bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h +include/bonobo-activation-2.0/bonobo-activation/Bonobo_GenericFactory.h +include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-activate.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-async.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-init.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-register.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-server-info.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-version.h +include/bonobo-activation-2.0/bonobo-activation/bonobo-activation.h include/libbonobo-2.0/bonobo/Bonobo.h include/libbonobo-2.0/bonobo/bonobo-arg.h include/libbonobo-2.0/bonobo/bonobo-context.h include/libbonobo-2.0/bonobo/bonobo-event-source.h include/libbonobo-2.0/bonobo/bonobo-exception.h +include/libbonobo-2.0/bonobo/bonobo-foreign-object.h include/libbonobo-2.0/bonobo/bonobo-generic-factory.h include/libbonobo-2.0/bonobo/bonobo-i18n.h include/libbonobo-2.0/bonobo/bonobo-item-container.h @@ -36,17 +51,57 @@ lib/bonobo-2.0/samples/bonobo-echo-2 lib/bonobo/monikers/libmoniker_std_2.a lib/bonobo/monikers/libmoniker_std_2.la lib/bonobo/monikers/libmoniker_std_2.so +lib/bonobo/servers/Bonobo_CosNaming_NamingContext.server lib/bonobo/servers/Bonobo_Moniker_std.server lib/bonobo/servers/Bonobo_Sample_Echo.server +lib/bonobo/servers/broken.server +lib/bonobo/servers/empty.server +lib/bonobo/servers/plugin.server lib/libbonobo-2.a lib/libbonobo-2.la lib/libbonobo-2.so lib/libbonobo-2.so.0 lib/libbonobo-2.so.0.0 +lib/libbonobo-activation.a +lib/libbonobo-activation.la +lib/libbonobo-activation.so +lib/libbonobo-activation.so.4 +lib/libbonobo-activation.so.4.0 lib/orbit-2.0/Bonobo_module.a lib/orbit-2.0/Bonobo_module.la lib/orbit-2.0/Bonobo_module.so +lib/pkgconfig/bonobo-activation-2.0.pc lib/pkgconfig/libbonobo-2.0.pc +libexec/bonobo-activation-server +man/man1/bonobo-activation-server.1 +sbin/bonobo-activation-sysconf +share/doc/html/bonobo-activation/api-reference.html +share/doc/html/bonobo-activation/architecture.html +share/doc/html/bonobo-activation/async-activation.html +share/doc/html/bonobo-activation/attribute-tag.html +share/doc/html/bonobo-activation/bonobo-activation-Debugging.html +share/doc/html/bonobo-activation/bonobo-activation-Initialization.html +share/doc/html/bonobo-activation/bonobo-activation-Query-and-Activation.html +share/doc/html/bonobo-activation/bonobo-activation-Registration.html +share/doc/html/bonobo-activation/bonobo-activation-Utilities.html +share/doc/html/bonobo-activation/bonobo-activation.devhelp +share/doc/html/bonobo-activation/bonobo-activation.png +share/doc/html/bonobo-activation/checklist.html +share/doc/html/bonobo-activation/configuring.html +share/doc/html/bonobo-activation/home.png +share/doc/html/bonobo-activation/index.html +share/doc/html/bonobo-activation/index.sgml +share/doc/html/bonobo-activation/left.png +share/doc/html/bonobo-activation/lgpl.html +share/doc/html/bonobo-activation/migrating.html +share/doc/html/bonobo-activation/query-langage.html +share/doc/html/bonobo-activation/query-syntax.html +share/doc/html/bonobo-activation/right.png +share/doc/html/bonobo-activation/server-arch.html +share/doc/html/bonobo-activation/server-xml-reference.html +share/doc/html/bonobo-activation/terms.html +share/doc/html/bonobo-activation/tutorial.html +share/doc/html/bonobo-activation/up.png share/doc/html/libbonobo/debugging.html share/doc/html/libbonobo/factories.html share/doc/html/libbonobo/general.html @@ -64,7 +119,6 @@ share/doc/html/libbonobo/libbonobo-bonobo-i18n.html share/doc/html/libbonobo/libbonobo-bonobo-item-container.html share/doc/html/libbonobo/libbonobo-bonobo-item-handler.html share/doc/html/libbonobo/libbonobo-bonobo-listener.html -share/doc/html/libbonobo/libbonobo-bonobo-macros.html share/doc/html/libbonobo/libbonobo-bonobo-main.html share/doc/html/libbonobo/libbonobo-bonobo-moniker-context.html share/doc/html/libbonobo/libbonobo-bonobo-moniker-extender.html @@ -86,10 +140,10 @@ share/doc/html/libbonobo/libbonobo-bonobo-storage.html share/doc/html/libbonobo/libbonobo-bonobo-stream-client.html share/doc/html/libbonobo/libbonobo-bonobo-stream-memory.html share/doc/html/libbonobo/libbonobo-bonobo-types.html -share/doc/html/libbonobo/libbonobo-bonobo-xobject.html share/doc/html/libbonobo/libbonobo-faq.html share/doc/html/libbonobo/libbonobo.devhelp share/doc/html/libbonobo/misc.html +share/doc/html/libbonobo/monikers-overview.html share/doc/html/libbonobo/monikers.html share/doc/html/libbonobo/persist-file.png share/doc/html/libbonobo/persist-storage.png @@ -100,10 +154,13 @@ share/doc/html/libbonobo/properties.html share/doc/html/libbonobo/property-bags.html share/doc/html/libbonobo/refcounting.html share/doc/html/libbonobo/right.png +share/doc/html/libbonobo/running-context.png share/doc/html/libbonobo/storage.png share/doc/html/libbonobo/stream.png share/doc/html/libbonobo/streams.html +share/doc/html/libbonobo/unknown.png share/doc/html/libbonobo/up.png +share/examples/bonobo-activation/bonobo-activation-config.xml share/idl/bonobo-2.0/Bonobo.idl share/idl/bonobo-2.0/Bonobo_Canvas.idl share/idl/bonobo-2.0/Bonobo_Clipboard.idl @@ -122,28 +179,44 @@ share/idl/bonobo-2.0/Bonobo_Sample_Echo.idl share/idl/bonobo-2.0/Bonobo_Storage.idl share/idl/bonobo-2.0/Bonobo_UI.idl share/idl/bonobo-2.0/Bonobo_Zoomable.idl +share/idl/bonobo-activation-2.0/Bonobo_ActivationContext.idl +share/idl/bonobo-activation-2.0/Bonobo_Activation_types.idl +share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl +share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl +share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/is/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/li/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libbonobo-2.0.mo @@ -151,24 +224,35 @@ ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/libbonobo-2.0.mo +${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libbonobo-2.0.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo +@dirrm share/idl/bonobo-activation-2.0 @dirrm share/idl/bonobo-2.0 @comment in ORBit2: @dirrm share/idl +@dirrm share/examples/bonobo-activation @dirrm share/doc/html/libbonobo +@dirrm share/doc/html/bonobo-activation @comment in ORBit2: @dirrm lib/orbit-2.0 -@comment in bonobo-activation: @dirrm lib/bonobo/servers -@comment in bonobo-activation: @dirrm lib/bonobo/monikers +@dirrm lib/bonobo/servers +@unexec ${RMDIR} %D/lib/bonobo/monikers 2>/dev/null || ${TRUE} @dirrm lib/bonobo-2.0/samples @dirrm lib/bonobo-2.0 +@unexec ${RMDIR} %D/lib/bonobo 2>/dev/null || ${TRUE} @dirrm include/libbonobo-2.0/bonobo @dirrm include/libbonobo-2.0 +@dirrm include/bonobo-activation-2.0/bonobo-activation +@dirrm include/bonobo-activation-2.0 diff --git a/devel/libbonobo/buildlink2.mk b/devel/libbonobo/buildlink2.mk index d8ab6672eef..1343c3328b3 100644 --- a/devel/libbonobo/buildlink2.mk +++ b/devel/libbonobo/buildlink2.mk @@ -1,25 +1,30 @@ -# $NetBSD: buildlink2.mk,v 1.8 2003/11/12 01:31:48 salo Exp $ +# $NetBSD: buildlink2.mk,v 1.9 2003/12/14 19:46:25 jmmv Exp $ +# +# This Makefile fragment is included by packages that use libbonobo. +# +# This file was created automatically using createbuildlink 2.8. +# .if !defined(LIBBONOBO_BUILDLINK2_MK) LIBBONOBO_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= libbonobo -BUILDLINK_DEPENDS.libbonobo?= libbonobo>=2.2.0nb4 +BUILDLINK_DEPENDS.libbonobo?= libbonobo>=2.4.2 BUILDLINK_PKGSRCDIR.libbonobo?= ../../devel/libbonobo EVAL_PREFIX+= BUILDLINK_PREFIX.libbonobo=libbonobo BUILDLINK_PREFIX.libbonobo_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.libbonobo+= include/bonobo-activation-2.0/bonobo-activation/* BUILDLINK_FILES.libbonobo+= include/libbonobo-2.0/bonobo/* -BUILDLINK_FILES.libbonobo+= include/libbonobo-2.0/* -BUILDLINK_FILES.libbonobo+= lib/bonobo/monikers/* -BUILDLINK_FILES.libbonobo+= lib/bonobo/servers/* +BUILDLINK_FILES.libbonobo+= include/libbonobo-2.0/libbonobo.h BUILDLINK_FILES.libbonobo+= lib/libbonobo-2.* -BUILDLINK_FILES.libbonobo+= lib/orbit-2.0/Bonobo_module.* -BUILDLINK_FILES.libbonobo+= lib/pkgconfig/libbonobo-2.0.pc -BUILDLINK_FILES.libbonobo+= share/idl/bonobo-2.0/* +BUILDLINK_FILES.libbonobo+= lib/libbonobo-activation.* -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../devel/bonobo-activation/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/glib2/buildlink2.mk" +.include "../../devel/popt/buildlink2.mk" +.include "../../net/ORBit2/buildlink2.mk" +.include "../../textproc/libxml2/buildlink2.mk" BUILDLINK_TARGETS+= libbonobo-buildlink diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 6e588bda98d..112cf113e8b 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.3 2003/01/25 22:27:10 jmmv Exp $ +$NetBSD: distinfo,v 1.4 2003/12/14 19:46:25 jmmv Exp $ -SHA1 (libbonobo-2.2.0.tar.bz2) = d6b697a4be16df12ba0325064c0e1f19b9daf392 -Size (libbonobo-2.2.0.tar.bz2) = 754714 bytes +SHA1 (libbonobo-2.4.2.tar.bz2) = 81e63fd6a1cc9328963633f91c059016d512bdde +Size (libbonobo-2.4.2.tar.bz2) = 1359309 bytes +SHA1 (patch-aa) = f9f94279a1819af70123eef49cf98b4b34b956e1 +SHA1 (patch-ab) = 36e17156e0dc0ce19c395abb730707b8bc0ea8da |