diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-04-17 11:02:31 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-04-17 11:02:31 +0000 |
commit | 3b9a095f020898d1cbdc929efb2f45ec39e53374 (patch) | |
tree | 43dbdc2cd6137063f3b80b63277770108171b840 | |
parent | punt galeon, as part of xulrunner removal (diff) | |
download | historical-3b9a095f020898d1cbdc929efb2f45ec39e53374.tar.gz historical-3b9a095f020898d1cbdc929efb2f45ec39e53374.tar.bz2 historical-3b9a095f020898d1cbdc929efb2f45ec39e53374.zip |
remove gluezilla, as part of xulrunner removal
-rw-r--r-- | dev-dotnet/gluezilla/ChangeLog | 115 | ||||
-rw-r--r-- | dev-dotnet/gluezilla/Manifest | 15 | ||||
-rw-r--r-- | dev-dotnet/gluezilla/files/gluezilla-2.6-xulrunner2.patch | 200 | ||||
-rw-r--r-- | dev-dotnet/gluezilla/gluezilla-2.6-r1.ebuild | 26 | ||||
-rw-r--r-- | dev-dotnet/gluezilla/metadata.xml | 5 |
5 files changed, 0 insertions, 361 deletions
diff --git a/dev-dotnet/gluezilla/ChangeLog b/dev-dotnet/gluezilla/ChangeLog deleted file mode 100644 index d7868c9b6548..000000000000 --- a/dev-dotnet/gluezilla/ChangeLog +++ /dev/null @@ -1,115 +0,0 @@ -# ChangeLog for dev-dotnet/gluezilla -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gluezilla/ChangeLog,v 1.24 2011/03/27 17:00:10 pacho Exp $ - - 27 Mar 2011; Pacho Ramos <pacho@gentoo.org> -gluezilla-2.6.ebuild, - gluezilla-2.6-r1.ebuild, -files/gluezilla-2.6-fix-xulrunner-detection.patch, - +files/gluezilla-2.6-xulrunner2.patch, -gluezilla-9999.ebuild: - Fix compilation against xulrunner-2.0 (bug #360791 by Rafał Mużyło), - remove old. - - 21 Mar 2011; Brent Baude <ranger@gentoo.org> gluezilla-2.6-r1.ebuild: - Marking gluezilla-2.6-r1 ppc stable for bug 359651 - - 29 Jan 2011; Markos Chandras <hwoarang@gentoo.org> gluezilla-2.6-r1.ebuild: - Stable on amd64 wrt bug #352808 - - 29 Jan 2011; Christian Faulhammer <fauli@gentoo.org> - gluezilla-2.6-r1.ebuild: - stable x86, bug 352808 - -*gluezilla-2.6-r1 (14 Oct 2010) - - 14 Oct 2010; Alistair Bush <ali_bush@gentoo.org> +gluezilla-2.6-r1.ebuild: - Bump from stable to update mono dep. - - 07 Oct 2010; Pacho Ramos <pacho@gentoo.org> -gluezilla-2.0.9999.ebuild, - -gluezilla-2.4.2.ebuild, -gluezilla-2.4.9999.ebuild: - Remove old. - - 12 Sep 2010; Joseph Jezak <josejx@gentoo.org> gluezilla-2.6.ebuild: - Marked ppc for bug #327279. - - 12 Jul 2010; Christian Faulhammer <fauli@gentoo.org> gluezilla-2.6.ebuild: - stable x86, bug 327279 - - 09 Jul 2010; Pacho Ramos <pacho@gentoo.org> gluezilla-2.6.ebuild: - amd64 stable, bug 327279 - -*gluezilla-2.6 (21 Feb 2010) - - 21 Feb 2010; Patrick Lauer <patrick@gentoo.org> +gluezilla-2.6.ebuild, - +files/gluezilla-2.6-fix-xulrunner-detection.patch: - Bump, includes xulrunner detection fix by Priit Laes - - 27 Sep 2009; nixnut <nixnut@gentoo.org> gluezilla-2.4.2.ebuild: - ppc stable #284306 - - 19 Sep 2009; Markus Meier <maekke@gentoo.org> gluezilla-2.4.2.ebuild: - amd64/x86 stable, bug #284306 - - 02 Sep 2009; Peter Alfredsen <loki_val@gentoo.org> -gluezilla-2.2.ebuild, - -gluezilla-2.2.9999.ebuild, -gluezilla-2.4.ebuild: - Drop old - -*gluezilla-2.4.2 (30 Jun 2009) - - 30 Jun 2009; Peter Alfredsen <loki_val@gentoo.org> - -gluezilla-2.4.2_rc1.ebuild, +gluezilla-2.4.2.ebuild: - Bump to 2.4.2 - -*gluezilla-2.4.2_rc1 (22 Jun 2009) - - 22 Jun 2009; Peter Alfredsen <loki_val@gentoo.org> - -gluezilla-2.4.2_pre2.ebuild, +gluezilla-2.4.2_rc1.ebuild: - Bump - -*gluezilla-2.4.2_pre2 (17 Jun 2009) - - 17 Jun 2009; Peter Alfredsen <loki_val@gentoo.org> - -gluezilla-2.4.2_pre1.ebuild, +gluezilla-2.4.2_pre2.ebuild: - Bump - -*gluezilla-2.4.2_pre1 (09 Jun 2009) - - 09 Jun 2009; Peter Alfredsen <loki_val@gentoo.org> - +gluezilla-2.4.2_pre1.ebuild: - Add 2.4.2 preview 1 - - 09 Jun 2009; Peter Alfredsen <loki_val@gentoo.org> - gluezilla-2.0.9999.ebuild, gluezilla-2.2.9999.ebuild, - gluezilla-2.4.9999.ebuild, gluezilla-9999.ebuild: - Drop keywords for all *9999 ebuilds instead of maintaining a huge - package.mask - - 20 May 2009; Brent Baude <ranger@gentoo.org> gluezilla-2.4.ebuild: - Marking gluezilla-2.4 ~ppc for bug 268517 - -*gluezilla-9999 (05 May 2009) -*gluezilla-2.4.9999 (05 May 2009) -*gluezilla-2.2.9999 (05 May 2009) -*gluezilla-2.0.9999 (05 May 2009) - - 05 May 2009; Peter Alfredsen <loki_val@gentoo.org> - +gluezilla-2.0.9999.ebuild, +gluezilla-2.2.9999.ebuild, - +gluezilla-2.4.9999.ebuild, +gluezilla-9999.ebuild: - Add live ebuilds for trunk and >=2.0 branches - - 17 Apr 2009; Brent Baude <ranger@gentoo.org> gluezilla-2.2.ebuild: - Marking gluezilla-2.2 ~ppc for bug 255410 - -*gluezilla-2.4 (30 Mar 2009) - - 30 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> +gluezilla-2.4.ebuild: - Bump to mono-2.4 version. - - 19 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> gluezilla-2.2.ebuild: - Fix missing DEPENDs, bug 255504. Thanks to Wulf C. Krueger - <wk@mailstation.de> for reporting. - -*gluezilla-2.2 (18 Jan 2009) - - 18 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> +metadata.xml, - +gluezilla-2.2.ebuild: - Initial commit, bug 254929 and bug 233636. - diff --git a/dev-dotnet/gluezilla/Manifest b/dev-dotnet/gluezilla/Manifest deleted file mode 100644 index 42e098d7588f..000000000000 --- a/dev-dotnet/gluezilla/Manifest +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX gluezilla-2.6-xulrunner2.patch 6537 RMD160 3f33bf5a0d53dfb174210234cf12f4bc036afa83 SHA1 d4528ae3c154792033a3cbc37de2dc245e6eb9dc SHA256 b8cc075bea1444b3b8a02ff33822321f2f8662336c3578cfee225ce8837f7eeb -DIST gluezilla-2.6.tar.bz2 286772 RMD160 8c35f646c6c4bf122b4c0bd7fdffb98f93338915 SHA1 060518a41535a4a5ae59a070a52b49dea6f69305 SHA256 c557a21695cea376cb062adcc50d336a15e0549ce0f3a157702d6b32805d9b4b -EBUILD gluezilla-2.6-r1.ebuild 641 RMD160 7b932acc60d88373bebb2d22f65932add7044ce5 SHA1 3aa09550813ec921120ff7bc114169fddacabd90 SHA256 ff4107b65d535d2a5fc1bdbc5d251482b82f9532c5275610819c9c49113bf93f -MISC ChangeLog 3922 RMD160 0d2bb0ea7c8eea593e80a9a1fb5ecb10e23a0be9 SHA1 a175829886600c943e316c86c124adff63d6a9fb SHA256 1dc6164a9354058ce3a81b4c5ecddb8044797b7e60e5b6a2392661363b60b780 -MISC metadata.xml 159 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 SHA1 ac19a418765e817e54d4c54c1992c9062d5dcf3e SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk2PbSEACgkQCaWpQKGI+9SEvwCggzNQcNF7YQG3Tt0C3CeFzJQH -1JAAn3KEGPngVFOUmg/HDCeiCTz44qi9 -=JSMo ------END PGP SIGNATURE----- diff --git a/dev-dotnet/gluezilla/files/gluezilla-2.6-xulrunner2.patch b/dev-dotnet/gluezilla/files/gluezilla-2.6-xulrunner2.patch deleted file mode 100644 index 77afed22934b..000000000000 --- a/dev-dotnet/gluezilla/files/gluezilla-2.6-xulrunner2.patch +++ /dev/null @@ -1,200 +0,0 @@ -diff -ur gluezilla-2.6.orig/configure.ac gluezilla-2.6/configure.ac ---- gluezilla-2.6.orig/configure.ac 2011-03-27 18:51:37.000000000 +0200 -+++ gluezilla-2.6/configure.ac 2011-03-27 18:52:45.000000000 +0200 -@@ -87,16 +87,23 @@ - - if test "x${oldxul}" != xyes ; then - -- AC_MSG_CHECKING(Mozilla XPCOM > 1.8) -- mozilla_xpcom_pcs="libxul-embedding-unstable" -- for pc in $mozilla_xpcom_pcs; do -- if $PKG_CONFIG --exists $pc; then -- AC_MSG_RESULT($pc) -- mozilla_xpcom=$pc -- XUL_VERSION=3 -- break; -- fi -- done -+ if test -z $mozilla_xpcom; then -+ AC_MSG_CHECKING(Mozilla XPCOM > 1.8) -+ mozilla_xpcom_pcs="libxul-embedding libxul-embedding-unstable" -+ for pc in $mozilla_xpcom_pcs; do -+ if $PKG_CONFIG --exists $pc; then -+ mozilla_xpcom=$pc -+ XUL_VERSION=3 -+ version="$(pkg-config --modversion $pc)" -+ minor=`echo "$version" | sed -e 's,\([[0-9]]*\)\..*,\1,'` -+ if test $minor -ge 2; then -+ XUL_VERSION=4 -+ fi -+ AC_MSG_RESULT(Found $version) -+ break; -+ fi -+ done -+ fi - fi - - if test -z $mozilla_xpcom; then -@@ -121,10 +128,13 @@ - XPCOM_PKGS="$mozilla_xpcom" - fi - --AM_CONDITIONAL([OLDXUL], [test x$XUL_VERSION = x2]) -- - AC_SUBST(XUL_VERSION) - -+AM_CONDITIONAL([XUL_4], [test x$XUL_VERSION = x4]) -+AM_CONDITIONAL([XUL_3], [test x$XUL_VERSION = x3]) -+AM_CONDITIONAL([XUL_2], [test x$XUL_VERSION = x2]) -+ -+ - AC_ARG_ENABLE([optimize], - AC_HELP_STRING([--enable-optimize], [Enable optimizations (-O2)]), - [ -Sólo en gluezilla-2.6: configure.ac.orig -Sólo en gluezilla-2.6: configure.ac.rej -diff -ur gluezilla-2.6.orig/src/BrowserWindow.cpp gluezilla-2.6/src/BrowserWindow.cpp ---- gluezilla-2.6.orig/src/BrowserWindow.cpp 2011-03-27 18:51:37.000000000 +0200 -+++ gluezilla-2.6/src/BrowserWindow.cpp 2011-03-27 18:51:46.000000000 +0200 -@@ -28,23 +28,6 @@ - NS_GENERIC_FACTORY_CONSTRUCTOR(SecurityWarningDialogs) - NS_GENERIC_FACTORY_CONSTRUCTOR(PromptService) - --static const nsModuleComponentInfo components[] = { -- { -- SECURITYWARNINGSDIALOGS_CLASSNAME, -- SECURITYWARNINGSDIALOGS_CID, -- NS_SECURITYWARNINGDIALOGS_CONTRACTID, -- SecurityWarningDialogsConstructor -- }, -- { -- PROMPTSERVICE_CLASSNAME, -- PROMPTSERVICE_CID, -- NS_PROMPTSERVICE_CONTRACTID, -- PromptServiceConstructor -- } -- --}; -- -- - BrowserWindow::BrowserWindow (void) - { - owner = nsnull; -@@ -162,17 +145,17 @@ - nsCOMPtr<nsIFactory> componentFactory; - rv = NS_NewSecurityWarningServiceFactory(getter_AddRefs(componentFactory)); - if (NS_SUCCEEDED(rv)) { -- compReg->RegisterFactory(components[0].mCID, -- components[0].mDescription, -- components[0].mContractID, -+ compReg->RegisterFactory(kSECURITYWARNINGSDIALOGS_CID, -+ SECURITYWARNINGSDIALOGS_CLASSNAME, -+ NS_SECURITYWARNINGDIALOGS_CONTRACTID, - componentFactory); - } - - rv = NS_NewPromptServiceFactory(getter_AddRefs(componentFactory), this); - if (NS_SUCCEEDED(rv)) { -- compReg->RegisterFactory(components[1].mCID, -- components[1].mDescription, -- components[1].mContractID, -+ compReg->RegisterFactory(kPROMPTSERVICE_CID, -+ PROMPTSERVICE_CLASSNAME, -+ NS_PROMPTSERVICE_CONTRACTID, - componentFactory); - } - -diff -ur gluezilla-2.6.orig/src/Makefile.am gluezilla-2.6/src/Makefile.am ---- gluezilla-2.6.orig/src/Makefile.am 2011-03-27 18:51:37.000000000 +0200 -+++ gluezilla-2.6/src/Makefile.am 2011-03-27 18:51:46.000000000 +0200 -@@ -26,7 +26,7 @@ - gluezilla.h \ - FastDelegate.h - --if OLDXUL -+if XUL_2 - libgluezilla_la_SOURCES += \ - gluezilla_nsIScriptContext.h \ - gluezilla_nsIScriptGlobalObject.h -diff -ur gluezilla-2.6.orig/src/PromptService.h gluezilla-2.6/src/PromptService.h ---- gluezilla-2.6.orig/src/PromptService.h 2011-03-27 18:51:37.000000000 +0200 -+++ gluezilla-2.6/src/PromptService.h 2011-03-27 18:51:46.000000000 +0200 -@@ -20,8 +20,9 @@ - // {77686174-2061-6d20-6920-746F20646F20}
- #define PROMPTSERVICE_CID \
- { 0x77686174, 0x2061, 0x6d20, { 0x69, 0x20, 0x74, 0x6F, 0x20, 0x64, 0x6F, 0x20 } }
--
--
-+ -+static NS_DEFINE_CID(kPROMPTSERVICE_CID, PROMPTSERVICE_CID); -+ - class PromptService : public nsIPromptService
- {
- NS_DECL_ISUPPORTS
-diff -ur gluezilla-2.6.orig/src/SecurityWarningsDialogs.h gluezilla-2.6/src/SecurityWarningsDialogs.h ---- gluezilla-2.6.orig/src/SecurityWarningsDialogs.h 2011-03-27 18:51:37.000000000 +0200 -+++ gluezilla-2.6/src/SecurityWarningsDialogs.h 2011-03-27 18:51:46.000000000 +0200 -@@ -21,8 +21,9 @@ - // {696E7465-7265-7374-696E-67206C696665}
- #define SECURITYWARNINGSDIALOGS_CID \
- { 0x696E7465, 0x7265, 0x7374, { 0x69, 0x6E, 0x67, 0x20, 0x6C, 0x69, 0x66, 0x65 } }
--
--
-+ -+static NS_DEFINE_CID(kSECURITYWARNINGSDIALOGS_CID, SECURITYWARNINGSDIALOGS_CID); -+ - class SecurityWarningDialogs : public nsISecurityWarningDialogs
- {
- public:
-diff -ur gluezilla-2.6.orig/src/interfaces.h gluezilla-2.6/src/interfaces.h ---- gluezilla-2.6.orig/src/interfaces.h 2011-03-27 18:51:37.000000000 +0200 -+++ gluezilla-2.6/src/interfaces.h 2011-03-27 18:51:46.000000000 +0200 -@@ -4,7 +4,18 @@ - #define TO_STRING(x) #x - - //Gecko Embedding API -+#if XUL_VERSION < 4 - #include <nsEmbedAPI.h> -+#else -+#include <nscore.h> -+#include <nsXPCOM.h> -+#include <nsILocalFile.h> -+#include <nsIDirectoryService.h> -+#define NS_GRE_COMPONENT_DIR "GreComsD" -+#define NS_XPCOM_COMPONENT_DIR "ComsD" -+#define NS_XPCOM_COMPONENT_REGISTRY_FILE "ComRegF" -+#define NS_XPCOM_XPTI_REGISTRY_FILE "XptiRegF" -+#endif - - //XPCOM API - #include <nsCOMPtr.h> -@@ -78,8 +89,12 @@ - #include <nsIPromptService.h> - #include <nsISecurityWarningDialogs.h> - #include <nsIComponentRegistrar.h> -+#if XUL_VERSION < 4 - #include <nsIGenericFactory.h> -- -+#else -+#include <mozilla/ModuleUtils.h> -+struct nsModuleComponentInfo; -+#endif - // preferences - #include <nsIPrefBranch.h> - #include <nsIPrefService.h> -@@ -131,12 +146,15 @@ - typedef type (NS_FROZENCALL * name##Type) params; \ - extern name##Type name NS_HIDDEN; - -+#if XUL_VERSION < 4 - XRE_API(nsresult, - XRE_InitEmbedding, (nsILocalFile *aLibXULDirectory, - nsILocalFile *aAppDirectory, - nsIDirectoryServiceProvider *aAppDirProvider, - nsStaticModuleInfo const *aStaticComponents, - PRUint32 aStaticComponentCount)) -+#endif -+ - - XRE_API(void, XRE_TermEmbedding, ()) - diff --git a/dev-dotnet/gluezilla/gluezilla-2.6-r1.ebuild b/dev-dotnet/gluezilla/gluezilla-2.6-r1.ebuild deleted file mode 100644 index bb6a619a4d86..000000000000 --- a/dev-dotnet/gluezilla/gluezilla-2.6-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gluezilla/gluezilla-2.6-r1.ebuild,v 1.6 2011/03/27 17:00:10 pacho Exp $ - -EAPI=2 - -inherit go-mono mono autotools - -DESCRIPTION="A simple library to embed Gecko (xulrunner) in the Mono Winforms WebControl" -HOMEPAGE="http://mono-project.com/Gluezilla" - -LICENSE="LGPL-2 MPL-1.1" -KEYWORDS="amd64 ppc x86" -SLOT="0" -IUSE="" - -RDEPEND="net-libs/xulrunner:1.9 - x11-libs/gtk+:2 - >=dev-lang/mono-${PV} - " -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}/${P}-xulrunner2.patch" - eautoreconf -} diff --git a/dev-dotnet/gluezilla/metadata.xml b/dev-dotnet/gluezilla/metadata.xml deleted file mode 100644 index e85974a7fa17..000000000000 --- a/dev-dotnet/gluezilla/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>dotnet</herd> -</pkgmetadata> |