From 35a79664a415ebd05a3d45d10bf5bbef4ef4f5f5 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Mon, 28 Mar 2022 19:36:37 +0200 Subject: [PATCH 1/3] lilypond: update to 2.23.7 --- srcpkgs/lilypond/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template index 0cc74759a100..3b2d73fa05c9 100644 --- a/srcpkgs/lilypond/template +++ b/srcpkgs/lilypond/template @@ -1,6 +1,6 @@ # Template file for 'lilypond' pkgname=lilypond -version=2.23.6 +version=2.23.7 revision=1 build_wrksrc="build" build_style="gnu-configure" @@ -9,20 +9,18 @@ configure_args="--disable-documentation ac_cv_func_isinf=yes --with-texgyre-dir=/usr/share/texmf-dist/fonts/opentype/public/tex-gyre" hostmakedepends="autogen automake bison flex fontforge gettext guile1.8 perl pkg-config python3 t1utils tar texinfo texlive" -makedepends="gc-devel guile1.8-devel libltdl-devel pango-devel" -depends="ghostscript python3" +makedepends="gc-devel guile-devel libltdl-devel pango-devel" +depends="ghostscript guile python3" checkdepends="ImageMagick rsync texi2html" short_desc="Music engraving program" maintainer="newbluemoon " license="GPL-3.0-or-later, GFDL-1.3-or-later" homepage="https://lilypond.org/" distfiles="https://lilypond.org/downloads/sources/v2.23/lilypond-${version}.tar.gz" -checksum=a179bd974a0e64390efef5bb0cc1e7287f1218237548433adba51c4f25bba2ce +checksum=b5674df4c2371cb6d59a06ea54eaba6c87f2e7c503c9f17ec3db3facd61807c0 python_version=3 if [ -n "${CROSS_BUILD}" ]; then - # needs guile-config-1.8 - hostmakedepends+=" guile1.8-devel" makedepends+=" libfl-devel" fi From 396193f99769923e4079e030196c24767e98963b Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Mon, 28 Mar 2022 19:36:55 +0200 Subject: [PATCH 2/3] lilypond-doc: update to 2.23.7 --- srcpkgs/lilypond-doc/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template index f0ee3b262e90..03e97dd21c40 100644 --- a/srcpkgs/lilypond-doc/template +++ b/srcpkgs/lilypond-doc/template @@ -1,17 +1,16 @@ # Template file for 'lilypond-doc' pkgname=lilypond-doc -version=2.23.6 +version=2.23.7 revision=1 create_wrksrc=yes short_desc="Documentation for the lilypond music engraving program" maintainer="newbluemoon " license="GPL-3.0-or-later, GFDL-1.3-or-later" homepage="https://lilypond.org/" -distfiles="https://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2" -checksum=1fada73c22dbcfa6224744a8ad87e10cced784f98fd9243768c96ee5bc0ee45d +distfiles="https://gitlab.com/lilypond/lilypond/-/releases/v${version}/downloads/lilypond-${version}-documentation.tar.xz" +checksum=a257ba62e2f2588754482a2a171ffae06385b28633b628b55bed71524c1ee597 do_install() { - vmkdir usr - rm share/info/lilypond - mv share ${DESTDIR}/usr/ + vmkdir usr/share/doc/lilypond/html + mv * ${DESTDIR}/usr/share/doc/lilypond/html } From 4048ec58867e54345312dece065007ce9c394460 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Mon, 28 Mar 2022 19:43:08 +0200 Subject: [PATCH 3/3] guile1.8: remove --- common/shlibs | 6 --- srcpkgs/guile1.8-devel | 1 - srcpkgs/guile1.8/patches/cross.patch | 25 ---------- srcpkgs/guile1.8/patches/musl-longlong.patch | 13 ----- .../guile1.8/patches/musl-sigcontext.patch | 49 ------------------- srcpkgs/guile1.8/template | 34 ------------- srcpkgs/removed-packages/template | 2 + 7 files changed, 2 insertions(+), 128 deletions(-) delete mode 120000 srcpkgs/guile1.8-devel delete mode 100644 srcpkgs/guile1.8/patches/cross.patch delete mode 100644 srcpkgs/guile1.8/patches/musl-longlong.patch delete mode 100644 srcpkgs/guile1.8/patches/musl-sigcontext.patch delete mode 100644 srcpkgs/guile1.8/template diff --git a/common/shlibs b/common/shlibs index 673c62085f5b..dc2ad4283067 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3104,12 +3104,6 @@ libprotoc.so.30 libprotoc-3.19.4_1 libprotobuf.so.30 libprotobuf-3.19.4_1 libsombok.so.3 sombok-2.4.0_1 libdeviceclient.so.0 pragha-1.3.3_1 -libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1 -libguile-srfi-srfi-4-v-3.so.3 guile1.8-1.8.8_1 -libguile-srfi-srfi-60-v-2.so.2 guile1.8-1.8.8_1 -libguile.so.17 guile1.8-1.8.8_1 -libguilereadline-v-17.so.17 guile1.8-1.8.8_1 -libguile-srfi-srfi-13-14-v-3.so.3 guile1.8-1.8.8_1 libykclient.so.3 ykclient-2.15_1 libbooster.so.0 cppcms-1.0.5_1 libcppcms.so.1 cppcms-1.0.5_1 diff --git a/srcpkgs/guile1.8-devel b/srcpkgs/guile1.8-devel deleted file mode 120000 index 8cfa70ed3ec5..000000000000 --- a/srcpkgs/guile1.8-devel +++ /dev/null @@ -1 +0,0 @@ -guile1.8 \ No newline at end of file diff --git a/srcpkgs/guile1.8/patches/cross.patch b/srcpkgs/guile1.8/patches/cross.patch deleted file mode 100644 index 9e0540741bff..000000000000 --- a/srcpkgs/guile1.8/patches/cross.patch +++ /dev/null @@ -1,25 +0,0 @@ -Configure cannot execute built binary when cross compiling. -The patch skips the test and assumes "no". -This is how it is done in version 2.0.14's configure script. - ---- a/configure 2017-09-15 11:14:54.427295947 +0200 -+++ b/configure 2017-09-15 14:11:07.253528181 +0200 -@@ -19802,6 +19802,7 @@ - $as_echo_n "checking whether pthread_attr_getstack works for the main thread... " >&6; } - old_CFLAGS="$CFLAGS" - CFLAGS="$PTHREAD_CFLAGS $CFLAGS" -+if test "$cross_compiling" = no; then - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -@@ -19849,6 +19850,10 @@ - conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - -+else -+ works="assuming it doesn't" -+fi -+ - CFLAGS="$old_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $works" >&5 - $as_echo "$works" >&6; } diff --git a/srcpkgs/guile1.8/patches/musl-longlong.patch b/srcpkgs/guile1.8/patches/musl-longlong.patch deleted file mode 100644 index 3a19617d50c6..000000000000 --- a/srcpkgs/guile1.8/patches/musl-longlong.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/libguile/fports.c 2010-12-13 18:24:40.000000000 +0100 -+++ b/libguile/fports.c 2017-10-25 21:51:07.234942515 +0200 -@@ -78,8 +78,8 @@ - #define OFF_T_MAX LONG_MAX - #define OFF_T_MIN LONG_MIN - #elif SIZEOF_OFF_T == SIZEOF_LONG_LONG --#define OFF_T_MAX LONG_LONG_MAX --#define OFF_T_MIN LONG_LONG_MIN -+#define OFF_T_MAX LLONG_MAX -+#define OFF_T_MIN LLONG_MIN - #else - #error Oops, unknown OFF_T size - #endif diff --git a/srcpkgs/guile1.8/patches/musl-sigcontext.patch b/srcpkgs/guile1.8/patches/musl-sigcontext.patch deleted file mode 100644 index 9fa3279fc34b..000000000000 --- a/srcpkgs/guile1.8/patches/musl-sigcontext.patch +++ /dev/null @@ -1,49 +0,0 @@ -When checking for the location of the sigcontext struct it is not taken into -account that a different libc than glibc could be used. It falls back to libc5 -which leads to a sigcontext redefinition error when using the musl libc. The -patch simply removes the misleading checks since we're way beyond those -versions anyway. - ---- a/libguile/gc_os_dep.c 2010-12-13 18:25:01.000000000 +0100 -+++ b/libguile/gc_os_dep.c 2017-09-17 23:01:55.494204333 +0200 -@@ -1445,40 +1445,6 @@ - /* include assembly code to do it well. */ - # endif - --# if defined(LINUX) && !defined(POWERPC) -- --# if 0 --# include --# if (LINUX_VERSION_CODE <= 0x10400) -- /* Ugly hack to get struct sigcontext_struct definition. Required */ -- /* for some early 1.3.X releases. Will hopefully go away soon. */ -- /* in some later Linux releases, asm/sigcontext.h may have to */ -- /* be included instead. */ --# define __KERNEL__ --# include --# undef __KERNEL__ --# endif -- --# else -- -- /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */ -- /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */ -- /* prototypes, so we have to include the top-level sigcontext.h to */ -- /* make sure the former gets defined to be the latter if appropriate. */ --# include --# if 2 <= __GLIBC__ --# if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__ -- /* glibc 2.1 no longer has sigcontext.h. But signal.h */ -- /* has the right declaration for glibc 2.1. */ --# include --# endif /* 0 == __GLIBC_MINOR__ */ --# else /* not 2 <= __GLIBC__ */ -- /* libc5 doesn't have : go directly with the kernel */ -- /* one. Check LINUX_VERSION_CODE to see which we should reference. */ --# include --# endif /* 2 <= __GLIBC__ */ --# endif --# endif - # if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MACOS) - # include - # if !defined(MSWIN32) && !defined(SUNOS4) diff --git a/srcpkgs/guile1.8/template b/srcpkgs/guile1.8/template deleted file mode 100644 index 2f575000cbfe..000000000000 --- a/srcpkgs/guile1.8/template +++ /dev/null @@ -1,34 +0,0 @@ -# Template file for 'guile1.8' -pkgname=guile1.8 -version=1.8.8 -revision=3 -wrksrc=${pkgname/1.8/}-${version} -build_style="gnu-configure" -configure_args="--disable-static --disable-error-on-warning --program-suffix='-1.8'" -make_build_args="GUILE_FOR_BUILD=guile" -hostmakedepends="pkg-config guile" -makedepends="gmp-devel libltdl-devel ncurses-devel readline-devel" -short_desc="Portable, embeddable Scheme implementation written in C" -maintainer="newbluemoon " -license="LGPL-2.1-or-later" -homepage="https://www.gnu.org/software/guile/guile.html" -distfiles="${GNU_SITE}/${pkgname/1.8/}/${pkgname/1.8/}-${version}.tar.gz" -checksum=c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 - -post_install() { - # conflicts with guile-2.0 - rm -rf ${DESTDIR}/usr/share/info -} - -guile1.8-devel_package() { - short_desc+=" - development files" - depends="gmp-devel ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/bin/guile-config-1.8 - sed -i '1s|/usr/bin/guile|/usr/bin/guile-1.8|' ${PKGDESTDIR}/usr/bin/guile-config-1.8 - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/share/aclocal - mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-1.8.m4} - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 6859fe29da93..6da5e775c432 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -416,6 +416,8 @@ replaces=" zuluplay-devel<=1.1_1 zuluplay<=1.1_1 bgc<=1.0.1_1 + guile1.8-devel<=1.8.8_3 + guile1.8<=1.8.8_3 " if [ "$XBPS_TARGET_LIBC" = "musl" ]; then