Skip to content

Commit f6e6dfd

Browse files
Elsie19Elsie19
authored
fix(emacs*): broken dependencies (#6937)
1 parent f815069 commit f6e6dfd

File tree

5 files changed

+26
-22
lines changed

5 files changed

+26
-22
lines changed

‎packages/emacs-git/.SRCINFO‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ pkgbase = emacs-git
66
depends = libalsaplayer0
77
depends = libgnutls28-dev
88
depends = libxml2
9-
depends = libjansson-dev gpm
9+
depends = libjansson-dev
10+
depends = gpm
1011
depends = m17n-lib-bin
1112
depends = libharfbuzz0b
1213
depends = libgccjit0
13-
depends = libgccjit-10-dev
14+
depends = libgccjit-12-dev | libgccjit-11-dev
1415
depends = libgtk-4-dev | libgtk-3-dev
1516
depends = libsm6
1617
depends = libxcb-util1
@@ -19,7 +20,7 @@ pkgbase = emacs-git
1920
depends = libpng16-16
2021
depends = libgif-dev
2122
depends = libwebp7 | libweb6
22-
depends = libtiff5
23+
depends = libtiff6
2324
depends = libcairo2
2425
makedepends = git
2526
makedepends = autoconf

‎packages/emacs-git/emacs-git.pacscript‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ pkgname="emacs-git"
7575
gives="emacs"
7676
pkgdesc="An extensible, customizable, free/libre text editor — and more."
7777
makedepends=("git" "autoconf" "texinfo" "pkg-config" "libncurses-dev" "libjpeg-dev" "libpng-dev" "libtiff-dev" "libgnutls28-dev" "libgif-dev" "libxaw7-dev" "libxpm-dev")
78-
depends_nox=("libalsaplayer0" "libgnutls28-dev" "libxml2" "libjansson-dev gpm")
78+
depends_nox=("libalsaplayer0" "libgnutls28-dev" "libxml2" "libjansson-dev" "gpm")
7979
depends=("${depends_nox[@]}" "m17n-lib-bin" "libharfbuzz0b")
8080
breaks=("${pkgname}" "${pkgname}-nox")
8181
replaces=("${pkgname}" "${pkgname}-nox")
@@ -114,9 +114,9 @@ fi
114114

115115
if [[ ${JIT} == "YES" ]]; then
116116
if [[ ${CLI} == "YES" ]]; then
117-
depends_nox+=("libgccjit0" "libgccjit-10-dev")
117+
depends_nox+=("libgccjit0" "libgccjit-12-dev | libgccjit-11-dev")
118118
else
119-
depends+=("libgccjit0" "libgccjit-10-dev")
119+
depends+=("libgccjit0" "libgccjit-12-dev | libgccjit-11-dev")
120120
fi
121121
fi
122122

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

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

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

300301
# fix permssions on /var/games
301302
mkdir -p "${pkgdir}/var/games/emacs"
302303
chmod 775 "${pkgdir}/var/games"
303304
chmod 775 "${pkgdir}/var/games/emacs"
304-
chown -R root:games "${pkgdir}/var/games"
305305
}
306306
# vim:set ft=sh ts=2 sw=2 et:

‎packages/emacs/.SRCINFO‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ pkgbase = emacs
66
depends = libalsaplayer0
77
depends = libgnutls28-dev
88
depends = libxml2
9-
depends = libjansson-dev gpm
9+
depends = libjansson-dev
10+
depends = gpm
1011
depends = m17n-lib-bin
1112
depends = libharfbuzz0b
1213
depends = libgccjit0
13-
depends = libgccjit-10-dev
14+
depends = libgccjit-12-dev | libgccjit-11-dev
1415
depends = libgtk-4-dev | libgtk-3-dev
1516
depends = libsm6
1617
depends = libxcb-util1
@@ -19,7 +20,7 @@ pkgbase = emacs
1920
depends = libpng16-16
2021
depends = libgif-dev
2122
depends = libwebp7 | libweb6
22-
depends = libtiff5
23+
depends = libtiff6
2324
depends = libcairo2
2425
makedepends = git
2526
makedepends = autoconf

‎packages/emacs/emacs.pacscript‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ pkgver="28.2"
7777
source=("@${pkgname}~${pkgver}::http://ftpmirror.gnu.org/emacs/emacs-${pkgver}.tar.xz")
7878
pkgdesc="An extensible, customizable, free/libre text editor — and more."
7979
makedepends=("git" "autoconf" "texinfo" "pkg-config" "libncurses-dev" "libjpeg-dev" "libpng-dev" "libtiff-dev" "libgnutls28-dev" "libgif-dev" "libxaw7-dev" "libxpm-dev")
80-
depends_nox=("libalsaplayer0" "libgnutls28-dev" "libxml2" "libjansson-dev gpm")
80+
depends_nox=("libalsaplayer0" "libgnutls28-dev" "libxml2" "libjansson-dev" "gpm")
8181
depends=("${depends_nox[@]}" "m17n-lib-bin" "libharfbuzz0b")
8282
gives="${pkgname}"
8383
breaks=("${pkgname}-git" "${pkgname}-nox")
@@ -116,9 +116,9 @@ fi
116116

117117
if [[ ${JIT} == "YES" ]]; then
118118
if [[ ${CLI} == "YES" ]]; then
119-
depends_nox+=("libgccjit0" "libgccjit-10-dev")
119+
depends_nox+=("libgccjit0" "libgccjit-12-dev | libgccjit-11-dev")
120120
else
121-
depends+=("libgccjit0" "libgccjit-10-dev")
121+
depends+=("libgccjit0" "libgccjit-12-dev | libgccjit-11-dev")
122122
fi
123123
fi
124124

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

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

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

302303
# fix permssions on /var/games
303304
mkdir -p "${pkgdir}/var/games/emacs"
304305
chmod 775 "${pkgdir}/var/games"
305306
chmod 775 "${pkgdir}/var/games/emacs"
306-
chown -R root:games "${pkgdir}/var/games"
307307
}
308308
# vim:set ft=sh ts=2 sw=2 et:

‎srclist‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2492,11 +2492,12 @@ pkgbase = emacs-git
24922492
depends = libalsaplayer0
24932493
depends = libgnutls28-dev
24942494
depends = libxml2
2495-
depends = libjansson-dev gpm
2495+
depends = libjansson-dev
2496+
depends = gpm
24962497
depends = m17n-lib-bin
24972498
depends = libharfbuzz0b
24982499
depends = libgccjit0
2499-
depends = libgccjit-10-dev
2500+
depends = libgccjit-12-dev | libgccjit-11-dev
25002501
depends = libgtk-4-dev | libgtk-3-dev
25012502
depends = libsm6
25022503
depends = libxcb-util1
@@ -2505,7 +2506,7 @@ pkgbase = emacs-git
25052506
depends = libpng16-16
25062507
depends = libgif-dev
25072508
depends = libwebp7 | libweb6
2508-
depends = libtiff5
2509+
depends = libtiff6
25092510
depends = libcairo2
25102511
makedepends = git
25112512
makedepends = autoconf
@@ -2538,11 +2539,12 @@ pkgbase = emacs
25382539
depends = libalsaplayer0
25392540
depends = libgnutls28-dev
25402541
depends = libxml2
2541-
depends = libjansson-dev gpm
2542+
depends = libjansson-dev
2543+
depends = gpm
25422544
depends = m17n-lib-bin
25432545
depends = libharfbuzz0b
25442546
depends = libgccjit0
2545-
depends = libgccjit-10-dev
2547+
depends = libgccjit-12-dev | libgccjit-11-dev
25462548
depends = libgtk-4-dev | libgtk-3-dev
25472549
depends = libsm6
25482550
depends = libxcb-util1
@@ -2551,7 +2553,7 @@ pkgbase = emacs
25512553
depends = libpng16-16
25522554
depends = libgif-dev
25532555
depends = libwebp7 | libweb6
2554-
depends = libtiff5
2556+
depends = libtiff6
25552557
depends = libcairo2
25562558
makedepends = git
25572559
makedepends = autoconf

0 commit comments

Comments
 (0)