ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

Merge branch '3.4' into 3.5

Browse Source 
Conflicts:
	python3/.signature
	samba/.signature
	samba/Pkgfile
This commit is contained in:
Juergen Daubert 2019-04-09 14:37:44 +02:00
commit 8a06b1a18c
23 changed files with 71 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apr/.footprint
View File

@ -16,6 +16,7 @@ drwxr-xr-x root/root usr/include/apr-1/
-rw-r--r-- root/root usr/include/apr-1/apr_dbd.h
-rw-r--r-- root/root usr/include/apr-1/apr_dbm.h
-rw-r--r-- root/root usr/include/apr-1/apr_dso.h
-rw-r--r-- root/root usr/include/apr-1/apr_encode.h
-rw-r--r-- root/root usr/include/apr-1/apr_env.h
-rw-r--r-- root/root usr/include/apr-1/apr_errno.h
-rw-r--r-- root/root usr/include/apr-1/apr_escape.h
@ -82,9 +83,9 @@ drwxr-xr-x root/root usr/include/apr-1/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libapr-1.a
-rwxr-xr-x root/root usr/lib/libapr-1.la
lrwxrwxrwx root/root usr/lib/libapr-1.so -> libapr-1.so.0.6.5
lrwxrwxrwx root/root usr/lib/libapr-1.so.0 -> libapr-1.so.0.6.5
-rwxr-xr-x root/root usr/lib/libapr-1.so.0.6.5
lrwxrwxrwx root/root usr/lib/libapr-1.so -> libapr-1.so.0.7.0
lrwxrwxrwx root/root usr/lib/libapr-1.so.0 -> libapr-1.so.0.7.0
-rwxr-xr-x root/root usr/lib/libapr-1.so.0.7.0
-rw-r--r-- root/root usr/lib/libaprutil-1.a
-rwxr-xr-x root/root usr/lib/libaprutil-1.la
lrwxrwxrwx root/root usr/lib/libaprutil-1.so -> libaprutil-1.so.0.6.1
@ -95,9 +96,7 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/apr-util-1.pc
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/apr-1/
-rw-r--r-- root/root usr/share/apr-1/apr_common.m4
-rw-r--r-- root/root usr/share/apr-1/apr_rules.mk
-rw-r--r-- root/root usr/share/apr-1/find_apr.m4
-rwxr-xr-x root/root usr/share/apr-1/libtool
-rw-r--r-- root/root usr/share/apr-1/make_exports.awk
-rw-r--r-- root/root usr/share/apr-1/make_var_export.awk

8
apr/.signature
View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/c394k2NIQZC5KEEL+lrCAb4SItkVF2607FHHUQ15gRShXdk8e9D9doXZeRl9jR09H6otK5BzO7OfxghXDkcOgA=
SHA256 (Pkgfile) = 8b1c69ea158131e2d3c310b9c9397047c28b7004abc35b9b821214fcbd7adf5c
SHA256 (.footprint) = e60c0dc12cf99cc4d7dc60f656fd3cbc123bf2dd7e815b35c466247ab0a055ef
SHA256 (apr-1.6.5.tar.bz2) = a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105
RWSE3ohX2g5d/UeToMgjJFBQDeYGY1K3eb+bA03/BUYJR6yNNxy5jixeUXxu8OY2CRXQK19ARXHNcPOLs4+nWFriyuFU5ITOFg4=
SHA256 (Pkgfile) = bb635a71930c583ad51dfb8d70f337574f0d0df979975ebe10b0117d12c3233f
SHA256 (.footprint) = 7677ca29935b7a0838348fb7a1d04b78e542b998a93760ca2ee5b52c7735b5cf
SHA256 (apr-1.7.0.tar.bz2) = e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea
SHA256 (apr-util-1.6.1.tar.bz2) = d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b

2
apr/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: util-linux, expat, db, gdbm
name=apr
version=1.6.5
version=1.7.0
release=1
source=(http://www.apache.org/dist/$name/$name-$version.tar.bz2 \
http://www.apache.org/dist/$name/$name-util-1.6.1.tar.bz2)

2
cifs-utils/.footprint
View File

@ -8,6 +8,7 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/cifscreds
-rwxr-xr-x root/root usr/bin/getcifsacl
-rwxr-xr-x root/root usr/bin/setcifsacl
-rwxr-xr-x root/root usr/bin/smbinfo
drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/cifsidmap.h
drwxr-xr-x root/root usr/lib/
@ -21,6 +22,7 @@ drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/cifscreds.1.gz
-rw-r--r-- root/root usr/share/man/man1/getcifsacl.1.gz
-rw-r--r-- root/root usr/share/man/man1/setcifsacl.1.gz
-rw-r--r-- root/root usr/share/man/man1/smbinfo.1.gz
drwxr-xr-x root/root usr/share/man/man8/
-rw-r--r-- root/root usr/share/man/man8/cifs.idmap.8.gz
-rw-r--r-- root/root usr/share/man/man8/idmapwb.8.gz

10
cifs-utils/.signature
View File

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/dNy0ksnNaWMXFqyr1yK6CXIpLBXtLx2ziuQGHOdIc9HVvLkHSvzNX0kvCWKfMtKbC9KL5Y9wB/GGgXm2wXU4AE=
SHA256 (Pkgfile) = 2ff1faee2ddcd1103bf9c0544b55e19889e6fac84914a47d4898253ddb353819
SHA256 (.footprint) = 24d983fca25f91dd80378ea506d7a8a8be8d65c3eb9c1bae1a79fb1ac76023ed
SHA256 (cifs-utils-6.8.tar.bz2) = e7d1f6050c43f21f82cd77e288eb756755effd22f0c310fc2c525df9d41dff79
SHA256 (cifs-utils-man.tar.xz) = 14b14f323a66f049e23e639c20ae1898f7bdea8ce8de814166bb7d5d60812e5c
RWSE3ohX2g5d/aSh0LPxdO9HP/9d1bTRx/e2+e/eH+3d3aOAQJLZYrU7fosIGKs9x7ozuY0nsEbnVJYhNQfgS8+2IGq/8sMt/w0=
SHA256 (Pkgfile) = b44d08ebdc423c2329493f120230f35a5d1fcc52098bc1b1fb37f3b446693787
SHA256 (.footprint) = f0590716ad6497a8e9156d8ce2c1fbf39e4b1383bcbd4e1567457cbb928302ba
SHA256 (cifs-utils-6.9.tar.bz2) = 18d8f1bf92c13c4d611502dbd6759e3a766ddc8467ec8a2eda3f589e40b9ac9c
SHA256 (cifs-utils-man.tar.xz) = a3663f891a5606e77371c0aae38cdb353cf5210cbedb64e956c5b9b65d94306b
SHA256 (cifs) = 6dc576a4b23722cc9b7fd630275f3ba721a0e659a8a9642cd0f7c37df09c9e79

7
cifs-utils/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: samba keyutils
name=cifs-utils
version=6.8
version=6.9
release=1
source=(https://download.samba.org/pub/linux-cifs/$name/$name-$version.tar.bz2
cifs-utils-man.tar.xz cifs)
@ -12,14 +12,13 @@ source=(https://download.samba.org/pub/linux-cifs/$name/$name-$version.tar.bz2
build () {
cd $name-$version
autoreconf -i
./configure --prefix=/usr
make
make DESTDIR=$PKG install
install -d $PKG/usr/share/man/man{1,8}
install -m 0644 *.1 $PKG/usr/share/man/man1
install -m 0644 *.8 $PKG/usr/share/man/man8
install -m 0644 $SRC/*.1 $PKG/usr/share/man/man1
install -m 0644 $SRC/*.8 $PKG/usr/share/man/man8
install -D -m 0755 $SRC/cifs $PKG/etc/rc.d/cifs
}

BIN
cifs-utils/cifs-utils-man.tar.xz
View File

Binary file not shown.

6
cups-filters/.signature
View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/XKWaMy1AFdjd6s4jISq98M6mzxzmDlFhps9ZivBj1j+nED5LN9UgvuMWN3dBvDmKLfqTJQA4KLbREqh+iBGuQU=
SHA256 (Pkgfile) = c5f690db1c3d2dab65dad5054d12abd3d74c5621dc11d9a16ec11ab2eeba2e27
RWSE3ohX2g5d/XoG5Wi9IxxIl65yipKIjtrb1QFZbcwXVvfHqvJUsfP9+L1BZjdxWz4gtR+4u3cexfNMkkwBFhFbuoGpJmFiAAI=
SHA256 (Pkgfile) = 5d09d2ae0a8f8468b2df0789b81272ad1d97a277cdbfae067cc51b8c9e0d4078
SHA256 (.footprint) = 32c7827b0a711a571ef4e2b7eb7812ed42a3b8f8e590cdbe949fa60a5b3978d5
SHA256 (cups-filters-1.22.3.tar.xz) = 43024dbf6c2d1a14c8306fb7744f1e693e6a99dc9441bfd187070f0ad0a67187
SHA256 (cups-filters-1.22.5.tar.xz) = 30d453a2152f0b3032126720aecfe35d5c3adc00d9f32f0320da492e92f707a6
SHA256 (cups-browsed) = 4c4900ee88d488078da20a5cabc949921382fa69bc28bb2a7f89fa5ae01afb5b

2
cups-filters/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: ghostscript poppler qpdf mupdf
name=cups-filters
version=1.22.3
version=1.22.5
release=1
source=(https://www.openprinting.org/download/$name/$name-$version.tar.xz
cups-browsed)

4
cyrus-sasl/.signature
View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/dcsJAX7AqiiVehAWPrGnavxBkwGzfgk2Y/jv/4CRCCH+HDxXJCpCorX4sdHaE/fsSi9J3xwt/56Xa16SbfwmQk=
SHA256 (Pkgfile) = 274b6d2b4ea4273fd995d5a9a1d34cec4c310e421e5cf8d9a4500c2d51ea204b
RWSE3ohX2g5d/cCLvAxTP5MWOhLI37e1M0oPEFky0xQOM7LdG+KMjEo9eZ7+gMv+Ztt9GJr95M2NYWzb1R1otxKNIRtn1kI3xAM=
SHA256 (Pkgfile) = 72b3dba839c5c4ffe449f1bb47274a92b1f6549213b6174b77fb13b38c92c837
SHA256 (.footprint) = e4e77c95f7485a0b84ae04ce6db392db6aa362e706da3a52ca28f95b97ca6abd
SHA256 (cyrus-sasl-2.1.26.tar.gz) = 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3
SHA256 (saslauthd) = 2a96dca868261d5275087ed8e1eef59946f47c6d35797368710c3037f46e61bd

7
cyrus-sasl/Pkgfile
View File

@ -1,17 +1,15 @@
# Description: Simple Authentication and Security Layer
# URL: https://cyrusimap.org/
# URL: https://www.cyrusimap.org/sasl/
# Maintainer: Thomas Penteker, tek at serverop dot de
# Packager: Daniel Mueller, daniel at danm dot de
# Depends on: db openssl
name=cyrus-sasl
version=2.1.26
release=2
source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-$version.tar.gz
source=(https://www.cyrusimap.org/releases/cyrus-sasl-$version.tar.gz
saslauthd fix-CVE-2013-4122.diff)
build(){
cd $name-$version
patch -i ../fix-CVE-2013-4122.diff -p1
@ -41,5 +39,4 @@ build(){
$PKG/etc/rc.d
install -m 755 $SRC/saslauthd $PKG/etc/rc.d
}

1
gimp/.footprint
View File

@ -3605,7 +3605,6 @@ drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/gimp-2.10.1.gz
lrwxrwxrwx root/root usr/share/man/man1/gimp-console-2.10.1.gz -> gimp-2.10.1.gz
lrwxrwxrwx root/root usr/share/man/man1/gimp-console.1.gz -> gimp-console-2.10.1.gz
lrwxrwxrwx root/root usr/share/man/man1/gimp.1.gz -> gimp-2.10.1.gz
-rw-r--r-- root/root usr/share/man/man1/gimptool-2.0.1.gz
drwxr-xr-x root/root usr/share/man/man5/

6
gimp/.signature
View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/VGpYUf7uBxaBW23MgQDRZVmgr0Hbk5NFTdqQmXghJFANfg3gHgDDm+XmG4ds3wU8Qp3auC12U4RLXronIPGfQA=
SHA256 (Pkgfile) = 1d943b7f08df9d0423eb42e932ba937c7a2d860e2e78908e60bd472e08193fc6
SHA256 (.footprint) = be2a407a2df0e53004860ea7be9cd85fffd14ed1ea0f8281bde29a4939a1de88
RWSE3ohX2g5d/YWRNal0VTblg1rPbrHyn0jeL0AeJ0PyAuAai849b37pPu3NGvh3f2Azsnu/J7LIVSnUrS1vUWPVmPkZx4XW4gQ=
SHA256 (Pkgfile) = f45e2d6c8e024f196d69bbb4c13427ee31c79342d40e0fce97adeb2b2a8b19c6
SHA256 (.footprint) = 250ec6dba27c9c862312d0f12799c737a93f84e44c69f059f301eca185da5890
SHA256 (gimp-2.10.8.tar.bz2) = d849c1cf35244938ae82e521b92b720ab48b8e9ed092d5de92c2464ef5244b9b
SHA256 (cve-2013-1913) = 4f20ff48793e7843a1fdc488d13a875ddaca74a758ded106c566968f7097d6c5

2
gimp/Pkgfile
View File

@ -3,7 +3,7 @@
# Maintainer: Thomas Penteker, tek at serverop dot de
# Packager: Simone Rota, sip at crux dot nu
# Depends on: gexiv2 libart_lgpl libmypaint librsvg mypaint-brushes poppler-data poppler-glib xorg-libxmu xorg-libxpm glib-networking
# Nice to have: gimp-print, libsdl, ghostscript, libmng
# Optional: gimp-print libsdl ghostscript libmng
name=gimp
version=2.10.8

11
hexchat/.footprint
View File

@ -7,23 +7,16 @@ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/hexchat/
drwxr-xr-x root/root usr/lib/hexchat/plugins/
-rwxr-xr-x root/root usr/lib/hexchat/plugins/checksum.la
-rwxr-xr-x root/root usr/lib/hexchat/plugins/checksum.so
-rwxr-xr-x root/root usr/lib/hexchat/plugins/fishlim.la
-rwxr-xr-x root/root usr/lib/hexchat/plugins/fishlim.so
-rwxr-xr-x root/root usr/lib/hexchat/plugins/perl.la
-rwxr-xr-x root/root usr/lib/hexchat/plugins/perl.so
-rwxr-xr-x root/root usr/lib/hexchat/plugins/python.la
-rwxr-xr-x root/root usr/lib/hexchat/plugins/python.so
-rwxr-xr-x root/root usr/lib/hexchat/plugins/sysinfo.la
-rwxr-xr-x root/root usr/lib/hexchat/plugins/sysinfo.so
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/hexchat-plugin.pc
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/appdata/
-rw-r--r-- root/root usr/share/appdata/hexchat.appdata.xml
drwxr-xr-x root/root usr/share/applications/
-rw-r--r-- root/root usr/share/applications/hexchat.desktop
-rw-r--r-- root/root usr/share/applications/io.github.Hexchat.desktop
drwxr-xr-x root/root usr/share/icons/
drwxr-xr-x root/root usr/share/icons/hicolor/
drwxr-xr-x root/root usr/share/icons/hicolor/48x48/
@ -35,3 +28,5 @@ drwxr-xr-x root/root usr/share/icons/hicolor/scalable/apps/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/hexchat.1.gz
drwxr-xr-x root/root usr/share/metainfo/
-rw-r--r-- root/root usr/share/metainfo/io.github.Hexchat.appdata.xml

10
hexchat/.signature
View File

@ -1,7 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/TzGa7BIeiTbgtRqB5Y2pLzC+UEfiDuoFRYwvW1RUeh4WlkJOcKD4NM1fwIieQXHmQBl1FjIXWbk7Eoc1/QRCgc=
SHA256 (Pkgfile) = e584c24caebc1e61f924e1ce8068f5734a3111920adc24794b097a958f5893ee
SHA256 (.footprint) = 23bf408e9ed745eb12003a6b2270de16b3a651b03374c34b29edec11ceac6cdd
SHA256 (hexchat-2.12.4.tar.xz) = fa35913158bbc7d0d99de79371b6df3e8d21802f1d2c7c92f0e5db694acf2c3a
SHA256 (hexchat-enchant2.0.patch) = d5f1e70b696337b15d40386292748483d2b27631a9bba6cfa5c97eae4f6987f1
SHA256 (hexchat-enchant2.0_name.patch) = b9687999f8e013716ec997458de1db0d3618382a6963d5f6eb578fea253daa24
RWSE3ohX2g5d/dt62tUhOiWIWsMnrTUIh8VJKR3H764CpI2l4q6BT4gK5caCq04erbb62fSgq5eM7+o1l1RGNriTxvckaaARXQc=
SHA256 (Pkgfile) = a85db66ee677f3cdb857a022d64167e791d70cbfc047209bdcfde027c59826bb
SHA256 (.footprint) = 890fbae8258fa479df98a709305dec29ce2e972446df597faf3fc2013476308b
SHA256 (hexchat-2.14.2.tar.xz) = 7792b9e52560fbd3e10d75bfb5d138a20913a87771d676d296547f1b4ac09618

46
hexchat/Pkgfile
View File

@ -1,38 +1,40 @@
# Description: GTK+ based IRC client.
# URL: http://hexchat.github.io/
# Maintainer: Danny Rawlins, crux at romster dot me
# Depends on: autoconf-archive gtk iso-codes libnotify pciutils xorg-libxdamage
# Optional: enchant libcanberra lua
# Depends on: gtk iso-codes xorg-libxdamage
# Optional: dbus-glib desktop-file-utils enchant libcanberra libnotify libproxy lua pciutils
name=hexchat
version=2.12.4
release=3
source=(http://dl.hexchat.net/hexchat/$name-$version.tar.xz
hexchat-enchant2.0.patch
hexchat-enchant2.0_name.patch)
version=2.14.2
release=1
source=(http://dl.hexchat.net/hexchat/$name-$version.tar.xz)
build() {
cd $name-$version
patch -p1 -i $SRC/hexchat-enchant2.0.patch
patch -p1 -i $SRC/hexchat-enchant2.0_name.patch
# Lua scripting plugin, value is pkg-config name
prt-get isinst lua && PKGMK_HEXCHAT+=' -Dwith-lua=lua' || PKGMK_HEXCHAT+=' -Dwith-lua=false'
local LUA
if [ "$(pkginfo -i | grep '^lua ')" ]; then
LUA='--enable-lua'
else
LUA='--disable-lua'
fi
# Support for getting proxy information
prt-get isinst libproxy || PKGMK_HEXCHAT+=' -Dwith-libproxy=false'
autoreconf -vi
# Support for freedesktop notifications
prt-get isinst libnotify || PKGMK_HEXCHAT+=' -Dwith-libnotify=false'
./configure \
--prefix=/usr \
--enable-python=python2 \
--enable-textfe $LUA
# Support for sound alerts
prt-get isinst libcanberra || PKGMK_HEXCHAT+=' -Dwith-libcanberra=false'
make
make DESTDIR=$PKG install
# Support used for single-instance and scripting interface
prt-get isinst dbus-glib || PKGMK_HEXCHAT+=' -Dwith-dbus=false'
prt-get isinst pciutils && PKGMK_HEXCHAT+=' -Dwith-sysinfo=true'
meson build ${PKGMK_HEXCHAT} \
--prefix /usr \
-Dwith-text=true
ninja -C build -j ${JOBS:-1}
DESTDIR="$PKG" ninja -C build install
rm -r $PKG/usr/share/locale
}

124
hexchat/hexchat-enchant2.0.patch
View File

@ -1,124 +0,0 @@
From 005858795878b92fc17b4c2127bce90a1d053483 Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Fri, 24 Nov 2017 03:51:10 -0500
Subject: [PATCH] spell-entry: Improve robustness of enchant loading and fix
2.0 support
- Add logging and error handling to loading symbols
- Don't load unversioned symbol
- Handle new function names in Enchant 2.0
Closes #2095
---
src/fe-gtk/sexy-spell-entry.c | 94 +++++++++++++++++++++++++------------------
1 file changed, 55 insertions(+), 39 deletions(-)
diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c
index 566abcf3e..bd31d2239 100644
--- a/src/fe-gtk/sexy-spell-entry.c
+++ b/src/fe-gtk/sexy-spell-entry.c
@@ -159,49 +159,65 @@ initialize_enchant (void)
{
GModule *enchant;
gpointer funcptr;
-
-
- enchant = g_module_open("libenchant."G_MODULE_SUFFIX, 0);
- if (enchant == NULL)
- {
-#ifndef WIN32
- enchant = g_module_open("libenchant.so.1", 0);
- if (enchant == NULL)
- {
-#ifdef __APPLE__
- enchant = g_module_open("libenchant.dylib", 0);
- if (enchant == NULL)
+ gsize i;
+ const char * const libnames[] = {
+#ifdef G_OS_WIN32
+ "libenchant.dll",
#endif
- return;
- }
-#else
- return;
+#ifdef G_OS_UNIX
+ "libenchant.so.1",
+ "libenchant.so.2",
#endif
- }
-
- have_enchant = TRUE;
-
-#define MODULE_SYMBOL(name, func) \
- g_module_symbol(enchant, (name), &funcptr); \
- (func) = funcptr;
-
- MODULE_SYMBOL("enchant_broker_init", enchant_broker_init)
- MODULE_SYMBOL("enchant_broker_free", enchant_broker_free)
- MODULE_SYMBOL("enchant_broker_free_dict", enchant_broker_free_dict)
- MODULE_SYMBOL("enchant_broker_list_dicts", enchant_broker_list_dicts)
- MODULE_SYMBOL("enchant_broker_request_dict", enchant_broker_request_dict)
-
- MODULE_SYMBOL("enchant_dict_add_to_personal", enchant_dict_add_to_personal)
- MODULE_SYMBOL("enchant_dict_add_to_session", enchant_dict_add_to_session)
- MODULE_SYMBOL("enchant_dict_check", enchant_dict_check)
- MODULE_SYMBOL("enchant_dict_describe", enchant_dict_describe)
+#ifdef __APPLE__
+ "libenchant.dylib",
+#endif
+ };
+
+ for (i = 0; i < G_N_ELEMENTS(libnames); ++i)
+ {
+ enchant = g_module_open(libnames[i], 0);
+ if (enchant)
+ {
+ g_info ("Loaded %s", libnames[i]);
+ have_enchant = TRUE;
+ break;
+ }
+ }
+
+ if (!have_enchant)
+ return;
+
+#define MODULE_SYMBOL(name, func, alt_name) G_STMT_START { \
+ const char *funcname = name; \
+ gboolean ret = g_module_symbol(enchant, funcname, &funcptr); \
+ if (alt_name) { \
+ funcname = alt_name; \
+ ret = g_module_symbol(enchant, funcname, &funcptr); \
+ } \
+ if (ret == FALSE) { \
+ g_warning ("Failed to find enchant symbol %s", funcname); \
+ have_enchant = FALSE; \
+ return; \
+ } \
+ (func) = funcptr; \
+} G_STMT_END;
+
+ MODULE_SYMBOL("enchant_broker_init", enchant_broker_init, NULL)
+ MODULE_SYMBOL("enchant_broker_free", enchant_broker_free, NULL)
+ MODULE_SYMBOL("enchant_broker_free_dict", enchant_broker_free_dict, NULL)
+ MODULE_SYMBOL("enchant_broker_list_dicts", enchant_broker_list_dicts, NULL)
+ MODULE_SYMBOL("enchant_broker_request_dict", enchant_broker_request_dict, NULL)
+
+ MODULE_SYMBOL("enchant_dict_add_to_personal", enchant_dict_add_to_personal,
+ "enchant_dict_add")
+ MODULE_SYMBOL("enchant_dict_add_to_session", enchant_dict_add_to_session, NULL)
+ MODULE_SYMBOL("enchant_dict_check", enchant_dict_check, NULL)
+ MODULE_SYMBOL("enchant_dict_describe", enchant_dict_describe, NULL)
MODULE_SYMBOL("enchant_dict_free_suggestions",
- enchant_dict_free_suggestions)
+ enchant_dict_free_suggestions, "enchant_dict_free_string_list")
MODULE_SYMBOL("enchant_dict_store_replacement",
- enchant_dict_store_replacement)
- MODULE_SYMBOL("enchant_dict_suggest", enchant_dict_suggest)
-
-#undef MODULE_SYMBOL
+ enchant_dict_store_replacement, NULL)
+ MODULE_SYMBOL("enchant_dict_suggest", enchant_dict_suggest, NULL)
}
static void

24
hexchat/hexchat-enchant2.0_name.patch
View File

@ -1,24 +0,0 @@
From 234fe8698781f149df0e6928e48859f66b5e947b Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Tue, 6 Feb 2018 16:57:30 -0500
Subject: [PATCH] Fix Enchant 2.1.3+ support
They changed the lib name yet again...
Closes #2117
---
src/fe-gtk/sexy-spell-entry.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c
index bd31d2239..dce19b829 100644
--- a/src/fe-gtk/sexy-spell-entry.c
+++ b/src/fe-gtk/sexy-spell-entry.c
@@ -167,6 +167,7 @@ initialize_enchant (void)
#ifdef G_OS_UNIX
"libenchant.so.1",
"libenchant.so.2",
+ "libenchant-2.so.2",
#endif
#ifdef __APPLE__
"libenchant.dylib",

6
socat/.signature
View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/YgDcjZ7/RPvbeT37ZjhMgXqa0VK2flKcBkr16lhfRaQTUkrT9E/ImRzARAen/vUHSK6SrnnMI/VJdlh0bG8HAs=
SHA256 (Pkgfile) = 5a8c3bd8137490ec5e242c99e4cd7b280be0efa7de5b852e053116a1a365eb6c
RWSE3ohX2g5d/ZQSCw21xilUIZN3X2TmsxbMa9NSal20shYEMc7ll9xMivcWCxUD5QNgkhTv864w+qNhW43ansV5O7BA9Pe9EQ0=
SHA256 (Pkgfile) = 150a283c568750eb43e8682b4cb384de9373971d5a28a3bed872e04cec431ce8
SHA256 (.footprint) = 89674cf5f4f155af5e864485c8dc94dff3b370c1f06555edf28d959cd516e691
SHA256 (socat-1.7.3.2.tar.bz2) = e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251
SHA256 (socat-1.7.3.3.tar.bz2) = 0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a

2
socat/Pkgfile
View File

@ -4,7 +4,7 @@
# Depends on: openssl readline
name=socat
version=1.7.3.2
version=1.7.3.3
release=1
source=(http://www.dest-unreach.org/socat/download/$name-$version.tar.bz2)

6
stunnel/.signature
View File

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/bO6gzFb+cTkv8qvWszcDyDmvig65X2EeNNTu9akQQD9CdN4Nn55FK2VKIETbRMAgDbzKHcbGBMZJAeBH8m6PAg=
SHA256 (Pkgfile) = 62a5c51bdab7cf769bd8d8d60f00bfa3521d4f817457f9b5679901d84dfb5e32
RWSE3ohX2g5d/ZjNvM5MdxC6cPlHF6/+uOAj72cTKZOW+qd2Xkd2c9JlEiWo+lZ6C714iS12kmaPGrGtU6NjIZQuS0P2SugDcwg=
SHA256 (Pkgfile) = e4df5fc624aaf8f57417f7e25e501af7475b6a6c32783968051c9951577e8be1
SHA256 (.footprint) = f83e6abdfdb94cb68ef512ba0ef5d19a1e180887f2cf7c92d2916af0ec7b1e51
SHA256 (stunnel-5.50.tar.gz) = 951d92502908b852a297bd9308568f7c36598670b84286d3e05d4a3a550c0149
SHA256 (stunnel-5.52.tar.gz) = 00b973aa0d48b0707dd722c4e0a20b8378fc9b0ba301fdb785ffb75341024e21
SHA256 (stunnel.conf) = ef09041fd68530a6029826678eb22db30a80d8a77308ee361b12aa466f7daa28
SHA256 (stunnel) = c6e5c2bcfd87b709bbc24b5c24a603b43bc9440e125eeaf283a11daadc78cbd7

4
stunnel/Pkgfile
View File

@ -4,8 +4,8 @@
# Depends on: openssl zlib
name=stunnel
version=5.50
release=2
version=5.52
release=1
source=(https://www.stunnel.org/downloads/$name-$version.tar.gz \
$name.conf $name)