summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/mugshot/ChangeLog6
-rw-r--r--net-misc/mugshot/Manifest8
-rw-r--r--net-misc/mugshot/files/mugshot-1.1.22-as-needed.patch42
-rw-r--r--net-misc/mugshot/files/mugshot-1.1.46-as-needed.patch42
-rw-r--r--net-misc/mugshot/mugshot-1.1.46.ebuild (renamed from net-misc/mugshot/mugshot-1.1.45.ebuild)4
5 files changed, 55 insertions, 47 deletions
diff --git a/net-misc/mugshot/ChangeLog b/net-misc/mugshot/ChangeLog
index 275bdee8d..04fa2e05e 100644
--- a/net-misc/mugshot/ChangeLog
+++ b/net-misc/mugshot/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 03 Sep 2007; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+ -files/mugshot-1.1.22-as-needed.patch,
+ +files/mugshot-1.1.46-as-needed.patch, -mugshot-1.1.45.ebuild,
+ +mugshot-1.1.46.ebuild:
+ Version bump
+
20 Jun 2007; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
-mugshot-1.1.42.ebuild, +mugshot-1.1.45.ebuild:
Version bump
diff --git a/net-misc/mugshot/Manifest b/net-misc/mugshot/Manifest
index 8f755ece8..9203a6d0e 100644
--- a/net-misc/mugshot/Manifest
+++ b/net-misc/mugshot/Manifest
@@ -1,8 +1,8 @@
-AUX mugshot-1.1.22-as-needed.patch 1707 RMD160 25fcbf250e37ef5060678152534ed7b57485fa56 SHA1 32fa756a67fbd0fb93d5e001a95cfac8360af7d3 SHA256 21774c3ab5babc9423e0d6ce63b656c424e487a5d1ecc24e98a54cc9e55251b2
AUX mugshot-1.1.32-use-firefox.patch 3519 RMD160 0d388e8c09a2da49157eb207ec192d92fa01157e SHA1 548d067d555dc7875d5754046b48f4b24967aec4 SHA256 1bc4d10d51a4199556fb6108a767572e2e132503646a923fd307585f5b62d850
AUX mugshot-1.1.40-firefox-update.sh 950 RMD160 d11c5ae1620ac54210c8787b398c2c77ac286eed SHA1 033d81c1c32d6ba0b893569e151007bce0efa3d3 SHA256 0141d1a1d87376da73de6032966a0ace9b771ded3b6996d5126b5d34713fcd47
AUX mugshot-1.1.42-libxpcom.patch 2178 RMD160 2571c7b74b51821bd9f2fadfaeaf6b8810651468 SHA1 5d1f1c598de848ac014fa5e551cf7fad3dba5397 SHA256 185229bf03328df1a8f794ff0d0ec93b018d262e321287b09c6d4c525b66c6f9
-DIST mugshot-1.1.45.tar.gz 897559 RMD160 8095b4b39e757a669c29c5fb26c9567b4f5f93c6 SHA1 9f30feb9088187d2f7174c187501c6824cda24c1 SHA256 2320feab6311689942209a1721d25ba9d18fbd218af7171d61fcea522e39d708
-EBUILD mugshot-1.1.45.ebuild 2305 RMD160 772c2d61bb3b998add4e18ec2d9fadfc1fe23aa7 SHA1 0ee70ecf99aaa2cfcdf29b79e3795043cc60731a SHA256 b92c7e861f41bde2a52b2bcbc1fdeadac701ddda36c742c6c5432f9622f1816f
-MISC ChangeLog 2642 RMD160 f3cab5a412789985738a6f59a65156870f8be371 SHA1 99e33586494cc9058bd19f909199927988f03a5e SHA256 f59c4b03a9a48c21b74a3e8191f2a61f9e135ab9f1c1ab89bb959f32ee83512f
+AUX mugshot-1.1.46-as-needed.patch 1857 RMD160 eec46d81792e98343a1f2480eaeb0ca3e6fb6add SHA1 4868e60ae6144419848203b248edd55c423d6dd1 SHA256 ccb57faaf6f3c585d43896cc181f1b4991f4a2a9b40335c5e0a879a888d3313b
+DIST mugshot-1.1.46.tar.gz 901508 RMD160 4fe1e6353308d560e1a3385798b71abf31add272 SHA1 83373297e113c22b9792fa624ddd7cf4586c3e83 SHA256 f43f00b17f2bbb5e74a03603ed4d89e3cf172b69fa16b9d5cb1b93edbdc0b008
+EBUILD mugshot-1.1.46.ebuild 2366 RMD160 12e0ec32b156f3cd3e4a5cde4ebff29d6a879385 SHA1 bb07b2d47c6308675b9d8c72e6f1b01a7be07c7a SHA256 0220276768a2b65ad9de343755a7295cb5ddd627d79c3600f8b81fcb8ce8eb43
+MISC ChangeLog 2860 RMD160 b434da5b45b88ba15d396bcaf7fbb943f50f2aea SHA1 4aa26e6f94d033db5aee6fe41e4ab00ec0ce9b42 SHA256 1e65c4845ff1c817491f65a174820b5f2805faa59f4d6fc318b1ee3a7999373c
MISC metadata.xml 457 RMD160 4b49c49c4554f9280db8409e7e1c5dbf9718cff5 SHA1 2c79a1b908c24114d359a3fcd3dd9a614aa70048 SHA256 11b470c8f458ecdd6d8e4aab4f5d62a56436ac77c9f7431970127ea755522074
diff --git a/net-misc/mugshot/files/mugshot-1.1.22-as-needed.patch b/net-misc/mugshot/files/mugshot-1.1.22-as-needed.patch
deleted file mode 100644
index 7eb2c389e..000000000
--- a/net-misc/mugshot/files/mugshot-1.1.22-as-needed.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ru mugshot-1.1.22-orig/Makefile-mugshot.am mugshot-1.1.22/Makefile-mugshot.am
---- mugshot-1.1.22-orig/Makefile-mugshot.am 2006-10-25 17:04:17.486420616 -0400
-+++ mugshot-1.1.22/Makefile-mugshot.am 2006-10-25 18:37:07.683621928 -0400
-@@ -6,8 +6,8 @@
- $(MUGSHOT_CFLAGS) \
- -I$(top_srcdir)/canvas
-
--mugshot_LDFLAGS=$(MUGSHOT_LIBS)
--mugshot_LDADD= libhippoipc.la libhippo.la
-+mugshot_LDFLAGS=
-+mugshot_LDADD= libhippoipc.la libhippo.la $(MUGSHOT_LIBS)
-
- if !HAVE_GTK210
- mugshot_CPPFLAGS += -I$(top_srcdir)/gtkcopy
-diff -ru mugshot-1.1.22-orig/Makefile-mugshot-uri-handler.am mugshot-1.1.22/Makefile-mugshot-uri-handler.am
---- mugshot-1.1.22-orig/Makefile-mugshot-uri-handler.am 2006-10-25 17:04:17.492419704 -0400
-+++ mugshot-1.1.22/Makefile-mugshot-uri-handler.am 2006-10-25 18:37:24.554057232 -0400
-@@ -4,8 +4,8 @@
- $(AM_CPPFLAGS) \
- $(MUGSHOT_URI_HANDLER_CFLAGS)
-
--mugshot_uri_handler_LDFLAGS=$(MUGSHOT_URI_HANDLER_LIBS)
--mugshot_uri_handler_LDADD= libhippo.la
-+mugshot_uri_handler_LDFLAGS=
-+mugshot_uri_handler_LDADD= libhippo.la $(MUGSHOT_URI_HANDLER_LIBS)
-
- mugshot_uri_handler_SOURCES= \
- src/hippo-dbus-client.c \
-diff -ru mugshot-1.1.22-orig/Makefile-test-hippo-ipc.am mugshot-1.1.22/Makefile-test-hippo-ipc.am
---- mugshot-1.1.22-orig/Makefile-test-hippo-ipc.am 2006-10-25 17:04:17.509417120 -0400
-+++ mugshot-1.1.22/Makefile-test-hippo-ipc.am 2006-10-25 18:37:37.675062536 -0400
-@@ -4,8 +4,8 @@
- $(AM_CPPFLAGS) \
- $(TEST_HIPPO_IPC_CFLAGS)
-
--test_hippo_ipc_LDFLAGS=$(TEST_HIPPO_IPC_LIBS)
--test_hippo_ipc_LDADD= libhippoipc.la
-+test_hippo_ipc_LDFLAGS=
-+test_hippo_ipc_LDADD= libhippoipc.la $(TEST_HIPPO_IPC_LIBS)
-
- test_hippo_ipc_SOURCES= \
- hippoipc/test-hippo-ipc.cpp
diff --git a/net-misc/mugshot/files/mugshot-1.1.46-as-needed.patch b/net-misc/mugshot/files/mugshot-1.1.46-as-needed.patch
new file mode 100644
index 000000000..f58252018
--- /dev/null
+++ b/net-misc/mugshot/files/mugshot-1.1.46-as-needed.patch
@@ -0,0 +1,42 @@
+diff -ru mugshot-1.1.46_orig/Makefile-mugshot.am mugshot-1.1.46_before_libxpcom/Makefile-mugshot.am
+--- mugshot-1.1.46_orig/Makefile-mugshot.am 2007-06-26 12:26:53.000000000 -0400
++++ mugshot-1.1.46_before_libxpcom/Makefile-mugshot.am 2007-09-01 18:36:22.000000000 -0400
+@@ -7,8 +7,8 @@
+ $(CANVAS_CFLAGS) \
+ -DHOST_CPU=\"$(host_cpu)\"
+
+-mugshot_LDFLAGS=$(MUGSHOT_LIBS)
+-mugshot_LDADD= libhippoipc.la libhippo.la $(CANVAS_LIBADD)
++mugshot_LDFLAGS=
++mugshot_LDADD= libhippoipc.la libhippo.la $(MUGSHOT_LIBS) $(CANVAS_LIBADD)
+
+ if !HAVE_GTK210
+ mugshot_CPPFLAGS += -I$(top_srcdir)/gtkcopy
+diff -ru mugshot-1.1.46_orig/Makefile-mugshot-uri-handler.am mugshot-1.1.46_before_libxpcom/Makefile-mugshot-uri-handler.am
+--- mugshot-1.1.46_orig/Makefile-mugshot-uri-handler.am 2006-08-16 13:06:12.000000000 -0400
++++ mugshot-1.1.46_before_libxpcom/Makefile-mugshot-uri-handler.am 2007-09-01 18:36:53.000000000 -0400
+@@ -4,8 +4,8 @@
+ $(AM_CPPFLAGS) \
+ $(MUGSHOT_URI_HANDLER_CFLAGS)
+
+-mugshot_uri_handler_LDFLAGS=$(MUGSHOT_URI_HANDLER_LIBS)
+-mugshot_uri_handler_LDADD= libhippo.la
++mugshot_uri_handler_LDFLAGS=
++mugshot_uri_handler_LDADD= libhippo.la $(MUGSHOT_URI_HANDLER_LIBS)
+
+ mugshot_uri_handler_SOURCES= \
+ src/hippo-dbus-client.c \
+diff -ru mugshot-1.1.46_orig/Makefile-test-hippo-ipc.am mugshot-1.1.46_before_libxpcom/Makefile-test-hippo-ipc.am
+--- mugshot-1.1.46_orig/Makefile-test-hippo-ipc.am 2007-01-11 15:48:14.000000000 -0500
++++ mugshot-1.1.46_before_libxpcom/Makefile-test-hippo-ipc.am 2007-09-01 18:37:34.000000000 -0400
+@@ -5,8 +5,8 @@
+ -I $(COMMONSRCDIR)/hippoipc \
+ $(TEST_HIPPO_IPC_CFLAGS)
+
+-test_hippo_ipc_LDFLAGS=$(TEST_HIPPO_IPC_LIBS)
+-test_hippo_ipc_LDADD= libhippoipc.la
++test_hippo_ipc_LDFLAGS=
++test_hippo_ipc_LDADD= libhippoipc.la $(TEST_HIPPO_IPC_LIBS)
+
+ test_hippo_ipc_SOURCES= \
+ hippoipc/test-hippo-ipc.cpp
diff --git a/net-misc/mugshot/mugshot-1.1.45.ebuild b/net-misc/mugshot/mugshot-1.1.46.ebuild
index a0dfa601b..12391aac1 100644
--- a/net-misc/mugshot/mugshot-1.1.45.ebuild
+++ b/net-misc/mugshot/mugshot-1.1.46.ebuild
@@ -28,6 +28,7 @@ RDEPEND=">=dev-libs/glib-2.6
>=net-misc/curl-7.13.1
x11-libs/cairo
>=x11-libs/gtk+-2.6
+ x11-libs/hippo-canvas
x11-libs/libXScrnSaver
x11-libs/pango
firefox? ( !xulrunner? (
@@ -42,7 +43,7 @@ src_unpack() {
cd "${S}"
# configure looks in the wrong place for xpidl
sed -e 's:bin/xpidl:xpidl:' -i configure.ac
- epatch "${FILESDIR}/${PN}-1.1.22-as-needed.patch"
+ epatch "${FILESDIR}/${P}-as-needed.patch"
epatch "${FILESDIR}/${PN}-1.1.42-libxpcom.patch"
epatch "${FILESDIR}/${PN}-1.1.32-use-firefox.patch"
eautoreconf
@@ -62,6 +63,7 @@ src_unpack() {
else
G2CONF="--disable-firefox"
fi
+ G2CONF="${G2CONF} --without-included-canvas"
}
pkg_postinst () {