diff options
Diffstat (limited to 'editors/abiword/patches')
7 files changed, 38 insertions, 59 deletions
diff --git a/editors/abiword/patches/patch-configure.ac b/editors/abiword/patches/patch-configure.ac index 6cc08d81d53..4d8ba3d4931 100644 --- a/editors/abiword/patches/patch-configure.ac +++ b/editors/abiword/patches/patch-configure.ac @@ -1,8 +1,21 @@ -$NetBSD: patch-configure.ac,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-configure.ac,v 1.2 2016/02/12 23:42:15 jperkin Exp $ + Use the installed libabiword instead of the one in the build directory This is needed for the plugins so the can build as a separate package ---- configure.ac.orig 2015-06-06 23:11:58.000000000 +0000 + +Disable Cocoa configuration on Darwin, it doesn't build. + +--- configure.ac.orig 2014-12-21 04:51:43.000000000 +0000 +++ configure.ac +@@ -146,7 +146,7 @@ fi + TOOLKIT_IS_GTK2="no" + AC_MSG_CHECKING([for platform and toolkit]) + case ${host_os} in +- *darwin*) ++ *notdarwin*) + PLATFORM="unix" + TOOLKIT="cocoa" + ;; @@ -893,7 +893,7 @@ if test "$TOOLKIT" = "gtk" && test "$enable_shared" = "yes"; then # link plugins to work around gcc visibility issue with diff --git a/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am b/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am index 9d939612baa..4a845b393bd 100644 --- a/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am +++ b/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am @@ -1,15 +1,11 @@ -$NetBSD: patch-plugins_aiksaurus_Makefile.am,v 1.2 2016/01/24 15:30:46 nros Exp $ -GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall -to the linker. Prefix with "-Wl," to fix build. +$NetBSD: patch-plugins_aiksaurus_Makefile.am,v 1.3 2016/02/12 23:42:15 jperkin Exp $ + Use CXX for linking. + --- plugins/aiksaurus/Makefile.am.orig 2014-03-21 23:51:31.000000000 +0000 +++ plugins/aiksaurus/Makefile.am -@@ -28,7 +28,8 @@ aiksaurus_la_LIBADD = \ - aiksaurus_la_LDFLAGS = \ - -avoid-version \ - -module \ -- -no-undefined -+ -Wl,--no-undefined +@@ -31,4 +31,5 @@ aiksaurus_la_LDFLAGS = \ + -no-undefined aiksaurus_la_SOURCES = +nodist_EXTRA_aiksaurus_la_SOURCES = dummy.cpp diff --git a/editors/abiword/patches/patch-plugins_clarisworks_Makefile.am b/editors/abiword/patches/patch-plugins_clarisworks_Makefile.am deleted file mode 100644 index 3fbf7a69f5d..00000000000 --- a/editors/abiword/patches/patch-plugins_clarisworks_Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-plugins_clarisworks_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $ -GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall -to the linker. Prefix with "-Wl," to fix build. ---- plugins/clarisworks/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000 -+++ plugins/clarisworks/Makefile.am -@@ -18,7 +18,7 @@ clarisworks_la_LIBADD = \ - clarisworks_la_LDFLAGS = \ - -avoid-version \ - -module \ -- -no-undefined -+ -Wl,-no-undefined - - clarisworks_la_SOURCES = - diff --git a/editors/abiword/patches/patch-plugins_command_Makefile.am b/editors/abiword/patches/patch-plugins_command_Makefile.am index dddc24fdb07..edf245904af 100644 --- a/editors/abiword/patches/patch-plugins_command_Makefile.am +++ b/editors/abiword/patches/patch-plugins_command_Makefile.am @@ -1,15 +1,11 @@ -$NetBSD: patch-plugins_command_Makefile.am,v 1.2 2016/01/24 15:30:46 nros Exp $ -GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall -to the linker. Prefix with "-Wl," to fix build. +$NetBSD: patch-plugins_command_Makefile.am,v 1.3 2016/02/12 23:42:15 jperkin Exp $ + Use CXX for linking. + --- plugins/command/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000 +++ plugins/command/Makefile.am -@@ -13,8 +13,9 @@ command_la_LIBADD = \ - command_la_LDFLAGS = \ - -avoid-version \ - -module \ -- -no-undefined -+ -Wl,--no-undefined +@@ -16,5 +16,6 @@ command_la_LDFLAGS = \ + -no-undefined command_la_SOURCES = +nodist_EXTRA_command_la_SOURCES = dummy.cpp diff --git a/editors/abiword/patches/patch-plugins_goffice_Makefile.am b/editors/abiword/patches/patch-plugins_goffice_Makefile.am index 628b6f36aee..b4d7ad33944 100644 --- a/editors/abiword/patches/patch-plugins_goffice_Makefile.am +++ b/editors/abiword/patches/patch-plugins_goffice_Makefile.am @@ -1,21 +1,11 @@ -$NetBSD: patch-plugins_goffice_Makefile.am,v 1.2 2016/01/24 15:30:46 nros Exp $ -GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall -to the linker. Prefix with "-Wl," to fix build. +$NetBSD: patch-plugins_goffice_Makefile.am,v 1.3 2016/02/12 23:42:15 jperkin Exp $ + Use CXX for linking. + --- plugins/goffice/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000 +++ plugins/goffice/Makefile.am -@@ -1,4 +1,5 @@ - -+ - SUBDIRS = unix - - plugindir = $(ABIWORD_PLUGINSDIR) -@@ -11,9 +12,10 @@ goffice_la_LIBADD = \ - goffice_la_LDFLAGS = \ - -avoid-version \ - -module \ -- -no-undefined -+ -Wl,--no-undefined +@@ -14,6 +14,7 @@ goffice_la_LDFLAGS = \ + -no-undefined goffice_la_SOURCES = +nodist_EXTRA_goffice_la_SOURCES = dummy.cpp diff --git a/editors/abiword/patches/patch-plugins_psion_Makefile.am b/editors/abiword/patches/patch-plugins_psion_Makefile.am index 352e5d96589..4c8789596c5 100644 --- a/editors/abiword/patches/patch-plugins_psion_Makefile.am +++ b/editors/abiword/patches/patch-plugins_psion_Makefile.am @@ -1,15 +1,11 @@ -$NetBSD: patch-plugins_psion_Makefile.am,v 1.2 2016/01/24 15:30:47 nros Exp $ -GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall -to the linker. Prefix with "-Wl," to fix build. +$NetBSD: patch-plugins_psion_Makefile.am,v 1.3 2016/02/12 23:42:15 jperkin Exp $ + Use CXX for linking. + --- plugins/psion/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000 +++ plugins/psion/Makefile.am -@@ -11,9 +11,10 @@ psion_la_LIBADD = \ - psion_la_LDFLAGS = \ - -avoid-version \ - -module \ -- -no-undefined -+ -Wl,--no-undefined +@@ -14,6 +14,7 @@ psion_la_LDFLAGS = \ + -no-undefined psion_la_SOURCES = +nodist_EXTRA_psion_la_SOURCES = dummy.cpp diff --git a/editors/abiword/patches/patch-src_af_util_xp_ut__endian.h b/editors/abiword/patches/patch-src_af_util_xp_ut__endian.h index 954f30e8148..392f4b4dbb3 100644 --- a/editors/abiword/patches/patch-src_af_util_xp_ut__endian.h +++ b/editors/abiword/patches/patch-src_af_util_xp_ut__endian.h @@ -1,4 +1,6 @@ -$NetBSD: patch-src_af_util_xp_ut__endian.h,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-src_af_util_xp_ut__endian.h,v 1.2 2016/02/12 23:42:15 jperkin Exp $ + +Support DragonFly. --- src/af/util/xp/ut_endian.h.orig 2013-04-07 13:53:03.000000000 +0000 +++ src/af/util/xp/ut_endian.h |