diff options
| -rw-r--r-- | net-misc/mugshot/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/mugshot/Manifest | 10 | ||||
| -rw-r--r-- | net-misc/mugshot/files/mugshot-1.1.93-use-firefox.patch (renamed from net-misc/mugshot/files/mugshot-1.1.92-use-firefox.patch) | 31 | ||||
| -rw-r--r-- | net-misc/mugshot/metadata.xml | 2 | ||||
| -rw-r--r-- | net-misc/mugshot/mugshot-1.1.93.ebuild (renamed from net-misc/mugshot/mugshot-1.1.92.ebuild) | 7 |
5 files changed, 30 insertions, 26 deletions
diff --git a/net-misc/mugshot/ChangeLog b/net-misc/mugshot/ChangeLog index 501b3dded..bf8a7eeba 100644 --- a/net-misc/mugshot/ChangeLog +++ b/net-misc/mugshot/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Apr 2008; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com> + -mugshot-1.1.92.ebuild, -files/mugshot-1.1.92-use-firefox.patch, + +mugshot-1.1.93.ebuild, +files/mugshot-1.1.93-use-firefox.patch, + metadata.xml: + Version bump. Now works with latest firefox-3 nightlies. + 30 Mar 2008; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com> -files/mugshot-1.1.42-libxpcom.patch, -files/mugshot-1.1.56-use-firefox.patch, -mugshot-1.1.58.ebuild, diff --git a/net-misc/mugshot/Manifest b/net-misc/mugshot/Manifest index 82d2f4acc..8e1a3dc23 100644 --- a/net-misc/mugshot/Manifest +++ b/net-misc/mugshot/Manifest @@ -1,7 +1,7 @@ AUX mugshot-1.1.58-firefox-update.sh 908 RMD160 0b3491101111a71e3ca4b3fbff98e8cc29ebed68 SHA1 dfe14fa9776e13794ba46ccdd36f25d85b2fe4ae SHA256 f6c5276d5f86c0fa3e83659b16092fa9ec6c9d6a7bb84abffa49acbfb83f59a1 AUX mugshot-1.1.92-libxpcom.patch 2433 RMD160 8742d49906554022d53de8a3551389595390ce59 SHA1 2eb689d24e2c4499394f08ca2c386e87fc26365b SHA256 b9dbe5a1171cc34d12e469969aa7db28e918fff408af43298110107d91de0d5c -AUX mugshot-1.1.92-use-firefox.patch 3144 RMD160 a36caa048623eead3f66a8482e21b760e59f2ac3 SHA1 242051d81084e301d701976bfc06cf51d987346a SHA256 97d13919720915c0a7723ffe64fb4ef4d1686e4a16b5d204278f0cb1009ef361 -DIST mugshot-1.1.92.tar.gz 652586 RMD160 e85f3f76bd457c60192887eab50b758f30da4ac5 SHA1 4505ecfaa9c23b8118d34bb27184eb593a8162bd SHA256 35bcce0540e031c1e9190f6ea4d9b2f58438750a994dd312999d8fd8d62708d7 -EBUILD mugshot-1.1.92.ebuild 2835 RMD160 a951e7dfcf63927d6749b801b390b8d212077747 SHA1 434ca79f7e5a7eaf50135f12bf89f989331d9ab9 SHA256 dbe8a5e3ceb77274304d77eaa16301205450cab7c4c8e85cea70a33f9174d5c8 -MISC ChangeLog 4130 RMD160 e17d1ce1912793e05e4d16d9e76edfaa931b1d95 SHA1 6fd67c3fe7b593f9ac5348e96fc6507624beb956 SHA256 1cf6e790cd75cb23d915c2b96a9d286c1ddd03c46fe4bb5391262b6721134672 -MISC metadata.xml 530 RMD160 a0de7b0954d9ca56bc70b0e88b142863f9be95d5 SHA1 a35ff660684677bd26df838de5e13e6714785639 SHA256 321f065a29cd9c0a50dc82817691564d465ee6a2d32a34dd6912f968199af338 +AUX mugshot-1.1.93-use-firefox.patch 3271 RMD160 e3e28ba0c47542381f67db3c06cb44eaaf3149bb SHA1 12c0912639ea6f422c822c912fd3eab5baf31370 SHA256 714e24e22a3ae5d77914461182c4a77325957df5c7313d2fb9b8d3d76ff742ac +DIST mugshot-1.1.93.tar.gz 653496 RMD160 572f8642a4bac2613febccfa45732f6605f7ddef SHA1 c1e2c01fbffdf86a76ac6230af41bb7de34110be SHA256 b80c28ba737462a52ff348c984406dc777e3af1d8c914b9c3644a3e41a7b104a +EBUILD mugshot-1.1.93.ebuild 2748 RMD160 d0b0ac64c5b7404eac3d427fccd81a60f2574f63 SHA1 abf10ebc8c49329044ea8ae296d7bb4691ed3d46 SHA256 5c2c18c41ea9bf2e687c9f0d523ec5e961410fe9b037f7cda4349c640885aef0 +MISC ChangeLog 4410 RMD160 24dd6e198387196872cb2e46068ac8d55d0c16d2 SHA1 894942d095bf992c5a0a5c174038a10baee2768e SHA256 09d86bcfa50088a383fc536f68990df03678bef78ee6dcb5de61a0607bea4e84 +MISC metadata.xml 457 RMD160 4b49c49c4554f9280db8409e7e1c5dbf9718cff5 SHA1 2c79a1b908c24114d359a3fcd3dd9a614aa70048 SHA256 11b470c8f458ecdd6d8e4aab4f5d62a56436ac77c9f7431970127ea755522074 diff --git a/net-misc/mugshot/files/mugshot-1.1.92-use-firefox.patch b/net-misc/mugshot/files/mugshot-1.1.93-use-firefox.patch index 80f646c61..e769386db 100644 --- a/net-misc/mugshot/files/mugshot-1.1.92-use-firefox.patch +++ b/net-misc/mugshot/files/mugshot-1.1.93-use-firefox.patch @@ -1,6 +1,6 @@ -diff -ru mugshot-1.1.92.xpcom/configure.ac mugshot-1.1.92/configure.ac ---- mugshot-1.1.92.xpcom/configure.ac 2008-03-29 16:00:20.000000000 -0400 -+++ mugshot-1.1.92/configure.ac 2008-03-29 16:05:28.000000000 -0400 +diff -ru mugshot-1.1.93.libxpcom/configure.ac mugshot-1.1.93/configure.ac +--- mugshot-1.1.93.libxpcom/configure.ac 2008-04-04 15:22:27.603493000 -0400 ++++ mugshot-1.1.93/configure.ac 2008-04-04 15:31:37.696493211 -0400 @@ -410,6 +410,16 @@ ## ## Checks for Firefox build environment @@ -27,19 +27,20 @@ diff -ru mugshot-1.1.92.xpcom/configure.ac mugshot-1.1.92/configure.ac if test "x$with_gecko_sdk" != x -a "x$with_gecko_sdk" != xyes -a "x$with_gecko_sdk" != xno ; then GECKO_IDLDIR="$with_gecko_sdk/idl" GECKO_INCLUDEDIR="$with_gecko_sdk/include" -@@ -624,6 +636,11 @@ - LIBHIPPOFIREFOX_LIBS="${LIBHIPPOFIREFOX_LIBS} `pkg-config --libs libxul-unstable`" +@@ -646,6 +658,12 @@ + LIBHIPPOFIREFOX_LIBS="${LIBHIPPOFIREFOX_LIBS} `$PKG_CONFIG --libs $xulrunner_package`" fi +else + AM_CONDITIONAL(HAVE_FULL_GECKO, false) -+fi ++ AM_CONDITIONAL(USE_XULRUNNER, false) ++fi ### test "x$firefox" = xtrue + + #### define absolute path to srcdir for debugging-only code ABSOLUTE_TOP_SRCDIR=`cd ${srcdir} && pwd` AC_DEFINE_UNQUOTED(ABSOLUTE_TOP_SRCDIR, "$ABSOLUTE_TOP_SRCDIR", [full path to srcdir]) -@@ -647,6 +664,7 @@ +@@ -669,6 +687,7 @@ prefix: ${prefix} compiler: ${CC} @@ -47,9 +48,9 @@ diff -ru mugshot-1.1.92.xpcom/configure.ac mugshot-1.1.92/configure.ac xpidl: ${XPIDL} Gecko includes: ${GECKO_INCLUDEDIR} Gecko idl files: ${GECKO_IDLDIR} -diff -ru mugshot-1.1.92.xpcom/Makefile.am mugshot-1.1.92/Makefile.am ---- mugshot-1.1.92.xpcom/Makefile.am 2008-02-26 15:16:21.000000000 -0500 -+++ mugshot-1.1.92/Makefile.am 2008-03-29 16:22:12.000000000 -0400 +diff -ru mugshot-1.1.93.libxpcom/Makefile.am mugshot-1.1.93/Makefile.am +--- mugshot-1.1.93.libxpcom/Makefile.am 2008-03-26 15:02:48.000000000 -0400 ++++ mugshot-1.1.93/Makefile.am 2008-04-04 15:24:22.154493070 -0400 @@ -34,8 +34,13 @@ rmdir $(BUILT_SRC_DIR) ; \ fi @@ -64,15 +65,15 @@ diff -ru mugshot-1.1.92.xpcom/Makefile.am mugshot-1.1.92/Makefile.am # These are added to using += in the included files bin_PROGRAMS = -diff -ru mugshot-1.1.92.xpcom/Makefile-libhippofirefox.am mugshot-1.1.92/Makefile-libhippofirefox.am ---- mugshot-1.1.92.xpcom/Makefile-libhippofirefox.am 2008-01-24 14:54:44.000000000 -0500 -+++ mugshot-1.1.92/Makefile-libhippofirefox.am 2008-03-29 16:20:06.000000000 -0400 +diff -ru mugshot-1.1.93.libxpcom/Makefile-libhippofirefox.am mugshot-1.1.93/Makefile-libhippofirefox.am +--- mugshot-1.1.93.libxpcom/Makefile-libhippofirefox.am 2008-04-01 10:56:52.000000000 -0400 ++++ mugshot-1.1.93/Makefile-libhippofirefox.am 2008-04-04 15:24:22.154493070 -0400 @@ -1,3 +1,4 @@ +if USE_FIREFOX FIREFOX_SRCDIR = $(COMMONSRCDIR)/firefox GECKO_PRIVATE_INCLUDEDIR=$(FIREFOX_SRCDIR)/gecko-private/include - -@@ -192,3 +193,4 @@ + EXTENSION_ID = firefox@mugshot.org +@@ -198,3 +199,4 @@ cp $(GECKO_PRIVATE_IDL_FILES) $(distdir)/common-dist/firefox/gecko-private/idl mkdir $(distdir)/common-dist/firefox/gecko-private/include cp $(GECKO_PRIVATE_INCLUDE_FILES) $(distdir)/common-dist/firefox/gecko-private/include diff --git a/net-misc/mugshot/metadata.xml b/net-misc/mugshot/metadata.xml index 2ab3153ea..84fd4c6f9 100644 --- a/net-misc/mugshot/metadata.xml +++ b/net-misc/mugshot/metadata.xml @@ -7,7 +7,5 @@ Mugshot works with the server at mugshot.org to extend the panel, web browser, music player and other parts of the desktop with a "live social experience" and interoperation with online services you and your friends use. It's fun and easy. - -The mugshot package also includes the Desktop Data Model (ddm) library. </longdescription> </pkgmetadata> diff --git a/net-misc/mugshot/mugshot-1.1.92.ebuild b/net-misc/mugshot/mugshot-1.1.93.ebuild index f75fb1c5d..28bf54741 100644 --- a/net-misc/mugshot/mugshot-1.1.92.ebuild +++ b/net-misc/mugshot/mugshot-1.1.93.ebuild @@ -7,7 +7,7 @@ SCROLLKEEPER_UPDATE="no" inherit autotools eutils gnome2 multilib -DESCRIPTION="Companion software for mugshot.org; also includes the ddm library" +DESCRIPTION="Companion software for mugshot.org" HOMEPAGE="http://www.mugshot.org/" SRC_URI="http://download.mugshot.org/client/sources/linux/${P}.tar.gz" @@ -25,6 +25,7 @@ RDEPEND=">=dev-libs/glib-2.6 x11-libs/cairo >=x11-libs/gtk+-2.10 x11-libs/libXScrnSaver + >=x11-libs/hippo-canvas-0.2.30 x11-libs/pango firefox? ( !xulrunner? ( www-client/mozilla-firefox ) ) xulrunner? ( net-libs/xulrunner )" @@ -40,7 +41,7 @@ src_unpack() { cd "${S}" # configure looks in the wrong place for xpidl sed -e 's:bin/xpidl:xpidl:' -i configure.ac - epatch "${FILESDIR}/${P}-libxpcom.patch" || die "epatch failed" + epatch "${FILESDIR}/${PN}-1.1.92-libxpcom.patch" || die "epatch failed" epatch "${FILESDIR}/${P}-use-firefox.patch" || die "epatch failed" eautoreconf if use firefox || use xulrunner ; then @@ -64,8 +65,6 @@ src_unpack() { else G2CONF="--disable-firefox" fi - # external hippo-canvas seems to be deprecated now? - G2CONF="${G2CONF} --with-included-canvas" } src_install() { |