From 3c454513f03376d46c08645f47df63f6a7438c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 29 Oct 2024 19:44:48 +0100 Subject: RPM: Minor update after building all packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/docker/osstw/Dockerfile.i686 | 22 +++++++++---- redhat/docker/osstw/Dockerfile.x86_64 | 2 +- .../osstw/heimdal-7.8.0-ftbfs_osstw_i686.patch | 36 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 redhat/docker/osstw/heimdal-7.8.0-ftbfs_osstw_i686.patch (limited to 'redhat/docker/osstw') diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index b54fcea1f..59a9bcf9a 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM opensuse32/tumbleweed:latest -ARG TDE_VERSION=14.1.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=i686 # Add PACKMAN repository @@ -13,27 +13,37 @@ RUN set -x \ && setarch ${ARCH} zypper -n install --allow-vendor-change $(>/etc/sudoers USER trinity COPY rpmmacros /home/trinity/.rpmmacros +# Fix taglib headers to match actual built library (amarok, soundkonverter) +RUN set -x \ + && sed -i "/usr/include/taglib/id3v1tag.h" -e "s|offset_t tagOffset|long tagOffset|" \ + && sed -i "/usr/include/taglib/tfile.h" -e "s|offset_t offset|long offset|" -e "s|offset_t start|long start|" + # Add YUM repository for locally built packages -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ +RUN set -x \ + && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch # Install heimdal development files -RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-4.1.src.rpm \ +COPY heimdal-7.8.0-ftbfs_osstw_i686.patch /home/trinity/rpmbuild/SOURCES +RUN set -x \ + && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-4.1.src.rpm \ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ - && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|.*|Patch0: heimdal-7.8.0-ftbfs_osstw_i686.patch|" \ && LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" setarch ${ARCH} rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install # Add lilypond (i686 only) -RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.2.src.rpm \ +RUN set -x \ + && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.3.src.rpm \ && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm" diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index b8c5328a1..786107fe7 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/tumbleweed:latest -ARG TDE_VERSION=14.1.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/osstw/heimdal-7.8.0-ftbfs_osstw_i686.patch b/redhat/docker/osstw/heimdal-7.8.0-ftbfs_osstw_i686.patch new file mode 100644 index 000000000..b2cf2de50 --- /dev/null +++ b/redhat/docker/osstw/heimdal-7.8.0-ftbfs_osstw_i686.patch @@ -0,0 +1,36 @@ +diff --git a/lib/libedit/src/common.c b/lib/libedit/src/common.c +index 2708605..a166f29 100644 +--- a/lib/libedit/src/common.c ++++ b/lib/libedit/src/common.c +@@ -366,12 +366,13 @@ libedit_private el_action_t + ed_quoted_insert(EditLine *el, wint_t c) + { + int num; ++ wchar_t ch; + + tty_quotemode(el); +- num = el_wgetc(el, &c); ++ num = el_wgetc(el, &ch); + tty_noquotemode(el); + if (num == 1) +- return ed_insert(el, c); ++ return ed_insert(el, ch); + else + return ed_end_of_file(el, 0); + } +diff --git a/lib/libedit/src/search.c b/lib/libedit/src/search.c +index 5226cf5..1cc8383 100644 +--- a/lib/libedit/src/search.c ++++ b/lib/libedit/src/search.c +@@ -603,8 +603,10 @@ cv_csearch(EditLine *el, int direction, wint_t ch, int count, int tflag) + return CC_ERROR; + + if (ch == (wint_t)-1) { +- if (el_wgetc(el, &ch) != 1) ++ wchar_t c; ++ if (el_wgetc(el, &c) != 1) + return ed_end_of_file(el, 0); ++ ch = c; + } + + /* Save for ';' and ',' commands */ -- cgit v1.2.1