diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
commit | aec9ffe68488d34c02bceb4942b87779f5c460d5 (patch) | |
tree | 5aaa0d61510bf94c4dd5bd751b53f61d39817e96 /community-testing/prboom | |
parent | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (diff) | |
parent | 9598f5141ea75ffa72a3c7c85639c6f296020ef1 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/projectm/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/qtcreator/PKGBUILD
community-testing/qtcreator/qtcreator.desktop
community/galculator/PKGBUILD
community/ristretto/PKGBUILD
core/systemd/PKGBUILD
extra/llvm/PKGBUILD
extra/pyqt/PKGBUILD
extra/python-lxml/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/glew/PKGBUILD
staging/xine-lib/PKGBUILD
testing/calligra/PKGBUILD
testing/gdk-pixbuf2/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/fix_external_program_directories.patch
testing/glib2/PKGBUILD
testing/gnome-color-manager/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtk3/PKGBUILD
testing/gvfs/PKGBUILD
testing/inkscape/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/networkmanager/PKGBUILD
testing/polkit/PKGBUILD
testing/poppler/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-xdm/PKGBUILD
Diffstat (limited to 'community-testing/prboom')
-rw-r--r-- | community-testing/prboom/PKGBUILD | 34 | ||||
-rw-r--r-- | community-testing/prboom/libpng-1.4.patch | 21 |
2 files changed, 0 insertions, 55 deletions
diff --git a/community-testing/prboom/PKGBUILD b/community-testing/prboom/PKGBUILD deleted file mode 100644 index 7a6f8086d..000000000 --- a/community-testing/prboom/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 77584 2012-10-13 02:06:46Z ebelanger $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Thayer Williams <thayer@archlinux.org> -# Contributor: dale <dale@archlinux.org> - -pkgname=prboom -pkgver=2.5.0 -pkgrel=7 -pkgdesc='A game engine which provides a program to play Doom levels.' -url='http://prboom.sourceforge.net/' -license=('GPL2') -arch=('i686' 'x86_64') -depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu') -makedepends=('mesa') -source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz" - 'libpng-1.4.patch') -md5sums=('a8a15f61fa2626ab98051ab2703378c4' - 'ba53474db8e747035ca2320a445e4ae0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 < ../libpng-1.4.patch - - ./configure --prefix=/usr --disable-i386-asm - sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - diff --git a/community-testing/prboom/libpng-1.4.patch b/community-testing/prboom/libpng-1.4.patch deleted file mode 100644 index a2215e37b..000000000 --- a/community-testing/prboom/libpng-1.4.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c ---- prboom-2.5.0-orig/src/SDL/i_sshot.c 2010-01-24 23:26:03.000000000 -0500 -+++ prboom-2.5.0/src/SDL/i_sshot.c 2010-01-24 23:28:42.000000000 -0500 -@@ -231,7 +231,7 @@ - if (fp) - { - png_struct *png_ptr = png_create_write_struct( -- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); -+ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); - - if (png_ptr) - { -@@ -279,7 +279,7 @@ - break; - } - } -- png_destroy_write_struct(&png_ptr, png_infopp_NULL); -+ png_destroy_write_struct(&png_ptr, NULL); - } - fclose(fp); - } |