aboutsummaryrefslogtreecommitdiff
path: root/deskutils/kdepim3
diff options
context:
space:
mode:
authorWesley Shields <wxs@FreeBSD.org>2009-07-15 16:47:45 +0000
committerWesley Shields <wxs@FreeBSD.org>2009-07-15 16:47:45 +0000
commite6246d1055202098dd1df8f2a827665d39dddde8 (patch)
tree6a8029cf8aa42fc328c40fc63ed5d1ae25d0c255 /deskutils/kdepim3
parenta7000e3a390271ff985d84e575f89d8239e49aa7 (diff)
Notes
Diffstat (limited to 'deskutils/kdepim3')
-rw-r--r--deskutils/kdepim3/Makefile2
-rw-r--r--deskutils/kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp11
-rw-r--r--deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in11
-rw-r--r--deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp13
-rw-r--r--deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.h11
-rw-r--r--deskutils/kdepim3/pkg-plist2
6 files changed, 48 insertions, 2 deletions
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index a35b614f0aa3..409c85e1c93b 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kdepim
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils mail news palm kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/deskutils/kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp b/deskutils/kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp
new file mode 100644
index 000000000000..97e25a6dccc6
--- /dev/null
+++ b/deskutils/kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp
@@ -0,0 +1,11 @@
+--- certmanager/lib/backends/qgpgme/qgpgmebackend.cpp.orig 2009-07-01 19:41:54.000000000 -0400
++++ certmanager/lib/backends/qgpgme/qgpgmebackend.cpp 2009-07-01 19:42:25.000000000 -0400
+@@ -54,7 +54,7 @@
+ mOpenPGPProtocol( 0 ),
+ mSMIMEProtocol( 0 )
+ {
+-
++ GpgME::initializeLibrary();
+ }
+
+ Kleo::QGpgMEBackend::~QGpgMEBackend() {
diff --git a/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in b/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in
new file mode 100644
index 000000000000..1aa8958d5236
--- /dev/null
+++ b/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in
@@ -0,0 +1,11 @@
+--- libkdenetwork/gpgmepp/Makefile.in.orig 2009-07-01 19:33:31.000000000 -0400
++++ libkdenetwork/gpgmepp/Makefile.in 2009-07-01 19:39:35.000000000 -0400
+@@ -434,7 +434,7 @@
+ # (Interfaces added/removed/changed: CURRENT++, REVISION=0)
+ # (Interfaces added: AGE++)
+ # (Interfaces removed/changed: AGE=0)
+-libgpgme___la_LDFLAGS = -no-undefined -version-info 3:0:3
++libgpgme___la_LDFLAGS = -no-undefined -version-info 4:0:4
+ libgpgme___la_LIBADD = $(GPGME_LIBS)
+ libgpgme___la_DEPENDENCIES = $(GPGME_LIBS_DEP)
+ all: all-recursive
diff --git a/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp b/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp
new file mode 100644
index 000000000000..f36684554b48
--- /dev/null
+++ b/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp
@@ -0,0 +1,13 @@
+--- libkdenetwork/gpgmepp/context.cpp.orig 2009-07-01 19:33:09.000000000 -0400
++++ libkdenetwork/gpgmepp/context.cpp 2009-07-01 19:35:46.000000000 -0400
+@@ -53,6 +53,10 @@
+
+ namespace GpgME {
+
++ void initializeLibrary() {
++ gpgme_check_version( 0 );
++ }
++
+ const char * Error::source() const {
+ return gpgme_strsource( (gpgme_error_t)mErr );
+ }
diff --git a/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.h b/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.h
new file mode 100644
index 000000000000..4ecdfe064735
--- /dev/null
+++ b/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.h
@@ -0,0 +1,11 @@
+--- libkdenetwork/gpgmepp/context.h.orig 2009-07-01 19:33:50.000000000 -0400
++++ libkdenetwork/gpgmepp/context.h 2009-07-01 19:36:53.000000000 -0400
+@@ -287,6 +287,8 @@
+ //
+ //
+
++ KDE_EXPORT void initializeLibrary();
++
+ KDE_EXPORT GpgME::Error setDefaultLocale( int category, const char * value );
+
+ KDE_EXPORT Context * wait( GpgME::Error & e, bool hang=true );
diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist
index 52d3770874d6..cc91f01ecb53 100644
--- a/deskutils/kdepim3/pkg-plist
+++ b/deskutils/kdepim3/pkg-plist
@@ -594,7 +594,7 @@ lib/libakregatorprivate.so
lib/libgpgme++.a
lib/libgpgme++.la
lib/libgpgme++.so
-lib/libgpgme++.so.3
+lib/libgpgme++.so.4
lib/libgwsoap.a
lib/libgwsoap.la
lib/libgwsoap.so