Waldemar Brodkorb 3 месяцев назад
Родитель
Сommit
0473a20f17

+ 9 - 5
package/enchant/Makefile

@@ -4,11 +4,12 @@
 include $(ADK_TOPDIR)/rules.mk
 include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		enchant
 PKG_NAME:=		enchant
-PKG_VERSION:=		2.8.2
+PKG_VERSION:=		2.8.16
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
-PKG_HASH:=		8f19535adb5577b83b00e02f330fe9b9eb40dd21f19e2899636fc4d3a7696375
+PKG_HASH:=		d73162b5eff401a6397e1215e2b103bcef83f921c396c7f6b1394d2450d124e2
 PKG_DESCR:=		spelling library
 PKG_DESCR:=		spelling library
 PKG_SECTION:=		libs/misc
 PKG_SECTION:=		libs/misc
+PKG_URL:=		https://github.com/rrthomas/enchant
 PKG_SITES:=		https://github.com/rrthomas/enchant/releases/download/v$(PKG_VERSION)/
 PKG_SITES:=		https://github.com/rrthomas/enchant/releases/download/v$(PKG_VERSION)/
 
 
 DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
 DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -17,11 +18,14 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 
 $(eval $(call PKG_template,ENCHANT,enchant,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 $(eval $(call PKG_template,ENCHANT,enchant,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 
+AUTOTOOL_STYLE:=	autoreconf
+
+pre-install:
+	mkdir -p $(WRKINST)/usr/lib/enchant-2
+
 enchant-install:
 enchant-install:
 	$(INSTALL_DIR) $(IDIR_ENCHANT)/usr/lib/enchant
 	$(INSTALL_DIR) $(IDIR_ENCHANT)/usr/lib/enchant
-	$(CP) $(WRKINST)/usr/lib/libenchant.so* \
+	$(CP) $(WRKINST)/usr/lib/libenchant*.so* \
 		$(IDIR_ENCHANT)/usr/lib
 		$(IDIR_ENCHANT)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/enchant/*.so* \
-		$(IDIR_ENCHANT)/usr/lib/enchant
 
 
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk
 include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 12 - 0
package/enchant/patches/patch-lib_Makefile_am

@@ -0,0 +1,12 @@
+--- enchant-2.8.16.orig/lib/Makefile.am	2025-07-29 13:38:09.000000000 +0200
++++ enchant-2.8.16/lib/Makefile.am	2026-05-12 20:20:48.809351381 +0200
+@@ -42,9 +42,6 @@ libenchant_include_HEADERS = enchant.h e
+ libenchant_datadir = $(pkgdatadir)-@ENCHANT_MAJOR_VERSION@
+ libenchant_data_DATA = enchant.ordering
+ 
+-dist_man_MANS = enchant.5
+-nodist_doc_DATA = enchant.html
+-
+ edit = sed \
+ 	-e 's|@PKGDATADIR[@]|$(pkgdatadir)|g' \
+ 	-e 's|@SYSCONFDIR[@]|$(sysconfdir)|g'

+ 12 - 7
package/enchant/patches/patch-src_Makefile_am

@@ -1,12 +1,17 @@
---- enchant-2.8.2.orig/src/Makefile.am	2024-04-25 14:23:39.000000000 +0200
-+++ enchant-2.8.2/src/Makefile.am	2025-03-30 13:10:04.475913008 +0200
-@@ -13,9 +13,6 @@
+--- enchant-2.8.16.orig/src/Makefile.am	2025-07-29 13:42:14.000000000 +0200
++++ enchant-2.8.16/src/Makefile.am	2026-05-12 20:18:10.421695428 +0200
+@@ -25,14 +25,8 @@ BUILT_VAPIS = util.vapi
  
  
- AM_CPPFLAGS = -I$(top_srcdir) $(ISYSTEM)$(top_builddir)/libgnu $(ISYSTEM)$(top_srcdir)/libgnu -I$(top_srcdir)/lib $(GLIB_CFLAGS) $(WARN_CFLAGS) -DG_LOG_DOMAIN='"libenchant"'
+ util.h util.vapi: libutil.la
  
  
 -dist_man_MANS = enchant-@ENCHANT_MAJOR_VERSION@.1 enchant-lsmod-@ENCHANT_MAJOR_VERSION@.1
 -dist_man_MANS = enchant-@ENCHANT_MAJOR_VERSION@.1 enchant-lsmod-@ENCHANT_MAJOR_VERSION@.1
 -nodist_doc_DATA = enchant-@ENCHANT_MAJOR_VERSION@.html enchant-lsmod-@ENCHANT_MAJOR_VERSION@.html
 -nodist_doc_DATA = enchant-@ENCHANT_MAJOR_VERSION@.html enchant-lsmod-@ENCHANT_MAJOR_VERSION@.html
 -
 -
- edit = sed \
- 	-e 's|@PKGDATADIR[@]|$(pkgdatadir)|g' \
- 	-e 's|@SYSCONFDIR[@]|$(sysconfdir)|g'
+ DISTCLEANFILES = $(dist_man_MANS) $(nodist_doc_DATA) dummy.vala
+ 
+-.1.html:
+-	groff -mandoc -Thtml $< > $@
+-
+ enchant-@ENCHANT_MAJOR_VERSION@.1: $(builddir)/enchant.1 Makefile.am $(top_builddir)/config.status
+ 	cp $(abs_builddir)/enchant.1 $@
+ 

+ 0 - 22
package/enchant/patches/patch-src_Makefile_in

@@ -1,22 +0,0 @@
---- enchant-2.8.2.orig/src/Makefile.in	2024-08-14 11:33:20.000000000 +0200
-+++ enchant-2.8.2/src/Makefile.in	2025-04-01 05:16:13.945853550 +0200
-@@ -472,8 +472,8 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir) $(ISYSTEM)$(top_builddir)/libgnu $(ISYSTEM)$(top_srcdir)/libgnu -I$(top_srcdir)/lib $(GLIB_CFLAGS) $(WARN_CFLAGS) -DG_LOG_DOMAIN='"libenchant"'
--dist_man_MANS = enchant-@ENCHANT_MAJOR_VERSION@.1 enchant-lsmod-@ENCHANT_MAJOR_VERSION@.1
--nodist_doc_DATA = enchant-@ENCHANT_MAJOR_VERSION@.html enchant-lsmod-@ENCHANT_MAJOR_VERSION@.html
-+dist_man_MANS = 
-+nodist_doc_DATA = 
- edit = sed \
- 	-e 's|@PKGDATADIR[@]|$(pkgdatadir)|g' \
- 	-e 's|@SYSCONFDIR[@]|$(sysconfdir)|g'
-@@ -727,7 +727,7 @@ distdir-am: $(DISTFILES)
- 	done
- check-am: all-am
- check: check-am
--all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
-+all-am: Makefile $(PROGRAMS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \