update net/profanity to 0.13.0

- bump AUTOCONF_VERSION to 2.71: is what upstream uses to generate the
   tarball anyway.
 - add new LDEP on libqrencode.
 - disable gdk-pixbuf dependency: is used only to scale avatars before
   uploading them and we seem to avoid big dependencies for profanity.

plus regen the patches and fix a typo in the configure: the generated
variable name is `enable_gdk_pixbuf' and not `enable_pixbuf'; otherwise
it always links to gdk-pixbuf even if disabled.
This commit is contained in:
op 2022-09-15 16:30:58 +00:00
parent dcb0a0325a
commit 2a373dbe88
4 changed files with 31 additions and 10 deletions

View File

@ -1,5 +1,5 @@
COMMENT = console based XMPP client
DISTNAME = profanity-0.12.1
DISTNAME = profanity-0.13.0
CATEGORIES = net
HOMEPAGE = https://profanity-im.github.io/
@ -13,16 +13,18 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = https://profanity-im.github.io/tarballs/
WANTLIB += assuan c crypto curl curses ereadline expat ffi gcrypt
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
WANTLIB += gpgme iconv intl m strophe nghttp2 otr pcre pthread
WANTLIB += ${MODPY_WANTLIB} signal-protocol-c sqlite3 ssl util z
WANTLIB += X11 Xext Xss assuan c crypto curl curses ereadline
WANTLIB += expat ffi gcrypt gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gpg-error gpgme iconv intl m nghttp2 otr pcre pthread
WANTLIB += ${MODPY_WANTLIB} qrencode signal-protocol-c sqlite3 ssl
WANTLIB += strophe util xcb z
MODULES += lang/python
LIB_DEPENDS += databases/sqlite3 \
devel/glib2 \
devel/readline \
graphics/libqrencode \
net/curl \
net/libstrophe \
net/libsignal-protocol-c \
@ -34,13 +36,14 @@ LIB_DEPENDS += databases/sqlite3 \
BUILD_DEPENDS += devel/cmocka
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.69
AUTOCONF_VERSION = 2.71
SEPARATE_BUILD = Yes
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS += --with-xscreensaver=no \
--enable-gdk-pixbuf=no \
--enable-icons-and-clipboard=no \
--enable-notifications=no \
--enable-plugins=yes \

View File

@ -1,2 +1,2 @@
SHA256 (profanity-0.12.1.tar.gz) = 40RIHnvzsWuvWKFp0yG4CcRwC+z/tw228cOa3D+tMG4=
SIZE (profanity-0.12.1.tar.gz) = 895566
SHA256 (profanity-0.13.0.tar.gz) = elYs1LpwOjnlyqbwCgHFoJ/lHbIKc4hfVrI7w/gvxJI=
SIZE (profanity-0.13.0.tar.gz) = 903454

View File

@ -1,10 +1,11 @@
Use ${MODPY_VERSION} to pick up the correct python .pc file
Use ${LOCALBASE} instead of hard-coded /usr/local
fix typo: the variable is `enable_gdk_pixbuf' not `enable_pixbuf'
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -100,7 +100,7 @@ elif test "x$enable_python_plugins" != xno; then
@@ -104,7 +104,7 @@ elif test "x$enable_python_plugins" != xno; then
rm -f Python.framework
ln -s $PYTHON_FRAMEWORK Python.framework ])
PKG_CHECK_MODULES([python], [python-embed], [PYTHON_CONFIG_EXISTS=yes], [PYTHON_CONFIG_EXISTS=no])
@ -13,7 +14,7 @@ Index: configure.ac
if test "$PYTHON_CONFIG_EXISTS" = "yes" || test "$PYTHON3_CONFIG_EXISTS" = "yes"; then
AM_CONDITIONAL([BUILD_PYTHON_API], [true])
AC_DEFINE([HAVE_PYTHON], [1], [Python support])
@@ -219,10 +219,10 @@ AS_IF([test "x$PLATFORM" = xosx],
@@ -223,10 +223,10 @@ AS_IF([test "x$PLATFORM" = xosx],
[AC_MSG_ERROR([libreadline is required for profanity. Install it with Homebrew, MacPorts, or manually into /usr/local])])],
[test "x$PLATFORM" = xopenbsd],
@ -27,3 +28,17 @@ Index: configure.ac
AC_SUBST(AM_LDFLAGS)])],
[AC_CHECK_LIB([readline], [main], [],
@@ -311,11 +311,11 @@ if test "x$enable_otr" != xno; then
fi
dnl feature: pixbuf / used for scaling avatars before uploading via `/avatar set`
-AS_IF([test "x$enable_pixbuf" != xno],
+AS_IF([test "x$enable_gdk_pixbuf" != xno],
[PKG_CHECK_MODULES([gdk_pixbuf], [gdk-pixbuf-2.0 >= 2.4],
[AC_DEFINE([HAVE_PIXBUF], [1], [gdk-pixbuf module])
LIBS="$gdk_pixbuf_LIBS $LIBS" CFLAGS="$gdk_pixbuf_CFLAGS $CFLAGS"],
- [AS_IF([test "x$enable_pixbuf" = xyes],
+ [AS_IF([test "x$enable_gdk_pixbuf" = xyes],
[AC_MSG_ERROR([gdk-pixbuf-2.0 >= 2.4 is required to scale avatars before uploading])],
[AC_MSG_NOTICE([gdk-pixbuf-2.0 >= 2.4 not found, GDK Pixbuf support not enabled])])])])

View File

@ -59,6 +59,7 @@ lib/libprofanity.la
@man man/man1/profanity-os.1
@man man/man1/profanity-otr.1
@man man/man1/profanity-outtype.1
@man man/man1/profanity-ox-setup.1
@man man/man1/profanity-ox.1
@man man/man1/profanity-paste.1
@man man/man1/profanity-pgp.1
@ -86,6 +87,7 @@ lib/libprofanity.la
@man man/man1/profanity-slashguard.1
@man man/man1/profanity-software.1
@man man/man1/profanity-splash.1
@man man/man1/profanity-stamp.1
@man man/man1/profanity-states.1
@man man/man1/profanity-status.1
@man man/man1/profanity-statusbar.1
@ -123,6 +125,7 @@ share/profanity/themes/forest
share/profanity/themes/gruvbox
share/profanity/themes/hacker
share/profanity/themes/headache
share/profanity/themes/irssi
share/profanity/themes/joker
share/profanity/themes/jubalian
share/profanity/themes/mono