Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7577 from IdrisKalp/master

Browse Source 
compface rebuild
This commit is contained in:
Idris Kalp
2020-01-15 18:52:03 +03:00
committed by GitHub
parent 45ac6925dc 69bc316bb0
commit c68b68a60f
6 changed files with 195 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/misc/compface/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>X-Face library</Summary>
<Description>Utilities and library to convert to/from X-Face format.</Description>
<Archive sha1sum="72dad8774b3301a1562bdbd5b3c5536ebf86a03d" type="targz">http://mirrors.ibiblio.org/xemacs/aux/compface-1.5.2.tar.gz</Archive>
<Archive sha1sum="72dad8774b3301a1562bdbd5b3c5536ebf86a03d" type="targz">http://ftp.xemacs.org/pub/xemacs/aux/compface-1.5.2.tar.gz</Archive>
<Patches>
<Patch level="1">xbmp.patch</Patch>
<Patch level="1">shared.patch</Patch>
@@ -43,6 +43,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-01-15</Date>
<Version>1.5.2</Version>
<Comment>Rebuild</Comment>
<Name>İdris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-09-01</Date>
<Version>1.5.2</Version>
office/spellcheck/aspell/actions.py
+2 -2
View File
@@ -10,8 +10,8 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
shelltools.system("sed -i '/ top.do_check ==/s/top.do_check/*&/' modules/filter/tex.cpp")
shelltools.system("sed -i '/word ==/s/word/*&/' prog/check_funs.cpp")
#shelltools.system("sed -i '/ top.do_check ==/s/top.do_check/*&/' modules/filter/tex.cpp")
#shelltools.system("sed -i '/word ==/s/word/*&/' prog/check_funs.cpp")
autotools.autoreconf()
autotools.configure("--disable-static \
office/spellcheck/aspell/files/fedora/aspell-0.60.7-fileconflict.patch
+55
View File
@@ -0,0 +1,55 @@
diff --git a/Makefile.in b/Makefile.in
index f293649..e5d2b1a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -518,6 +518,7 @@ distcleancheck_listfiles = find . -type f -print
# These are needed due to a bug in Automake
pkgdatadir = @pkgdatadir@
+pkgdatadir2 = @pkgdatadir2@
pkglibdir = @pkglibdir@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -2071,7 +2072,7 @@ gen/dirs.h: gen/mk-dirs_h.pl
perl ${srcdir}/gen/mk-dirs_h.pl ${prefix} ${pkgdatadir} ${pkglibdir} ${sysconfdir} > gen/dirs.h
scripts/run-with-aspell: scripts/run-with-aspell.create
- sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir} > scripts/run-with-aspell
+ sh ${srcdir}/scripts/run-with-aspell.create ${pkgdatadir2} > scripts/run-with-aspell
chmod 755 scripts/run-with-aspell
@PSPELL_COMPATIBILITY_TRUE@scripts/pspell-config: scripts/mkconfig
@PSPELL_COMPATIBILITY_TRUE@ sh ${srcdir}/scripts/mkconfig ${VERSION} ${datadir} ${pkgdatadir}
diff --git a/configure b/configure
index 1236c90..8a6e697 100755
--- a/configure
+++ b/configure
@@ -709,6 +709,7 @@ CXXFLAGS
CXX
pkglibdir
pkgdatadir
+pkgdatadir2
pkgdocdir
MAINT
MAINTAINER_MODE_FALSE
@@ -3297,18 +3298,21 @@ pkgdatadir=undef
# Check whether --enable-pkgdatadir was given.
if test "${enable_pkgdatadir+set}" = set; then :
enableval=$enable_pkgdatadir; pkgdatadir=$enable_pkgdatadir
+ pkgdatadir2=$enable_pkgdatadir
fi
# Check whether --enable-pkgdata-dir was given.
if test "${enable_pkgdata_dir+set}" = set; then :
enableval=$enable_pkgdata_dir; pkgdatadir=$enable_dict_dir
+ pkgdatadir2=$enable_dict_dir
fi
if test "$pkgdatadir" = "undef"
then
pkgdatadir=\${libdir}/aspell-0.60
+ pkgdatadir2=${exec_prefix}/lib/aspell-0.60:${exec_prefix}/lib64/aspell-0.60
fi
office/spellcheck/aspell/files/fedora/aspell-0.60.7-mp.patch
+48
View File
@@ -0,0 +1,48 @@
diff --git a/manual/aspell.1 b/manual/aspell.1
index 854debf..b1106ca 100644
--- a/manual/aspell.1
+++ b/manual/aspell.1
@@ -328,7 +328,6 @@ are also allowed. The \fI/etc/aspell.conf\fR file is a good example of
how to set these options and the Aspell Manual has more detailed info.
.SH SEE ALSO
.PP
-.BR aspell\-import (1),
.BR prezip\-bin (1),
.BR run\-with\-aspell (1),
.BR word\-list\-compress (1)
diff --git a/manual/prezip-bin.1 b/manual/prezip-bin.1
index afb6c05..09b5784 100644
--- a/manual/prezip-bin.1
+++ b/manual/prezip-bin.1
@@ -99,7 +99,6 @@ the output file is not complete.
.SH SEE ALSO
.PP
.BR aspell (1),
-.BR aspell\-import (1),
.BR run\-with\-aspell (1),
.BR word\-list\-compress (1)
.PP
diff --git a/manual/run-with-aspell.1 b/manual/run-with-aspell.1
index 8dea131..67f3117 100644
--- a/manual/run-with-aspell.1
+++ b/manual/run-with-aspell.1
@@ -28,7 +28,6 @@ such as ispell's own scripts.
.SH SEE ALSO
.PP
.BR aspell (1),
-.BR aspell\-import (1),
.BR word\-list\-compress (1)
.PP
Aspell is fully documented in its Texinfo manual. See the
diff --git a/manual/word-list-compress.1 b/manual/word-list-compress.1
index 5126cd2..6686997 100644
--- a/manual/word-list-compress.1
+++ b/manual/word-list-compress.1
@@ -80,7 +80,6 @@ be written to.
.SH SEE ALSO
.PP
.BR aspell (1),
-.BR aspell\-import (1),
.BR prezip\-bin (1),
.BR run\-with\-aspell (1)
.PP
office/spellcheck/aspell/files/fedora/aspell-0.60.7-pspell_conf.patch
+65
View File
@@ -0,0 +1,65 @@
diff --git a/Makefile.in b/Makefile.in
index e5d2b1a..bc53e34 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1019,6 +1019,8 @@ clean-filterLTLIBRARIES:
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig; \
+ cp aspell.pc $(DESTDIR)$(libdir)/pkgconfig/aspell.pc; \
list2=; for p in $$list; do \
if test -f $$p; then \
list2="$$list2 $$p"; \
diff --git a/aspell.pc.in b/aspell.pc.in
new file mode 100644
index 0000000..13da044
--- /dev/null
+++ b/aspell.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+pkgdatadir=@pkgdatadir@
+
+Name: Aspell
+Description: A spelling checker.
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -laspell
+Cflags: -I${includedir}
diff --git a/configure b/configure
index 8a6e697..995a3df 100755
--- a/configure
+++ b/configure
@@ -18732,7 +18732,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
# #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile"
+ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile aspell.pc scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -19887,6 +19887,7 @@ do
"modules/filter/Makefile") CONFIG_FILES="$CONFIG_FILES modules/filter/Makefile" ;;
"myspell/Makefile") CONFIG_FILES="$CONFIG_FILES myspell/Makefile" ;;
"lib5/Makefile") CONFIG_FILES="$CONFIG_FILES lib5/Makefile" ;;
+ "aspell.pc") CONFIG_FILES="$CONFIG_FILES aspell.pc" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/scripts/mkconfig b/scripts/mkconfig
index 608e3f7..f15f31c 100755
--- a/scripts/mkconfig
+++ b/scripts/mkconfig
@@ -15,7 +15,7 @@ case \$1 in
echo "$2"
;;
--pkgdatadir | pkgdatadir)
- echo "$3"
+ pkg-config aspell --variable=pkgdatadir
;;
*)
echo "usage: pspell-config version|datadir|pkgdatadir"
office/spellcheck/aspell/pspec.xml
+17 -1
View File
@@ -12,13 +12,22 @@
<IsA>app:console</IsA>
<Summary>A multi-language spellchecker</Summary>
<Description>Aspell is a spellchecker that has dictionaries for more than one language and is written as a replacement to ispell.</Description>
<Archive sha1sum="ff1190db8de279f950c242c6f4c5d5cdc2cbdc49" type="targz">mirrors://gnu/aspell/aspell-0.60.6.1.tar.gz</Archive>
<Archive sha1sum="ae554df297aee676b4d16f261fa5c60e285478f6" type="targz">mirrors://gnu/aspell/aspell-0.60.8.tar.gz</Archive>
<Patches>
<!--
<Patch level="1">fedora/aspell-0.60.3-install_info.patch</Patch>
-->
<!--
<Patch level="1">fedora/aspell-0.60.5-fileconflict.patch</Patch>
<Patch level="1">fedora/aspell-0.60.5-pspell_conf.patch</Patch>
<Patch level="1">fedora/aspell-0.60.6-mp.patch</Patch>
-->
<!--
<Patch level="1">fedora/aspell-0.60.6-zero.patch</Patch>
-->
<Patch level="1">fedora/aspell-0.60.7-fileconflict.patch</Patch>
<Patch level="1">fedora/aspell-0.60.7-mp.patch</Patch>
<Patch level="1">fedora/aspell-0.60.7-pspell_conf.patch</Patch>
</Patches>
</Source>
@@ -51,6 +60,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-01-15</Date>
<Version>0.60.8</Version>
<Comment>Version bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2018-09-16</Date>
<Version>0.60.6.1</Version>