summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2009-09-29 06:11:46 +0530
committerNirbheek Chauhan <nirbheek@gentoo.org>2009-09-29 07:15:55 +0530
commit2d24d4f469eed222d9162908f38e9e2be0f3990b (patch)
treed96d2f1e9ccab993e635a7c99efa9782ff1ff672 /app-crypt/seahorse
parentdev-utils/gnome-devel-docs: 2.27.1 -> 2.28.0 (diff)
downloadgnome-2d24d4f469eed222d9162908f38e9e2be0f3990b.tar.gz
gnome-2d24d4f469eed222d9162908f38e9e2be0f3990b.tar.bz2
gnome-2d24d4f469eed222d9162908f38e9e2be0f3990b.zip
app-crypt/seahorse: 2.27.90 -> 2.28.0
* Patch for build fix with -Wl,--as-needed - https://bugzilla.gnome.org/show_bug.cgi?id=596691 * Bugfixes - Include config.h to avoid build breakage when gpgme is compiled with LFS - Update context menu display after keyring op. - Respect the button-images setting, and cleanup gtkbuilder xml. - Fix problems with gtk-builder UI files. - Fix problem with 'Type:' label of SSH key displaying location. - Fix compiler warnings. * Features: - Optionally use silent automake build rules. - Lots of documentation work.
Diffstat (limited to 'app-crypt/seahorse')
-rw-r--r--app-crypt/seahorse/Manifest6
-rw-r--r--app-crypt/seahorse/files/seahorse-2.26.2-gpgme-lfs.patch39
-rw-r--r--app-crypt/seahorse/files/seahorse-2.28.0-as-needed.patch16
-rw-r--r--app-crypt/seahorse/seahorse-2.28.0.ebuild (renamed from app-crypt/seahorse/seahorse-2.27.90.ebuild)8
4 files changed, 24 insertions, 45 deletions
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index d68a9b95..e48c39be 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,3 +1,3 @@
-AUX seahorse-2.26.2-gpgme-lfs.patch 1210 RMD160 7aaa3cae7c31154331cd9eb92a6643d7bd6a00a9 SHA1 8ffe6667fe7d33f440a3e154a1cbd320963b5beb SHA256 a0cd874dc4e2a79559eb4a4a65349c88e4c9925871493041d662e33b6a53a57d
-DIST seahorse-2.27.90.tar.bz2 2275733 RMD160 8fb0735700e274fec3bb4ab99d5d8a899b99459b SHA1 d67f4bba2db77f3b603199c368e93cdd9e6f2ab3 SHA256 db2e479f50b5b6477bd0fb432f4c0a601dd951227ce1c37c9cd246e067e01d7d
-EBUILD seahorse-2.27.90.ebuild 1884 RMD160 8daf48525d0a2483df94734f3c19e7273947da6d SHA1 232748e2d4a8ffcf2908ef4ff82e955341af0334 SHA256 bb62689b862f0f03775ae4343207fa66515f86730f99cb10104b0d9d6e72f7d4
+AUX seahorse-2.28.0-as-needed.patch 381 RMD160 2756cc4440f36b2a206b07710f5bc9b60037a564 SHA1 390204f347f89b3c0dcebbe8cb1f154090b22aa4 SHA256 243d49dd613a19d569e8fa5560d4f4d1618c9c067b00588cd61ccf6dc7516d3c
+DIST seahorse-2.28.0.tar.bz2 2388622 RMD160 0e1f6c1d830236f5734ac43fbf38de74e3d7c3ef SHA1 5dc3167c567c66a18878dd57c4d91189e4e3267d SHA256 63d40fea2b8fb52d1b29d10bee2c5c3a6722516a770793979eb062ed53588a3e
+EBUILD seahorse-2.28.0.ebuild 1913 RMD160 29419525db5ac4e27712d48303d7800ff4b6b396 SHA1 ed6c3156648e621e710256081b21242919c697f7 SHA256 e76358ff3ced26a5756386a394791c10adebf3289c0bf68eb847f55e894e08a6
diff --git a/app-crypt/seahorse/files/seahorse-2.26.2-gpgme-lfs.patch b/app-crypt/seahorse/files/seahorse-2.26.2-gpgme-lfs.patch
deleted file mode 100644
index 1c72b39d..00000000
--- a/app-crypt/seahorse/files/seahorse-2.26.2-gpgme-lfs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --exclude-from=/opt/home/dang/.scripts/diffrc -up -ruN seahorse-2.26.2.orig/pgp/seahorse-gpg-op.c seahorse-2.26.2/pgp/seahorse-gpg-op.c
---- seahorse-2.26.2.orig/pgp/seahorse-gpg-op.c 2009-04-20 11:35:00.000000000 -0400
-+++ seahorse-2.26.2/pgp/seahorse-gpg-op.c 2009-07-10 09:43:31.550476889 -0400
-@@ -18,7 +18,9 @@
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
--
-+
-+#include "config.h"
-+
- #include <glib.h>
- #include <gpgme.h>
- #include <string.h>
-diff --exclude-from=/opt/home/dang/.scripts/diffrc -up -ruN seahorse-2.26.2.orig/pgp/seahorse-gpg-options.c seahorse-2.26.2/pgp/seahorse-gpg-options.c
---- seahorse-2.26.2.orig/pgp/seahorse-gpg-options.c 2009-04-20 11:35:00.000000000 -0400
-+++ seahorse-2.26.2/pgp/seahorse-gpg-options.c 2009-07-10 09:36:16.012409729 -0400
-@@ -19,6 +19,11 @@
- * Boston, MA 02111-1307, USA.
- */
-
-+#include "config.h"
-+
-+#include "seahorse-util.h"
-+#include "seahorse-context.h"
-+
- #include <sys/param.h>
- #include <sys/wait.h>
- #include <sys/file.h>
-@@ -31,9 +36,6 @@
- #include <unistd.h>
- #include <sys/stat.h>
-
--#include "seahorse-util.h"
--#include "seahorse-context.h"
--
- #include "pgp/seahorse-gpgme.h"
- #include "pgp/seahorse-gpg-options.h"
-
diff --git a/app-crypt/seahorse/files/seahorse-2.28.0-as-needed.patch b/app-crypt/seahorse/files/seahorse-2.28.0-as-needed.patch
new file mode 100644
index 00000000..1ffef527
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-2.28.0-as-needed.patch
@@ -0,0 +1,16 @@
+Fix linking libgcryptui.so with -Wl,--as-needed in LDFLAGS. Missing DBUS_CFLAGS
+in INCLUDES.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=596691
+
+---
+--- libcryptui/Makefile.am
++++ libcryptui/Makefile.am
+@@ -70,6 +70,7 @@
+
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir) \
++ $(DBUS_CFLAGS) \
+ $(LIBCRYPTUI_CFLAGS) \
+ -DLIBCRYPTUI_BUILD=1 \
+ -DLIBCRYPTUI_API_SUBJECT_TO_CHANGE
diff --git a/app-crypt/seahorse/seahorse-2.27.90.ebuild b/app-crypt/seahorse/seahorse-2.28.0.ebuild
index e471105e..ef18b083 100644
--- a/app-crypt/seahorse/seahorse-2.27.90.ebuild
+++ b/app-crypt/seahorse/seahorse-2.28.0.ebuild
@@ -4,7 +4,7 @@
EAPI="2"
-inherit gnome2 eutils
+inherit autotools eutils gnome2
DESCRIPTION="A GNOME application for managing encryption keys"
HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
@@ -63,8 +63,10 @@ src_prepare() {
# Fix intltoolize broken file, see upstream #577133
sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
- # fix building with gpgme with lfs Bug #275445
- epatch "${FILESDIR}"/${PN}-2.26.2-gpgme-lfs.patch
+ # https://bugzilla.gnome.org/show_bug.cgi?id=596691
+ epatch "${FILESDIR}/${PN}-2.28.0-as-needed.patch"
+
+ eautoreconf
}
pkg_postinst() {