diff options
author | 2006-07-02 13:45:12 +0000 | |
---|---|---|
committer | 2006-07-02 13:45:12 +0000 | |
commit | 9c21c2f75229a7594a8d7467be8fc0be85157b44 (patch) | |
tree | 6d87acdebdc2438b6b40b9a067a2ca73f1175f6f /media-tv | |
parent | sys-auth/pam_skey: move big patch to gentooexperimental.org to fix repoman er... (diff) | |
download | sunrise-9c21c2f75229a7594a8d7467be8fc0be85157b44.tar.gz sunrise-9c21c2f75229a7594a8d7467be8fc0be85157b44.tar.bz2 sunrise-9c21c2f75229a7594a8d7467be8fc0be85157b44.zip |
media-tv/democracy: add firefox support thanks to Rick Harris, add ~ppc and python-berkdb check thanks to Steffen Strobel and Jorge Vargas in bug 131527
svn path=/sunrise/; revision=423
Diffstat (limited to 'media-tv')
-rw-r--r-- | media-tv/democracy/ChangeLog | 4 | ||||
-rw-r--r-- | media-tv/democracy/Manifest | 16 | ||||
-rw-r--r-- | media-tv/democracy/democracy-0.8.4.1.ebuild | 29 | ||||
-rw-r--r-- | media-tv/democracy/files/democracy-0.8.4.1-firefox.patch | 57 | ||||
-rw-r--r-- | media-tv/democracy/files/democracy-use-gecko-sdk.patch | 13 |
5 files changed, 80 insertions, 39 deletions
diff --git a/media-tv/democracy/ChangeLog b/media-tv/democracy/ChangeLog index e50b38cad..1f69789d0 100644 --- a/media-tv/democracy/ChangeLog +++ b/media-tv/democracy/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 02 Jul 2006; Stefan Schweizer <genstef@gentoo.org> ChangeLog: + add firefox support thanks to Rick Harris, add ~ppc and python-berkdb check + thanks to Steffen Strobel and Jorge Vargas in bug 131527 + 24 Jun 2006; Stefan Schweizer <genstef@gentoo.org> ChangeLog: New democracy ebuild thanks to Jorge Vargas for the initial ebuild, Martin Meyer and Anton for helping with improving it and Louis C. for bumping it in diff --git a/media-tv/democracy/Manifest b/media-tv/democracy/Manifest index c56451e6c..5475f16ef 100644 --- a/media-tv/democracy/Manifest +++ b/media-tv/democracy/Manifest @@ -1,16 +1,16 @@ +AUX democracy-0.8.4.1-firefox.patch 2522 RMD160 0c13bca0eec65c822e7b4b36bdc3ec4557befb8e SHA1 21c931d6e0d4190816647b4454bc1dda450617c7 SHA256 0806eabe3b55e3c991277bc8100a97fa86076858b3a1ec171692a6b375b7da76 +MD5 3c6f043a46ad881a704738729b12a5ff files/democracy-0.8.4.1-firefox.patch 2522 +RMD160 0c13bca0eec65c822e7b4b36bdc3ec4557befb8e files/democracy-0.8.4.1-firefox.patch 2522 +SHA256 0806eabe3b55e3c991277bc8100a97fa86076858b3a1ec171692a6b375b7da76 files/democracy-0.8.4.1-firefox.patch 2522 AUX democracy-as-needed-libX11.patch 628 RMD160 1fcd86335cabce0642488fee43fe866c8cd1f46c SHA1 5768a12373fdd968cf2ded7736dd7cf41d1eee00 SHA256 cc6335f87db36c2a71c7e28aabe363b4156a16836f77088f298f89feafb891f4 MD5 66e5acf5517b1f0c6075960d9816195a files/democracy-as-needed-libX11.patch 628 RMD160 1fcd86335cabce0642488fee43fe866c8cd1f46c files/democracy-as-needed-libX11.patch 628 SHA256 cc6335f87db36c2a71c7e28aabe363b4156a16836f77088f298f89feafb891f4 files/democracy-as-needed-libX11.patch 628 -AUX democracy-use-gecko-sdk.patch 763 RMD160 c3b2784bb79df1b2467dda3ab0970ff2ea497422 SHA1 fdb905426c40a857785333611190869562975f01 SHA256 2b86a4dd2e429dcd428619c9c2b39084b2b56890a2b03bb5b7e3279fc064ee0a -MD5 a1e1e2851e4c9785726592174f2affad files/democracy-use-gecko-sdk.patch 763 -RMD160 c3b2784bb79df1b2467dda3ab0970ff2ea497422 files/democracy-use-gecko-sdk.patch 763 -SHA256 2b86a4dd2e429dcd428619c9c2b39084b2b56890a2b03bb5b7e3279fc064ee0a files/democracy-use-gecko-sdk.patch 763 DIST Democracy-0.8.4.1.tar.gz 4903115 RMD160 94c0e73248b65b4a475277c185554cfd53f4a607 SHA1 badb9977f9efb791ed6424aada0ee27b10fa7b28 SHA256 d754a72610df4deb93ae7671d1cb45ea3cae104ec2bf198bf4a7d8de3cdf1025 -EBUILD democracy-0.8.4.1.ebuild 1707 RMD160 5050457552519c78b0bf244e9971f79b5409bc92 SHA1 2ba004618239146a999a4493a9440be7ea0bf711 SHA256 a0864e10c89499d13792a5a7da460a434ee4f6966778200b7580f265cef94a0e -MD5 e65ae12f587993e98f7cd61c830ea9fd democracy-0.8.4.1.ebuild 1707 -RMD160 5050457552519c78b0bf244e9971f79b5409bc92 democracy-0.8.4.1.ebuild 1707 -SHA256 a0864e10c89499d13792a5a7da460a434ee4f6966778200b7580f265cef94a0e democracy-0.8.4.1.ebuild 1707 +EBUILD democracy-0.8.4.1.ebuild 1487 RMD160 cd33e87e6052bcc4c495cb093f9a6ef1e6d0b112 SHA1 992d007aedd85a8b950d34087c9bdfd8be31e4fc SHA256 0cf71b6fe8e31e2383912414f81be977fd3216cd8f07ef8cafaa6bfe3ab53d24 +MD5 56dec07b6ad1d86aa1a678bdce0509d5 democracy-0.8.4.1.ebuild 1487 +RMD160 cd33e87e6052bcc4c495cb093f9a6ef1e6d0b112 democracy-0.8.4.1.ebuild 1487 +SHA256 0cf71b6fe8e31e2383912414f81be977fd3216cd8f07ef8cafaa6bfe3ab53d24 democracy-0.8.4.1.ebuild 1487 MISC ChangeLog 353 RMD160 a56b6f263b022dcdab6df3592502ea18ad4e7e55 SHA1 547dbdb598ddde8c2101d75b509cf0a622ef4c0f SHA256 8890068520db7e83903c2f87677c196abb1337546dc98f229f3c2dbaa4e6584e MD5 2fb09d183b61e058514a796a272030d4 ChangeLog 353 RMD160 a56b6f263b022dcdab6df3592502ea18ad4e7e55 ChangeLog 353 diff --git a/media-tv/democracy/democracy-0.8.4.1.ebuild b/media-tv/democracy/democracy-0.8.4.1.ebuild index 7ca001a6b..b06a70677 100644 --- a/media-tv/democracy/democracy-0.8.4.1.ebuild +++ b/media-tv/democracy/democracy-0.8.4.1.ebuild @@ -10,28 +10,15 @@ HOMEPAGE="http://www.getdemocracy.com" SRC_URI="ftp://ftp.osuosl.org/pub/pculture.org/democracy/src/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~amd64" -#currently the support for firefox appears to be broken -#IUSE="gecko-sdk mozilla firefox" - +KEYWORDS="~x86 ~amd64 ~ppc" RDEPEND="dev-python/pyrex >virtual/python-2.4 media-libs/xine-lib dev-libs/boost >=dev-python/pygtk-2.0 dev-python/gnome-python-extras - net-libs/gecko-sdk - || ( x11-libs/libX11 virtual/x11 )" - #www-client/mozilla, maybe even www-client/mozilla-firefox? - #this are pull by gnome-python - #gnome-base/gconf - #gnome-base/gnome-vfs - -#TODO gnome2_src_configure ${G2CONF} -# maybe add support in this way -#/usr/portage/dev-python/gnome-python-extras/gnome-python-extras-2.14.0.ebuild - - + www-client/mozilla-firefox + x11-libs/libX11" DEPEND="${RDEPEND} dev-util/pkgconfig" @@ -39,14 +26,20 @@ DOCS="README" S="${WORKDIR}/${MY_P}/platform/gtk-x11/" +pkg_setup() { + if ! built_with_use python berkdb; then + eerror "You must build python with berkdb support" + die "Please re-emerge python with berkdb USE flag ON" + fi +} src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/democracy-{use-gecko-sdk,as-needed-libX11}.patch + epatch "${FILESDIR}"/democracy-{0.8.4.1-firefox,as-needed-libX11}.patch } pkg_postinst(){ - if ! built_with_use -a xine-lib aac ffmpeg mad asf flac sdl win32codecs; then + if ! built_with_use xine-lib aac ffmpeg mad asf flac sdl win32codecs; then ewarn "The Democracy team recommends you to emerge xine-lib as follows:" ewarn "" ewarn "# echo \"media-libs/xine-lib aac ffmpeg mad asf flac sdl win32codecs\" \ " diff --git a/media-tv/democracy/files/democracy-0.8.4.1-firefox.patch b/media-tv/democracy/files/democracy-0.8.4.1-firefox.patch new file mode 100644 index 000000000..71c428062 --- /dev/null +++ b/media-tv/democracy/files/democracy-0.8.4.1-firefox.patch @@ -0,0 +1,57 @@ +diff -ur Democracy-0.8.4.1.orig/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.h Democracy-0.8.4.1/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.h +--- Democracy-0.8.4.1.orig/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.h 2006-07-02 15:35:18.000000000 +0200 ++++ Democracy-0.8.4.1/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.h 2006-07-02 15:35:23.000000000 +0200 +@@ -1,6 +1,9 @@ + #ifndef MOZILLA_BROWSER_XPCOM_H + #define MOZILLA_BROWSER_XPCOM_H + ++#ifndef MOZILLA_INTERNAL_API ++#define MOZILLA_INTERNAL_API ++ + #include <gtkmozembed.h> + #include <nscore.h> + +@@ -25,4 +28,6 @@ + } + #endif + ++#endif /* MOZILLA_INTERNAL_API */ ++ + #endif /* MOZILLA_BROWSER_XPCOM_H */ +diff -ur Democracy-0.8.4.1.orig/platform/gtk-x11/setup.py Democracy-0.8.4.1/platform/gtk-x11/setup.py +--- Democracy-0.8.4.1.orig/platform/gtk-x11/setup.py 2006-07-02 15:35:18.000000000 +0200 ++++ Democracy-0.8.4.1/platform/gtk-x11/setup.py 2006-07-02 15:35:58.000000000 +0200 +@@ -129,10 +129,11 @@ + + if options_dict is None: + options_dict = { +- 'include_dirs' : [], ++ 'include_dirs' : ['/usr/lib/mozilla-firefox/include/webbrwsr', ++ '/usr/lib/mozilla-firefox/include/dom', ++ '/usr/lib/mozilla-firefox/include/uriloader'], + 'library_dirs' : [], + 'libraries' : [], +- 'extra_compile_args' : [] + } + commandLine = "%s --cflags --libs %s" % (command, components) + output = getCommandOutput(commandLine).strip() +@@ -144,8 +145,6 @@ + options_dict['library_dirs'].append(rest) + elif prefix == '-l': + options_dict['libraries'].append(rest) +- else: +- options_dict['extra_compile_args'].append(comp) + return options_dict + + #### The fasttypes extension #### +@@ -157,8 +156,8 @@ + + #### MozillaBrowser Extension #### + mozilla_browser_options = parsePkgConfig("pkg-config" , +- "gtk+-2.0 glib-2.0 pygtk-2.0 mozilla-gtkmozembed mozilla-xpcom") +-mozilla_lib_path = parsePkgConfig('pkg-config', 'mozilla-gtkmozembed')['library_dirs'] ++ "gtk+-2.0 glib-2.0 pygtk-2.0 firefox-gtkmozembed firefox-xpcom") ++mozilla_lib_path = parsePkgConfig('pkg-config', 'firefox-gtkmozembed')['library_dirs'] + mozilla_browser_ext = Extension("democracy.MozillaBrowser", + [ os.path.join(frontend_implementation_dir,'MozillaBrowser.pyx'), + os.path.join(frontend_implementation_dir,'MozillaBrowserXPCOM.cc'), diff --git a/media-tv/democracy/files/democracy-use-gecko-sdk.patch b/media-tv/democracy/files/democracy-use-gecko-sdk.patch deleted file mode 100644 index af2f933af..000000000 --- a/media-tv/democracy/files/democracy-use-gecko-sdk.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- setup.py 2006-05-02 00:38:42.000000000 -0400 -+++ setup.py.new 2006-05-02 00:39:28.000000000 -0400 -@@ -157,8 +157,8 @@ - - #### MozillaBrowser Extension #### - mozilla_browser_options = parsePkgConfig("pkg-config" , -- "gtk+-2.0 glib-2.0 pygtk-2.0 mozilla-gtkmozembed mozilla-xpcom") --mozilla_lib_path = parsePkgConfig('pkg-config', 'mozilla-gtkmozembed')['library_dirs'] -+ "gtk+-2.0 glib-2.0 pygtk-2.0 gecko-sdk-gtkmozembed gecko-sdk-xpcom") -+mozilla_lib_path = parsePkgConfig('pkg-config', 'gecko-sdk-gtkmozembed')['library_dirs'] - mozilla_browser_ext = Extension("democracy.MozillaBrowser", - [ os.path.join(frontend_implementation_dir,'MozillaBrowser.pyx'), - os.path.join(frontend_implementation_dir,'MozillaBrowserXPCOM.cc'), |