From 06dfcd4f6545236f18800aa99cb1e184936728e2 Mon Sep 17 00:00:00 2001 From: ngn Date: Sun, 25 Aug 2024 16:11:58 +0300 Subject: [PATCH] fix: package cleanups to prevent build failures --- src/epiphany/pkg.sh | 27 ++++++++++++++++------- src/gdk-pixbuf/pkg.sh | 19 +++++++++++----- src/graphviz/changes.md | 3 +++ src/graphviz/pkg.sh | 31 +++++++++++++++++--------- src/gst-plugins-bad/changes.md | 3 +++ src/gst-plugins-bad/pkg.sh | 35 ++++++++++++++++++----------- src/gst-plugins-base/changes.md | 3 +++ src/gst-plugins-base/pkg.sh | 39 +++++++++++++++++++++------------ src/gst-plugins-good/changes.md | 3 +++ src/gst-plugins-good/pkg.sh | 37 +++++++++++++++++++------------ 10 files changed, 135 insertions(+), 65 deletions(-) diff --git a/src/epiphany/pkg.sh b/src/epiphany/pkg.sh index b7b64c8..96dca6e 100644 --- a/src/epiphany/pkg.sh +++ b/src/epiphany/pkg.sh @@ -1,25 +1,36 @@ NAME="epiphany" DESC="Simple yet powerful GNOME web browser targeted at non-technical users" VERSION="44.6" -FILES=("https://download.gnome.org/sources/epiphany/${VERSION%.*}/epiphany-$VERSION.tar.xz") + +FILES=("https://download.gnome.org/sources/epiphany/${VERSION%.*}/epiphany-${VERSION}.tar.xz") HASHES=("fbc40317261873100f625736ec6a511c") + DEPENDS=( - "gcr4" "iso-codes" "json-glib" - "nettle" "webkitgtk" "gnome-keyring" - "libadwaita" "libportal" "graphene" + "cairo" "dconf" "gcc-libs" + "gdk-pixbuf" "glib" "glibc" + "gmp" "graphene" "gstreamer" + "gtk4" "hicolor-icon-theme" "json-glib" + "libarchive" "libportal" "libsecret" + "libsoup" "libxml2" "nettle" + "pango" "sqlite" "webkitgtk" "gcr4" +) +BUILD=( + "docbook-xml" "glib" "gobject-introspection" + "meson" "startup-notification" "aspell" ) PACKAGE() { - tar xf $NAME-$VERSION.tar.xz - cd $NAME-$VERSION + tar xf "${NAME}-${VERSION}.tar.xz" + cd "${NAME}-${VERSION}" mkdir build cd build meson setup --prefix=/usr --buildtype=release .. - ninja $MAKEFLAGS && DESTDIR="$ROOTDIR" ninja install + ninja + DESTDIR="${ROOTDIR}" ninja install - cd ../.. && rm -r $NAME-$VERSION + cd ../.. && rm -r "${NAME}-${VERSION}" } INSTALL(){ diff --git a/src/gdk-pixbuf/pkg.sh b/src/gdk-pixbuf/pkg.sh index 0f46c36..d123621 100644 --- a/src/gdk-pixbuf/pkg.sh +++ b/src/gdk-pixbuf/pkg.sh @@ -1,13 +1,19 @@ NAME="gdk-pixbuf" DESC="Toolkit for image loading and pixel buffer manipulation" VERSION="2.42.10" -FILES=("https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-$VERSION.tar.xz") + +FILES=("https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-${VERSION}.tar.xz") HASHES=("4a62f339cb1424693fba9bb7ffef8150") -DEPENDS=("glib" "libjpeg-turbo" "libpng" "shared-mime-info") + +DEPENDS=( + "glib" "glibc" "libtiff" + "libjpeg-turbo" "libpng" "shared-mime-info" +) +BUILD=("meson" "pypi-docutils" "gobject-introspection") PACKAGE() { - tar xf $NAME-$VERSION.tar.xz - cd $NAME-$VERSION + tar xf "${NAME}-${VERSION}.tar.xz" + cd "${NAME}-${VERSION}" mkdir build cd build @@ -16,9 +22,10 @@ PACKAGE() { --prefix=/usr \ --buildtype=release \ --wrap-mode=nofallback - ninja && DESTDIR="$ROOTDIR" ninja install + ninja + DESTDIR="${ROOTDIR}" ninja install - cd ../.. && rm -rf $NAME-$VERSION + cd ../.. && rm -r "${NAME}-${VERSION}" } INSTALL(){ diff --git a/src/graphviz/changes.md b/src/graphviz/changes.md index 2000a70..b3b8f19 100644 --- a/src/graphviz/changes.md +++ b/src/graphviz/changes.md @@ -1,2 +1,5 @@ +# 10.0.1 +Updated to a newer upstream release + # 8.1.0 First version diff --git a/src/graphviz/pkg.sh b/src/graphviz/pkg.sh index 0b3f393..4a2b9ae 100644 --- a/src/graphviz/pkg.sh +++ b/src/graphviz/pkg.sh @@ -1,19 +1,30 @@ NAME="graphviz" DESC="Graph visualization software" -VERSION="8.1.0" -FILES=("https://gitlab.com/graphviz/graphviz/-/archive/$VERSION/graphviz-$VERSION.tar.bz2") -HASHES=("e6a45773e84d3f83fed87cb6290563e6") -DEPENDS=("fontconfig" "libpng" "pango" "cairo") +VERSION="10.0.1" + +FILES=("https://gitlab.com/graphviz/graphviz/-/archive/${VERSION}/graphviz-${VERSION}.tar.bz2") +HASHES=("5d343d0ba08dc11624d3961af2b4755c") + +DEPENDS=( + "libtool" "librsvg" "pango" +) +BUILD=("tk" "python3" "qt5") PACKAGE() { - tar xf $NAME-$VERSION.tar.bz2 - cd $NAME-$VERSION + tar xf "${NAME}-${VERSION}.tar.bz2" + cd "${NAME}-${VERSION}" + + export CXXFLAGS+=' -fPIC -fpermissive' sed -i '/LIBPOSTFIX="64"/s/64//' configure.ac ./autogen.sh - ./configure --prefix=/usr \ - --docdir=/usr/share/doc/graphviz-$VERSION - make && make DESTDIR="$ROOTDIR" install + ./configure --prefix=/usr \ + --enable-python3=yes \ + --disable-python \ + --docdir="/usr/share/doc/graphviz-${VERSION}" + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make + make DESTDIR="${ROOTDIR}" install - cd .. && rm -rf $NAME-$VERSION + cd .. && rm -r "${NAME}-${VERSION}" } diff --git a/src/gst-plugins-bad/changes.md b/src/gst-plugins-bad/changes.md index 9180c3d..d167dc1 100644 --- a/src/gst-plugins-bad/changes.md +++ b/src/gst-plugins-bad/changes.md @@ -1,2 +1,5 @@ +# 1.22.10 +Updated to a newer upstream release + # 1.22.5 First version diff --git a/src/gst-plugins-bad/pkg.sh b/src/gst-plugins-bad/pkg.sh index bb08e8f..330028b 100644 --- a/src/gst-plugins-bad/pkg.sh +++ b/src/gst-plugins-bad/pkg.sh @@ -1,24 +1,33 @@ NAME="gst-plugins-bad" DESC="Set of GStreamer plug-ins that aren't up to par compared to the rest" -VERSION="1.22.5" -FILES=("https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-$VERSION.tar.xz") +VERSION="1.22.10" + +FILES=("https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${VERSION}.tar.xz") HASHES=("d18cde538d5c954e94f888143e703a52") -DEPENDS=("gst-plugins-base") + +DEPENDS=( + "gst-plugins-base" "bzip2" "cairo" + "curl" "faad2" "gcc-libs" + "glib" "glibc" "json-glib" +) +BUILD=("gobject-introspection" "graphene") PACKAGE() { - tar xf $NAME-$VERSION.tar.xz - cd $NAME-$VERSION + tar xf "${NAME}-${VERSION}.tar.xz" + cd "${NAME}-${VERSION}" mkdir build cd build - meson setup .. \ - --prefix=/usr \ - --buildtype=release \ - -Dgpl=enabled \ - -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/12.0-systemd/ \ - -Dpackage-name="GStreamer $VERSION" - ninja && DESTDIR="$ROOTDIR" ninja install + meson setup .. \ + --prefix=/usr \ + --buildtype=release \ + -Dgpl=enabled \ + -Dpackage-origin="https://git.matterlinux.xyz/Matter/desktop" \ + -Dpackage-name="GStreamer ${VERSION}" - cd ../.. && rm -rf $NAME-$VERSION + ninja + DESTDIR="${ROOTDIR}" ninja install + + cd ../.. && rm -r "${NAME}-${VERSION}" } diff --git a/src/gst-plugins-base/changes.md b/src/gst-plugins-base/changes.md index 9180c3d..d167dc1 100644 --- a/src/gst-plugins-base/changes.md +++ b/src/gst-plugins-base/changes.md @@ -1,2 +1,5 @@ +# 1.22.10 +Updated to a newer upstream release + # 1.22.5 First version diff --git a/src/gst-plugins-base/pkg.sh b/src/gst-plugins-base/pkg.sh index db57da7..2644ce5 100644 --- a/src/gst-plugins-base/pkg.sh +++ b/src/gst-plugins-base/pkg.sh @@ -1,24 +1,35 @@ NAME="gst-plugins-base" DESC="GStreamer Base Plug-ins is a well-groomed and well-maintained collection of GStreamer plug-ins and elements" -VERSION="1.22.5" -FILES=("https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$VERSION.tar.xz") -HASHES=("cc16aeaefdfd3917e009412a22d07fac") -DEPENDS=("gstreamer" "alsa-lib") +VERSION="1.22.10" + +FILES=("https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${VERSION}.tar.xz") +HASHES=("8b3fdd849cfc198c8e5ceb3d8513661b") + +DEPENDS=( + "gstreamer" "alsa-lib" "cairo" + "glib" "glibc" "graphene" + "gstreamer" "libjpeg-turbo" "libogg" + "libpng" "libtheora" "libvorbis" + "libx11" "opus" "pango" +) +BUILD=("gobject-introspection" "iso-codes") PACKAGE() { - tar xf $NAME-$VERSION.tar.xz - cd $NAME-$VERSION + tar xf "${NAME}-${VERSION}.tar.xz" + cd "${NAME}-${VERSION}" mkdir build cd build - meson setup .. \ - --prefix=/usr \ - --buildtype=release \ - --wrap-mode=nodownload \ - -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/12.0-systemd/ \ - -Dpackage-name="GStreamer $VERSION" - ninja && DESTDIR="$ROOTDIR" ninja install + meson setup .. \ + --prefix=/usr \ + --buildtype=release \ + --wrap-mode=nodownload \ + -Dpackage-origin="https://git.matterlinux.xyz/Matter/desktop" \ + -Dpackage-name="GStreamer ${VERSION}" - cd ../.. && rm -rf $NAME-$VERSION + ninja + DESTDIR="${ROOTDIR}" ninja install + + cd ../.. && rm -r "${NAME}-${VERSION}" } diff --git a/src/gst-plugins-good/changes.md b/src/gst-plugins-good/changes.md index 9180c3d..d167dc1 100644 --- a/src/gst-plugins-good/changes.md +++ b/src/gst-plugins-good/changes.md @@ -1,2 +1,5 @@ +# 1.22.10 +Updated to a newer upstream release + # 1.22.5 First version diff --git a/src/gst-plugins-good/pkg.sh b/src/gst-plugins-good/pkg.sh index dd36c80..8082de9 100644 --- a/src/gst-plugins-good/pkg.sh +++ b/src/gst-plugins-good/pkg.sh @@ -1,26 +1,35 @@ NAME="gst-plugins-good" DESC="GStreamer Good Plug-ins is a set of plug-ins considered by the GStreamer developers to be good" -VERSION="1.22.5" -FILES=("https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$VERSION.tar.xz") -HASHES=("8c5a67f702ff5f30290be35ac27b3ac9") +VERSION="1.22.10" + +FILES=("https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${VERSION}.tar.xz") +HASHES=("0b3d46da3ff7530e9b7cada625bdaf34") + DEPENDS=( - "gst-plugins-base" "flac" "cairo" "lame" - "gdk-pixbuf" "libsoup" "mpg123" "nasm" "pulseaudio" + "gst-plugins-base" "flac" "cairo" + "gdk-pixbuf" "libsoup" "mpg123" + "nasm" "pulseaudio" "glibc" + "libgudev" "libdv" "zlib" + "lame" "gcc-libs" "glib" + "nettle" "mpg123" "libx11" ) +BUILD=("gobject-introspection" "graphene" "iso-codes") PACKAGE() { - tar xf $NAME-$VERSION.tar.xz - cd $NAME-$VERSION + tar xf "${NAME}-${VERSION}.tar.xz" + cd "${NAME}-${VERSION}" mkdir build cd build - meson setup .. \ - --prefix=/usr \ - --buildtype=release \ - -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/12.0-systemd/ \ - -Dpackage-name="GStreamer $VERSION" - ninja && DESTDIR="$ROOTDIR" ninja install + meson setup .. \ + --prefix=/usr \ + --buildtype=release \ + -Dpackage-origin="https://git.matterlinux.xyz/Matter/desktop" \ + -Dpackage-name="GStreamer ${VERSION}" - cd ../.. && rm -r $NAME-$VERSION + ninja + DESTDIR="${ROOTDIR}" ninja install + + cd ../.. && rm -r "${NAME}-${VERSION}" }