[packages/enchant] drop applespell logic to avoid libtool confusion

atler atler at pld-linux.org
Sun Apr 2 00:07:21 CEST 2023


commit 8c232a4317ef8a62c1a95110604e51c26815085a
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Apr 2 00:04:49 2023 +0200

    drop applespell logic to avoid libtool confusion
    
    with both c and obj-c sources within single library autotools fail to
    decide on proper --tag= during linking and ultimately none is added
    resulting in an error. clear things up by dropping applespell logic
    never activated on linux anyway.

 disable-applespell.patch | 17 +++++++++++++++++
 enchant.spec             |  2 ++
 2 files changed, 19 insertions(+)
---
diff --git a/enchant.spec b/enchant.spec
index 8265a1c..41fb1e6 100644
--- a/enchant.spec
+++ b/enchant.spec
@@ -18,6 +18,7 @@ Source0:	https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/%{na
 # Source0-md5:	4110afe7d7010acbb5c69dd1214fa936
 Patch0:		hunspell-1.4.patch
 Patch1:		%{name}-sh.patch
+Patch2:		disable-applespell.patch
 URL:		https://www.abisource.com/projects/enchant/
 BuildRequires:	aspell-devel >= 2:0.50.0
 BuildRequires:	autoconf >= 2.50
@@ -198,6 +199,7 @@ Moduł obsługujący backend zemberek (turecki) dla Enchanta.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/disable-applespell.patch b/disable-applespell.patch
new file mode 100644
index 0000000..2b3e466
--- /dev/null
+++ b/disable-applespell.patch
@@ -0,0 +1,17 @@
+--- enchant-1.6.1/src/Makefile.am.orig	2017-04-04 23:13:57.000000000 +0200
++++ enchant-1.6.1/src/Makefile.am	2023-04-02 00:02:38.807237432 +0200
+@@ -19,14 +19,6 @@
+ libenchant_includedir = $(includedir)/enchant
+ libenchant_include_HEADERS = enchant.h enchant-provider.h enchant++.h
+ 
+-if WITH_APPLESPELL
+-AM_CPPFLAGS += @APPLESPELL_CFLAGS@
+-libenchant_la_LIBADD += @APPLESPELL_LIBS@
+-libenchant_la_LDFLAGS += @APPLESPELL_LDFLAGS@
+-libenchant_la_SOURCES += enchant_cocoa.m enchant_cocoa.h
+-libenchant_include_HEADERS += enchant_cocoa.h
+-endif
+-
+ EXTRA_DIST=enchant.i
+ 
+ if OS_WIN32
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/enchant.git/commitdiff/8c232a4317ef8a62c1a95110604e51c26815085a



More information about the pld-cvs-commit mailing list