Skip to content

fix(emacs*): broken dependencies #6937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Elsie19 merged 7 commits into from
Feb 22, 2025
Merged

fix(emacs*): broken dependencies #6937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6969389
fix(emacs*): broken dependencies
Elsie19 Jan 24, 2025
b10ae8c
Bump deps
Elsie19 Feb 22, 2025
be1675d
Merge branch 'master' into what
Elsie19 Feb 22, 2025
f7ab945
Bump deps
Elsie19 Feb 22, 2025
7c79aa3
Bump deps
Elsie19 Feb 22, 2025
16f63ae
Install parity with emacs
Elsie19 Feb 22, 2025
222d463
Try newer libgccjit first
Elsie19 Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/emacs-git/.SRCINFO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ pkgbase = emacs-git
depends = libalsaplayer0
depends = libgnutls28-dev
depends = libxml2
depends = libjansson-dev gpm
depends = libjansson-dev
depends = gpm
depends = m17n-lib-bin
depends = libharfbuzz0b
depends = libgccjit0
depends = libgccjit-10-dev
depends = libgccjit-12-dev | libgccjit-11-dev
depends = libgtk-4-dev | libgtk-3-dev
depends = libsm6
depends = libxcb-util1
Expand All @@ -19,7 +20,7 @@ pkgbase = emacs-git
depends = libpng16-16
depends = libgif-dev
depends = libwebp7 | libweb6
depends = libtiff5
depends = libtiff6
depends = libcairo2
makedepends = git
makedepends = autoconf
Expand Down
10 changes: 5 additions & 5 deletions packages/emacs-git/emacs-git.pacscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pkgname="emacs-git"
gives="emacs"
pkgdesc="An extensible, customizable, free/libre text editor — and more."
makedepends=("git" "autoconf" "texinfo" "pkg-config" "libncurses-dev" "libjpeg-dev" "libpng-dev" "libtiff-dev" "libgnutls28-dev" "libgif-dev" "libxaw7-dev" "libxpm-dev")
depends_nox=("libalsaplayer0" "libgnutls28-dev" "libxml2" "libjansson-dev gpm")
depends_nox=("libalsaplayer0" "libgnutls28-dev" "libxml2" "libjansson-dev" "gpm")
depends=("${depends_nox[@]}" "m17n-lib-bin" "libharfbuzz0b")
breaks=("${pkgname}" "${pkgname}-nox")
replaces=("${pkgname}" "${pkgname}-nox")
Expand Down Expand Up @@ -114,9 +114,9 @@ fi

if [[ ${JIT} == "YES" ]]; then
if [[ ${CLI} == "YES" ]]; then
depends_nox+=("libgccjit0" "libgccjit-10-dev")
depends_nox+=("libgccjit0" "libgccjit-12-dev | libgccjit-11-dev")
else
depends+=("libgccjit0" "libgccjit-10-dev")
depends+=("libgccjit0" "libgccjit-12-dev | libgccjit-11-dev")
fi
fi

Expand All @@ -134,7 +134,7 @@ elif [[ ${GTK3} == "YES" ]]; then
fi

if [[ ${CLI} != "YES" ]]; then
depends+=("libjpeg-turbo8 | libjpeg62-turbo" "libpng16-16" "libgif-dev" "libwebp7 | libweb6" "libtiff5")
depends+=("libjpeg-turbo8 | libjpeg62-turbo" "libpng16-16" "libgif-dev" "libwebp7 | libweb6" "libtiff6")
elif [[ ${CLI} == "YES" ]]; then
depends+=("")
fi
Expand Down Expand Up @@ -295,12 +295,12 @@ package() {
if [[ ${DOCS_PDF} == "YES" ]]; then make -j"${NCPU}" DESTDIR="${pkgdir}" install-pdf; fi

# fix user/root permissions on usr/local/share files
mkdir -p "${pkgdir}/usr/share/emacs/"
find "${pkgdir}/usr/share/emacs/" -print0 | xargs -0 chown root:root

# fix permssions on /var/games
mkdir -p "${pkgdir}/var/games/emacs"
chmod 775 "${pkgdir}/var/games"
chmod 775 "${pkgdir}/var/games/emacs"
chown -R root:games "${pkgdir}/var/games"
}
# vim:set ft=sh ts=2 sw=2 et:
7 changes: 4 additions & 3 deletions packages/emacs/.SRCINFO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ pkgbase = emacs
depends = libalsaplayer0
depends = libgnutls28-dev
depends = libxml2
depends = libjansson-dev gpm
depends = libjansson-dev
depends = gpm
depends = m17n-lib-bin
depends = libharfbuzz0b
depends = libgccjit0
depends = libgccjit-10-dev
depends = libgccjit-12-dev | libgccjit-11-dev
depends = libgtk-4-dev | libgtk-3-dev
depends = libsm6
depends = libxcb-util1
Expand All @@ -19,7 +20,7 @@ pkgbase = emacs
depends = libpng16-16
depends = libgif-dev
depends = libwebp7 | libweb6
depends = libtiff5
depends = libtiff6
depends = libcairo2
makedepends = git
makedepends = autoconf
Expand Down
10 changes: 5 additions & 5 deletions packages/emacs/emacs.pacscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ pkgver="28.2"
source=("@${pkgname}~${pkgver}::http://ftpmirror.gnu.org/emacs/emacs-${pkgver}.tar.xz")
pkgdesc="An extensible, customizable, free/libre text editor — and more."
makedepends=("git" "autoconf" "texinfo" "pkg-config" "libncurses-dev" "libjpeg-dev" "libpng-dev" "libtiff-dev" "libgnutls28-dev" "libgif-dev" "libxaw7-dev" "libxpm-dev")
depends_nox=("libalsaplayer0" "libgnutls28-dev" "libxml2" "libjansson-dev gpm")
depends_nox=("libalsaplayer0" "libgnutls28-dev" "libxml2" "libjansson-dev" "gpm")
depends=("${depends_nox[@]}" "m17n-lib-bin" "libharfbuzz0b")
gives="${pkgname}"
breaks=("${pkgname}-git" "${pkgname}-nox")
Expand Down Expand Up @@ -116,9 +116,9 @@ fi

if [[ ${JIT} == "YES" ]]; then
if [[ ${CLI} == "YES" ]]; then
depends_nox+=("libgccjit0" "libgccjit-10-dev")
depends_nox+=("libgccjit0" "libgccjit-12-dev | libgccjit-11-dev")
else
depends+=("libgccjit0" "libgccjit-10-dev")
depends+=("libgccjit0" "libgccjit-12-dev | libgccjit-11-dev")
fi
fi

Expand All @@ -136,7 +136,7 @@ elif [[ ${GTK3} == "YES" ]]; then
fi

if [[ ${CLI} != "YES" ]]; then
depends+=("libjpeg-turbo8 | libjpeg62-turbo" "libpng16-16" "libgif-dev" "libwebp7 | libweb6" "libtiff5")
depends+=("libjpeg-turbo8 | libjpeg62-turbo" "libpng16-16" "libgif-dev" "libwebp7 | libweb6" "libtiff6")
elif [[ ${CLI} == "YES" ]]; then
depends+=("")
fi
Expand Down Expand Up @@ -297,12 +297,12 @@ package() {
if [[ ${DOCS_PDF} == "YES" ]]; then make -j"${NCPU}" DESTDIR="${pkgdir}" install-pdf; fi

# fix user/root permissions on usr/local/share files
mkdir -p "${pkgdir}/usr/share/emacs/"
find "${pkgdir}/usr/share/emacs/" -print0 | xargs -0 chown root:root

# fix permssions on /var/games
mkdir -p "${pkgdir}/var/games/emacs"
chmod 775 "${pkgdir}/var/games"
chmod 775 "${pkgdir}/var/games/emacs"
chown -R root:games "${pkgdir}/var/games"
}
# vim:set ft=sh ts=2 sw=2 et:
14 changes: 8 additions & 6 deletions srclist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2492,11 +2492,12 @@ pkgbase = emacs-git
depends = libalsaplayer0
depends = libgnutls28-dev
depends = libxml2
depends = libjansson-dev gpm
depends = libjansson-dev
depends = gpm
depends = m17n-lib-bin
depends = libharfbuzz0b
depends = libgccjit0
depends = libgccjit-10-dev
depends = libgccjit-12-dev | libgccjit-11-dev
depends = libgtk-4-dev | libgtk-3-dev
depends = libsm6
depends = libxcb-util1
Expand All @@ -2505,7 +2506,7 @@ pkgbase = emacs-git
depends = libpng16-16
depends = libgif-dev
depends = libwebp7 | libweb6
depends = libtiff5
depends = libtiff6
depends = libcairo2
makedepends = git
makedepends = autoconf
Expand Down Expand Up @@ -2538,11 +2539,12 @@ pkgbase = emacs
depends = libalsaplayer0
depends = libgnutls28-dev
depends = libxml2
depends = libjansson-dev gpm
depends = libjansson-dev
depends = gpm
depends = m17n-lib-bin
depends = libharfbuzz0b
depends = libgccjit0
depends = libgccjit-10-dev
depends = libgccjit-12-dev | libgccjit-11-dev
depends = libgtk-4-dev | libgtk-3-dev
depends = libsm6
depends = libxcb-util1
Expand All @@ -2551,7 +2553,7 @@ pkgbase = emacs
depends = libpng16-16
depends = libgif-dev
depends = libwebp7 | libweb6
depends = libtiff5
depends = libtiff6
depends = libcairo2
makedepends = git
makedepends = autoconf
Expand Down
Loading