diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-12-11 21:03:27 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-12-12 08:59:50 +0100 |
| commit | e37e24f7e55a4939e41cb59ed0ca29b1dccc2fec (patch) | |
| tree | e0db23a168f93fa4574d38cfa8ac938c35e7803b /source/xap | |
| parent | c42086b90c8f4ddf8de656cd3d155ddaabb6ace1 (diff) | |
| download | current-e37e24f7e55a4939e41cb59ed0ca29b1dccc2fec.tar.gz current-e37e24f7e55a4939e41cb59ed0ca29b1dccc2fec.tar.xz | |
Wed Dec 11 21:03:27 UTC 201920191211210327
ap/mariadb-10.4.11-x86_64-1.txz: Upgraded.
d/cmake-3.16.1-x86_64-1.txz: Upgraded.
d/git-2.24.1-x86_64-1.txz: Upgraded.
l/mozjs52-52.9.0esr-x86_64-2.txz: Removed.
This was used only by polkit-0.115.
l/mozjs60-60.9.0esr-x86_64-1.txz: Added.
This is needed for polkit-0.116.
l/polkit-0.116-x86_64-1.txz: Upgraded.
n/ModemManager-1.12.2-x86_64-1.txz: Upgraded.
xap/xine-ui-0.99.12-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xap')
| -rw-r--r-- | source/xap/xine-ui/02_FTBFS.diff | 63 | ||||
| -rwxr-xr-x | source/xap/xine-ui/xine-ui.SlackBuild | 6 |
2 files changed, 1 insertions, 68 deletions
diff --git a/source/xap/xine-ui/02_FTBFS.diff b/source/xap/xine-ui/02_FTBFS.diff deleted file mode 100644 index 0e30f94a4..000000000 --- a/source/xap/xine-ui/02_FTBFS.diff +++ /dev/null @@ -1,63 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -91,6 +91,7 @@ PKG_CHECK_MODULES([XINE], [libxine >= 1. - XINE_LIB_SHIMS - XINE_LIB_OPEN_CLOEXEC - XINE_LIB_SOCKET_CLOEXEC -+XINE_LIB_LIST_NEXT_VALUE - - CFLAGS="${CFLAGS} ${XINE_CFLAGS}" - ---- a/m4/_xine.m4 -+++ b/m4/_xine.m4 -@@ -241,3 +241,21 @@ AC_DEFUN([XINE_LIB_SOCKET_CLOEXEC], - LIBS="$tmp_LIBS" - ]) - -+dnl Test for xine_list_next_value function -+AC_DEFUN([XINE_LIB_LIST_NEXT_VALUE], -+ [AC_MSG_CHECKING([for xine_list_next_value within xine-lib]) -+ tmp_CFLAGS="$CFLAGS" -+ tmp_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $XINE_CFLAGS" -+ LIBS="$LIBS $XINE_LIBS" -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM([ -+ ],[ -+xine_list_next_value (); -+ ])], -+ [AC_DEFINE([HAVE_XINE_LIST_NEXT_VALUE], [1], [Define if xine-lib supports xine_list_next_value]) -+ AC_MSG_RESULT([yes])], -+ [AC_MSG_RESULT([no])]) -+ CFLAGS="$tmp_CFLAGS" -+ LIBS="$tmp_LIBS" -+ ]) ---- a/src/xitk/setup.c -+++ b/src/xitk/setup.c -@@ -32,6 +32,17 @@ - - #include <xine/list.h> - -+#ifdef HAVE_XINE_LIST_NEXT_VALUE -+# define _xine_list_next_value(_xlnv_list,_xlnv_ite) xine_list_next_value (_xlnv_list, _xlnv_ite) -+#else -+static inline void *_xine_list_next_value (xine_list_t *list, xine_list_iterator_t *ite) { -+ if (*ite) -+ *ite = xine_list_next (list, *ite); -+ else -+ *ite = xine_list_front (list); -+ return *ite ? xine_list_get_value (list, *ite) : NULL; -+} -+#endif - - #define WINDOW_WIDTH 630 - #define WINDOW_HEIGHT 530 -@@ -809,7 +820,7 @@ static void setup_change_section(xitk_wi - xitk_widget_t *sw; - xine_list_iterator_t ite = NULL; - while (1) { -- sw = xine_list_next_value (setup->widgets, &ite); -+ sw = _xine_list_next_value (setup->widgets, &ite); - if (!ite) - break; - xitk_destroy_widget (sw); diff --git a/source/xap/xine-ui/xine-ui.SlackBuild b/source/xap/xine-ui/xine-ui.SlackBuild index 3f3c366a3..a43c9804c 100755 --- a/source/xap/xine-ui/xine-ui.SlackBuild +++ b/source/xap/xine-ui/xine-ui.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -60,10 +60,6 @@ rm -rf xine-ui-$VERSION tar xvf $CWD/xine-ui-$VERSION.tar.?z || exit 1 cd xine-ui-$VERSION || exit 1 -# Fix missing function: -zcat $CWD/02_FTBFS.diff.gz | patch -p1 --verbose || exit 1 -autoreconf -vif - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ |