fixes
This commit is contained in:
1 parent
493c5eb93b
commit
03dc9c04af
9 files changed
+179
-12
No files matched your search
@@ -24,8 +24,8 @@ setup(){
|
|||||||
build(){
|
build(){
|
||||||
cp -a unrar libunrar
|
cp -a unrar libunrar
|
||||||
export LDFLAGS+=' -pthread'
|
export LDFLAGS+=' -pthread'
|
||||||
make -C libunrar lib
|
make -C libunrar lib $jobs
|
||||||
make -C unrar -j1
|
make -C unrar $jobs
|
||||||
}
|
}
|
||||||
|
|
||||||
package(){
|
package(){
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
Submitted By: Xi Ruoyao <xry111 at xry111 dot site>
|
||||||
|
Date: 2022-09-16
|
||||||
|
Initial Package Version: 5.4.4
|
||||||
|
Upstream Status: Rejected
|
||||||
|
Origin: Arch Linux, with some modifications
|
||||||
|
Description: 2020-06-30 renodr:
|
||||||
|
Creates a shared liblua library, as well as
|
||||||
|
removes optimization since it causes SIGBUS errors,
|
||||||
|
and sets the search path to /usr from /usr/local.
|
||||||
|
The initial version of this patch was created by
|
||||||
|
Igor Zivkovic, before being rediffed for 5.4.0 by
|
||||||
|
myself with some modifications made.
|
||||||
|
2022-09-16 xry111:
|
||||||
|
Remove an extra newline before $(MYLDFLAGS).
|
||||||
|
MYLDFLAGS is empty by default so it does not break
|
||||||
|
BLFS build, but it may break a custom build with
|
||||||
|
tuning or hardening.
|
||||||
|
|
||||||
|
diff -Naurp lua-5.4.0.orig/Makefile lua-5.4.0/Makefile
|
||||||
|
--- lua-5.4.0.orig/Makefile 2020-04-15 07:55:07.000000000 -0500
|
||||||
|
+++ lua-5.4.0/Makefile 2020-06-30 13:22:00.997938585 -0500
|
||||||
|
@@ -52,7 +52,7 @@ R= $V.0
|
||||||
|
all: $(PLAT)
|
||||||
|
|
||||||
|
$(PLATS) help test clean:
|
||||||
|
- @cd src && $(MAKE) $@
|
||||||
|
+ @cd src && $(MAKE) $@ V=$(V) R=$(R)
|
||||||
|
|
||||||
|
install: dummy
|
||||||
|
cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
|
||||||
|
diff -Naurp lua-5.4.0.orig/src/luaconf.h lua-5.4.0/src/luaconf.h
|
||||||
|
--- lua-5.4.0.orig/src/luaconf.h 2020-06-18 09:25:54.000000000 -0500
|
||||||
|
+++ lua-5.4.0/src/luaconf.h 2020-06-30 13:24:59.294932289 -0500
|
||||||
|
@@ -227,7 +227,7 @@
|
||||||
|
|
||||||
|
#else /* }{ */
|
||||||
|
|
||||||
|
-#define LUA_ROOT "/usr/local/"
|
||||||
|
+#define LUA_ROOT "/usr/"
|
||||||
|
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
|
||||||
|
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
|
||||||
|
|
||||||
|
diff -Naurp lua-5.4.0.orig/src/Makefile lua-5.4.0/src/Makefile
|
||||||
|
--- lua-5.4.0.orig/src/Makefile 2020-04-15 08:00:29.000000000 -0500
|
||||||
|
+++ lua-5.4.0/src/Makefile 2020-06-30 13:24:15.746933827 -0500
|
||||||
|
@@ -7,7 +7,7 @@
|
||||||
|
PLAT= guess
|
||||||
|
|
||||||
|
CC= gcc -std=gnu99
|
||||||
|
-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
|
||||||
|
+CFLAGS= -fPIC -O0 -Wall -Wextra -DLUA_COMPAT_5_3 -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1 $(SYSCFLAGS) $(MYCFLAGS)
|
||||||
|
LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
|
||||||
|
LIBS= -lm $(SYSLIBS) $(MYLIBS)
|
||||||
|
|
||||||
|
@@ -33,6 +33,7 @@ CMCFLAGS= -Os
|
||||||
|
PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris
|
||||||
|
|
||||||
|
LUA_A= liblua.a
|
||||||
|
+LUA_SO= liblua.so
|
||||||
|
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o
|
||||||
|
LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
|
||||||
|
BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
|
||||||
|
@@ -44,7 +45,7 @@ LUAC_T= luac
|
||||||
|
LUAC_O= luac.o
|
||||||
|
|
||||||
|
ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
|
||||||
|
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
|
||||||
|
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
|
||||||
|
ALL_A= $(LUA_A)
|
||||||
|
|
||||||
|
# Targets start here.
|
||||||
|
@@ -60,6 +61,11 @@ $(LUA_A): $(BASE_O)
|
||||||
|
$(AR) $@ $(BASE_O)
|
||||||
|
$(RANLIB) $@
|
||||||
|
|
||||||
|
+$(LUA_SO): $(CORE_O) $(LIB_O)
|
||||||
|
+ $(CC) -shared -ldl -Wl,--soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
|
||||||
|
+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
|
||||||
|
+ ln -sf $(LUA_SO).$(R) $(LUA_SO)
|
||||||
|
+
|
||||||
|
$(LUA_T): $(LUA_O) $(LUA_A)
|
||||||
|
$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
|
||||||
|
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
V=%VER%
|
||||||
|
R=%REL%
|
||||||
|
|
||||||
|
prefix=/usr
|
||||||
|
INSTALL_BIN=${prefix}/bin
|
||||||
|
INSTALL_INC=${prefix}/include
|
||||||
|
INSTALL_LIB=${prefix}/lib
|
||||||
|
INSTALL_MAN=${prefix}/man/man1
|
||||||
|
INSTALL_LMOD=${prefix}/share/lua/${V}
|
||||||
|
INSTALL_CMOD=${prefix}/lib/lua/${V}
|
||||||
|
exec_prefix=${prefix}
|
||||||
|
libdir=${exec_prefix}/lib
|
||||||
|
includedir=${prefix}/include
|
||||||
|
|
||||||
|
Name: Lua
|
||||||
|
Description: An Extensible Extension Language
|
||||||
|
Version: ${R}
|
||||||
|
Requires:
|
||||||
|
Libs: -L${libdir} -llua -lm
|
||||||
|
Cflags: -I${includedir} -fPIC
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
name='lua'
|
||||||
|
release='1'
|
||||||
|
version='5.4.7'
|
||||||
|
url='https://lua.org'
|
||||||
|
description='Powerful lightweight programming language designed for extending applicationsPowerful lightweight programming language designed for extending applications'
|
||||||
|
email='parduscix@yandex.ru'
|
||||||
|
maintainer='sulincix'
|
||||||
|
license=('GPLv3')
|
||||||
|
source=("https://www.lua.org/ftp/lua-$version.tar.gz"
|
||||||
|
"lua.pc"
|
||||||
|
"lua-5.4.7-shared_library-1.patch")
|
||||||
|
depends=(readline)
|
||||||
|
makedepends=()
|
||||||
|
sha256sums=('9fbf5e28ef86c69858f6d3d34eccc32e911c1a28b4120ff3e84aaa70cfbf1e30'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP')
|
||||||
|
group=(dev.lang)
|
||||||
|
uses=()
|
||||||
|
arch=('x86_64')
|
||||||
|
|
||||||
|
cd $name-$version
|
||||||
|
|
||||||
|
prepare(){
|
||||||
|
patch -Np1 -i ../lua-5.4.7-shared_library-1.patch
|
||||||
|
}
|
||||||
|
|
||||||
|
build () {
|
||||||
|
make $jobs
|
||||||
|
}
|
||||||
|
|
||||||
|
package () {
|
||||||
|
make install $jobs \
|
||||||
|
INSTALL_TOP="$DESTDIR" \
|
||||||
|
INSTALL_DATA='cp -d' \
|
||||||
|
INSTALL_MAN="$DESTDIR/usr/share/man/man1" \
|
||||||
|
TO_LIB="liblua.so liblua.so.5.4 liblua.so.5.4.7"
|
||||||
|
install -Dm644 ../lua.pc "$DESTDIR"/usr/lib/pkgconfig/lua54.pc
|
||||||
|
ln -sf lua54.pc "$DESTDIR"/usr/lib/pkgconfig/lua.pc
|
||||||
|
ln -sf lua54.pc "$DESTDIR"/usr/lib/pkgconfig/lua5.4.pc
|
||||||
|
ln -sf lua54.pc "$DESTDIR"/usr/lib/pkgconfig/lua-5.4.pc
|
||||||
|
rm -rvf "$DESTDIR"/share
|
||||||
|
}
|
||||||
|
|
||||||
@@ -8,9 +8,9 @@ email='akarsu@protonmail.com'
|
|||||||
maintainer='akarsu'
|
maintainer='akarsu'
|
||||||
license=('LGPL')
|
license=('LGPL')
|
||||||
source=("https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${version}.tar.xz")
|
source=("https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${version}.tar.xz")
|
||||||
depends=(glib elfutils libxml2 ocr)
|
depends=(glib elfutils libxml2 orc)
|
||||||
makedepends=(gobject-introspection gtk3 libcap python)
|
makedepends=(gobject-introspection gtk3 libcap python)
|
||||||
sha256sums=('779f5ede3016019eec01d64a025583078d3936e35d4288ec2e8433494d757dd9')
|
sha256sums=('c0e75b124c52bb7a0c3dcdb734b2ad260ea7286a8745cf2ea629d4c849e6a958')
|
||||||
group=(media.libs)
|
group=(media.libs)
|
||||||
uses=()
|
uses=()
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
|
|||||||
@@ -17,13 +17,18 @@ arch=('x86_64')
|
|||||||
|
|
||||||
cd $name-$version
|
cd $name-$version
|
||||||
|
|
||||||
|
prepare(){
|
||||||
|
# force disable docs
|
||||||
|
sed -i "s/^subdir('docs')//g" meson.build
|
||||||
|
}
|
||||||
|
|
||||||
setup(){
|
setup(){
|
||||||
meson setup build --prefix=/usr \
|
meson setup build --prefix=/usr \
|
||||||
--libdir=/usr/lib64 \
|
--libdir=/usr/lib64 \
|
||||||
|
-Dsystem-lua=true \
|
||||||
-Ddoc=disabled \
|
-Ddoc=disabled \
|
||||||
-Dsystemd=disabled \
|
-Dsystemd=disabled \
|
||||||
-Dtests=false \
|
-Dtests=false
|
||||||
--buildtype=release
|
|
||||||
}
|
}
|
||||||
build(){
|
build(){
|
||||||
ninja -C build
|
ninja -C build
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
diff --git a/src/terminal-app.cc b/src/terminal-app.cc
|
||||||
|
index ff91e156..c834b314 100644
|
||||||
|
--- a/src/terminal-app.cc
|
||||||
|
+++ b/src/terminal-app.cc
|
||||||
|
@@ -236,6 +236,7 @@ strv_contains_gnome (char **strv)
|
||||||
|
static gboolean
|
||||||
|
terminal_app_should_use_headerbar (TerminalApp *app)
|
||||||
|
{
|
||||||
|
+ return TRUE;
|
||||||
|
gboolean set, use;
|
||||||
|
g_settings_get (app->global_settings, TERMINAL_SETTING_HEADERBAR_KEY, "mb", &set, &use);
|
||||||
|
if (set)
|
||||||
@@ -8,12 +8,14 @@ email='akarsu@protonmail.com'
|
|||||||
maintainer='akarsu'
|
maintainer='akarsu'
|
||||||
license=('GPLv3')
|
license=('GPLv3')
|
||||||
source=("https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
|
source=("https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/${version}/gnome-terminal-${version}.tar.gz"
|
||||||
"00-ignore-language-check.patch"
|
"00-ignore-language-check.patch"
|
||||||
"gnome-terminal-daemon"
|
"01-gnome-terminal-always-headerbar.patch"
|
||||||
"gnome-terminal-daemon.desktop")
|
"gnome-terminal-daemon"
|
||||||
|
"gnome-terminal-daemon.desktop")
|
||||||
depends=(dconf gsettings-desktop-schemas itstool libpcre2 vte3)
|
depends=(dconf gsettings-desktop-schemas itstool libpcre2 vte3)
|
||||||
makedepends=()
|
makedepends=()
|
||||||
sha256sums=('77370b4a00d0cda9ef339ff3aa809d266f3b937f00875176904c5bbefb76ae79'
|
sha256sums=('77370b4a00d0cda9ef339ff3aa809d266f3b937f00875176904c5bbefb76ae79'
|
||||||
|
'SKIP'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'SKIP')
|
'SKIP')
|
||||||
@@ -25,10 +27,11 @@ cd $name-$version
|
|||||||
|
|
||||||
prepare (){
|
prepare (){
|
||||||
patch -Np1 -i ../00-ignore-language-check.patch
|
patch -Np1 -i ../00-ignore-language-check.patch
|
||||||
|
patch -Np1 -i ../01-gnome-terminal-always-headerbar.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
setup () {
|
setup () {
|
||||||
meson setup build --prefix=/usr \
|
command meson setup build --prefix=/usr \
|
||||||
--libdir=/usr/lib64/ \
|
--libdir=/usr/lib64/ \
|
||||||
-Dnautilus_extension=false \
|
-Dnautilus_extension=false \
|
||||||
-Dsearch_provider=false
|
-Dsearch_provider=false
|
||||||
|
|||||||
@@ -50,8 +50,8 @@ package(){
|
|||||||
make install $jobs DESTDIR=${DESTDIR}
|
make install $jobs DESTDIR=${DESTDIR}
|
||||||
make install-ti $jobs DESTDIR=${DESTDIR}
|
make install-ti $jobs DESTDIR=${DESTDIR}
|
||||||
mkdir -p "${DESTDIR}"/usr/share/applications
|
mkdir -p "${DESTDIR}"/usr/share/applications
|
||||||
mkdir -p "${DESTDIR}"/usr/share/xgreeters
|
mkdir -p "${DESTDIR}"/usr/share/xsessions
|
||||||
install {xterm,uxterm}.desktop "${DESTDIR}"/usr/share/applications/
|
install {xterm,uxterm}.desktop "${DESTDIR}"/usr/share/applications/
|
||||||
install ../xterm.desktop "${DESTDIR}"/usr/share/xgreeters/
|
install ../xterm.desktop "${DESTDIR}"/usr/share/xsessions/
|
||||||
}
|
}
|
||||||
|
|
||||||
Reference in new issue
Block a user