[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Friday, August 28, 2020 @ 18:36:47 Author: juergen Revision: 394846 add harfbuzz and cairo support, fixes #67567 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-08-28 16:30:08 UTC (rev 394845) +++ PKGBUILD2020-08-28 18:36:47 UTC (rev 394846) @@ -3,12 +3,12 @@ pkgname=emacs pkgver=27.1 -pkgrel=2 +pkgrel=3 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('x86_64') url="https://www.gnu.org/software/emacs/emacs.html; license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'gnutls' 'jansson') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'gnutls' 'jansson' 'cairo' 'harfbuzz') validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') source=(https://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) sha1sums=('d1b6b9efa14c5628dda9ea78628796a73f7f' @@ -18,7 +18,7 @@ cd "$srcdir"/$pkgname-$pkgver ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk3 --with-xft --with-wide-int \ ---with-modules +--with-modules --with-cairo --with-harfbuzz make }
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Thursday, August 13, 2020 @ 18:37:28 Author: juergen Revision: 394021 Add native support for JSON. Fixes #67559 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-08-13 15:48:51 UTC (rev 394020) +++ PKGBUILD2020-08-13 18:37:28 UTC (rev 394021) @@ -3,12 +3,12 @@ pkgname=emacs pkgver=27.1 -pkgrel=1 +pkgrel=2 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('x86_64') url="https://www.gnu.org/software/emacs/emacs.html; license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'gnutls') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'gnutls' 'jansson') validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') source=(https://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) sha1sums=('d1b6b9efa14c5628dda9ea78628796a73f7f'
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Tuesday, August 11, 2020 @ 19:27:45 Author: juergen Revision: 393545 upgpkg: emacs 27.1-1 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |9 - 1 file changed, 4 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-08-11 18:10:39 UTC (rev 393544) +++ PKGBUILD2020-08-11 19:27:45 UTC (rev 393545) @@ -2,21 +2,20 @@ # Contributor: Renchi Raju pkgname=emacs -pkgver=26.3 -pkgrel=2 +pkgver=27.1 +pkgrel=1 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('x86_64') url="https://www.gnu.org/software/emacs/emacs.html; license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'libmagick6' 'gnutls') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'gnutls') validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') source=(https://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) -sha1sums=('2960e1dddef401b18abd779cb159306984157eef' +sha1sums=('d1b6b9efa14c5628dda9ea78628796a73f7f' 'SKIP') build() { cd "$srcdir"/$pkgname-$pkgver - PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig" \ ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk3 --with-xft --with-wide-int \ --with-modules
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Tuesday, May 19, 2020 @ 08:04:23 Author: felixonmars Revision: 386139 upgpkg: emacs 26.3-2: reproducibility rebuild Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-05-19 08:04:13 UTC (rev 386138) +++ PKGBUILD2020-05-19 08:04:23 UTC (rev 386139) @@ -3,7 +3,7 @@ pkgname=emacs pkgver=26.3 -pkgrel=1 +pkgrel=2 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('x86_64') url="https://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Friday, December 27, 2019 @ 16:39:20 Author: juergen Revision: 372330 Enable wide-int This change has no effect on 64-bit systems. It enables the use of large integer values (2**61 - 1) on 32-bit systems (like Arch Linux ARM/32-bit) which is required for some Emacs packages. Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-12-27 16:06:57 UTC (rev 372329) +++ PKGBUILD2019-12-27 16:39:20 UTC (rev 372330) @@ -18,7 +18,7 @@ cd "$srcdir"/$pkgname-$pkgver PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig" \ ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ ---localstatedir=/var --with-x-toolkit=gtk3 --with-xft \ +--localstatedir=/var --with-x-toolkit=gtk3 --with-xft --with-wide-int \ --with-modules make }
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Thursday, August 29, 2019 @ 19:53:30 Author: juergen Revision: 361390 upgpkg: emacs 26.3-1 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-08-29 18:49:05 UTC (rev 361389) +++ PKGBUILD2019-08-29 19:53:30 UTC (rev 361390) @@ -2,7 +2,7 @@ # Contributor: Renchi Raju pkgname=emacs -pkgver=26.2 +pkgver=26.3 pkgrel=1 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('x86_64') @@ -11,7 +11,7 @@ depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'libmagick6' 'gnutls') validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') source=(https://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) -sha1sums=('61eda5bd1ce42e34c04e33c9e0d977d105ec4fc4' +sha1sums=('2960e1dddef401b18abd779cb159306984157eef' 'SKIP') build() {
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Saturday, May 4, 2019 @ 18:56:41 Author: arojas Revision: 352487 https Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-05-04 18:56:09 UTC (rev 352486) +++ PKGBUILD2019-05-04 18:56:41 UTC (rev 352487) @@ -6,11 +6,11 @@ pkgrel=1 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('x86_64') -url="http://www.gnu.org/software/emacs/emacs.html; +url="https://www.gnu.org/software/emacs/emacs.html; license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'libmagick6' 'gnutls') validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) +source=(https://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) sha1sums=('61eda5bd1ce42e34c04e33c9e0d977d105ec4fc4' 'SKIP')
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Friday, April 12, 2019 @ 18:29:09 Author: juergen Revision: 350647 update to 26.2-1 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD | 23 +-- 1 file changed, 5 insertions(+), 18 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-04-12 18:25:55 UTC (rev 350646) +++ PKGBUILD2019-04-12 18:29:09 UTC (rev 350647) @@ -2,8 +2,8 @@ # Contributor: Renchi Raju pkgname=emacs -pkgver=26.1 -pkgrel=3 +pkgver=26.2 +pkgrel=1 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('x86_64') url="http://www.gnu.org/software/emacs/emacs.html; @@ -10,23 +10,10 @@ license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'libmagick6' 'gnutls') validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} - 0001-Ignore-color-fonts-when-using-Xft.patch - 0001-Port-FC_COLOR-change-to-older-fontconfig.patch - 0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch) -sha1sums=('53c01d987b2613701f42d9f941c2d5225a5874c4' - 'SKIP' - 'e6b77aadf6c60dfdc1ec6b61d5968e64d959257d' - '6b40ad3d8936bfd068398c8d46cb8e0b9501fe64' - '51b3e6a2c32be315c9a15c55ca2e97e84d204f32') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) +sha1sums=('61eda5bd1ce42e34c04e33c9e0d977d105ec4fc4' + 'SKIP') -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i "${srcdir}/0001-Ignore-color-fonts-when-using-Xft.patch" - patch -Np1 -i "${srcdir}/0001-Port-FC_COLOR-change-to-older-fontconfig.patch" - patch -Np1 -i "${srcdir}/0001-src-ftfont.c-ftfont_spec_pattern-Fix-whitespace.patch" -} - build() { cd "$srcdir"/$pkgname-$pkgver PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig" \
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Sunday, March 17, 2019 @ 13:51:13 Author: juergen Revision: 348570 upgpkg: emacs 26.1-3 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-03-17 13:22:10 UTC (rev 348569) +++ PKGBUILD2019-03-17 13:51:13 UTC (rev 348570) @@ -3,7 +3,7 @@ pkgname=emacs pkgver=26.1 -pkgrel=2 +pkgrel=3 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('x86_64') url="http://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Sunday, March 17, 2019 @ 13:15:56 Author: juergen Revision: 348568 remove unused dependency: Fixes #59887 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-03-17 12:56:26 UTC (rev 348567) +++ PKGBUILD2019-03-17 13:15:56 UTC (rev 348568) @@ -8,7 +8,7 @@ arch=('x86_64') url="http://www.gnu.org/software/emacs/emacs.html; license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'libmagick6' 'gnutls') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'libmagick6' 'gnutls') validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} 0001-Ignore-color-fonts-when-using-Xft.patch
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Tuesday, May 29, 2018 @ 04:08:04 Author: juergen Revision: 325104 Update to Emacs 26.1 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD | 11 +++ 1 file changed, 3 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-05-29 00:53:22 UTC (rev 325103) +++ PKGBUILD2018-05-29 04:08:04 UTC (rev 325104) @@ -3,8 +3,8 @@ # Contributor: Renchi Raju pkgname=emacs -pkgver=25.3 -pkgrel=4 +pkgver=26.1 +pkgrel=1 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('x86_64') url="http://www.gnu.org/software/emacs/emacs.html; @@ -12,7 +12,7 @@ depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'libmagick6' 'gnutls') validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) -sha1sums=('1cb4f39e9c0a3305fd62f936c7c95ff8e2924323' +sha1sums=('53c01d987b2613701f42d9f941c2d5225a5874c4' 'SKIP') build() { @@ -34,9 +34,4 @@ # fix user/root permissions on usr/share files find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \; - # fix perms on /var/games - chmod 775 "$pkgdir"/var/games - chmod 775 "$pkgdir"/var/games/emacs - chmod 664 "$pkgdir"/var/games/emacs/* - chown -R root:games "$pkgdir"/var/games }
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Wednesday, May 9, 2018 @ 10:41:01 Author: arojas Revision: 323599 libmagick6 6.9.9.43 rebuild Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-05-09 10:00:01 UTC (rev 323598) +++ PKGBUILD2018-05-09 10:41:01 UTC (rev 323599) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=25.3 -pkgrel=3 +pkgrel=4 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('x86_64') url="http://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Thursday, February 8, 2018 @ 23:20:08 Author: bisson Revision: 316492 rebuild for libotf-0.9.16 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-02-08 23:05:19 UTC (rev 316491) +++ PKGBUILD2018-02-08 23:20:08 UTC (rev 316492) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=25.3 -pkgrel=2 +pkgrel=3 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('x86_64') url="http://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Monday, December 4, 2017 @ 21:46:39 Author: arojas Revision: 311623 Rebuild with libmagick6 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-12-04 21:42:48 UTC (rev 311622) +++ PKGBUILD2017-12-04 21:46:39 UTC (rev 311623) @@ -4,12 +4,12 @@ pkgname=emacs pkgver=25.3 -pkgrel=1 +pkgrel=2 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('x86_64') url="http://www.gnu.org/software/emacs/emacs.html; license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'libmagick6' 'gnutls') validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) sha1sums=('1cb4f39e9c0a3305fd62f936c7c95ff8e2924323' @@ -17,6 +17,7 @@ build() { cd "$srcdir"/$pkgname-$pkgver + PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig" \ ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk3 --with-xft \ --with-modules
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Saturday, September 16, 2017 @ 19:23:18 Author: juergen Revision: 305660 upgpkg: emacs 25.3-1 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-09-16 14:51:49 UTC (rev 305659) +++ PKGBUILD2017-09-16 19:23:18 UTC (rev 305660) @@ -3,8 +3,8 @@ # Contributor: Renchi Rajupkgname=emacs -pkgver=25.2 -pkgrel=2 +pkgver=25.3 +pkgrel=1 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html; @@ -12,7 +12,7 @@ depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls') validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) -sha1sums=('3960d0b64031c645d98aafd4dc9ebf6f6ef4cf50' +sha1sums=('1cb4f39e9c0a3305fd62f936c7c95ff8e2924323' 'SKIP') build() {
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Saturday, July 15, 2017 @ 23:30:27 Author: arojas Revision: 300637 imagemagick 6.9.9.0 rebuild Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-07-15 23:24:22 UTC (rev 300636) +++ PKGBUILD2017-07-15 23:30:27 UTC (rev 300637) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=25.2 -pkgrel=1 +pkgrel=2 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Saturday, April 22, 2017 @ 08:59:24 Author: juergen Revision: 293890 update to 25.2 and add module support (FS#52540) Modified: emacs/trunk/PKGBUILD --+ PKGBUILD | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-04-22 07:55:05 UTC (rev 293889) +++ PKGBUILD2017-04-22 08:59:24 UTC (rev 293890) @@ -3,8 +3,8 @@ # Contributor: Renchi Rajupkgname=emacs -pkgver=25.1 -pkgrel=4 +pkgver=25.2 +pkgrel=1 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html; @@ -12,14 +12,14 @@ depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls') validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) -md5sums=('4f3d42fb22823a659e16bfa89078a74c' +sha1sums=('3960d0b64031c645d98aafd4dc9ebf6f6ef4cf50' 'SKIP') build() { cd "$srcdir"/$pkgname-$pkgver - export REL_ALLOC=no ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ ---localstatedir=/var --with-x-toolkit=gtk3 --with-xft +--localstatedir=/var --with-x-toolkit=gtk3 --with-xft \ +--with-modules make }
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Tuesday, February 7, 2017 @ 17:15:04 Author: arojas Revision: 288203 Imagemagick 6.9.7.7 rebuild Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-02-07 16:59:04 UTC (rev 288202) +++ PKGBUILD2017-02-07 17:15:04 UTC (rev 288203) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=25.1 -pkgrel=3 +pkgrel=4 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Saturday, December 24, 2016 @ 12:34:24 Author: juergen Revision: 284628 Fix Emacs 25.1 segmentation fault issue. Refs #51337, #51290 and #50954 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-12-24 12:24:35 UTC (rev 284627) +++ PKGBUILD2016-12-24 12:34:24 UTC (rev 284628) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=25.1 -pkgrel=2 +pkgrel=3 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html; @@ -17,6 +17,7 @@ build() { cd "$srcdir"/$pkgname-$pkgver + export REL_ALLOC=no ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk3 --with-xft make
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Saturday, December 17, 2016 @ 16:17:02 Author: foutrelis Revision: 284259 imagemagick 6.9.6.8 rebuild Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-12-17 15:46:23 UTC (rev 284258) +++ PKGBUILD2016-12-17 16:17:02 UTC (rev 284259) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=25.1 -pkgrel=1 +pkgrel=2 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Sunday, June 5, 2016 @ 14:08:38 Author: juergen Revision: 269050 Don't remove Emacs Info manual, Fixes #49500 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-06-05 11:46:42 UTC (rev 269049) +++ PKGBUILD2016-06-05 12:08:38 UTC (rev 269050) @@ -36,8 +36,7 @@ # remove conflict with ctags package mv "$pkgdir"/usr/bin/{ctags,ctags.emacs} mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1} - # remove conflict with texinfo - rm "$pkgdir"/usr/share/info/info.info.gz + # fix user/root permissions on usr/share files find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \; # fix perms on /var/games
[arch-commits] Commit in emacs/trunk (PKGBUILD emacs.install)
Date: Thursday, May 5, 2016 @ 23:06:55 Author: arojas Revision: 266974 Hooks Modified: emacs/trunk/PKGBUILD Deleted: emacs/trunk/emacs.install ---+ PKGBUILD |3 +-- emacs.install | 32 2 files changed, 1 insertion(+), 34 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-05-05 20:55:23 UTC (rev 266973) +++ PKGBUILD2016-05-05 21:06:55 UTC (rev 266974) @@ -4,13 +4,12 @@ pkgname=emacs pkgver=24.5 -pkgrel=2 +pkgrel=3 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html; license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls') -install=emacs.install validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) md5sums=('50560ee00bac9bb9cf0e822764cd0832' Deleted: emacs.install === --- emacs.install 2016-05-05 20:55:23 UTC (rev 266973) +++ emacs.install 2016-05-05 21:06:55 UTC (rev 266974) @@ -1,32 +0,0 @@ -ICON_PATH=usr/share/icons/hicolor -INFO_DIR=usr/share/info - -INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse -ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake -forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode -org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail -speedbar srecode tramp url vip viper widget wisent woman) - -post_install() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} - update-desktop-database -q - - [[ -x usr/bin/install-info ]] || return 0 - for f in ${INFO_FILES[@]}; do -install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} - update-desktop-database -q - - [[ -x usr/bin/install-info ]] || return 0 - for f in ${INFO_FILES[@]}; do -install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null - done -}
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Thursday, September 10, 2015 @ 04:43:15 Author: foutrelis Revision: 245643 ncurses 6.0 rebuild. Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-09-10 02:15:24 UTC (rev 245642) +++ PKGBUILD2015-09-10 02:43:15 UTC (rev 245643) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=24.5 -pkgrel=1 +pkgrel=2 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Monday, April 20, 2015 @ 12:15:03 Author: juergen Revision: 237779 Summary: update to 24.5-1 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-04-20 08:52:42 UTC (rev 237778) +++ PKGBUILD2015-04-20 10:15:03 UTC (rev 237779) @@ -3,8 +3,8 @@ # Contributor: Renchi Raju ren...@green.tam.uiuc.edu pkgname=emacs -pkgver=24.4 -pkgrel=3 +pkgver=24.5 +pkgrel=1 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; @@ -11,10 +11,10 @@ license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls') install=emacs.install -validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199') +validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} gnupg21.patch) -md5sums=('ad487658ad7421ad8d7b5152192eb945' +md5sums=('50560ee00bac9bb9cf0e822764cd0832' 'SKIP' '0583d868e0e304bac3df95b7518615cd')
[arch-commits] Commit in emacs/trunk (PKGBUILD gnupg21.patch)
Date: Monday, April 20, 2015 @ 12:36:15 Author: juergen Revision: 237780 Remove GnuPG 2.1 patch Fixed in Upstream commit dbae12c5dfd236bc5f5916296659407e50fce7d6 Modified: emacs/trunk/PKGBUILD Deleted: emacs/trunk/gnupg21.patch ---+ PKGBUILD | 11 ++- gnupg21.patch | 28 2 files changed, 2 insertions(+), 37 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-04-20 10:15:03 UTC (rev 237779) +++ PKGBUILD2015-04-20 10:36:15 UTC (rev 237780) @@ -12,17 +12,10 @@ depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls') install=emacs.install validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199' '28D3BED851FDF3AB57FEF93C233587A47C207910') -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} -gnupg21.patch) +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) md5sums=('50560ee00bac9bb9cf0e822764cd0832' - 'SKIP' - '0583d868e0e304bac3df95b7518615cd') + 'SKIP') -prepare() { - cd $srcdir/$pkgname-$pkgver - patch -p1 -i ../gnupg21.patch -} - build() { cd $srcdir/$pkgname-$pkgver ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ Deleted: gnupg21.patch === --- gnupg21.patch 2015-04-20 10:15:03 UTC (rev 237779) +++ gnupg21.patch 2015-04-20 10:36:15 UTC (rev 237780) @@ -1,28 +0,0 @@ -From 135a9f4b5aead507c030fb7e3e8ad13aaa91f403 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno u...@gnu.org -Date: Fri, 07 Nov 2014 02:31:12 + -Subject: epg: Adjust to GnuPG 2.1 key listing change - -* epg.el (epg--list-keys-1): Ignore fields after the 15th field -(bug#18979). Reported by Hideki Saito. -(limited to 'lisp/epg.el') - -diff --git a/lisp/epg.el b/lisp/epg.el -index 0c74531..e4d8c1e 100644 a/lisp/epg.el -+++ b/lisp/epg.el -@@ -1278,8 +1278,9 @@ callback data (if any). - string (match-string 0) - index 0 - field 0) -- (while (eq index -- (string-match \\([^:]+\\)?: string index)) -+ (while (and ( field (length (car keys))) -+ (eq index -+ (string-match \\([^:]+\\)?: string index))) - (setq index (match-end 0)) - (aset (car keys) field (match-string 1 string)) - (setq field (1+ field --- -cgit v0.9.0.2
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Friday, April 17, 2015 @ 20:27:00 Author: andyrtr Revision: 237318 upgpkg: emacs 24.4-3 gnutls rebuild Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-04-17 18:20:08 UTC (rev 237317) +++ PKGBUILD2015-04-17 18:27:00 UTC (rev 237318) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=24.4 -pkgrel=2 +pkgrel=3 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD gnupg21.patch)
Date: Saturday, January 17, 2015 @ 21:20:44 Author: bisson Revision: 229491 fix FS#42972 Added: emacs/trunk/gnupg21.patch Modified: emacs/trunk/PKGBUILD ---+ PKGBUILD | 14 +++--- gnupg21.patch | 28 2 files changed, 39 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-01-17 12:15:24 UTC (rev 229490) +++ PKGBUILD2015-01-17 20:20:44 UTC (rev 229491) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=24.4 -pkgrel=1 +pkgrel=2 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; @@ -11,10 +11,18 @@ license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) +validpgpkeys=('B29426DEFB07724C3C35E5D36592E9A3A0B0F199') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} +gnupg21.patch) md5sums=('ad487658ad7421ad8d7b5152192eb945' - 'SKIP') + 'SKIP' + '0583d868e0e304bac3df95b7518615cd') +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -p1 -i ../gnupg21.patch +} + build() { cd $srcdir/$pkgname-$pkgver ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ Added: gnupg21.patch === --- gnupg21.patch (rev 0) +++ gnupg21.patch 2015-01-17 20:20:44 UTC (rev 229491) @@ -0,0 +1,28 @@ +From 135a9f4b5aead507c030fb7e3e8ad13aaa91f403 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno u...@gnu.org +Date: Fri, 07 Nov 2014 02:31:12 + +Subject: epg: Adjust to GnuPG 2.1 key listing change + +* epg.el (epg--list-keys-1): Ignore fields after the 15th field +(bug#18979). Reported by Hideki Saito. +--- +(limited to 'lisp/epg.el') + +diff --git a/lisp/epg.el b/lisp/epg.el +index 0c74531..e4d8c1e 100644 +--- a/lisp/epg.el b/lisp/epg.el +@@ -1278,8 +1278,9 @@ callback data (if any). + string (match-string 0) + index 0 + field 0) +- (while (eq index +- (string-match \\([^:]+\\)?: string index)) ++ (while (and ( field (length (car keys))) ++ (eq index ++ (string-match \\([^:]+\\)?: string index))) + (setq index (match-end 0)) + (aset (car keys) field (match-string 1 string)) + (setq field (1+ field +-- +cgit v0.9.0.2
[arch-commits] Commit in emacs/trunk (PKGBUILD emacs-24.3-giflib5.patch)
Date: Tuesday, October 21, 2014 @ 10:28:26 Author: juergen Revision: 225138 update to 24.4-1 Modified: emacs/trunk/PKGBUILD Deleted: emacs/trunk/emacs-24.3-giflib5.patch --+ PKGBUILD | 17 ++- emacs-24.3-giflib5.patch | 97 - 2 files changed, 5 insertions(+), 109 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-10-20 19:57:11 UTC (rev 225137) +++ PKGBUILD2014-10-21 08:28:26 UTC (rev 225138) @@ -3,8 +3,8 @@ # Contributor: Renchi Raju ren...@green.tam.uiuc.edu pkgname=emacs -pkgver=24.3 -pkgrel=7 +pkgver=24.4 +pkgrel=1 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; @@ -11,17 +11,10 @@ license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} -emacs-24.3-giflib5.patch) -md5sums=('ea9ed000ca165280265aabb55b9afbd7' - 'SKIP' - 'ccbe4e77440ff6ea56c8532ebc960446') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('ad487658ad7421ad8d7b5152192eb945' + 'SKIP') -prepare() { - cd $pkgname-$pkgver - patch -Np0 -i ../emacs-24.3-giflib5.patch -} - build() { cd $srcdir/$pkgname-$pkgver ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ Deleted: emacs-24.3-giflib5.patch === --- emacs-24.3-giflib5.patch2014-10-20 19:57:11 UTC (rev 225137) +++ emacs-24.3-giflib5.patch2014-10-21 08:28:26 UTC (rev 225138) @@ -1,97 +0,0 @@ src/image.c -+++ src/image.c2013-05-21 15:49:41.945819346 + -@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image - } - - /* Open the GIF file. */ -+#if GIFLIB_MAJOR 5 - gif = fn_DGifOpenFileName (SSDATA (file)); -+#else -+ gif = fn_DGifOpenFileName (SSDATA (file), NULL); -+#endif - if (gif == NULL) - { - image_error (Cannot open `%s', file, Qnil); -@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image - memsrc.len = SBYTES (specified_data); - memsrc.index = 0; - -+#if GIFLIB_MAJOR 5 - gif = fn_DGifOpen (memsrc, gif_read_from_memory); -+#else -+ gif = fn_DGifOpen (memsrc, gif_read_from_memory, NULL); -+#endif - if (!gif) - { - image_error (Cannot open memory source `%s', img-spec, Qnil); -@@ -7225,7 +7225,11 @@ - if (!check_image_size (f, gif-SWidth, gif-SHeight)) - { - image_error (Invalid image size (see `max-image-size'), Qnil, Qnil); -+#if GIFLIB_MAJOR = 5 GIFLIB_MINOR = 1 -+ fn_DGifCloseFile (gif, NULL); -+#else - fn_DGifCloseFile (gif); -+#endif - return 0; - } - -@@ -7234,7 +7238,11 @@ - if (rc == GIF_ERROR || gif-ImageCount = 0) - { - image_error (Error reading `%s', img-spec, Qnil); -+#if GIFLIB_MAJOR = 5 GIFLIB_MINOR = 1 -+ fn_DGifCloseFile (gif, NULL); -+#else - fn_DGifCloseFile (gif); -+#endif - return 0; - } - -@@ -7246,7 +7254,11 @@ - { - image_error (Invalid image number `%s' in image `%s', -image_number, img-spec); -+#if GIFLIB_MAJOR = 5 GIFLIB_MINOR = 1 -+ fn_DGifCloseFile (gif, NULL); -+#else - fn_DGifCloseFile (gif); -+#endif - return 0; - } - } -@@ -7264,14 +7276,22 @@ - if (!check_image_size (f, width, height)) - { - image_error (Invalid image size (see `max-image-size'), Qnil, Qnil); -+#if GIFLIB_MAJOR = 5 GIFLIB_MINOR = 1 -+ fn_DGifCloseFile (gif, NULL); -+#else - fn_DGifCloseFile (gif); -+#endif - return 0; - } - - /* Create the X image and pixmap. */ - if (!x_create_x_image_and_pixmap (f, width, height, 0, ximg, img-pixmap)) - { -+#if GIFLIB_MAJOR = 5 GIFLIB_MINOR = 1 -+ fn_DGifCloseFile (gif, NULL); -+#else - fn_DGifCloseFile (gif); -+#endif - return 0; - } - -@@ -7447,7 +7467,11 @@ - Fcons (make_number (gif-ImageCount), - img-lisp_data)); - -+#if GIFLIB_MAJOR = 5 GIFLIB_MINOR = 1 -+ fn_DGifCloseFile (gif, NULL); -+#else - fn_DGifCloseFile (gif); -+#endif - - /* Maybe fill in the background field while we have ximg handy. */ - if (NILP (image_spec_value (img-spec, QCbackground, NULL)))
[arch-commits] Commit in emacs/trunk (PKGBUILD emacs-24.3-giflib5.patch)
Date: Wednesday, June 11, 2014 @ 14:00:08 Author: jgc Revision: 214997 upgpkg: emacs 24.3-7 giflib 5.1 rebuild Modified: emacs/trunk/PKGBUILD emacs/trunk/emacs-24.3-giflib5.patch --+ PKGBUILD |4 +- emacs-24.3-giflib5.patch | 71 + 2 files changed, 73 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-06-11 11:40:28 UTC (rev 214996) +++ PKGBUILD2014-06-11 12:00:08 UTC (rev 214997) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=24.3 -pkgrel=6 +pkgrel=7 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; @@ -15,7 +15,7 @@ emacs-24.3-giflib5.patch) md5sums=('ea9ed000ca165280265aabb55b9afbd7' 'SKIP' - '560cdf463299e059c5fadf474bcba218') + 'ccbe4e77440ff6ea56c8532ebc960446') prepare() { cd $pkgname-$pkgver Modified: emacs-24.3-giflib5.patch === --- emacs-24.3-giflib5.patch2014-06-11 11:40:28 UTC (rev 214996) +++ emacs-24.3-giflib5.patch2014-06-11 12:00:08 UTC (rev 214997) @@ -24,3 +24,74 @@ if (!gif) { image_error (Cannot open memory source `%s', img-spec, Qnil); +@@ -7225,7 +7225,11 @@ + if (!check_image_size (f, gif-SWidth, gif-SHeight)) + { + image_error (Invalid image size (see `max-image-size'), Qnil, Qnil); ++#if GIFLIB_MAJOR = 5 GIFLIB_MINOR = 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + +@@ -7234,7 +7238,11 @@ + if (rc == GIF_ERROR || gif-ImageCount = 0) + { + image_error (Error reading `%s', img-spec, Qnil); ++#if GIFLIB_MAJOR = 5 GIFLIB_MINOR = 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + +@@ -7246,7 +7254,11 @@ + { + image_error (Invalid image number `%s' in image `%s', +image_number, img-spec); ++#if GIFLIB_MAJOR = 5 GIFLIB_MINOR = 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + } +@@ -7264,14 +7276,22 @@ + if (!check_image_size (f, width, height)) + { + image_error (Invalid image size (see `max-image-size'), Qnil, Qnil); ++#if GIFLIB_MAJOR = 5 GIFLIB_MINOR = 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + + /* Create the X image and pixmap. */ + if (!x_create_x_image_and_pixmap (f, width, height, 0, ximg, img-pixmap)) + { ++#if GIFLIB_MAJOR = 5 GIFLIB_MINOR = 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + return 0; + } + +@@ -7447,7 +7467,11 @@ + Fcons (make_number (gif-ImageCount), + img-lisp_data)); + ++#if GIFLIB_MAJOR = 5 GIFLIB_MINOR = 1 ++ fn_DGifCloseFile (gif, NULL); ++#else + fn_DGifCloseFile (gif); ++#endif + + /* Maybe fill in the background field while we have ximg handy. */ + if (NILP (image_spec_value (img-spec, QCbackground, NULL)))
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Tuesday, January 28, 2014 @ 15:14:03 Author: juergen Revision: 204838 Add gnutls dependency Fixes: FS#38632 New Release: 24.3-6 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-01-28 12:49:20 UTC (rev 204837) +++ PKGBUILD2014-01-28 14:14:03 UTC (rev 204838) @@ -4,12 +4,12 @@ pkgname=emacs pkgver=24.3 -pkgrel=5 +pkgrel=6 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls') install=emacs.install source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} emacs-24.3-giflib5.patch)
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Saturday, January 18, 2014 @ 07:57:16 Author: eric Revision: 204367 upgpkg: emacs 24.3-5 Rebuild against imagemagick 6.8.8.2 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-01-18 05:55:24 UTC (rev 204366) +++ PKGBUILD2014-01-18 06:57:16 UTC (rev 204367) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=24.3 -pkgrel=4 +pkgrel=5 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Wednesday, August 7, 2013 @ 00:25:58 Author: eric Revision: 192194 upgpkg: emacs 24.3-4 Rebuild against imagemagick 6.8.6.8 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-08-06 21:50:51 UTC (rev 192193) +++ PKGBUILD2013-08-06 22:25:58 UTC (rev 192194) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=24.3 -pkgrel=3 +pkgrel=4 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD emacs-24.3-giflib5.patch)
Date: Tuesday, July 30, 2013 @ 12:29:42 Author: jgc Revision: 191764 giflib rebuild upgpkg: emacs 24.3-3 Added: emacs/trunk/emacs-24.3-giflib5.patch Modified: emacs/trunk/PKGBUILD --+ PKGBUILD | 15 +++ emacs-24.3-giflib5.patch | 26 ++ 2 files changed, 37 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-07-30 10:02:50 UTC (rev 191763) +++ PKGBUILD2013-07-30 10:29:42 UTC (rev 191764) @@ -4,20 +4,27 @@ pkgname=emacs pkgver=24.3 -pkgrel=2 +pkgrel=3 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} +emacs-24.3-giflib5.patch) md5sums=('ea9ed000ca165280265aabb55b9afbd7' - '3f6990fabfbe1d5f3cd58bace4eb20f1') + 'SKIP' + '560cdf463299e059c5fadf474bcba218') +prepare() { + cd $pkgname-$pkgver + patch -Np0 -i ../emacs-24.3-giflib5.patch +} + build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk3 --with-xft make } Added: emacs-24.3-giflib5.patch === --- emacs-24.3-giflib5.patch(rev 0) +++ emacs-24.3-giflib5.patch2013-07-30 10:29:42 UTC (rev 191764) @@ -0,0 +1,26 @@ +--- src/image.c src/image.c2013-05-21 15:49:41.945819346 + +@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image + } + + /* Open the GIF file. */ ++#if GIFLIB_MAJOR 5 + gif = fn_DGifOpenFileName (SSDATA (file)); ++#else ++ gif = fn_DGifOpenFileName (SSDATA (file), NULL); ++#endif + if (gif == NULL) + { + image_error (Cannot open `%s', file, Qnil); +@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image + memsrc.len = SBYTES (specified_data); + memsrc.index = 0; + ++#if GIFLIB_MAJOR 5 + gif = fn_DGifOpen (memsrc, gif_read_from_memory); ++#else ++ gif = fn_DGifOpen (memsrc, gif_read_from_memory, NULL); ++#endif + if (!gif) + { + image_error (Cannot open memory source `%s', img-spec, Qnil);
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Monday, April 29, 2013 @ 23:42:36 Author: eric Revision: 183949 upgpkg: emacs 24.3-2 Rebuild against libpng 1.6 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-04-29 19:55:54 UTC (rev 183948) +++ PKGBUILD2013-04-29 21:42:36 UTC (rev 183949) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=24.3 -pkgrel=1 +pkgrel=2 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD emacs.install)
Date: Monday, March 18, 2013 @ 21:22:11 Author: eric Revision: 180240 upgpkg: emacs 24.3-1 Rebuild against imagemagick-6.8.3.9, Upstream update, Update info pages handling in install scriptlet Modified: emacs/trunk/PKGBUILD emacs/trunk/emacs.install ---+ PKGBUILD | 12 +++- emacs.install | 10 +- 2 files changed, 12 insertions(+), 10 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-03-18 19:28:47 UTC (rev 180239) +++ PKGBUILD2013-03-18 20:22:11 UTC (rev 180240) @@ -3,18 +3,18 @@ # Contributor: Renchi Raju ren...@green.tam.uiuc.edu pkgname=emacs -pkgver=24.2 -pkgrel=4 +pkgver=24.3 +pkgrel=1 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}) -md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('ea9ed000ca165280265aabb55b9afbd7' + '3f6990fabfbe1d5f3cd58bace4eb20f1') - build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ @@ -29,6 +29,8 @@ # remove conflict with ctags package mv $pkgdir/usr/bin/{ctags,ctags.emacs} mv $pkgdir/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1} + # remove conflict with texinfo + rm $pkgdir/usr/share/info/info.info.gz # fix user/root permissions on usr/share files find $pkgdir/usr/share/emacs/$pkgver -exec chown root:root {} \; # fix perms on /var/games Modified: emacs.install === --- emacs.install 2013-03-18 19:28:47 UTC (rev 180239) +++ emacs.install 2013-03-18 20:22:11 UTC (rev 180240) @@ -1,11 +1,11 @@ ICON_PATH=usr/share/icons/hicolor INFO_DIR=usr/share/info -INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse +INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake -forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode +forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail -speedbar tramp url vip viper widget woman) +speedbar srecode tramp url vip viper widget wisent woman) post_install() { gtk-update-icon-cache -q -t -f ${ICON_PATH} @@ -13,7 +13,7 @@ [[ -x usr/bin/install-info ]] || return 0 for f in ${INFO_FILES[@]}; do -install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2 /dev/null +install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2 /dev/null done } @@ -27,6 +27,6 @@ [[ -x usr/bin/install-info ]] || return 0 for f in ${INFO_FILES[@]}; do -install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2 /dev/null +install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2 /dev/null done }
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Sunday, January 20, 2013 @ 01:39:14 Author: eric Revision: 175713 upgpkg: emacs 24.2-4 Rebuild against imagemagick-6.8.1.9 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-01-20 05:59:36 UTC (rev 175712) +++ PKGBUILD2013-01-20 06:39:14 UTC (rev 175713) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=24.2 -pkgrel=3 +pkgrel=4 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD emacs.install)
Date: Sunday, November 18, 2012 @ 03:01:04 Author: eric Revision: 171501 upgpkg: emacs 24.2-3 Fix undefined variable (close FS#32163), Update info pages in .install file Modified: emacs/trunk/PKGBUILD emacs/trunk/emacs.install ---+ PKGBUILD |6 ++ emacs.install |2 +- 2 files changed, 3 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-11-18 07:59:37 UTC (rev 171500) +++ PKGBUILD2012-11-18 08:01:04 UTC (rev 171501) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=24.2 -pkgrel=2 +pkgrel=3 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; @@ -29,10 +29,8 @@ # remove conflict with ctags package mv $pkgdir/usr/bin/{ctags,ctags.emacs} mv $pkgdir/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1} - # fix all the 777 perms on directories - find $pkgdir/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \; # fix user/root permissions on usr/share files - find $pkgdir/usr/share/emacs/$_majorver -exec chown root:root {} \; + find $pkgdir/usr/share/emacs/$pkgver -exec chown root:root {} \; # fix perms on /var/games chmod 775 $pkgdir/var/games chmod 775 $pkgdir/var/games/emacs Modified: emacs.install === --- emacs.install 2012-11-18 07:59:37 UTC (rev 171500) +++ emacs.install 2012-11-18 08:01:04 UTC (rev 171501) @@ -2,7 +2,7 @@ INFO_DIR=usr/share/info INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse -ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake +ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar tramp url vip viper widget woman)
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Sunday, October 21, 2012 @ 20:40:38 Author: eric Revision: 169484 upgpkg: emacs 24.2-2 Rebuild against imagemagick 6.8.0 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2012-10-22 00:13:27 UTC (rev 169483) +++ PKGBUILD2012-10-22 00:40:38 UTC (rev 169484) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=24.2 -pkgrel=1 +pkgrel=2 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html;
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Tuesday, August 28, 2012 @ 07:50:31 Author: juergen Revision: 165666 update to 24.2 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-08-28 11:17:01 UTC (rev 165665) +++ PKGBUILD2012-08-28 11:50:31 UTC (rev 165666) @@ -3,8 +3,8 @@ # Contributor: Renchi Raju ren...@green.tam.uiuc.edu pkgname=emacs -pkgver=24.1 -pkgrel=2 +pkgver=24.2 +pkgrel=1 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; @@ -12,7 +12,7 @@ depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') install=emacs.install source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}) -md5sums=('8ba0932c498bc8fb10d7ddba52227e5b' 'c303d5c0bd0f7ea28acd14c9738faff4') +md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158') build() {
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Tuesday, August 21, 2012 @ 08:00:17 Author: juergen Revision: 165497 use gtk3 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-08-21 08:58:19 UTC (rev 165496) +++ PKGBUILD2012-08-21 12:00:17 UTC (rev 165497) @@ -9,7 +9,7 @@ arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') install=emacs.install source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}) md5sums=('8ba0932c498bc8fb10d7ddba52227e5b' 'c303d5c0bd0f7ea28acd14c9738faff4') @@ -18,7 +18,7 @@ build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ ---localstatedir=/var --with-x-toolkit=gtk --with-xft +--localstatedir=/var --with-x-toolkit=gtk3 --with-xft make }
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Tuesday, August 21, 2012 @ 08:14:05 Author: juergen Revision: 165498 fix FS#30904 - [emacs] add dependencies to support bidi Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2012-08-21 12:00:17 UTC (rev 165497) +++ PKGBUILD2012-08-21 12:14:05 UTC (rev 165498) @@ -9,7 +9,7 @@ arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') install=emacs.install source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}) md5sums=('8ba0932c498bc8fb10d7ddba52227e5b' 'c303d5c0bd0f7ea28acd14c9738faff4')
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Monday, June 11, 2012 @ 03:31:19 Author: juergen Revision: 161419 update to 24.1 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD | 16 +--- 1 file changed, 5 insertions(+), 11 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-06-11 06:43:17 UTC (rev 161418) +++ PKGBUILD2012-06-11 07:31:19 UTC (rev 161419) @@ -3,26 +3,20 @@ # Contributor: Renchi Raju ren...@green.tam.uiuc.edu pkgname=emacs -pkgver=23.4 -pkgrel=2 +pkgver=24.1 +pkgrel=1 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig} - emacs-subversion17.patch - emacs-23.3-xgselect_init.patch) -md5sums=('070c68ad8e3c31fb3cb2414feaf5e6f0' - '55eb16eb48b44987693c0e3ea5ab8075' - '12e2e7a66df5cc5ded54e1d30083a1fb' -'0d3b3d701ba1295613ace30e8d67ca88') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}) +md5sums=('8ba0932c498bc8fb10d7ddba52227e5b' 'c303d5c0bd0f7ea28acd14c9738faff4') + build() { cd $srcdir/$pkgname-$pkgver - patch -p1 -i ../emacs-subversion17.patch - patch -p1 -i ../emacs-23.3-xgselect_init.patch ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk --with-xft make
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Monday, June 11, 2012 @ 03:51:41 Author: juergen Revision: 161421 upgpkg: emacs 24.1-1 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2012-06-11 07:31:45 UTC (rev 161420) +++ PKGBUILD2012-06-11 07:51:41 UTC (rev 161421) @@ -28,7 +28,7 @@ # remove conflict with ctags package mv $pkgdir/usr/bin/{ctags,ctags.emacs} - mv $pkgdir/usr/share/man/man1/{ctags.1,ctags.emacs.1} + mv $pkgdir/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1} # fix all the 777 perms on directories find $pkgdir/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \; # fix user/root permissions on usr/share files
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Monday, June 11, 2012 @ 10:59:47 Author: juergen Revision: 161433 add missing imagemagick dependency Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-06-11 13:29:15 UTC (rev 161432) +++ PKGBUILD2012-06-11 14:59:47 UTC (rev 161433) @@ -4,12 +4,12 @@ pkgname=emacs pkgver=24.1 -pkgrel=1 +pkgrel=2 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') install=emacs.install source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}) md5sums=('8ba0932c498bc8fb10d7ddba52227e5b' 'c303d5c0bd0f7ea28acd14c9738faff4')
[arch-commits] Commit in emacs/trunk (PKGBUILD emacs-23.3-xgselect_init.patch)
Date: Thursday, April 12, 2012 @ 07:14:11 Author: juergen Revision: 156052 fix FS#29233 - [Emacs] hangs with the glib 2.32 Added: emacs/trunk/emacs-23.3-xgselect_init.patch Modified: emacs/trunk/PKGBUILD + PKGBUILD |7 +-- emacs-23.3-xgselect_init.patch | 13 + 2 files changed, 18 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-04-12 08:26:22 UTC (rev 156051) +++ PKGBUILD2012-04-12 11:14:11 UTC (rev 156052) @@ -11,10 +11,13 @@ license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig} emacs-subversion17.patch) +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig} + emacs-subversion17.patch + emacs-23.3-xgselect_init.patch) md5sums=('070c68ad8e3c31fb3cb2414feaf5e6f0' '55eb16eb48b44987693c0e3ea5ab8075' - '12e2e7a66df5cc5ded54e1d30083a1fb') + '12e2e7a66df5cc5ded54e1d30083a1fb' +'0d3b3d701ba1295613ace30e8d67ca88') build() { cd $srcdir/$pkgname-$pkgver Added: emacs-23.3-xgselect_init.patch === --- emacs-23.3-xgselect_init.patch (rev 0) +++ emacs-23.3-xgselect_init.patch 2012-04-12 11:14:11 UTC (rev 156052) @@ -0,0 +1,13 @@ +diff -up emacs-23.3/src/xgselect.c.xgselect_init emacs-23.3/src/xgselect.c +--- emacs-23.3/src/xgselect.c.xgselect_init2011-01-08 18:45:14.0 +0100 emacs-23.3/src/xgselect.c 2011-11-11 13:00:53.211765255 +0100 +@@ -55,6 +55,9 @@ xg_select (max_fds, rfds, wfds, efds, ti + do { + if (n_gfds gfds_size) + { ++if (gfds_size == 0) ++ xgselect_initialize (); ++ + while (n_gfds gfds_size) + gfds_size *= 2; + xfree (gfds);
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Thursday, April 12, 2012 @ 08:20:23 Author: juergen Revision: 156053 upgpkg: emacs 23.4-2 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2012-04-12 11:14:11 UTC (rev 156052) +++ PKGBUILD2012-04-12 12:20:23 UTC (rev 156053) @@ -4,7 +4,7 @@ pkgname=emacs pkgver=23.4 -pkgrel=1 +pkgrel=2 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; @@ -22,6 +22,7 @@ build() { cd $srcdir/$pkgname-$pkgver patch -p1 -i ../emacs-subversion17.patch + patch -p1 -i ../emacs-23.3-xgselect_init.patch ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk --with-xft make
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Wednesday, February 1, 2012 @ 03:39:49 Author: juergen Revision: 148451 update to 23.4 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-02-01 04:56:04 UTC (rev 148450) +++ PKGBUILD2012-02-01 08:39:49 UTC (rev 148451) @@ -3,13 +3,13 @@ # Contributor: Renchi Raju ren...@green.tam.uiuc.edu pkgname=emacs -_majorver=23.3 -_minorver=b +_majorver=23.4 +_minorver= # We want something like 23.3.a so pacman version comparison works, but # upstream uses 23.3a, which is a bit silly and interpreted as alpha. pkgver=$_majorver.$_minorver _realver=$_majorver$_minorver -pkgrel=2 +pkgrel=1 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; @@ -17,8 +17,8 @@ depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') install=emacs.install source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.bz2{,.sig} emacs-subversion17.patch) -md5sums=('917ce0054ef63773078a6e99b55df1ee' - '4f987fbb906c0ee73e05904b0f7ce5ec' +md5sums=('070c68ad8e3c31fb3cb2414feaf5e6f0' + '55eb16eb48b44987693c0e3ea5ab8075' '12e2e7a66df5cc5ded54e1d30083a1fb') build() {
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Wednesday, February 1, 2012 @ 03:48:42 Author: juergen Revision: 148455 upgpkg: emacs 23.4-1 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-02-01 08:46:11 UTC (rev 148454) +++ PKGBUILD2012-02-01 08:48:42 UTC (rev 148455) @@ -3,12 +3,7 @@ # Contributor: Renchi Raju ren...@green.tam.uiuc.edu pkgname=emacs -_majorver=23.4 -_minorver= -# We want something like 23.3.a so pacman version comparison works, but -# upstream uses 23.3a, which is a bit silly and interpreted as alpha. -pkgver=$_majorver.$_minorver -_realver=$_majorver$_minorver +pkgver=23.4 pkgrel=1 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') @@ -30,7 +25,7 @@ } package() { - cd $srcdir/$pkgname-$_majorver + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install # remove conflict with ctags package
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Wednesday, February 1, 2012 @ 03:56:13 Author: juergen Revision: 148456 update to 23.4 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-02-01 08:48:42 UTC (rev 148455) +++ PKGBUILD2012-02-01 08:56:13 UTC (rev 148456) @@ -11,13 +11,13 @@ license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.bz2{,.sig} emacs-subversion17.patch) +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig} emacs-subversion17.patch) md5sums=('070c68ad8e3c31fb3cb2414feaf5e6f0' '55eb16eb48b44987693c0e3ea5ab8075' '12e2e7a66df5cc5ded54e1d30083a1fb') build() { - cd $srcdir/$pkgname-$_majorver + cd $srcdir/$pkgname-$pkgver patch -p1 -i ../emacs-subversion17.patch ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk --with-xft
[arch-commits] Commit in emacs/trunk (PKGBUILD emacs-subversion17.patch)
Date: Saturday, January 21, 2012 @ 16:55:02 Author: eric Revision: 147095 upgpkg: emacs 23.3.b-2 Rebuild against libpng 1.5 and libtiff 4.0, Fix vc for subversion 1.7 (close FS#27554) Added: emacs/trunk/emacs-subversion17.patch Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |9 +++- emacs-subversion17.patch | 83 + 2 files changed, 89 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-01-21 19:51:59 UTC (rev 147094) +++ PKGBUILD2012-01-21 21:55:02 UTC (rev 147095) @@ -9,18 +9,21 @@ # upstream uses 23.3a, which is a bit silly and interpreted as alpha. pkgver=$_majorver.$_minorver _realver=$_majorver$_minorver -pkgrel=1 +pkgrel=2 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz) -md5sums=('f2bfd8eab7e3b34a0f7f09acc0667e71') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.bz2{,.sig} emacs-subversion17.patch) +md5sums=('917ce0054ef63773078a6e99b55df1ee' + '4f987fbb906c0ee73e05904b0f7ce5ec' + '12e2e7a66df5cc5ded54e1d30083a1fb') build() { cd $srcdir/$pkgname-$_majorver + patch -p1 -i ../emacs-subversion17.patch ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk --with-xft make Added: emacs-subversion17.patch === --- emacs-subversion17.patch(rev 0) +++ emacs-subversion17.patch2012-01-21 21:55:02 UTC (rev 147095) @@ -0,0 +1,83 @@ +From d7afd9288e22c466b63c27e7e11783589b07aeff Mon Sep 17 00:00:00 2001 +From: Karl Pflästerer k...@rl.pflaesterer.de +Date: Sat, 12 Feb 2011 01:12:53 + +Subject: Adapt to Subversion change, with no .svn directory in each sub directory. + +http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00357.html + +* vc/vc-svn.el (vc-svn-registered): Use vc-svn-root. +(vc-svn-root): New function. Make vc-svn-responsible-p an alias. +(vc-svn-repository-hostname): Use svn info. +--- +(limited to 'lisp/vc/vc-svn.el') + +diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el +index aefef50..20c7689 100644 +--- a/lisp/vc-svn.el b/lisp/vc-svn.el +@@ -117,17 +117,13 @@ If you want to force an empty list of arguments, use t. + ;;;###autoload(getenv SVN_ASP_DOT_NET_HACK)) + ;;;###autoload _svn) + ;;;###autoload (t .svn +-;;;###autoload (when (file-readable-p (expand-file-name +-;;;###autoload (concat admin-dir /entries) +-;;;###autoload (file-name-directory f))) ++;;;###autoload (when (vc-find-root f admin-dir) + ;;;###autoload (load vc-svn) + ;;;###autoload (vc-svn-registered f + + (defun vc-svn-registered (file) + Check if FILE is SVN registered. +- (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory +- /entries) +- (file-name-directory file))) ++ (when (vc-svn-root file) + (with-temp-buffer + (cd (file-name-directory file)) + (let* (process-file-side-effects +@@ -275,14 +271,12 @@ Passes either `vc-svn-register-switches' or `vc-register-switches' + to the SVN command. + (apply 'vc-svn-command nil 0 files add (vc-switches 'SVN 'register))) + +-(defun vc-svn-responsible-p (file) +- Return non-nil if SVN thinks it is responsible for FILE. +- (file-directory-p (expand-file-name vc-svn-admin-directory +-(if (file-directory-p file) +-file +- (file-name-directory file) ++(defun vc-svn-root (file) ++ (vc-find-root file vc-svn-admin-directory)) + +-(defalias 'vc-svn-could-register 'vc-svn-responsible-p ++(defalias 'vc-svn-responsible-p 'vc-svn-root) ++ ++(defalias 'vc-svn-could-register 'vc-svn-root + Return non-nil if FILE could be registered in SVN. + This is only possible if SVN is responsible for FILE's directory.) + +@@ -594,20 +588,10 @@ and that it passes `vc-svn-global-switches' to it before FLAGS. + + (defun vc-svn-repository-hostname (dirname) + (with-temp-buffer +-(let ((coding-system-for-read +- (or file-name-coding-system +- default-file-name-coding-system))) +- (vc-insert-file (expand-file-name (concat vc-svn-admin-directory +- /entries) +-
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Thursday, January 5, 2012 @ 08:09:00 Author: juergen Revision: 146144 update to 23.3-b Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-01-05 13:08:52 UTC (rev 146143) +++ PKGBUILD2012-01-05 13:09:00 UTC (rev 146144) @@ -4,12 +4,12 @@ pkgname=emacs _majorver=23.3 -_minorver=a +_minorver=b # We want something like 23.3.a so pacman version comparison works, but # upstream uses 23.3a, which is a bit silly and interpreted as alpha. pkgver=$_majorver.$_minorver _realver=$_majorver$_minorver -pkgrel=3 +pkgrel=1 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; @@ -17,7 +17,7 @@ depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') install=emacs.install source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz) -md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04') +md5sums=('f2bfd8eab7e3b34a0f7f09acc0667e71') build() { cd $srcdir/$pkgname-$_majorver
[arch-commits] Commit in emacs/trunk (PKGBUILD emacs.desktop)
Date: Tuesday, October 25, 2011 @ 16:28:56 Author: andrea Revision: 141196 Upstream already ships desktop file and icon Modified: emacs/trunk/PKGBUILD Deleted: emacs/trunk/emacs.desktop ---+ PKGBUILD | 11 +++ emacs.desktop | 12 2 files changed, 3 insertions(+), 20 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-10-25 19:20:53 UTC (rev 141195) +++ PKGBUILD2011-10-25 20:28:56 UTC (rev 141196) @@ -1,6 +1,7 @@ # $Id$ # Maintainer: Juergen Hoetzel juer...@archlinux.org # Contributor: Renchi Raju ren...@green.tam.uiuc.edu + pkgname=emacs _majorver=23.3 _minorver=a @@ -15,9 +16,8 @@ license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz emacs.desktop) -md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04' - '8af038d2ba4561271e935bb444ceb4e3') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz) +md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04') build() { cd $srcdir/$pkgname-$_majorver @@ -42,9 +42,4 @@ chmod 775 $pkgdir/var/games/emacs chmod 664 $pkgdir/var/games/emacs/* chown -R root:games $pkgdir/var/games - - # fix FS#9253 - mkdir -p $pkgdir/usr/share/pixmaps $pkgdir/usr/share/applications - install -D -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications - ln -s ../emacs/$_majorver/etc/images/icons/hicolor/48x48/apps/emacs.png $pkgdir/usr/share/pixmaps/emacs-icon.png } Deleted: emacs.desktop === --- emacs.desktop 2011-10-25 19:20:53 UTC (rev 141195) +++ emacs.desktop 2011-10-25 20:28:56 UTC (rev 141196) @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=Emacs Text Editor -Name[de]=Emacs Texteditor -GenericName=Text Editor -Comment=Edit text -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=emacs %f -Icon=emacs-icon -Type=Application -Terminal=false -Categories=Development;TextEditor; -StartupWMClass=Emacs
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Tuesday, September 13, 2011 @ 08:10:32 Author: juergen Revision: 137973 enable sound support Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-09-13 10:41:55 UTC (rev 137972) +++ PKGBUILD2011-09-13 12:10:32 UTC (rev 137973) @@ -8,7 +8,7 @@ # upstream uses 23.3a, which is a bit silly and interpreted as alpha. pkgver=$_majorver.$_minorver _realver=$_majorver$_minorver -pkgrel=2 +pkgrel=3 pkgdesc=The extensible, customizable, self-documenting real-time display editor arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; @@ -22,7 +22,7 @@ build() { cd $srcdir/$pkgname-$_majorver ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ ---localstatedir=/var --without-sound --with-x-toolkit=gtk --with-xft +--localstatedir=/var --with-x-toolkit=gtk --with-xft make }
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Tuesday, September 13, 2011 @ 08:58:41 Author: juergen Revision: 137974 upgpkg: emacs 23.3.a-3 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2011-09-13 12:10:32 UTC (rev 137973) +++ PKGBUILD2011-09-13 12:58:41 UTC (rev 137974) @@ -13,7 +13,7 @@ arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') install=emacs.install source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz emacs.desktop) md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04'
[arch-commits] Commit in emacs/trunk (PKGBUILD emacs.install)
Date: Saturday, August 20, 2011 @ 22:29:35 Author: eric Revision: 135952 upgpkg: emacs 23.3.a-2 Improve description, Update license, Clean up depends, Add desktop-file-utils depends to run update-desktop-database in install scriptlet, Update list of info pages in install scriptlet, Remove docs option, Remove cdet replace array Modified: emacs/trunk/PKGBUILD emacs/trunk/emacs.install ---+ PKGBUILD | 17 +++-- emacs.install | 12 2 files changed, 15 insertions(+), 14 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-08-20 21:33:41 UTC (rev 135951) +++ PKGBUILD2011-08-21 02:29:35 UTC (rev 135952) @@ -8,24 +8,21 @@ # upstream uses 23.3a, which is a bit silly and interpreted as alpha. pkgver=$_majorver.$_minorver _realver=$_majorver$_minorver -pkgrel=1 -pkgdesc=The Emacs Editor -arch=(i686 x86_64) +pkgrel=2 +pkgdesc=The extensible, customizable, self-documenting real-time display editor +arch=('i686' 'x86_64') url=http://www.gnu.org/software/emacs/emacs.html; -license=('GPL') -options=(docs) -replaces=(cedet) -depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'libxft' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf') +license=('GPL3') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils') +install=emacs.install source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz emacs.desktop) md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04' '8af038d2ba4561271e935bb444ceb4e3') -install=emacs.install build() { cd $srcdir/$pkgname-$_majorver ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ ---localstatedir=/var --mandir=/usr/share/man --without-sound \ ---with-x-toolkit=gtk --with-xft +--localstatedir=/var --without-sound --with-x-toolkit=gtk --with-xft make } Modified: emacs.install === --- emacs.install 2011-08-20 21:33:41 UTC (rev 135951) +++ emacs.install 2011-08-21 02:29:35 UTC (rev 135952) @@ -1,15 +1,17 @@ -ICON_PATH=/usr/share/icons/hicolor -INFO_DIR=/usr/share/info +ICON_PATH=usr/share/icons/hicolor +INFO_DIR=usr/share/info INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse -ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc flymake +ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode -org pcl-cvs pgg rcirc reftex remember sasl sc ses sieve smtpmail +org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar tramp url vip viper widget woman) post_install() { gtk-update-icon-cache -q -t -f ${ICON_PATH} + update-desktop-database -q + [[ -x usr/bin/install-info ]] || return 0 for f in ${INFO_FILES[@]}; do install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2 /dev/null done @@ -21,7 +23,9 @@ pre_remove() { gtk-update-icon-cache -q -t -f ${ICON_PATH} + update-desktop-database -q + [[ -x usr/bin/install-info ]] || return 0 for f in ${INFO_FILES[@]}; do install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2 /dev/null done
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Thursday, August 18, 2011 @ 02:22:30 Author: dan Revision: 135730 Fix version comparison issues reported in FS#25408; also a handful of fixes from FS#23435 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD | 53 - 1 file changed, 28 insertions(+), 25 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-08-18 05:00:13 UTC (rev 135729) +++ PKGBUILD2011-08-18 06:22:30 UTC (rev 135730) @@ -2,7 +2,12 @@ # Maintainer: Juergen Hoetzel juer...@archlinux.org # Contributor: Renchi Raju ren...@green.tam.uiuc.edu pkgname=emacs -pkgver=23.3a +_majorver=23.3 +_minorver=a +# We want something like 23.3.a so pacman version comparison works, but +# upstream uses 23.3a, which is a bit silly and interpreted as alpha. +pkgver=$_majorver.$_minorver +_realver=$_majorver$_minorver pkgrel=1 pkgdesc=The Emacs Editor arch=(i686 x86_64) @@ -10,41 +15,39 @@ license=('GPL') options=(docs) replaces=(cedet) -depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf') -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop) +depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'libxft' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz emacs.desktop) md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04' '8af038d2ba4561271e935bb444ceb4e3') install=emacs.install build() { - cd $startdir/src/$pkgname-${pkgver%[a-z]} - mandir=/usr/share/man - - # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904 - CFLAGS=${CFLAGS} -fno-optimize-sibling-calls\ -./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ ---localstatedir=/var --mandir=${mandir} --without-sound --with-x-toolkit=gtk + cd $srcdir/$pkgname-$_majorver + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ +--localstatedir=/var --mandir=/usr/share/man --without-sound \ +--with-x-toolkit=gtk --with-xft make - make DESTDIR=$startdir/pkg install +} +package() { + cd $srcdir/$pkgname-$_majorver + make DESTDIR=$pkgdir install + # remove conflict with ctags package - mv $startdir/pkg/usr/bin/{ctags,ctags.emacs} - mv $startdir/pkg/usr/bin/{etags,etags.emacs} - mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1} - mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1} + mv $pkgdir/usr/bin/{ctags,ctags.emacs} + mv $pkgdir/usr/share/man/man1/{ctags.1,ctags.emacs.1} # fix all the 777 perms on directories - find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -type d -exec chmod 755 {} \; + find $pkgdir/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \; # fix user/root permissions on usr/share files - find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -exec chown root.root {} \; + find $pkgdir/usr/share/emacs/$_majorver -exec chown root:root {} \; # fix perms on /var/games - chmod 775 ${startdir}/pkg/var/games - chmod 775 ${startdir}/pkg/var/games/emacs - chmod 664 ${startdir}/pkg/var/games/emacs/* - chown -R root:50 ${startdir}/pkg/var/games + chmod 775 $pkgdir/var/games + chmod 775 $pkgdir/var/games/emacs + chmod 664 $pkgdir/var/games/emacs/* + chown -R root:games $pkgdir/var/games - # fix FS#9253 - mkdir -p $startdir/pkg/usr/share/pixmaps ${startdir}/pkg/usr/share/applications - install -D -m644 ${startdir}/src/${pkgname}.desktop ${startdir}/pkg/usr/share/applications - ln -s ../emacs/${pkgver%[a-z]}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png + mkdir -p $pkgdir/usr/share/pixmaps $pkgdir/usr/share/applications + install -D -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications + ln -s ../emacs/$_majorver/etc/images/icons/hicolor/48x48/apps/emacs.png $pkgdir/usr/share/pixmaps/emacs-icon.png }
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Friday, August 5, 2011 @ 03:55:30 Author: juergen Revision: 134523 update to 23.3a Modified: emacs/trunk/PKGBUILD --+ PKGBUILD | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-08-05 06:00:58 UTC (rev 134522) +++ PKGBUILD2011-08-05 07:55:30 UTC (rev 134523) @@ -2,7 +2,7 @@ # Maintainer: Juergen Hoetzel juer...@archlinux.org # Contributor: Renchi Raju ren...@green.tam.uiuc.edu pkgname=emacs -pkgver=23.3 +pkgver=23.3a pkgrel=1 pkgdesc=The Emacs Editor arch=(i686 x86_64) @@ -12,30 +12,30 @@ replaces=(cedet) depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop) -md5sums=('bf07c01ef473d8540c9c39f94506b1e6' +md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04' '8af038d2ba4561271e935bb444ceb4e3') install=emacs.install build() { - cd $startdir/src/$pkgname-$pkgver + cd $startdir/src/$pkgname-${pkgver%[a-z]} mandir=/usr/share/man - + # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904 CFLAGS=${CFLAGS} -fno-optimize-sibling-calls\ ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --mandir=${mandir} --without-sound --with-x-toolkit=gtk - make - make DESTDIR=$startdir/pkg install + make + make DESTDIR=$startdir/pkg install # remove conflict with ctags package - mv $startdir/pkg/usr/bin/{ctags,ctags.emacs} - mv $startdir/pkg/usr/bin/{etags,etags.emacs} - mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1} - mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1} + mv $startdir/pkg/usr/bin/{ctags,ctags.emacs} + mv $startdir/pkg/usr/bin/{etags,etags.emacs} + mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1} + mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1} # fix all the 777 perms on directories - find $startdir/pkg/usr/share/emacs/$pkgver -type d -exec chmod 755 {} \; + find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -type d -exec chmod 755 {} \; # fix user/root permissions on usr/share files - find $startdir/pkg/usr/share/emacs/$pkgver -exec chown root.root {} \; + find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -exec chown root.root {} \; # fix perms on /var/games chmod 775 ${startdir}/pkg/var/games chmod 775 ${startdir}/pkg/var/games/emacs @@ -43,8 +43,8 @@ chown -R root:50 ${startdir}/pkg/var/games - # fix FS#9253 + # fix FS#9253 mkdir -p $startdir/pkg/usr/share/pixmaps ${startdir}/pkg/usr/share/applications install -D -m644 ${startdir}/src/${pkgname}.desktop ${startdir}/pkg/usr/share/applications - ln -s ../emacs/${pkgver}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png + ln -s ../emacs/${pkgver%[a-z]}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png }
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Thursday, March 10, 2011 @ 06:31:08 Author: juergen Revision: 113641 update to 23.3.1 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-03-10 10:35:41 UTC (rev 113640) +++ PKGBUILD2011-03-10 11:31:08 UTC (rev 113641) @@ -2,7 +2,7 @@ # Maintainer: Juergen Hoetzel juer...@archlinux.org # Contributor: Renchi Raju ren...@green.tam.uiuc.edu pkgname=emacs -pkgver=23.2 +pkgver=23.3 pkgrel=1 pkgdesc=The Emacs Editor arch=(i686 x86_64) @@ -12,7 +12,8 @@ replaces=(cedet) depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop) -md5sums=('b6691852dae0bc142b3c12749f6b7ade' '8af038d2ba4561271e935bb444ceb4e3') +md5sums=('bf07c01ef473d8540c9c39f94506b1e6' + '8af038d2ba4561271e935bb444ceb4e3') install=emacs.install build() {
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Saturday, August 7, 2010 @ 04:00:20 Author: juergen Revision: 86947 fix typo (FS#19394) Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2010-08-07 05:39:07 UTC (rev 86946) +++ PKGBUILD2010-08-07 08:00:20 UTC (rev 86947) @@ -22,7 +22,7 @@ # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904 CFLAGS=${CFLAGS} -fno-optimize-sibling-calls\ ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ ---localstatedir=/var --mandir=${mandir} --without-sound -with-x-toolkit=gtk +--localstatedir=/var --mandir=${mandir} --without-sound --with-x-toolkit=gtk make make DESTDIR=$startdir/pkg install
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Saturday, June 12, 2010 @ 03:50:14 Author: juergen Revision: 82505 fix FS#19405 - [emacs] now contains cedet Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |1 + 1 file changed, 1 insertion(+) Modified: PKGBUILD === --- PKGBUILD2010-06-12 05:19:47 UTC (rev 82504) +++ PKGBUILD2010-06-12 07:50:14 UTC (rev 82505) @@ -9,6 +9,7 @@ url=http://www.gnu.org/software/emacs/emacs.html; license=('GPL') options=(docs) +replaces=(cedet) depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop) md5sums=('b6691852dae0bc142b3c12749f6b7ade' '8af038d2ba4561271e935bb444ceb4e3')
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Saturday, May 8, 2010 @ 04:55:56 Author: juergen Revision: 79814 update to emacs 23.2 Modified: emacs/trunk/PKGBUILD --+ PKGBUILD | 20 +++- 1 file changed, 11 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-05-08 05:04:07 UTC (rev 79813) +++ PKGBUILD2010-05-08 08:55:56 UTC (rev 79814) @@ -2,8 +2,8 @@ # Maintainer: Juergen Hoetzel juer...@archlinux.org # Contributor: Renchi Raju ren...@green.tam.uiuc.edu pkgname=emacs -pkgver=23.1 -pkgrel=5 +pkgver=23.2 +pkgrel=1 pkgdesc=The Emacs Editor arch=(i686 x86_64) url=http://www.gnu.org/software/emacs/emacs.html; @@ -11,18 +11,20 @@ options=(docs) depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop libpng14.patch 0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch) -md5sums=('a620d4452769d04ad8864d662f34f8dd' '8af038d2ba4561271e935bb444ceb4e3'\ - 'd3e657091f41504fba7bdb0e96ec9b38' '8afbea5b319862c1449cc6534e0908de') +sha1sums=('2f99c7111c232cf04410607698d2db842e305c82' + '50060b676382719955c4e43e28a597ec0bc5805a' + 'f206f65465f32c96e08aeb37ffb5008fb818f59d' + '403e1461c30ce7f7e44c4d2c634dcd4a93f02a43') install=emacs.install build() { cd $startdir/src/$pkgname-$pkgver - patch -p1 $startdir/src/libpng14.patch - # Patch from Upstream dev: Invoke $CPP with -P when creating Makefile - patch -p2 -i $startdir/src/0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch mandir=/usr/share/man - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --mandir=${mandir} --without-sound -with-x-toolkit=gtk + + # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904 + CFLAGS=${CFLAGS}-fno-optimize-sibling-calls\ +./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ +--localstatedir=/var --mandir=${mandir} --without-sound -with-x-toolkit=gtk make make DESTDIR=$startdir/pkg install
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Saturday, May 8, 2010 @ 05:00:32 Author: juergen Revision: 79815 add gconf dependecy (required by font-use-system-font) Modified: emacs/trunk/PKGBUILD --+ PKGBUILD | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-05-08 08:55:56 UTC (rev 79814) +++ PKGBUILD2010-05-08 09:00:32 UTC (rev 79815) @@ -9,12 +9,10 @@ url=http://www.gnu.org/software/emacs/emacs.html; license=('GPL') options=(docs) -depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme') -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop libpng14.patch 0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch) -sha1sums=('2f99c7111c232cf04410607698d2db842e305c82' - '50060b676382719955c4e43e28a597ec0bc5805a' - 'f206f65465f32c96e08aeb37ffb5008fb818f59d' - '403e1461c30ce7f7e44c4d2c634dcd4a93f02a43') +depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop) +md5sums=('b6691852dae0bc142b3c12749f6b7ade' + '8af038d2ba4561271e935bb444ceb4e3') install=emacs.install build() {
[arch-commits] Commit in emacs/trunk (PKGBUILD)
Date: Saturday, May 8, 2010 @ 05:09:51 Author: juergen Revision: 79817 fix missing whitespace in cflags Modified: emacs/trunk/PKGBUILD --+ PKGBUILD |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-05-08 09:05:49 UTC (rev 79816) +++ PKGBUILD2010-05-08 09:09:51 UTC (rev 79817) @@ -11,8 +11,7 @@ options=(docs) depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop) -md5sums=('b6691852dae0bc142b3c12749f6b7ade' - '8af038d2ba4561271e935bb444ceb4e3') +md5sums=('b6691852dae0bc142b3c12749f6b7ade' '8af038d2ba4561271e935bb444ceb4e3') install=emacs.install build() { @@ -20,7 +19,7 @@ mandir=/usr/share/man # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904 - CFLAGS=${CFLAGS}-fno-optimize-sibling-calls\ + CFLAGS=${CFLAGS} -fno-optimize-sibling-calls\ ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --mandir=${mandir} --without-sound -with-x-toolkit=gtk make
[arch-commits] Commit in emacs/trunk (PKGBUILD libpng14.patch)
Date: Tuesday, January 19, 2010 @ 23:51:27 Author: eric Revision: 64389 upgpkg: emacs 23.1-5 Fixed libpng patch Modified: emacs/trunk/PKGBUILD emacs/trunk/libpng14.patch + PKGBUILD |6 +++--- libpng14.patch |4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-01-20 04:34:10 UTC (rev 64388) +++ PKGBUILD2010-01-20 04:51:27 UTC (rev 64389) @@ -3,7 +3,7 @@ # Contributor: Renchi Raju ren...@green.tam.uiuc.edu pkgname=emacs pkgver=23.1 -pkgrel=4 +pkgrel=5 pkgdesc=The Emacs Editor arch=(i686 x86_64) url=http://www.gnu.org/software/emacs/emacs.html; @@ -12,9 +12,9 @@ depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop libpng14.patch) md5sums=('a620d4452769d04ad8864d662f34f8dd' '8af038d2ba4561271e935bb444ceb4e3'\ - 'ad06d0cbbff8cba40fd33a37407258c1') + 'd3e657091f41504fba7bdb0e96ec9b38') sha1sums=('e993445d14d2fdedd1418bc32c8c4ea30442bc51' '50060b676382719955c4e43e28a597ec0bc5805a'\ - '2c7c13708eaf4cab102d6c9cddecfc06a0538413') + 'f206f65465f32c96e08aeb37ffb5008fb818f59d') install=emacs.install build() { Modified: libpng14.patch === --- libpng14.patch 2010-01-20 04:34:10 UTC (rev 64388) +++ libpng14.patch 2010-01-20 04:51:27 UTC (rev 64389) @@ -33,7 +33,7 @@ /* Check PNG signature. */ if (fread (sig, 1, sizeof sig, fp) != sizeof sig -|| !fn_png_check_sig (sig, sizeof sig)) -+|| !fn_png_sig_cmp (sig, 0, sizeof sig)) ++|| fn_png_sig_cmp (sig, 0, sizeof sig)) { image_error (Not a PNG file: `%s', file, Qnil); UNGCPRO; @@ -42,7 +42,7 @@ /* Check PNG signature. */ if (tbr.len sizeof sig -|| !fn_png_check_sig (tbr.bytes, sizeof sig)) -+|| !fn_png_sig_cmp (tbr.bytes, 0, sizeof sig)) ++|| fn_png_sig_cmp (tbr.bytes, 0, sizeof sig)) { image_error (Not a PNG image: `%s', img-spec, Qnil); UNGCPRO;
[arch-commits] Commit in emacs/trunk (PKGBUILD libpng14.patch)
Date: Sunday, January 17, 2010 @ 23:58:20 Author: eric Revision: 63609 upgpkg: emacs 23.1-4 Built against libpng 1.4/libjpeg 8 Added: emacs/trunk/libpng14.patch Modified: emacs/trunk/PKGBUILD + PKGBUILD | 16 libpng14.patch | 48 2 files changed, 56 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-01-18 03:55:07 UTC (rev 63608) +++ PKGBUILD2010-01-18 04:58:20 UTC (rev 63609) @@ -3,19 +3,23 @@ # Contributor: Renchi Raju ren...@green.tam.uiuc.edu pkgname=emacs pkgver=23.1 -pkgrel=3 +pkgrel=4 pkgdesc=The Emacs Editor arch=(i686 x86_64) url=http://www.gnu.org/software/emacs/emacs.html; license=('GPL') options=(docs) -depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg=7' 'gtk2' 'texinfo' 'hicolor-icon-theme') -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop) -md5sums=('a620d4452769d04ad8864d662f34f8dd' '8af038d2ba4561271e935bb444ceb4e3') +depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme') +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop libpng14.patch) +md5sums=('a620d4452769d04ad8864d662f34f8dd' '8af038d2ba4561271e935bb444ceb4e3'\ + 'ad06d0cbbff8cba40fd33a37407258c1') +sha1sums=('e993445d14d2fdedd1418bc32c8c4ea30442bc51' '50060b676382719955c4e43e28a597ec0bc5805a'\ + '2c7c13708eaf4cab102d6c9cddecfc06a0538413') install=emacs.install build() { cd $startdir/src/$pkgname-$pkgver + patch -p1 ../libpng14.patch || return 1 mandir=/usr/share/man ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --mandir=${mandir} --without-sound -with-x-toolkit=gtk @@ -38,10 +42,6 @@ chown -R root:50 ${startdir}/pkg/var/games - # remove info dir - rm $startdir/pkg/usr/share/info/dir - gzip -9nf $startdir/pkg/usr/share/info/* - # fix FS#9253 mkdir -p $startdir/pkg/usr/share/pixmaps ${startdir}/pkg/usr/share/applications install -D -m644 ${startdir}/src/${pkgname}.desktop ${startdir}/pkg/usr/share/applications Added: libpng14.patch === --- libpng14.patch (rev 0) +++ libpng14.patch 2010-01-18 04:58:20 UTC (rev 63609) @@ -0,0 +1,48 @@ +diff -Naur emacs-23.1-orig/src/image.c emacs-23.1/src/image.c +--- emacs-23.1-orig/src/image.c2010-01-17 23:12:10.0 -0500 emacs-23.1/src/image.c 2010-01-17 23:18:16.0 -0500 +@@ -5793,7 +5793,7 @@ + /* PNG library details. */ + + DEF_IMGLIB_FN (png_get_io_ptr); +-DEF_IMGLIB_FN (png_check_sig); ++DEF_IMGLIB_FN (png_sig_cmp); + DEF_IMGLIB_FN (png_create_read_struct); + DEF_IMGLIB_FN (png_create_info_struct); + DEF_IMGLIB_FN (png_destroy_read_struct); +@@ -5824,7 +5824,7 @@ + return 0; + + LOAD_IMGLIB_FN (library, png_get_io_ptr); +- LOAD_IMGLIB_FN (library, png_check_sig); ++ LOAD_IMGLIB_FN (library, png_sig_cmp); + LOAD_IMGLIB_FN (library, png_create_read_struct); + LOAD_IMGLIB_FN (library, png_create_info_struct); + LOAD_IMGLIB_FN (library, png_destroy_read_struct); +@@ -5849,7 +5849,7 @@ + #else + + #define fn_png_get_io_ptr png_get_io_ptr +-#define fn_png_check_sig png_check_sig ++#define fn_png_sig_cmppng_sig_cmp + #define fn_png_create_read_struct png_create_read_struct + #define fn_png_create_info_struct png_create_info_struct + #define fn_png_destroy_read_structpng_destroy_read_struct +@@ -5996,7 +5996,7 @@ + + /* Check PNG signature. */ + if (fread (sig, 1, sizeof sig, fp) != sizeof sig +-|| !fn_png_check_sig (sig, sizeof sig)) ++|| !fn_png_sig_cmp (sig, 0, sizeof sig)) + { + image_error (Not a PNG file: `%s', file, Qnil); + UNGCPRO; +@@ -6013,7 +6013,7 @@ + + /* Check PNG signature. */ + if (tbr.len sizeof sig +-|| !fn_png_check_sig (tbr.bytes, sizeof sig)) ++|| !fn_png_sig_cmp (tbr.bytes, 0, sizeof sig)) + { + image_error (Not a PNG image: `%s', img-spec, Qnil); + UNGCPRO;