Ticket #48666: remove-upstream-patches.diff​

File remove-upstream-patches.diff​, 3.1 KB (added by cceleri@…, 9 years ago)
Line 
1diff --git a/Portfile b/Portfile
2index f0a13a1..dd2edd2 100644
3--- a/Portfile
4+++ b/Portfile
5@@ -29,10 +29,7 @@ depends_lib         port:xapian-bindings\
6                     port:gmime\
7                     port:talloc
8 
9-patchfiles          patch-bindings-python-notmuch-globals.py.diff \
10-                    patch-doc-Makefile.local.diff \
11-                    patch-lib-Makefile.local.diff \
12-                    visibility.patch
13+patchfiles          patch-bindings-python-notmuch-globals.py.diff
14 
15 post-patch {
16     reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/bindings/python/notmuch/globals.py
17diff --git a/files/patch-doc-Makefile.local.diff b/files/patch-doc-Makefile.local.diff
18deleted file mode 100644
19index 8031c50..0000000
20--- a/files/patch-doc-Makefile.local.diff
21+++ /dev/null
22@@ -1,13 +0,0 @@
23-Fix destroot by gzipping manpage before trying to install it.
24-http://notmuchmail.org/pipermail/notmuch/2015/020103.html
25---- doc/Makefile.local.orig    2014-11-14 13:35:40.000000000 -0600
26-+++ doc/Makefile.local 2015-04-29 21:35:59.000000000 -0500
27-@@ -63,7 +63,7 @@
28- ifeq ($(HAVE_DOXYGEN),1)
29- MAN_GZIP_FILES += ${APIMAN}.gz
30- apidocs: $(APIMAN)
31--install-apidocs: apidocs
32-+install-apidocs: ${APIMAN}.gz
33-       mkdir -p "$(DESTDIR)$(mandir)/man3"
34-       install -m0644  $(DOCBUILDDIR)/man/man3/*.3.gz  $(DESTDIR)/$(mandir)/man3
35-
36diff --git a/files/patch-lib-Makefile.local.diff b/files/patch-lib-Makefile.local.diff
37deleted file mode 100644
38index ead0d08..0000000
39--- a/files/patch-lib-Makefile.local.diff
40+++ /dev/null
41@@ -1,11 +0,0 @@
42---- lib/Makefile.local.orig    2012-08-21 03:43:50.000000000 -0500
43-+++ lib/Makefile.local 2012-12-03 03:50:15.000000000 -0600
44-@@ -24,7 +24,7 @@
45- LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
46- SONAME = libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBRARY_SUFFIX)
47- LIBNAME = libnotmuch.$(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE).$(LIBRARY_SUFFIX)
48--LIBRARY_LINK_FLAG = -dynamiclib -install_name $(SONAME) -compatibility_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR) -current_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)
49-+LIBRARY_LINK_FLAG = -dynamiclib -install_name $(libdir)/$(SONAME) -compatibility_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR) -current_version $(LIBNOTMUCH_VERSION_MAJOR).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)
50- else
51- LIBRARY_SUFFIX = so
52- LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
53diff --git a/files/visibility.patch b/files/visibility.patch
54deleted file mode 100644
55index ce48311..0000000
56--- a/files/visibility.patch
57+++ /dev/null
58@@ -1,18 +0,0 @@
59---- lib/notmuch-private.h.orig 2013-09-02 00:17:31.000000000 -0700
60-+++ lib/notmuch-private.h      2013-09-02 00:17:42.000000000 -0700
61-@@ -49,8 +49,6 @@ NOTMUCH_BEGIN_DECLS
62- #include "xutil.h"
63- #include "error_util.h"
64-
65--#pragma GCC visibility push(hidden)
66--
67- #ifdef DEBUG
68- # define DEBUG_DATABASE_SANITY 1
69- # define DEBUG_QUERY 1
70-@@ -529,6 +527,4 @@ _notmuch_talloc_steal (const void *new_c
71- #endif
72- #endif
73-
74--#pragma GCC visibility pop
75--
76- #endif