From 8cf278c784a4026577e087b421dbd5b61f26e310e56f6214faabfe2e614f3f3d Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Fri, 14 Jun 2024 15:50:44 +0000 Subject: [PATCH 01/12] Accepting request 1180872 from home:uncomfyhalomacro:branches:Publishing - Update to 0.15.3: * A lot of breaking changes in the transition to 0.15.0 https://github.com/sile-typesetter/sile/releases/tag/v0.15.0 * Bug Fixes - build: Distribute vendored compat-5.3.c source file - build: Remove Git from configure dependencies - classes: Correct order of operations when paragraphs are ended manually - packages: Change retrograde package so 'target' version works as expected - build: Bundle all assets in source distribution - core: Allow LUA_PATH env var to take effect at runtime - New build dependencies * cargo/rust * clang to replicate upstream's choice of c compiler * jq - Switch to lua51 for luajit. luajit only supports lua51 for now - New subpackages: fish zsh and bash completions OBS-URL: https://build.opensuse.org/request/show/1180872 OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=40 --- _service | 23 +++--- sile-0.14.17.obscpio | 3 - sile-0.15.3.tar.zst | 3 + sile.changes | 20 +++++ sile.obsinfo | 6 +- sile.spec | 170 +++++++++++++++++++++++++++++++------------ vendor.tar.zst | 3 + 7 files changed, 161 insertions(+), 67 deletions(-) delete mode 100644 sile-0.14.17.obscpio create mode 100644 sile-0.15.3.tar.zst create mode 100644 vendor.tar.zst diff --git a/_service b/_service index 2860c4e..b9510a3 100644 --- a/_service +++ b/_service @@ -1,19 +1,16 @@ - - git - https://github.com/sile-typesetter/sile.git - v0.14.17 - @PARENT_TAG@+@TAG_OFFSET@ - v?(.*)\+0 - \1 - + + https + github.com + /sile-typesetter/sile/releases/download/v0.15.3/sile-0.15.3.tar.zst - - - *.tar - zst + + sile*.tar.zst + zst + true + true - + diff --git a/sile-0.14.17.obscpio b/sile-0.14.17.obscpio deleted file mode 100644 index e959883..0000000 --- a/sile-0.14.17.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd1a57cf80a9ec41303cf556f1a51da1bb7bb66616ade80b9d72c2e1af35d191 -size 11584525 diff --git a/sile-0.15.3.tar.zst b/sile-0.15.3.tar.zst new file mode 100644 index 0000000..079b7c0 --- /dev/null +++ b/sile-0.15.3.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88d24a70710e301ba3400351a82c5f28b49cebcd637b7a59d28b001a56b398c6 +size 3150046 diff --git a/sile.changes b/sile.changes index 41b4ae1..94a564d 100644 --- a/sile.changes +++ b/sile.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Jun 14 10:20:53 UTC 2024 - Soc Virnyl Estela + +- Update to 0.15.3: + * A lot of breaking changes in the transition to 0.15.0 + https://github.com/sile-typesetter/sile/releases/tag/v0.15.0 + * Bug Fixes + - build: Distribute vendored compat-5.3.c source file + - build: Remove Git from configure dependencies + - classes: Correct order of operations when paragraphs are ended manually + - packages: Change retrograde package so 'target' version works as expected + - build: Bundle all assets in source distribution + - core: Allow LUA_PATH env var to take effect at runtime +- New build dependencies + * cargo/rust + * clang to replicate upstream's choice of c compiler + * jq +- Switch to lua51 for luajit. luajit only supports lua51 for now +- New subpackages: fish and bash completions + ------------------------------------------------------------------- Thu May 23 09:56:22 UTC 2024 - Dominique Leuenberger diff --git a/sile.obsinfo b/sile.obsinfo index 0ef3a79..d94958d 100644 --- a/sile.obsinfo +++ b/sile.obsinfo @@ -1,4 +1,4 @@ name: sile -version: 0.14.17 -mtime: 1707331766 -commit: 4276c710386866f7c2eff85c9f3fc1825be5636a +version: 0.15.3 +mtime: 1718059936 +commit: 6404c537a68e9f3c77fc5f70f1a8b912e2c75708 diff --git a/sile.spec b/sile.spec index eafde04..37669db 100644 --- a/sile.spec +++ b/sile.spec @@ -18,53 +18,54 @@ %bcond_without tests Name: sile -Version: 0.14.17 +Version: 0.15.3 Release: 0 Summary: Simon’s Improved Layout Engine Group: Productivity/Publishing License: MIT URL: https://sile-typesetter.org/ -Source0: sile-0.14.17.tar.zst -Source1: sile-rpmlintrc -Source2: LICENSE +Source0: sile-%{version}.tar.zst +Source1: vendor.tar.zst +Source2: sile-rpmlintrc +Source3: LICENSE # Lua modules -Requires: lua54 -BuildRequires: lua54-bit32 -BuildRequires: lua54-devel -Requires: lua54-bit32 -BuildRequires: lua54-cassowary -Requires: lua54-cassowary -Requires: lua54-cldr -BuildRequires: lua54-cliargs -Requires: lua54-cliargs -BuildRequires: lua54-cosmo -Requires: lua54-cosmo -BuildRequires: lua54-luaexpat -Requires: lua54-luaexpat -BuildRequires: lua54-luafilesystem -Requires: lua54-luafilesystem -BuildRequires: lua54-fluent -Requires: lua54-fluent -BuildRequires: lua54-linenoise -Requires: lua54-linenoise -BuildRequires: lua54-loadkit -Requires: lua54-loadkit -Requires: lua54-lpeg -Requires: lua54-luaepnf -BuildRequires: lua54-luarepl -Requires: lua54-luarepl -BuildRequires: lua54-luautf8 -Requires: lua54-luautf8 -Requires: lua54-penlight -BuildRequires: lua54-luasec -Requires: lua54-luasec -Requires: lua54-luasocket -BuildRequires: lua54-vstruct -Requires: lua54-vstruct -BuildRequires: lua54-zlib -# Without this Requires, lua54-zlib isn't counted as a dependency -Requires: lua54-zlib +Requires: lua51 +BuildRequires: lua51-bit32 +BuildRequires: lua51-devel +Requires: lua51-bit32 +BuildRequires: lua51-cassowary +Requires: lua51-cassowary +Requires: lua51-cldr +BuildRequires: lua51-cliargs +Requires: lua51-cliargs +BuildRequires: lua51-cosmo +Requires: lua51-cosmo +BuildRequires: lua51-luaexpat +Requires: lua51-luaexpat +BuildRequires: lua51-luafilesystem +Requires: lua51-luafilesystem +BuildRequires: lua51-fluent +Requires: lua51-fluent +BuildRequires: lua51-linenoise +Requires: lua51-linenoise +BuildRequires: lua51-loadkit +Requires: lua51-loadkit +Requires: lua51-lpeg +Requires: lua51-luaepnf +BuildRequires: lua51-luarepl +Requires: lua51-luarepl +BuildRequires: lua51-luautf8 +Requires: lua51-luautf8 +Requires: lua51-penlight +BuildRequires: lua51-luasec +Requires: lua51-luasec +Requires: lua51-luasocket +BuildRequires: lua51-vstruct +Requires: lua51-vstruct +BuildRequires: lua51-zlib +# Without this Requires, lua51-zlib isn't counted as a dependency +Requires: lua51-zlib # Other Dependencies %if %{with tests} @@ -99,6 +100,21 @@ Suggests: noto-sans-cjk-fonts # Default mono font Suggests: hack-fonts +# Rust build dependencies. We don't need cargo packaging. +# Sile has a flags we have to respect it +BuildRequires: cargo +# Attempt to also use clang too. Seems this is what they used +BuildRequires: clang +BuildRequires: clang-devel +# For tar scm lol +BuildRequires: zstd +# Also additional dep +BuildRequires: jq +BuildRequires: lua51-compat-5.3 +BuildRequires: luajit +BuildRequires: luajit-devel +BuildRequires: pkgconf-pkg-config + %description SILE is a typesetting system; its job is to produce beautiful printed documents. Conceptually, SILE is similar to TeX—from which it borrows some concepts and even @@ -126,17 +142,65 @@ Requires: libtexpdf0 = %{version} A PDF library extracted from TeX's dvipdfmx. Used in software such as SILE. This package contains the development files for libtexpdf. -%prep -%autosetup -p1 +%package fish-completion +Summary: Fish Completion for %{name} +Group: System/Shells +Supplements: (%{name} and fish) +Requires: fish +BuildArch: noarch -cp %{SOURCE2} . +%description fish-completion +Fish command-line completion support for %{name}. + +%package bash-completion +Summary: Bash Completion for %{name} +Group: System/Shells +Supplements: (%{name} and bash-completion) +Requires: bash-completion +BuildArch: noarch + +%description bash-completion +Bash command-line completion support for %{name}. + +%prep +%autosetup -p1 -a1 +cp %{SOURCE3} . %build -autoreconf -fiv -%configure --disable-static --with-system-luarocks +# The macros uses this but we have to respect what upstream config.toml +# uses for the RUSTFLAGS +unset LIBSSH2_SYS_USE_PKG_CONFIG +export RUSTFLAGS=" -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 -C incremental=false -C strip=none" +export CARGO_AUDITABLE=auditable +export CARGO_FEATURE_VENDORED=1 +export CXX=/usr/bin/clang++ +export CC=/usr/bin/clang +export AX_PROG_LUA=/usr/bin/lua5.1 +export LUA_INCLUDE="-I/usr/include/lua5.1" +export CFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" +export CXXFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" +%configure \ + --disable-static \ + --disable-embeded-resources \ + --with-system-lua-sources \ + --with-system-luarocks \ + --with-luajit + %make_build all %install +# The macros uses this but we have to respect what upstream config.toml +# uses for the RUSTFLAGS +unset LIBSSH2_SYS_USE_PKG_CONFIG +export RUSTFLAGS=" -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 -C incremental=false -C strip=none" +export CARGO_AUDITABLE=auditable +export CARGO_FEATURE_VENDORED=1 +export CXX=/usr/bin/clang++ +export CC=/usr/bin/clang +export AX_PROG_LUA=/usr/bin/lua5.1 +export LUA_INCLUDE="-I/usr/include/lua5.1" +export CFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" +export CXXFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" %make_install rm %{buildroot}%{_libdir}/*.la %fdupes %{buildroot} @@ -150,15 +214,15 @@ make check %ldconfig_scriptlets -n libtexpdf-devel %files -%license %{_datadir}/licenses/sile/LICENSE -%license %{_datadir}/licenses/sile/LICENSE-lunamark +%license LICENSE.md %doc %{_datadir}/doc/sile/* %dir %{_datadir}/doc/sile %dir %{_datadir}/licenses/sile %{_bindir}/sile +%{_bindir}/sile-lua %{_datadir}/sile %{_libdir}/sile -%{_mandir}/man1/sile.1.gz +%{_mandir}/man1/sile.1%{?ext_man} %files -n libtexpdf0 %license LICENSE @@ -168,4 +232,14 @@ make check %{_includedir}/libtexpdf %{_libdir}/libtexpdf.so +%files bash-completion +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/%{name} + +%files fish-completion +%dir %{_datadir}/fish +%dir %{_datadir}/fish/vendor_completions.d +%{_datadir}/fish/vendor_completions.d/%{name}.fish + %changelog diff --git a/vendor.tar.zst b/vendor.tar.zst new file mode 100644 index 0000000..f018b92 --- /dev/null +++ b/vendor.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e2f1df18c37e5c927d1d08f87624aac0b9248fa356cfc1cc0e61d665b788121 +size 14778379 From ae8b6d3f9cb15586021af5542f0da28c1a160f47b50f0cdab40b1b8f1b3464df Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Fri, 14 Jun 2024 16:51:49 +0000 Subject: [PATCH 02/12] - Add zsh completion subpackage - Fixup rpmlintrc - Document that we are using lua51 includes because luajit includes are missing from the openSUSE package * boo#1226307 OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=41 --- sile-rpmlintrc | 4 ++-- sile.changes | 9 ++++++++ sile.spec | 58 +++++++++++++++++++++++++++++++------------------- 3 files changed, 47 insertions(+), 24 deletions(-) diff --git a/sile-rpmlintrc b/sile-rpmlintrc index ed6990c..1f1a78d 100644 --- a/sile-rpmlintrc +++ b/sile-rpmlintrc @@ -1,2 +1,2 @@ -# Without the Requires, lua54-zlib module isn't counted as a dependency -addFilter("explicit-lib-dependency lua54-zlib") +# Without the Requires, lua51-zlib module isn't counted as a dependency +addFilter("explicit-lib-dependency lua51-zlib") diff --git a/sile.changes b/sile.changes index 94a564d..89e5246 100644 --- a/sile.changes +++ b/sile.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jun 14 16:42:20 UTC 2024 - Gordon Leung + +- Add zsh completion subpackage +- Fixup rpmlintrc +- Document that we are using lua51 includes because luajit includes + are missing from the openSUSE package + * boo#1226307 + ------------------------------------------------------------------- Fri Jun 14 10:20:53 UTC 2024 - Soc Virnyl Estela diff --git a/sile.spec b/sile.spec index 37669db..51dbb9a 100644 --- a/sile.spec +++ b/sile.spec @@ -21,7 +21,6 @@ Name: sile Version: 0.15.3 Release: 0 Summary: Simon’s Improved Layout Engine -Group: Productivity/Publishing License: MIT URL: https://sile-typesetter.org/ Source0: sile-%{version}.tar.zst @@ -30,15 +29,18 @@ Source2: sile-rpmlintrc Source3: LICENSE # Lua modules -Requires: lua51 +BuildRequires: luajit BuildRequires: lua51-bit32 +# boo#1226307 BuildRequires: lua51-devel +BuildRequires: luajit-devel Requires: lua51-bit32 BuildRequires: lua51-cassowary Requires: lua51-cassowary Requires: lua51-cldr BuildRequires: lua51-cliargs Requires: lua51-cliargs +BuildRequires: lua51-compat-5.3 BuildRequires: lua51-cosmo Requires: lua51-cosmo BuildRequires: lua51-luaexpat @@ -74,7 +76,6 @@ BuildRequires: sil-gentium-fonts %endif BuildRequires: automake BuildRequires: fontconfig-devel -BuildRequires: libtool Requires: fontconfig BuildRequires: freetype2-devel Requires: freetype2 @@ -86,9 +87,12 @@ BuildRequires: glibc-devel Requires: glibc # Harfbuzz's minimum version is now 6 https://github.com/sile-typesetter/sile/releases/tag/v0.14.8 BuildRequires: harfbuzz-devel >= 6.0.0 +BuildRequires: jq BuildRequires: libicu-devel Requires: icu BuildRequires: libpng16-compat-devel +BuildRequires: libtool +BuildRequires: pkgconf-pkg-config BuildRequires: zlib-devel # Default font for SILE # Without this, you have to specify the font every time you write a new .sil @@ -108,12 +112,6 @@ BuildRequires: clang BuildRequires: clang-devel # For tar scm lol BuildRequires: zstd -# Also additional dep -BuildRequires: jq -BuildRequires: lua51-compat-5.3 -BuildRequires: luajit -BuildRequires: luajit-devel -BuildRequires: pkgconf-pkg-config %description SILE is a typesetting system; its job is to produce beautiful printed documents. @@ -134,7 +132,6 @@ This package contains the shared library for libtexpdf. %package -n libtexpdf-devel Summary: Development files for libtexpdf -Group: Productivity/Publishing License: GPL-2.0-or-later Requires: libtexpdf0 = %{version} @@ -142,9 +139,17 @@ Requires: libtexpdf0 = %{version} A PDF library extracted from TeX's dvipdfmx. Used in software such as SILE. This package contains the development files for libtexpdf. +%package bash-completion +Summary: Bash Completion for %{name} +Supplements: (%{name} and bash-completion) +Requires: bash-completion +BuildArch: noarch + +%description bash-completion +Bash command-line completion support for %{name}. + %package fish-completion Summary: Fish Completion for %{name} -Group: System/Shells Supplements: (%{name} and fish) Requires: fish BuildArch: noarch @@ -152,15 +157,14 @@ BuildArch: noarch %description fish-completion Fish command-line completion support for %{name}. -%package bash-completion -Summary: Bash Completion for %{name} -Group: System/Shells -Supplements: (%{name} and bash-completion) -Requires: bash-completion +%package zsh-completion +Summary: Zsh Completion for %{name} +Supplements: (%{name} and zsh) +Requires: zsh BuildArch: noarch -%description bash-completion -Bash command-line completion support for %{name}. +%description zsh-completion +Zsh command-line completion support for %{name}. %prep %autosetup -p1 -a1 @@ -175,7 +179,8 @@ export CARGO_AUDITABLE=auditable export CARGO_FEATURE_VENDORED=1 export CXX=/usr/bin/clang++ export CC=/usr/bin/clang -export AX_PROG_LUA=/usr/bin/lua5.1 +# boo#1226307 +# Force configure file to use lua5.1 includes rather than luajit includes export LUA_INCLUDE="-I/usr/include/lua5.1" export CFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" export CXXFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" @@ -183,8 +188,7 @@ export CXXFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" --disable-static \ --disable-embeded-resources \ --with-system-lua-sources \ - --with-system-luarocks \ - --with-luajit + --with-system-luarocks %make_build all @@ -197,7 +201,8 @@ export CARGO_AUDITABLE=auditable export CARGO_FEATURE_VENDORED=1 export CXX=/usr/bin/clang++ export CC=/usr/bin/clang -export AX_PROG_LUA=/usr/bin/lua5.1 +# boo#1226307 +# Force configure file to use lua5.1 includes rather than luajit includes export LUA_INCLUDE="-I/usr/include/lua5.1" export CFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" export CXXFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" @@ -223,6 +228,7 @@ make check %{_datadir}/sile %{_libdir}/sile %{_mandir}/man1/sile.1%{?ext_man} +%{_mandir}/man1/sile-lua.1%{?ext_man} %files -n libtexpdf0 %license LICENSE @@ -233,13 +239,21 @@ make check %{_libdir}/libtexpdf.so %files bash-completion +%license LICENSE.md %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/%{name} %files fish-completion +%license LICENSE.md %dir %{_datadir}/fish %dir %{_datadir}/fish/vendor_completions.d %{_datadir}/fish/vendor_completions.d/%{name}.fish +%files zsh-completion +%license LICENSE.md +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/_%{name} + %changelog From 0ece15a40390ada7362868fef278a0ae184565d10eb38be76644ed64576e0456 Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Fri, 14 Jun 2024 16:59:27 +0000 Subject: [PATCH 03/12] - Switch back to gcc because clang fails on armv7l OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=42 --- sile.changes | 1 + sile.spec | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/sile.changes b/sile.changes index 89e5246..e1e9aa5 100644 --- a/sile.changes +++ b/sile.changes @@ -6,6 +6,7 @@ Fri Jun 14 16:42:20 UTC 2024 - Gordon Leung - Document that we are using lua51 includes because luajit includes are missing from the openSUSE package * boo#1226307 +- Switch back to gcc because clang fails on armv7l ------------------------------------------------------------------- Fri Jun 14 10:20:53 UTC 2024 - Soc Virnyl Estela diff --git a/sile.spec b/sile.spec index 51dbb9a..09822c0 100644 --- a/sile.spec +++ b/sile.spec @@ -107,9 +107,6 @@ Suggests: hack-fonts # Rust build dependencies. We don't need cargo packaging. # Sile has a flags we have to respect it BuildRequires: cargo -# Attempt to also use clang too. Seems this is what they used -BuildRequires: clang -BuildRequires: clang-devel # For tar scm lol BuildRequires: zstd @@ -177,8 +174,6 @@ unset LIBSSH2_SYS_USE_PKG_CONFIG export RUSTFLAGS=" -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 -C incremental=false -C strip=none" export CARGO_AUDITABLE=auditable export CARGO_FEATURE_VENDORED=1 -export CXX=/usr/bin/clang++ -export CC=/usr/bin/clang # boo#1226307 # Force configure file to use lua5.1 includes rather than luajit includes export LUA_INCLUDE="-I/usr/include/lua5.1" @@ -199,8 +194,6 @@ unset LIBSSH2_SYS_USE_PKG_CONFIG export RUSTFLAGS=" -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 -C incremental=false -C strip=none" export CARGO_AUDITABLE=auditable export CARGO_FEATURE_VENDORED=1 -export CXX=/usr/bin/clang++ -export CC=/usr/bin/clang # boo#1226307 # Force configure file to use lua5.1 includes rather than luajit includes export LUA_INCLUDE="-I/usr/include/lua5.1" From 6c21581e9d932a8a940df0eeeb23178ad3ff5bafe85284b899122d75cd6f5a9b Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Sat, 15 Jun 2024 15:39:40 +0000 Subject: [PATCH 04/12] OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=43 --- sile.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sile.spec b/sile.spec index 09822c0..20de859 100644 --- a/sile.spec +++ b/sile.spec @@ -41,6 +41,7 @@ Requires: lua51-cldr BuildRequires: lua51-cliargs Requires: lua51-cliargs BuildRequires: lua51-compat-5.3 +Requires: lua51-compat-5.3 BuildRequires: lua51-cosmo Requires: lua51-cosmo BuildRequires: lua51-luaexpat From 11d3ad68ef9f09b68dac8c018cc16edf3014c1fe30015e38361604fb27885bdc Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Mon, 17 Jun 2024 16:43:56 +0000 Subject: [PATCH 05/12] OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=44 --- sile.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sile.spec b/sile.spec index 20de859..df01da7 100644 --- a/sile.spec +++ b/sile.spec @@ -140,6 +140,7 @@ This package contains the development files for libtexpdf. %package bash-completion Summary: Bash Completion for %{name} Supplements: (%{name} and bash-completion) +Requires: sile Requires: bash-completion BuildArch: noarch @@ -149,6 +150,7 @@ Bash command-line completion support for %{name}. %package fish-completion Summary: Fish Completion for %{name} Supplements: (%{name} and fish) +Requires: sile Requires: fish BuildArch: noarch @@ -158,6 +160,7 @@ Fish command-line completion support for %{name}. %package zsh-completion Summary: Zsh Completion for %{name} Supplements: (%{name} and zsh) +Requires: sile Requires: zsh BuildArch: noarch From f2a10e3bed6bd9ba60c9ecfb187cb19158d76c8fda1d32dbaabeaeeb9a60fe8e Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Tue, 18 Jun 2024 15:40:20 +0000 Subject: [PATCH 06/12] - Point to use LuaJIT headers and use LuaJIT for Sile OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=45 --- sile.changes | 5 +++++ sile.spec | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sile.changes b/sile.changes index e1e9aa5..82c5de5 100644 --- a/sile.changes +++ b/sile.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 18 15:10:43 UTC 2024 - Soc Virnyl Estela + +- Point to use LuaJIT headers and use LuaJIT for Sile + ------------------------------------------------------------------- Fri Jun 14 16:42:20 UTC 2024 - Gordon Leung diff --git a/sile.spec b/sile.spec index df01da7..06a5bcd 100644 --- a/sile.spec +++ b/sile.spec @@ -140,8 +140,8 @@ This package contains the development files for libtexpdf. %package bash-completion Summary: Bash Completion for %{name} Supplements: (%{name} and bash-completion) -Requires: sile Requires: bash-completion +Requires: sile BuildArch: noarch %description bash-completion @@ -150,8 +150,8 @@ Bash command-line completion support for %{name}. %package fish-completion Summary: Fish Completion for %{name} Supplements: (%{name} and fish) -Requires: sile Requires: fish +Requires: sile BuildArch: noarch %description fish-completion @@ -198,11 +198,10 @@ unset LIBSSH2_SYS_USE_PKG_CONFIG export RUSTFLAGS=" -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 -C incremental=false -C strip=none" export CARGO_AUDITABLE=auditable export CARGO_FEATURE_VENDORED=1 -# boo#1226307 # Force configure file to use lua5.1 includes rather than luajit includes -export LUA_INCLUDE="-I/usr/include/lua5.1" -export CFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" -export CXXFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" +export LUA_INCLUDE="$(pkg-config --cflags-only-I luajit)" +export CFLAGS="%optflags $(pkg-config --cflags-only-I luajit)" +export CXXFLAGS="%optflags $(pkg-config --cflags-only-I luajit)" %make_install rm %{buildroot}%{_libdir}/*.la %fdupes %{buildroot} From 96ddce1854dc22b07a996c33988d2b7d5552f9dc3fd7bfed3ff78152e0417e17 Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Tue, 18 Jun 2024 15:41:39 +0000 Subject: [PATCH 07/12] OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=46 --- sile.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/sile.spec b/sile.spec index 06a5bcd..34b91bc 100644 --- a/sile.spec +++ b/sile.spec @@ -31,8 +31,6 @@ Source3: LICENSE # Lua modules BuildRequires: luajit BuildRequires: lua51-bit32 -# boo#1226307 -BuildRequires: lua51-devel BuildRequires: luajit-devel Requires: lua51-bit32 BuildRequires: lua51-cassowary From c94ac306c6a167aeb778c69d95d8e0a307bd5df216070a2430b5e441bf5855ed Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Tue, 18 Jun 2024 16:10:24 +0000 Subject: [PATCH 08/12] OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=47 --- sile.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sile.spec b/sile.spec index 34b91bc..03830e3 100644 --- a/sile.spec +++ b/sile.spec @@ -30,6 +30,7 @@ Source3: LICENSE # Lua modules BuildRequires: luajit +BuildRequires: lua51-devel BuildRequires: lua51-bit32 BuildRequires: luajit-devel Requires: lua51-bit32 From dc51c83974ed4f4fcc0ef927c5e7f86eeb2cbf2c8babc7f16427a1eb0be99a01 Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Tue, 18 Jun 2024 17:18:38 +0000 Subject: [PATCH 09/12] - Add export LUA_INCLUDE="-I/usr/include/luajit-5_1-2.1" so that we are finally building with LuaJIT headers. * I don't know why the configure file does not detect them by default are they placed in a non-standard location? * Since the headers exist I will close boo#1226307 I guess... OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=48 --- sile.changes | 9 +++++++++ sile.spec | 10 +++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/sile.changes b/sile.changes index 82c5de5..69f378e 100644 --- a/sile.changes +++ b/sile.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jun 18 17:16:10 UTC 2024 - Gordon Leung + +- Add export LUA_INCLUDE="-I/usr/include/luajit-5_1-2.1" + so that we are finally building with LuaJIT headers. + * I don't know why the configure file does not detect them by default + are they placed in a non-standard location? + * Since the headers exist I will close boo#1226307 I guess... + ------------------------------------------------------------------- Tue Jun 18 15:10:43 UTC 2024 - Soc Virnyl Estela diff --git a/sile.spec b/sile.spec index 03830e3..34ed626 100644 --- a/sile.spec +++ b/sile.spec @@ -30,7 +30,6 @@ Source3: LICENSE # Lua modules BuildRequires: luajit -BuildRequires: lua51-devel BuildRequires: lua51-bit32 BuildRequires: luajit-devel Requires: lua51-bit32 @@ -177,11 +176,9 @@ unset LIBSSH2_SYS_USE_PKG_CONFIG export RUSTFLAGS=" -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 -C incremental=false -C strip=none" export CARGO_AUDITABLE=auditable export CARGO_FEATURE_VENDORED=1 -# boo#1226307 -# Force configure file to use lua5.1 includes rather than luajit includes -export LUA_INCLUDE="-I/usr/include/lua5.1" -export CFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" -export CXXFLAGS="%optflags $(pkg-config --cflags-only-I lua5.1 luaji)" +export LUA_INCLUDE="-I/usr/include/luajit-5_1-2.1" +export CFLAGS="%optflags $(pkg-config --cflags-only-I luajit)" +export CXXFLAGS="%optflags $(pkg-config --cflags-only-I luajit)" %configure \ --disable-static \ --disable-embeded-resources \ @@ -197,7 +194,6 @@ unset LIBSSH2_SYS_USE_PKG_CONFIG export RUSTFLAGS=" -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 -C incremental=false -C strip=none" export CARGO_AUDITABLE=auditable export CARGO_FEATURE_VENDORED=1 -# Force configure file to use lua5.1 includes rather than luajit includes export LUA_INCLUDE="$(pkg-config --cflags-only-I luajit)" export CFLAGS="%optflags $(pkg-config --cflags-only-I luajit)" export CXXFLAGS="%optflags $(pkg-config --cflags-only-I luajit)" From f34067a19cf980a1bd1d4e8767b2bf8d1681d9b4a83db336b200818f8a2bc5aa Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Wed, 19 Jun 2024 00:01:23 +0000 Subject: [PATCH 10/12] Try using pkgconfig instead of hardcoding luajit header path OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=49 --- sile.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sile.spec b/sile.spec index 34ed626..957b9d7 100644 --- a/sile.spec +++ b/sile.spec @@ -176,7 +176,7 @@ unset LIBSSH2_SYS_USE_PKG_CONFIG export RUSTFLAGS=" -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 -C incremental=false -C strip=none" export CARGO_AUDITABLE=auditable export CARGO_FEATURE_VENDORED=1 -export LUA_INCLUDE="-I/usr/include/luajit-5_1-2.1" +export LUA_INCLUDE="$(pkg-config --cflags-only-I luajit)" export CFLAGS="%optflags $(pkg-config --cflags-only-I luajit)" export CXXFLAGS="%optflags $(pkg-config --cflags-only-I luajit)" %configure \ From 9972cc98582d97f9a0796e39d0a73ad5b0d58722eaff03a6ed7253a550831a5e Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Wed, 19 Jun 2024 00:10:36 +0000 Subject: [PATCH 11/12] OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=50 --- sile.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sile.spec b/sile.spec index 957b9d7..e0bf9d5 100644 --- a/sile.spec +++ b/sile.spec @@ -30,8 +30,8 @@ Source3: LICENSE # Lua modules BuildRequires: luajit -BuildRequires: lua51-bit32 BuildRequires: luajit-devel +BuildRequires: lua51-bit32 Requires: lua51-bit32 BuildRequires: lua51-cassowary Requires: lua51-cassowary From d2baa0a022696b8f767bc35756711138ecb0bf70212f188101ce779624b69742 Mon Sep 17 00:00:00 2001 From: Gordon Leung Date: Wed, 19 Jun 2024 00:14:17 +0000 Subject: [PATCH 12/12] OBS-URL: https://build.opensuse.org/package/show/Publishing/sile?expand=0&rev=51 --- sile.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sile.changes b/sile.changes index 69f378e..72dc9d9 100644 --- a/sile.changes +++ b/sile.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Jun 18 17:16:10 UTC 2024 - Gordon Leung -- Add export LUA_INCLUDE="-I/usr/include/luajit-5_1-2.1" +- Add export LUA_INCLUDE="$(pkg-config --cflags-only-I luajit)" so that we are finally building with LuaJIT headers. * I don't know why the configure file does not detect them by default are they placed in a non-standard location?