From a3b4fa51913575d1c7478abfbcdd2799d0855ab0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 20 Sep 2013 23:25:38 -0400 Subject: update emacs-lucid, move it from [~lukeshu] to [pcr] --- pcr/emacs-lucid/PKGBUILD | 54 ++++++++++++++++++++++++++++++++ pcr/emacs-lucid/emacs-24.3-giflib5.patch | 26 +++++++++++++++ pcr/emacs-lucid/emacs.install | 32 +++++++++++++++++++ ~lukeshu/emacs-lucid/PKGBUILD | 47 --------------------------- ~lukeshu/emacs-lucid/emacs.install | 32 ------------------- ~lukeshu/emacs-lucid/librenamcap | 8 ----- 6 files changed, 112 insertions(+), 87 deletions(-) create mode 100644 pcr/emacs-lucid/PKGBUILD create mode 100644 pcr/emacs-lucid/emacs-24.3-giflib5.patch create mode 100644 pcr/emacs-lucid/emacs.install delete mode 100644 ~lukeshu/emacs-lucid/PKGBUILD delete mode 100644 ~lukeshu/emacs-lucid/emacs.install delete mode 100644 ~lukeshu/emacs-lucid/librenamcap diff --git a/pcr/emacs-lucid/PKGBUILD b/pcr/emacs-lucid/PKGBUILD new file mode 100644 index 000000000..f88607e0a --- /dev/null +++ b/pcr/emacs-lucid/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 192474 2013-08-12 20:25:41Z eric $ +# Maintainer: Luke Shumaker +# Maintainer (Arch): Juergen Hoetzel +# Contributor: Renchi Raju + +_pkgname=emacs +pkgname=emacs-lucid +pkgver=24.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" +license=('GPL3') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' '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} + emacs-24.3-giflib5.patch) +md5sums=('ea9ed000ca165280265aabb55b9afbd7' + 'SKIP' + '560cdf463299e059c5fadf474bcba218') + +pkgdesc+=", with the Lucid X11 toolkit" +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") + +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 \ + --localstatedir=/var --with-x-toolkit=lucid --with-xft + make +} + +package() { + cd "$srcdir"/$_pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # 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 + chmod 775 "$pkgdir"/var/games + chmod 775 "$pkgdir"/var/games/emacs + chmod 664 "$pkgdir"/var/games/emacs/* + chown -R root:games "$pkgdir"/var/games +} diff --git a/pcr/emacs-lucid/emacs-24.3-giflib5.patch b/pcr/emacs-lucid/emacs-24.3-giflib5.patch new file mode 100644 index 000000000..b8571abb2 --- /dev/null +++ b/pcr/emacs-lucid/emacs-24.3-giflib5.patch @@ -0,0 +1,26 @@ +--- src/image.c ++++ src/image.c 2013-05-21 15:49:41.945819346 +0000 +@@ -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); diff --git a/pcr/emacs-lucid/emacs.install b/pcr/emacs-lucid/emacs.install new file mode 100644 index 000000000..6712f44ba --- /dev/null +++ b/pcr/emacs-lucid/emacs.install @@ -0,0 +1,32 @@ +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 +} diff --git a/~lukeshu/emacs-lucid/PKGBUILD b/~lukeshu/emacs-lucid/PKGBUILD deleted file mode 100644 index ebc49645d..000000000 --- a/~lukeshu/emacs-lucid/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 169743 2012-10-27 23:41:39Z eric $ -# Maintainer: Luke Shumaker -# Maintainer (Arch): Juergen Hoetzel -# Contributor (Arch): Renchi Raju - -_pkgname=emacs -pkgname=emacs-lucid -pkgver=24.2 -pkgrel=2 -pkgdesc="The extensible, customizable, self-documenting real-time display editor (lucid tooklit instead of GTK3)" - -provides=("$_pkgname=$pkgver") -conflicts=("$_pkgname") - -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/emacs/emacs.html" -license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'm17n-lib' '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') - - -build() { - cd "$srcdir"/$_pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --with-x-toolkit=lucid --with-xft - make -} - -package() { - cd "$srcdir"/$_pkgname-$pkgver - make DESTDIR="$pkgdir" install - - # 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 -type d -exec chmod 755 {} \; - # fix user/root permissions on usr/share files - find "$pkgdir"/usr/share/emacs -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 -} diff --git a/~lukeshu/emacs-lucid/emacs.install b/~lukeshu/emacs-lucid/emacs.install deleted file mode 100644 index d84f1de14..000000000 --- a/~lukeshu/emacs-lucid/emacs.install +++ /dev/null @@ -1,32 +0,0 @@ -ICON_PATH=usr/share/icons/hicolor -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 -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) - -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 -} - -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.gz ${INFO_DIR}/dir 2> /dev/null - done -} diff --git a/~lukeshu/emacs-lucid/librenamcap b/~lukeshu/emacs-lucid/librenamcap deleted file mode 100644 index a42ac9e22..000000000 --- a/~lukeshu/emacs-lucid/librenamcap +++ /dev/null @@ -1,8 +0,0 @@ -emacs-lucid E: incorrect-owner var/games (root:games) -emacs-lucid E: incorrect-owner var/games/emacs (root:games) -emacs-lucid E: incorrect-owner var/games/emacs/snake-scores (root:games) -emacs-lucid E: incorrect-owner var/games/emacs/tetris-scores (root:games) -emacs-lucid W: file-in-non-standard-dir var/games/ -emacs-lucid W: file-in-non-standard-dir var/games/emacs/ -emacs-lucid W: file-in-non-standard-dir var/games/emacs/snake-scores -emacs-lucid W: file-in-non-standard-dir var/games/emacs/tetris-scores -- cgit v1.2.3-2-g168b From 707e51680cb4647549cf24d44ecf8c1d89864037 Mon Sep 17 00:00:00 2001 From: Alon Ivtsan Date: Sat, 21 Sep 2013 08:17:48 +0300 Subject: updating youtube-dl-current to version 2013.09.20.1 --- pcr/youtube-dl-current/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 4782b8162..1f7b10296 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.09.17 +pkgver=2013.09.20.1 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -27,5 +27,6 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('cdf3f403aca2f397dc423ad28596dce8' + +md5sums=('ee26e1e7558bd5f411aae9b1bf9e7e47' 'SKIP') -- cgit v1.2.3-2-g168b