summaryrefslogtreecommitdiffstats
path: root/source/xap
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-09-28 21:37:06 +0000
committer Eric Hameleers <alien@slackware.com>2023-09-29 00:41:46 +0200
commite9c0b54c5cc41c2482d05f82b68e6bc6abfc0e77 (patch)
tree760907293e8313a935a76dd563c3a5eeb21d9594 /source/xap
parentd5cee66c5760e888f2b53c2e21453a3b11832425 (diff)
downloadcurrent-e9c0b54c5cc41c2482d05f82b68e6bc6abfc0e77.tar.gz
current-e9c0b54c5cc41c2482d05f82b68e6bc6abfc0e77.tar.xz
Thu Sep 28 21:37:06 UTC 202320230928213706
ap/mpg123-1.32.2-x86_64-1.txz: Upgraded. l/cairo-1.18.0-x86_64-1.txz: Upgraded. l/gtk4-4.12.3-x86_64-1.txz: Upgraded. x/fonttosfnt-1.2.3-x86_64-1.txz: Upgraded. xap/geeqie-2.1-x86_64-2.txz: Rebuilt. Patched and recompiled against lua-5.4.6. xap/mozilla-firefox-115.3.1esr-x86_64-1.txz: Upgraded. This update contains a security fix. For more information, see: https://www.mozilla.org/en-US/firefox/115.3.1/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2023-44/ https://www.cve.org/CVERecord?id=CVE-2023-5217 (* Security fix *) xfce/xfce4-panel-4.18.5-x86_64-1.txz: Upgraded. testing/packages/aaa_glibc-solibs-2.38-x86_64-1.txz: Added. testing/packages/glibc-2.38-x86_64-1.txz: Added. Instead of building the deprecated glibc crypt library, bundle libxcrypt-4.4.36 (both .so.1 compat version and .so.2 new API version). testing/packages/glibc-i18n-2.38-x86_64-1.txz: Added. testing/packages/glibc-profile-2.38-x86_64-1.txz: Added.
Diffstat (limited to 'source/xap')
-rw-r--r--source/xap/geeqie/geeqie-2.1-lua.patch14
-rwxr-xr-xsource/xap/geeqie/geeqie.SlackBuild6
2 files changed, 18 insertions, 2 deletions
diff --git a/source/xap/geeqie/geeqie-2.1-lua.patch b/source/xap/geeqie/geeqie-2.1-lua.patch
new file mode 100644
index 000000000..c1c3c6de3
--- /dev/null
+++ b/source/xap/geeqie/geeqie-2.1-lua.patch
@@ -0,0 +1,14 @@
+--- geeqie-2.1/src/lua.cc 2023-06-17 14:12:30.000000000 +0200
++++ geeqie-2.1/src/lua.cc.new 2023-07-13 11:28:14.538188452 +0200
+@@ -24,9 +24,11 @@
+
+ #define _XOPEN_SOURCE
+
++extern "C" {
+ #include <lua.h>
+ #include <lauxlib.h>
+ #include <lualib.h>
++}
+
+ #include <stdio.h>
+ #include <glib.h>
diff --git a/source/xap/geeqie/geeqie.SlackBuild b/source/xap/geeqie/geeqie.SlackBuild
index a45031076..d2138c0a4 100755
--- a/source/xap/geeqie/geeqie.SlackBuild
+++ b/source/xap/geeqie/geeqie.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2010, 2011, 2012, 2015, 2016, 2018, 2022 Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2011, 2012, 2015, 2016, 2018, 2022, 2023 Patrick Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=geeqie
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Download the geeqie Git head if there's no tarball:
if ! /bin/ls $CWD/geeqie*tar* 1> /dev/null 2> /dev/null ; then
@@ -89,6 +89,8 @@ find . \
mv ChangeLog.gqview ChangeLog
+cat $CWD/geeqie-2.1-lua.patch | patch -p1 --verbose || exit 1
+
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"